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 b6d6202d8..18e0bda0b 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 @@ -1268,8 +1268,10 @@ public class EmisWaybillController extends EmisBaseController if(!StringUtils.isEmpty(item)) { Map order = emisBaseService.getWaybillPrintOrder(item, subBillCodeRange, tpCodeItem, "zh", tpCodeItem, printManCode); - String cmd=CvtTplToCpcl.getPrintCmd(emisPrintTpl.getTplData(),order); - sbPrintCmd.append(cmd); + if(order!=null) { + String cmd = CvtTplToCpcl.getPrintCmd(emisPrintTpl.getTplData(), order); + sbPrintCmd.append(cmd); + } } } } @@ -1279,8 +1281,10 @@ public class EmisWaybillController extends EmisBaseController }else{ // 直接获取 Map order = emisBaseService.getWaybillPrintOrder(billCode, subBillCodeRange, tpCodeItem, "zh", tpCodeItem, printManCode); - String cmd=CvtTplToCpcl.getPrintCmd(emisPrintTpl.getTplData(),order); - sbPrintCmd.append(cmd); + if(order!=null) { + String cmd = CvtTplToCpcl.getPrintCmd(emisPrintTpl.getTplData(), order); + sbPrintCmd.append(cmd); + } } } } diff --git a/emis-biz/src/main/resources/tpl/TAN-CM-130.pdf b/emis-biz/src/main/resources/tpl/TAN-CM-130.pdf index 3cd39aeac..445e2bae2 100644 Binary files a/emis-biz/src/main/resources/tpl/TAN-CM-130.pdf and b/emis-biz/src/main/resources/tpl/TAN-CM-130.pdf differ