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..91701b5 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,
+                COALESCE(uc2.udfShortDesc, uc2.udfudesc) as shortUom,
                 json_arrayagg(
                     json_object(
                         'id', jobm.id,
@@ -67,7 +67,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/service/JoPickOrderService.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt
index 49d7e31..0fa1d51 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
@@ -376,6 +376,8 @@ open class JoPickOrderService(
                             "pickOrderConsoCode" to row["pickOrderConsoCode"],
                             "pickOrderLineId" to row["pickOrderLineId"],
                             "stockOutLineId" to row["stockOutLineId"],
+                            "suggestedPickLotId" to row["suggestedPickLotId"],
+                            "stockOutLineQty" to row["stockOutLineQty"], 
                             "stockOutLineStatus" to row["stockOutLineStatus"],
                             "routerIndex" to row["routerIndex"],
                             "routerArea" to row["routerArea"],
@@ -648,6 +650,8 @@ open fun getCompletedJobOrderLotsHierarchical(userId: Long): Map<String, Any?> {
                         "lotAvailability" to row["lotAvailability"],
                         "pickOrderId" to row["pickOrderId"],
                         "pickOrderCode" to row["pickOrderCode"],
+                        "suggestedPickLotId" to row["suggestedPickLotId"],
+                        "stockOutLineQty" to row["stockOutLineQty"],
                         "pickOrderConsoCode" to row["pickOrderConsoCode"],
                         "pickOrderLineId" to row["pickOrderLineId"],
                         "stockOutLineId" to row["stockOutLineId"],