This commit is contained in:
linfso 2024-08-30 09:52:14 +08:00
parent b4079a5e8f
commit 7634ba173b

View File

@ -1209,6 +1209,8 @@ public class EmisWaybillController extends EmisBaseController
if(!StringUtils.isEmpty(billCode)){
try {
billCode=WaybillHelper.formatQueryValue(billCode);
StringBuilder sbPrintCmd = new StringBuilder();
String printManCode=getLoginUser().getUser().getEmpCode();
@ -1311,69 +1313,6 @@ public class EmisWaybillController extends EmisBaseController
return AjaxResult.error("获取失败");
}
// @GetMapping("/realGetWaybillPdf")
// 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("参数错误");
// }
//
// try {
// response.setCharacterEncoding("UTF-8");
// response.setContentType("application/pdf");
// response.setHeader("Content-Disposition", "filename=" + billCode+".pdf");
// OutputStream os=response.getOutputStream();
//
// Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, tplCode,lang, printType,printManCode);
// 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("获取异常");
// }
//
// }
// @GetMapping("/realGetWaybillPng")
// 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)){
// 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<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange,tplCode, lang, printType,printManCode);
// if(order!=null) {
// IXddTplPrint tplPrint = new TanexTplPrintImpl();
// tplPrint.genPNG(order,"", os);
// }else{
// return AjaxResult.error("运单不存在");
// // 忽略错误
// }
//
// return null;
// }catch (Exception ex){
// ex.printStackTrace();
// return AjaxResult.error("系统异常");
// }
//
// }
@RequestMapping("/updatePrintStatus")
public AjaxResult updatePrintStatus(String billCode)
{