From 7c162a457a6316fcd63a45df4d52dec9b6b66b0e Mon Sep 17 00:00:00 2001
From: "B.E.N.S.O.N" <bensonhkbus@gmail.com>
Date: Mon, 19 Jan 2026 12:23:16 +0800
Subject: [PATCH] Update

---
 .../fpsms/modules/jobOrder/service/JoPickOrderService.kt | 4 ++--
 .../modules/jobOrder/web/model/CreateJobOrderRequest.kt  | 2 +-
 .../fpsms/modules/master/entity/PrinterRepository.kt     | 2 ++
 .../ffii/fpsms/modules/master/service/PrinterService.kt  | 4 ++++
 .../modules/master/service/WarehouseQrCodeService.kt     | 9 +++++++--
 .../ffii/fpsms/modules/master/web/PrinterController.kt   | 6 ++++++
 6 files changed, 22 insertions(+), 5 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 7ad7b70..d691498 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
@@ -488,7 +488,7 @@ open class JoPickOrderService(
                         suggestedPickLotId = spl.id,
                         stockOutLineQty = sol?.qty ?: 0.0,
                         stockOutLineStatus = sol?.status,
-                        routerIndex = warehouse?.order?.toIntOrNull(),
+                        routerIndex = warehouse?.order?.toString(),
                         routerArea = warehouse?.code,
                         routerRoute = warehouse?.code,
                         uomShortDesc = uom?.udfShortDesc,
@@ -2003,7 +2003,7 @@ open fun getJobOrderLotsHierarchicalByPickOrderId(pickOrderId: Long): JobOrderLo
                     suggestedPickLotId = spl.id,
                     stockOutLineQty = sol?.qty ?: 0.0,
                     stockOutLineStatus = sol?.status,
-                    routerIndex = warehouse?.order?.toIntOrNull(),
+                    routerIndex = warehouse?.order?.toString(),
                     routerArea = warehouse?.code,
                     routerRoute = warehouse?.code,
                     uomShortDesc = uom?.udfShortDesc,
diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/web/model/CreateJobOrderRequest.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/web/model/CreateJobOrderRequest.kt
index d9d653e..893055e 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/web/model/CreateJobOrderRequest.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/web/model/CreateJobOrderRequest.kt
@@ -112,7 +112,7 @@ data class LotDetailResponse(
     val suggestedPickLotId: Long?,
     val stockOutLineQty: Double?,
     val stockOutLineStatus: String?,
-    val routerIndex: Int?,
+    val routerIndex: String?,
     val routerArea: String?,
     val routerRoute: String?,
     val uomShortDesc: String?,
diff --git a/src/main/java/com/ffii/fpsms/modules/master/entity/PrinterRepository.kt b/src/main/java/com/ffii/fpsms/modules/master/entity/PrinterRepository.kt
index b1457f7..609c73a 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/entity/PrinterRepository.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/entity/PrinterRepository.kt
@@ -10,4 +10,6 @@ interface PrinterRepository : AbstractRepository<Printer, Long> {
     fun findPrinterComboByDeletedFalse(): List<PrinterCombo>;
 
     fun findByIdAndDeletedFalse(id: Serializable): Printer?;
+    
+    fun findAllByDeletedIsFalse(): List<Printer>;
 }
\ No newline at end of file
diff --git a/src/main/java/com/ffii/fpsms/modules/master/service/PrinterService.kt b/src/main/java/com/ffii/fpsms/modules/master/service/PrinterService.kt
index c43fd7a..0e45de3 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/service/PrinterService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/service/PrinterService.kt
@@ -9,6 +9,10 @@ import org.springframework.stereotype.Service
 open class PrinterService(
     val printerRepository: PrinterRepository
 ) {
+    open fun getPrinters(): List<Printer> {
+        return printerRepository.findAllByDeletedIsFalse();
+    }
+    
     open fun findCombo(): List<PrinterCombo> {
         return printerRepository.findPrinterComboByDeletedFalse();
     }
diff --git a/src/main/java/com/ffii/fpsms/modules/master/service/WarehouseQrCodeService.kt b/src/main/java/com/ffii/fpsms/modules/master/service/WarehouseQrCodeService.kt
index f804496..61d932b 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/service/WarehouseQrCodeService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/service/WarehouseQrCodeService.kt
@@ -44,8 +44,13 @@ class WarehouseQrCodeService(
                 continue
             }
             
-            val qrContentMap = mapOf("warehouseCode" to code)
-            val qrCodeContent = Json.encodeToString(qrContentMap)
+            val warehouseId = warehouse.id
+            if (warehouseId == null) {
+            continue  
+            }
+    
+            val qrContentMap = mapOf("warehouseId" to warehouseId) 
+            val qrCodeContent = Json.encodeToString(qrContentMap).replace(Regex("""(?<!:)(:)(?!\s)"""), ": ")
             
             val qrCodeImage = QrCodeUtil.generateQRCodeImage(qrCodeContent)
             
diff --git a/src/main/java/com/ffii/fpsms/modules/master/web/PrinterController.kt b/src/main/java/com/ffii/fpsms/modules/master/web/PrinterController.kt
index 4dc2f17..cc59d48 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/web/PrinterController.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/web/PrinterController.kt
@@ -1,5 +1,6 @@
 package com.ffii.fpsms.modules.master.web
 
+import com.ffii.fpsms.modules.master.entity.Printer
 import com.ffii.fpsms.modules.master.entity.projections.PrinterCombo
 import com.ffii.fpsms.modules.master.service.PrinterService
 import org.springframework.web.bind.annotation.GetMapping
@@ -11,6 +12,11 @@ import org.springframework.web.bind.annotation.RestController
 class PrinterController(
     private val printerService: PrinterService
 ) {
+    @GetMapping
+    fun getPrinters(): List<Printer> {
+        return printerService.getPrinters();
+    }
+    
     @GetMapping("/combo")
     fun findCombo(): List<PrinterCombo> {
         return printerService.findCombo();