Browse Source

naming update

master
kelvin.yau 21 hours ago
parent
commit
dc7f329da4
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt
  2. +2
    -2
      src/main/java/com/ffii/fpsms/modules/jobOrder/web/JobOrderController.kt

+ 2
- 2
src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt View File

@@ -642,7 +642,7 @@ open class JobOrderService(
throw FileNotFoundException("Report file not found: $FGSTOCKINLABEL_PDF") throw FileNotFoundException("Report file not found: $FGSTOCKINLABEL_PDF")
} }
val inputStream = resource.inputStream val inputStream = resource.inputStream
val fgPickRecordLabel = JasperCompileManager.compileReport(inputStream)
val fgStockInLabel = JasperCompileManager.compileReport(inputStream)


val params = mutableMapOf<String, Any>() val params = mutableMapOf<String, Any>()


@@ -685,7 +685,7 @@ open class JobOrderService(


val filename = params["jobOrderCode"] as String val filename = params["jobOrderCode"] as String
return mapOf( return mapOf(
"report" to PdfUtils.fillReport(fgPickRecordLabel, fields, params),
"report" to PdfUtils.fillReport(fgStockInLabel, fields, params),
"filename" to filename "filename" to filename
) )
} }


+ 2
- 2
src/main/java/com/ffii/fpsms/modules/jobOrder/web/JobOrderController.kt View File

@@ -206,7 +206,7 @@ fun recordSecondScanIssue(
jobOrderService.printPickRecord(request) jobOrderService.printPickRecord(request)
} }


@PostMapping("/FGPickRecordLabel")
@PostMapping("/FGStockInLabel")
@Throws(UnsupportedEncodingException::class, NoSuchMessageException::class, ParseException::class, Exception::class) @Throws(UnsupportedEncodingException::class, NoSuchMessageException::class, ParseException::class, Exception::class)
fun exportFGStockInLabel(@Valid @RequestBody request: ExportFGStockInLabelRequest, response: HttpServletResponse){ fun exportFGStockInLabel(@Valid @RequestBody request: ExportFGStockInLabelRequest, response: HttpServletResponse){
response.characterEncoding = "utf-8" response.characterEncoding = "utf-8"
@@ -218,7 +218,7 @@ fun recordSecondScanIssue(
out.write(JasperExportManager.exportReportToPdf(jasperPrint)) out.write(JasperExportManager.exportReportToPdf(jasperPrint))
} }


@GetMapping("/print-FGPickRecordLabel")
@GetMapping("/print-FGStockInLabel")
fun printStockInLabel(@ModelAttribute request: PrintFGStockInLabelRequest){ fun printStockInLabel(@ModelAttribute request: PrintFGStockInLabelRequest){
jobOrderService.printFGStockInLabel(request) jobOrderService.printFGStockInLabel(request)
} }


Loading…
Cancel
Save