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 563e00f92..174b2cb19 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 @@ -467,7 +467,7 @@ public class EmisWaybillController extends EmisBaseController } @RequestMapping("/realGetWaybillPrintData") - public AjaxResult realGetWaybillPrintData(String billCode, String billCodeRange, String lang,String tplCode, String printType,String isNeedPdf) + public AjaxResult realGetWaybillPrintData(String billCode, String billCodeRange, String lang,String tplCode, String printType,String printManCode,String isNeedPdf) { /* , HttpServletRequest request, HttpServletResponse response @@ -491,7 +491,7 @@ public class EmisWaybillController extends EmisBaseController String[] billCodeArr = billCode.split(","); for(String billCodeItem:billCodeArr) { - Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, tplCode,lang, printType); + Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, tplCode,lang, printType,printManCode); JSONObject printItem = new JSONObject(); printItem.put("billCode",billCodeItem); printItem.put("billDetail",Base64.getEncoder().encodeToString(JSONObject.toJSONString(order).getBytes(Charset.forName("UTF-8")))); @@ -672,7 +672,7 @@ public class EmisWaybillController extends EmisBaseController @RequestMapping("/realGetWaybillPdf") - public AjaxResult realGetWaybillPdf(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange,String tplCode, String lang, String printType,String isNeedPdf) + public AjaxResult realGetWaybillPdf(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange,String tplCode, String lang, String printType,String printManCode,String isNeedPdf) { if(StringUtils.isEmpty(billCode)){ return AjaxResult.error("参数错误"); @@ -684,7 +684,7 @@ public class EmisWaybillController extends EmisBaseController response.setHeader("Content-Disposition", "filename=" + billCode+".pdf"); OutputStream os=response.getOutputStream(); - Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, tplCode,lang, printType); + Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, tplCode,lang, printType,printManCode); if(order!=null) { IXddTplPrint tplPrint = new TanexTplPrintImpl(); tplPrint.genPDF(order, os); @@ -701,7 +701,7 @@ public class EmisWaybillController extends EmisBaseController } @RequestMapping("/realGetWaybillPng") - public AjaxResult realGetWaybillPng(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang,String tplCode, String printType,String isNeedPdf) + public AjaxResult realGetWaybillPng(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang,String tplCode, String printType,String printManCode,String isNeedPdf) { if(StringUtils.isEmpty(billCode)){ @@ -714,7 +714,7 @@ public class EmisWaybillController extends EmisBaseController response.setHeader("Content-Disposition", "filename=" + billCode+".png"); OutputStream os=response.getOutputStream(); - Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange,tplCode, lang, printType); + Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange,tplCode, lang, printType,printManCode); if(order!=null) { IXddTplPrint tplPrint = new TanexTplPrintImpl(); tplPrint.genPNG(order, os);