diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt index 6a5b4ec..49826e0 100644 --- a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt +++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt @@ -642,7 +642,7 @@ open class JobOrderService( throw FileNotFoundException("Report file not found: $FGSTOCKINLABEL_PDF") } val inputStream = resource.inputStream - val fgPickRecordLabel = JasperCompileManager.compileReport(inputStream) + val fgStockInLabel = JasperCompileManager.compileReport(inputStream) val params = mutableMapOf() @@ -685,7 +685,7 @@ open class JobOrderService( val filename = params["jobOrderCode"] as String return mapOf( - "report" to PdfUtils.fillReport(fgPickRecordLabel, fields, params), + "report" to PdfUtils.fillReport(fgStockInLabel, fields, params), "filename" to filename ) } diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/web/JobOrderController.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/web/JobOrderController.kt index 3602c62..67dd108 100644 --- a/src/main/java/com/ffii/fpsms/modules/jobOrder/web/JobOrderController.kt +++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/web/JobOrderController.kt @@ -208,7 +208,7 @@ fun recordSecondScanIssue( jobOrderService.printPickRecord(request) } - @PostMapping("/FGPickRecordLabel") + @PostMapping("/FGStockInLabel") @Throws(UnsupportedEncodingException::class, NoSuchMessageException::class, ParseException::class, Exception::class) fun exportFGStockInLabel(@Valid @RequestBody request: ExportFGStockInLabelRequest, response: HttpServletResponse){ response.characterEncoding = "utf-8" @@ -220,7 +220,7 @@ fun recordSecondScanIssue( out.write(JasperExportManager.exportReportToPdf(jasperPrint)) } - @GetMapping("/print-FGPickRecordLabel") + @GetMapping("/print-FGStockInLabel") fun printStockInLabel(@ModelAttribute request: PrintFGStockInLabelRequest){ jobOrderService.printFGStockInLabel(request) }