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 730fa2758..cbd4c4420 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 @@ -340,68 +340,68 @@ public class EmisWaybillController extends BaseController @RequestMapping("/realGetWaybillPdf") - public void 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 lang, String printType,String isNeedPdf) { - if(!StringUtils.isEmpty(billCode)){ - try { - JSONArray jArr = new JSONArray(); - String[] billCodeArr = billCode.split(","); - - for(String billCodeItem:billCodeArr) { - Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType); - if(order!=null) { - response.setCharacterEncoding("UTF-8"); - response.setContentType("application/pdf"); - response.setHeader("Content-Disposition", "filename=" + billCodeItem+".pdf"); - OutputStream os=response.getOutputStream(); - IXddTplPrint tplPrint = new TanexTplPrintImpl(); - tplPrint.genPDF(order, os); - - }else{ - responseJson(response,JSONObject.toJSONString(AjaxResult.error("未获取到数据"))); - } - } - }catch (Exception ex){ - ex.printStackTrace(); - responseJson(response,JSONObject.toJSONString(AjaxResult.error("获取异常"))); - - } + if(StringUtils.isEmpty(billCode)){ + return AjaxResult.error("参数错误"); + } + + try { + response.setCharacterEncoding("UTF-8"); + response.setContentType("application/pdf"); + response.setHeader("Content-Disposition", "filename=" + billCode+".pdf"); + OutputStream os=response.getOutputStream(); + + Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType); + if(order!=null) { + IXddTplPrint tplPrint = new TanexTplPrintImpl(); + tplPrint.genPDF(order, os); + }else{ + return AjaxResult.error("运单不存在"); + } + + return null; + }catch (Exception ex){ + ex.printStackTrace(); + return AjaxResult.error("获取异常"); } - responseJson(response,JSONObject.toJSONString(AjaxResult.error("获取失败"))); } @RequestMapping("/realGetWaybillPng") - public void 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 printType,String isNeedPdf) { - if(!StringUtils.isEmpty(billCode)){ - try { - JSONArray jArr = new JSONArray(); - String[] billCodeArr = billCode.split(","); - for(String billCodeItem:billCodeArr) { - Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType); - if(order!=null) { - response.setCharacterEncoding("UTF-8"); - response.setContentType(MediaType.IMAGE_PNG_VALUE); - response.setHeader("Content-Disposition", "filename=" + billCodeItem+".png"); - OutputStream os=response.getOutputStream(); - IXddTplPrint tplPrint = new TanexTplPrintImpl(); - tplPrint.genPNG(order, os); - - }else{ - responseJson(response,JSONObject.toJSONString(AjaxResult.error("未获取到数据"))); - } - } - - }catch (Exception ex){ - ex.printStackTrace(); - - responseJson(response,JSONObject.toJSONString(AjaxResult.error("获取异常"))); - } + if(StringUtils.isEmpty(billCode)){ + return AjaxResult.error("参数错误"); + } + + try { + response.setCharacterEncoding("UTF-8"); + response.setContentType(MediaType.IMAGE_PNG_VALUE); + response.setHeader("Content-Disposition", "filename=" + billCode+".png"); + OutputStream os=response.getOutputStream(); + + Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType); + if(order!=null) { + IXddTplPrint tplPrint = new TanexTplPrintImpl(); + tplPrint.genPNG(order, os); + }else{ + return AjaxResult.error("运单不存在"); + // 忽略错误 + } + +// String[] billCodeArr = billCode.split(","); +// for(String billCodeItemStr:billCodeArr) { +// +// } + + return null; + }catch (Exception ex){ + ex.printStackTrace(); + return AjaxResult.error("系统异常"); } - responseJson(response,JSONObject.toJSONString(AjaxResult.error("获取失败"))); }