From 31037b1cfafd650cc40154ff40aba0f3af1fe676 Mon Sep 17 00:00:00 2001 From: "kelvin.yau" Date: Mon, 29 Sep 2025 20:58:03 +0800 Subject: [PATCH 1/2] DN Labels new Layout --- .../DeliveryNoteCartonLabelsPDF.jrxml | 301 +++++++++--------- 1 file changed, 155 insertions(+), 146 deletions(-) diff --git a/src/main/resources/DeliveryNote/DeliveryNoteCartonLabelsPDF.jrxml b/src/main/resources/DeliveryNote/DeliveryNoteCartonLabelsPDF.jrxml index a9eca4e..392fe29 100644 --- a/src/main/resources/DeliveryNote/DeliveryNoteCartonLabelsPDF.jrxml +++ b/src/main/resources/DeliveryNote/DeliveryNoteCartonLabelsPDF.jrxml @@ -1,150 +1,159 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6bbbf60df84bfd164ae12afdd0df3292b8b11bef Mon Sep 17 00:00:00 2001 From: "kelvin.yau" Date: Mon, 29 Sep 2025 21:35:38 +0800 Subject: [PATCH 2/2] fix --- .../com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt | 1 + .../fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt | 1 + 2 files changed, 2 insertions(+) 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 4b700e3..6db8b36 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,6 +45,7 @@ interface JobOrderRepository : AbstractRepository { jo.reqQty, -- b.outputQtyUom, uc2.udfudesc as uom, + uc2.uomShortDesc as shortUom, json_arrayagg( json_object( 'id', jobm.id, 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 d4e3ab3..e9a32e1 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 @@ -47,6 +47,7 @@ data class JobOrderDetailPickLine( val pickedLotNo: List?, val reqQty: BigDecimal?, val uom: String?, + val shortUom: String?, val status: String? )