Merge remote-tracking branch 'origin/master'

src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt

@@ -713,10 +713,10 @@ open class DeliveryOrderService(
         try{
             JasperExportManager.exportReportToPdfFile(jasperPrint,tempPdfFile.absolutePath)
 
-            val printQty = if (request.printQty == null || request.printQty <= 0) 1 else request.printQty
-            printer.ip?.let { ip -> printer.port?.let { port ->
-                ZebraPrinterUtil.printPdfToZebra(tempPdfFile, ip, port, printQty, ZebraPrinterUtil.PrintDirection.ROTATED)
-            }}
+            //val printQty = if (request.printQty == null || request.printQty <= 0) 1 else request.printQty
+            //printer.ip?.let { ip -> printer.port?.let { port ->
+            //    ZebraPrinterUtil.printPdfToZebra(tempPdfFile, ip, port, printQty, ZebraPrinterUtil.PrintDirection.ROTATED)
+            //}}
         } finally {
             //tempPdfFile.delete()
         }

src/main/resources/db/changelog/changes/202510927_01_enson/03_fix_bug.sql

@@ -0,0 +1,8 @@
+-- liquibase formatted sql
+-- changeset cyril:fix_bug
+
+ALTER TABLE `jo_pick_order`
+    ADD COLUMN `hide` TINYINT(1) NULL AFTER `deleted`;
+
+ALTER TABLE `jo_pick_order_record`
+    ADD COLUMN `hide` TINYINT(1) NULL AFTER `deleted`;