From f5c9476262cc1edc904c5e35270b7f5f009b98b1 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 28 May 2024 18:09:56 +0800 Subject: [PATCH] md --- .../erp/web/emis/EmisCommonController.java | 4 ++-- .../erp/web/emis/EmisWaybillController.java | 20 +++++++++---------- .../erp/emis/service/EmisBaseService.java | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java index 19d7c92e2..a86b5371e 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java @@ -232,7 +232,7 @@ public class EmisCommonController extends BaseController @RequestMapping("/getPrintDataByPrinter") - public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response, String billCode, String billCodeRange, String lang, String printType) + public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response, String billCode, String billCodeRange,String tplCode, String lang, String printType) { if(StringUtils.isEmpty(billCode)){ @@ -242,7 +242,7 @@ public class EmisCommonController extends BaseController if(!StringUtils.isEmpty(billCode)){ try { - Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType); + Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, tplCode,lang, printType); JSONObject printItem = new JSONObject(); printItem.put("billCode",billCode); diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java index 8d8903a9b..a86a3edf3 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java @@ -415,7 +415,7 @@ public class EmisWaybillController extends BaseController } @RequestMapping("/realGetWaybillPrintData") - public AjaxResult realGetWaybillPrintData(String billCode, String billCodeRange, String lang, String printType,String isNeedPdf) + public AjaxResult realGetWaybillPrintData(String billCode, String billCodeRange, String lang,String tplCode, String printType,String isNeedPdf) { /* , HttpServletRequest request, HttpServletResponse response @@ -439,7 +439,7 @@ public class EmisWaybillController extends BaseController String[] billCodeArr = billCode.split(","); for(String billCodeItem:billCodeArr) { - Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType); + Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, tplCode,lang, printType); JSONObject printItem = new JSONObject(); printItem.put("billCode",billCodeItem); printItem.put("billDetail",Base64.getEncoder().encodeToString(JSONObject.toJSONString(order).getBytes(Charset.forName("UTF-8")))); @@ -482,7 +482,7 @@ public class EmisWaybillController extends BaseController } @RequestMapping("/realGetPrintList") - public AjaxResult realGetPrintList(String billCode, String billCodeRange, String lang, String printType) + public AjaxResult realGetPrintList(String billCode, String billCodeRange,String tplCode, String lang, String printType) { /* , HttpServletRequest request, HttpServletResponse response @@ -502,7 +502,7 @@ public class EmisWaybillController extends BaseController String[] billCodeArr = billCode.split(","); for(String billCodeItem:billCodeArr) { - Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType); + Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange,tplCode,lang, printType); JSONObject printItem = new JSONObject(); printItem.put("billCode",billCodeItem); if(order!=null) { @@ -564,7 +564,7 @@ public class EmisWaybillController extends BaseController @RequestMapping("/realGetWaybillPdf") - public AjaxResult realGetWaybillPdf(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang, String printType,String isNeedPdf) + public AjaxResult realGetWaybillPdf(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange,String tplCode, String lang, String printType,String isNeedPdf) { if(StringUtils.isEmpty(billCode)){ return AjaxResult.error("参数错误"); @@ -576,7 +576,7 @@ public class EmisWaybillController extends BaseController response.setHeader("Content-Disposition", "filename=" + billCode+".pdf"); OutputStream os=response.getOutputStream(); - Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType); + Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, tplCode,lang, printType); if(order!=null) { IXddTplPrint tplPrint = new TanexTplPrintImpl(); tplPrint.genPDF(order, os); @@ -593,7 +593,7 @@ public class EmisWaybillController extends BaseController } @RequestMapping("/realGetWaybillPng") - public AjaxResult realGetWaybillPng(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang, String printType,String isNeedPdf) + public AjaxResult realGetWaybillPng(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang,String tplCode, String printType,String isNeedPdf) { if(StringUtils.isEmpty(billCode)){ @@ -606,7 +606,7 @@ public class EmisWaybillController extends BaseController response.setHeader("Content-Disposition", "filename=" + billCode+".png"); OutputStream os=response.getOutputStream(); - Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType); + Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange,tplCode, lang, printType); if(order!=null) { IXddTplPrint tplPrint = new TanexTplPrintImpl(); tplPrint.genPNG(order, os); @@ -651,7 +651,7 @@ public class EmisWaybillController extends BaseController } @RequestMapping("/getPrintDataByPrinter") - public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang, String printType) + public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange,String tplCode, String lang, String printType) { if(StringUtils.isEmpty(billCode)){ @@ -661,7 +661,7 @@ public class EmisWaybillController extends BaseController if(!StringUtils.isEmpty(billCode)){ try { - Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType); + Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange,tplCode, lang, printType); JSONObject printItem = new JSONObject(); printItem.put("billCode",billCode); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index c67ac815b..aca499c44 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -375,7 +375,7 @@ public class EmisBaseService { * @param printType * @return */ - public Map getWaybillPrintOrder(String billCode, String billCodeRange, String lang, String printType) { + public Map getWaybillPrintOrder(String billCode, String billCodeRange, String tplCode,String lang, String printType) { if (StringUtils.isEmpty(billCode)) { return null; }