From 77cf2d7868d703a2b6823da9fdd6ad21cd619730 Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Tue, 30 Sep 2025 21:02:53 +0800
Subject: [PATCH] update jo

---
 .../ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt  | 4 ++--
 .../fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt | 4 ++++
 .../ffii/fpsms/modules/jobOrder/service/JobOrderService.kt    | 2 ++
 3 files changed, 8 insertions(+), 2 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 9ca0d35..c6b30ea 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
@@ -41,6 +41,7 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
             select
                 jo.id,
                 jo.code,
+                i.code as itemCode,
                 b.name,
                 jo.reqQty,
                 -- b.outputQtyUom,
@@ -68,8 +69,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, uc2.udfShortDesc
-            
+            group by jo.id, uc2.udfudesc, uc2.udfShortDesc, i.code
             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 11055e6..562c8a7 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
@@ -8,6 +8,8 @@ interface JobOrderInfo {
     val id: Long;
     val code: String;
 
+    @get:Value("#{target.bom.item.code}")
+    val itemCode: String;
     @get:Value("#{target.bom.name}")
     val name: String;
     val reqQty: BigDecimal;
@@ -23,6 +25,7 @@ interface JobOrderInfo {
 interface JobOrderDetailWithJsonString {
     val id: Long?;
     val code: String?;
+    val itemCode: String?;
     val name: String?;
     val reqQty: BigDecimal?;
     val uom: String?;
@@ -34,6 +37,7 @@ interface JobOrderDetailWithJsonString {
 data class JobOrderDetail(
     val id: Long?,
     val code: String?,
+    val itemCode: String?,
     val name: String?,
     val reqQty: BigDecimal?,
     val uom: 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 4a395fd..078dc39 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
@@ -79,6 +79,7 @@ open class JobOrderService(
         return JobOrderDetail(
             id = sqlResult.id,
             code = sqlResult.code,
+            itemCode = sqlResult.itemCode,
             name = sqlResult.name,
             reqQty = sqlResult.reqQty,
             uom = sqlResult.uom,
@@ -96,6 +97,7 @@ open class JobOrderService(
         return JobOrderDetail(
             id = sqlResult.id,
             code = sqlResult.code,
+            itemCode = sqlResult.itemCode,
             name = sqlResult.name,
             reqQty = sqlResult.reqQty,
             uom = sqlResult.uom,