aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-07 07:42:37 +08:00
parent 8637f2dcb0
commit 0f9dc6675a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

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