From f08a917f76a0adb781f58333e6e492aa140ef0a0 Mon Sep 17 00:00:00 2001
From: "kelvin.yau" <kelvin.yau@2fi-solutions.com.hk>
Date: Wed, 1 Oct 2025 13:26:56 +0800
Subject: [PATCH] DN fix + PR update

---
 .../jobOrder/service/JoPickOrderService.kt    |  9 +++++---
 .../jobOrder/service/JobOrderService.kt       | 21 +++++++++++++++++--
 .../web/model/ExportPickRecordRequest.kt      |  2 +-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt
index d901da3..46f27ed 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt
@@ -1131,8 +1131,10 @@ open fun getCompletedJobOrderPickOrderLotDetails(pickOrderId: Long): List<Map<St
                 fg.name as fgName,
                 
                 b.outputQtyUom as unit,
+                b.itemId as bomItemId,
+                iu.uomId as bomItemUomId,
                 
-                uc_fg.udfudesc as uomConversionDesc,
+                uc_bom.udfudesc as uomConversionDesc,
                 
                 -- Pick Order Line Information
                 pol.id as pickOrderLineId,
@@ -1234,8 +1236,9 @@ open fun getCompletedJobOrderPickOrderLotDetails(pickOrderId: Long): List<Map<St
             LEFT JOIN fpsmsdb.warehouse w ON w.id = ill.warehouseId
             LEFT JOIN fpsmsdb.stock_out_line sol ON sol.pickOrderLineId = pol.id AND sol.inventoryLotLineId = ill.id AND sol.deleted = false
             LEFT JOIN fpsmsdb.jo_pick_order jpo ON jpo.pick_order_id = po.id AND jpo.item_id = pol.itemId
-            LEFT JOIN fpsmsdb.item_uom iu ON iu.itemId = b.itemId
-            LEFT JOIN fpsmsdb.uom_conversion uc_fg ON uc_fg.id = iu.uomId AND iu.stockunit = 1
+            LEFT JOIN fpsmsdb.item_uom iu ON iu.itemId = b.itemId AND iu.stockUnit = 1
+            LEFT JOIN fpsmsdb.uom_conversion uc_fg ON uc_fg.id = iu.uomId
+            LEFT JOIN fpsmsdb.uom_conversion uc_bom ON uc_bom.id = iu.uomId
             WHERE po.deleted = false
             AND po.id = :pickOrderId
             AND pol.deleted = false
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 aebdea5..e6194e0 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
@@ -312,7 +312,7 @@ open class JobOrderService(
         }
         val inputStream = resource.inputStream
         val pickRecord = JasperCompileManager.compileReport(inputStream)
-        val pickRecordInfo = joPickOrderService.getCompletedJobOrderPickOrderLotDetails(request.jobOrderIds).toMutableList()
+        val pickRecordInfo = joPickOrderService.getCompletedJobOrderPickOrderLotDetails(request.pickOrderIds).toMutableList()
 
 
         val fields = mutableListOf<MutableMap<String, Any>>()
@@ -352,7 +352,24 @@ open class JobOrderService(
         params["FGCode"] = pickRecordInfo.firstOrNull()?.get("fgCode") as? String ?: "N/A"
         params["FGName"] = pickRecordInfo.firstOrNull()?.get("fgName") as? String ?: "N/A"
 
-        params["unit"] = pickRecordInfo.firstOrNull()?.get("unit") as? String ?: "N/A"
+        /*// Debug UOM information
+        val bomItemUomIdRaw = pickRecordInfo.firstOrNull()?.get("bomItemUomId")
+        val bomItemId = pickRecordInfo.firstOrNull()?.get("bomItemId")
+        val uomCode = pickRecordInfo.firstOrNull()?.get("uomCode") as? String
+        val uomDesc = pickRecordInfo.firstOrNull()?.get("uomDesc") as? String
+        val uomShortDesc = pickRecordInfo.firstOrNull()?.get("uomShortDesc") as? String
+        val unit = pickRecordInfo.firstOrNull()?.get("unit") as? String
+
+        println("Debug - UOM Info:")
+        println("  bomItemId: $bomItemId")
+        println("  bomItemUomId: $bomItemUomIdRaw")
+        println("  uomCode: $uomCode")
+        println("  uomDesc: $uomDesc")
+        println("  uomShortDesc: $uomShortDesc")
+        println("  unit (from BOM): $unit")*/
+
+        params["unit"] = pickRecordInfo.firstOrNull()?.get("uomConversionDesc") as? String ?: "N/A"
+
 
         return mapOf(
             "report" to PdfUtils.fillReport(pickRecord, fields, params),
diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/web/model/ExportPickRecordRequest.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/web/model/ExportPickRecordRequest.kt
index 34c36ac..a1d1f4c 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/web/model/ExportPickRecordRequest.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/web/model/ExportPickRecordRequest.kt
@@ -1,5 +1,5 @@
 package com.ffii.fpsms.modules.jobOrder.web.model
 
 data class ExportPickRecordRequest (
-    val jobOrderIds: Long,
+    val pickOrderIds: Long,
 )
\ No newline at end of file