| @@ -488,7 +488,7 @@ open class JoPickOrderService( | |||||
| suggestedPickLotId = spl.id, | suggestedPickLotId = spl.id, | ||||
| stockOutLineQty = sol?.qty ?: 0.0, | stockOutLineQty = sol?.qty ?: 0.0, | ||||
| stockOutLineStatus = sol?.status, | stockOutLineStatus = sol?.status, | ||||
| routerIndex = warehouse?.order?.toIntOrNull(), | |||||
| routerIndex = warehouse?.order?.toString(), | |||||
| routerArea = warehouse?.code, | routerArea = warehouse?.code, | ||||
| routerRoute = warehouse?.code, | routerRoute = warehouse?.code, | ||||
| uomShortDesc = uom?.udfShortDesc, | uomShortDesc = uom?.udfShortDesc, | ||||
| @@ -2003,7 +2003,7 @@ open fun getJobOrderLotsHierarchicalByPickOrderId(pickOrderId: Long): JobOrderLo | |||||
| suggestedPickLotId = spl.id, | suggestedPickLotId = spl.id, | ||||
| stockOutLineQty = sol?.qty ?: 0.0, | stockOutLineQty = sol?.qty ?: 0.0, | ||||
| stockOutLineStatus = sol?.status, | stockOutLineStatus = sol?.status, | ||||
| routerIndex = warehouse?.order?.toIntOrNull(), | |||||
| routerIndex = warehouse?.order?.toString(), | |||||
| routerArea = warehouse?.code, | routerArea = warehouse?.code, | ||||
| routerRoute = warehouse?.code, | routerRoute = warehouse?.code, | ||||
| uomShortDesc = uom?.udfShortDesc, | uomShortDesc = uom?.udfShortDesc, | ||||
| @@ -112,7 +112,7 @@ data class LotDetailResponse( | |||||
| val suggestedPickLotId: Long?, | val suggestedPickLotId: Long?, | ||||
| val stockOutLineQty: Double?, | val stockOutLineQty: Double?, | ||||
| val stockOutLineStatus: String?, | val stockOutLineStatus: String?, | ||||
| val routerIndex: Int?, | |||||
| val routerIndex: String?, | |||||
| val routerArea: String?, | val routerArea: String?, | ||||
| val routerRoute: String?, | val routerRoute: String?, | ||||
| val uomShortDesc: String?, | val uomShortDesc: String?, | ||||
| @@ -10,4 +10,6 @@ interface PrinterRepository : AbstractRepository<Printer, Long> { | |||||
| fun findPrinterComboByDeletedFalse(): List<PrinterCombo>; | fun findPrinterComboByDeletedFalse(): List<PrinterCombo>; | ||||
| fun findByIdAndDeletedFalse(id: Serializable): Printer?; | fun findByIdAndDeletedFalse(id: Serializable): Printer?; | ||||
| fun findAllByDeletedIsFalse(): List<Printer>; | |||||
| } | } | ||||
| @@ -9,6 +9,10 @@ import org.springframework.stereotype.Service | |||||
| open class PrinterService( | open class PrinterService( | ||||
| val printerRepository: PrinterRepository | val printerRepository: PrinterRepository | ||||
| ) { | ) { | ||||
| open fun getPrinters(): List<Printer> { | |||||
| return printerRepository.findAllByDeletedIsFalse(); | |||||
| } | |||||
| open fun findCombo(): List<PrinterCombo> { | open fun findCombo(): List<PrinterCombo> { | ||||
| return printerRepository.findPrinterComboByDeletedFalse(); | return printerRepository.findPrinterComboByDeletedFalse(); | ||||
| } | } | ||||
| @@ -44,8 +44,13 @@ class WarehouseQrCodeService( | |||||
| continue | 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) | val qrCodeImage = QrCodeUtil.generateQRCodeImage(qrCodeContent) | ||||
| @@ -1,5 +1,6 @@ | |||||
| package com.ffii.fpsms.modules.master.web | 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.entity.projections.PrinterCombo | ||||
| import com.ffii.fpsms.modules.master.service.PrinterService | import com.ffii.fpsms.modules.master.service.PrinterService | ||||
| import org.springframework.web.bind.annotation.GetMapping | import org.springframework.web.bind.annotation.GetMapping | ||||
| @@ -11,6 +12,11 @@ import org.springframework.web.bind.annotation.RestController | |||||
| class PrinterController( | class PrinterController( | ||||
| private val printerService: PrinterService | private val printerService: PrinterService | ||||
| ) { | ) { | ||||
| @GetMapping | |||||
| fun getPrinters(): List<Printer> { | |||||
| return printerService.getPrinters(); | |||||
| } | |||||
| @GetMapping("/combo") | @GetMapping("/combo") | ||||
| fun findCombo(): List<PrinterCombo> { | fun findCombo(): List<PrinterCombo> { | ||||
| return printerService.findCombo(); | return printerService.findCombo(); | ||||