From 9789afb0d9404b64025002efb15be44e52fc3b54 Mon Sep 17 00:00:00 2001
From: "kelvin.yau" <kelvin.yau@2fi-solutions.com.hk>
Date: Tue, 30 Sep 2025 10:23:58 +0800
Subject: [PATCH] repository update

---
 .../fpsms/modules/jobOrder/entity/JobOrderRepository.kt     | 5 +++--
 .../modules/jobOrder/entity/projections/JobOrderInfo.kt     | 2 ++
 .../ffii/fpsms/modules/jobOrder/service/JobOrderService.kt  | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
index 6db8b36..366f5df 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
@@ -45,7 +45,7 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
                 jo.reqQty,
                 -- b.outputQtyUom,
                 uc2.udfudesc as uom,
-                uc2.uomShortDesc as shortUom,
+                uc2.udfShortDesc as shortUom,
                 json_arrayagg(
                     json_object(
                         'id', jobm.id,
@@ -54,6 +54,7 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
                         'pickedLotNo', pln.pickedLotNo,
                         'reqQty', jobm.reqQty,
                         'uom', uc.udfudesc,
+                        'shortUom', uc.udfShortdesc,
                         'status', jobm.status
                     )
                 ) as pickLines,
@@ -67,7 +68,7 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
             left join uom_conversion uc on uc.id = jobm.uomId
             left join picked_lot_no pln on pln.itemId = jobm.itemId and pln.joId = jo.id
             where jo.id = :id
-            group by jo.id, uc2.udfudesc
+            group by jo.id, uc2.udfudesc, uc2.udfShortDesc
             limit 1
         """
     )
diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt
index e9a32e1..11055e6 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt
@@ -26,6 +26,7 @@ interface JobOrderDetailWithJsonString {
     val name: String?;
     val reqQty: BigDecimal?;
     val uom: String?;
+    val shortUom: String?;
     val pickLines: String?;
     val status: String?;
 }
@@ -36,6 +37,7 @@ data class JobOrderDetail(
     val name: String?,
     val reqQty: BigDecimal?,
     val uom: String?,
+    val shortUom: String?,
     val pickLines: List<JobOrderDetailPickLine>?,
     val status: String?
 )
diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt
index b56b489..4a395fd 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt
@@ -83,7 +83,8 @@ open class JobOrderService(
             reqQty = sqlResult.reqQty,
             uom = sqlResult.uom,
             pickLines = jsonResult,
-            status = sqlResult.status
+            status = sqlResult.status,
+            shortUom = sqlResult.shortUom
         )
     }
     
@@ -99,7 +100,8 @@ open class JobOrderService(
             reqQty = sqlResult.reqQty,
             uom = sqlResult.uom,
             pickLines = jsonResult,
-            status = sqlResult.status
+            status = sqlResult.status,
+            shortUom = sqlResult.shortUom
         )
     }