Merge remote-tracking branch 'origin/master'

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

@@ -697,7 +697,7 @@ open class DeliveryOrderService(
     //Print Delivery Note
     @Transactional
     open fun printDeliveryNote(request: PrintDeliveryNoteRequest){
-        val printer = printerService.findById(request.printerId) ?: throw java.util.NoSuchElementException("No such printer")
+        //val printer = printerService.findById(request.printerId) ?: throw java.util.NoSuchElementException("No such printer")
 
         val pdf = exportDeliveryNote(
             ExportDeliveryNoteRequest(

src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt

@@ -34,6 +34,7 @@ import kotlin.jvm.optionals.getOrNull
 import com.ffii.fpsms.modules.jobOrder.service.JoPickOrderService
 import com.ffii.fpsms.modules.jobOrder.web.model.ExportPickRecordRequest
 import com.ffii.fpsms.modules.jobOrder.web.model.PrintPickRecordRequest
+import com.ffii.fpsms.modules.master.service.PrinterService
 import com.ffii.fpsms.modules.pickOrder.entity.PickOrderRepository
 import com.ffii.fpsms.modules.pickOrder.entity.PickOrderLineRepository
 import com.ffii.fpsms.modules.stock.service.SuggestedPickLotService
@@ -46,7 +47,10 @@ import com.ffii.fpsms.modules.stock.web.model.StockOutStatus
 import com.ffii.fpsms.modules.stock.web.model.StockOutLineStatus
 import com.ffii.fpsms.modules.stock.web.model.SuggestedPickLotForPolRequest
 import net.sf.jasperreports.engine.JasperCompileManager
+import net.sf.jasperreports.engine.JasperExportManager
+import net.sf.jasperreports.engine.JasperPrint
 import org.springframework.core.io.ClassPathResource
+import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
 
@@ -65,6 +69,7 @@ open class JobOrderService(
     val inventoryLotLineRepository: InventoryLotLineRepository,
     val stockOutRepository: StockOutRepository,
     val stockOutLineRepository: StockOutLIneRepository,
+    private val printerService: PrinterService,
 
 ) {
 
@@ -370,15 +375,32 @@ open class JobOrderService(
 
         params["unit"] = pickRecordInfo.firstOrNull()?.get("uomConversionDesc") as? String ?: "N/A"
 
-
+        val pickOrderCode = pickRecordInfo.firstOrNull()?.get("pickOrderCode") as? String ?: "unknown"
         return mapOf(
             "report" to PdfUtils.fillReport(pickRecord, fields, params),
-            "filename" to "123"
+            "filename" to pickOrderCode
         )
     }
 
     @Transactional
     open fun printPickRecord(request: PrintPickRecordRequest){
+        //val printer = printerService.findById(request.printerId) ?: throw java.util.NoSuchElementException("No such printer")
+
+        val pdf = exportPickRecord(
+            ExportPickRecordRequest(
+                pickOrderIds = request.pickOrderId
+            )
+        )
 
+        val jasperPrint = pdf["report"] as JasperPrint
+
+        val tempPdfFile = File.createTempFile("print_job_",".pdf")
+
+        try{
+            JasperExportManager.exportReportToPdfFile(jasperPrint,tempPdfFile.absolutePath)
+
+        } finally {
+            //tempPdfFile.delete*9
+        }
     }
 }

src/main/java/com/ffii/fpsms/modules/jobOrder/web/JobOrderController.kt

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
 import com.ffii.fpsms.modules.jobOrder.service.JoPickOrderService
 import com.ffii.fpsms.modules.jobOrder.web.model.ExportPickRecordRequest
+import com.ffii.fpsms.modules.jobOrder.web.model.PrintPickRecordRequest
 import com.ffii.fpsms.modules.jobOrder.web.model.SecondScanSubmitRequest
 import com.ffii.fpsms.modules.jobOrder.web.model.SecondScanIssueRequest
 import jakarta.servlet.http.HttpServletResponse
@@ -170,6 +171,12 @@ class JobOrderController(
         response.addHeader("filename", "${pdf["filename"]}.pdf")
         out.write(JasperExportManager.exportReportToPdf(jasperPrint))
     }
+
+    @GetMapping("/print-PickRecord")
+    fun printPickRecord(@ModelAttribute request: PrintPickRecordRequest){
+        jobOrderService.printPickRecord(request)
+    }
+
     @GetMapping("/completed-job-order-pick-orders-only/{userId}")
     fun getCompletedJobOrderPickOrders(@PathVariable userId: Long): List<Map<String, Any?>> {
         return joPickOrderService.getCompletedJobOrderPickOrders(userId)

src/main/java/com/ffii/fpsms/modules/jobOrder/web/model/PrintPickRecordRequest.kt

@@ -1,4 +1,7 @@
 package com.ffii.fpsms.modules.jobOrder.web.model
 
-class PrintPickRecordRequest {
-}
+data class PrintPickRecordRequest(
+    val pickOrderId: Long,
+    val printerId: Long,
+    val printQty: Int?
+)