From a41e5aab0e7e3b6ef612dd7d7a876e3a3cf6a0bb Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 24 Aug 2024 22:38:20 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillController.java   |  12 ++++++++----
 .../src/main/resources/tpl/TAN-CM-130.pdf     | Bin 137708 -> 143081 bytes
 2 files changed, 8 insertions(+), 4 deletions(-)

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<String, Object> 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<String, Object> 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 3cd39aeac9636a0dd5011a241e823025bce372e8..445e2bae235d4619f9dcdd201f822f846a806e16 100644
GIT binary patch
delta 737
zcmaE}nd9YMj)oS-Elh7Dx4Yb8)MVx|2{AIVGB&p|wU}Ohm(d1^zkTmrMo~r;vlL4M
za|5#!U6WK}OWmX-6AN7n1H&|3GgBjzl+>iuloV6T?ceS(+H$g+7#SIx0}V3V&FIZ+
zY+^E9{Uzg7CKJ=?jdhGF+Ybmc=`k^xm`&gKj!}=%aQcIHjB@oCyABx$xYnocJCHfK
ztkjV!%Jj#EoXlSe9Uf=+x|=*b9|!%fTfVk`-`SXVJImFkPB>81sr|g>jYFE`d(&z6
zT#FV@@OS#~_SW~~E#?!SZT4yU6LIE~@Tv#$y6RJ;%)gXx4OwlPmD5xho6ThT`^dAK
zmr``N{w$imx^jLf?>~<D$@!_ibL&~WW!v+AuP8B@SP?dB<IjvhE7pw_y-Y_qijMZ3
zm-iET&hq4sYS_VO-;W(v)7p8z3VtvD?ERFJ|NeC8n~gW_TUyU%aLckUaWb+E*tlEc
zAFBkzti%W&-qgI5;*z4&#9R<7KPijX*u)&<cV!+keV^34^pXq(Ltq#IgF&WV<kUf~
zLkbcM55j-;-&U-DekE6-NuYU!g4sgnH=9bfb+bucxxM||{o@v_TwV|FiDbmg`a2^@
zV)N~}*FKyGFx+t3%&F71;EnDr{(1dgnZ4pGUiGrc{IR{Cb!n^bafcwK4Bdv%DHpai
zy9pdzI;WuK{LkNCDq>?lNahL#6|HxU2~z3&#;<m4%GQ6J1`LKW8rQM8-C{cb4Mv6O
z!OTov3MLjV7S4u7CPt>N7AB_7<`zbd=1yh?hEC2#mPW3|M$`8)Gf8k8nHVS-Dj1s>
zDp*XP|AA4A&(vH$peVIW!O+;;*vNQ#pd^zBqviA)9~hNPCe<81^5ea$+~s;T(>#UO
z*UXpI^ZcJ~WXQnSl8|!g0_!G;^~{{h1O!e?x$I%)FkpD{jOWyJ>06AlJSIlwMuxnq
Js;>TSyZ|z>Cr<zX

delta 13
UcmaEPm*dT5j)oS-Elh7D0WrM>HUIzs