diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 3163de54a..67be95814 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -403,7 +403,6 @@ public class EmisBaseService {
          order.put("dispatchType", dispatchType);
 
          EmisTransProduct emisTransProduct=getTransProductByCode(waybill.getProductType());
-         String agingFlag="";
          if(emisTransProduct!=null) {
              order.put("agingFlag", emisTransProduct.getAgingFlag());
          }
@@ -411,14 +410,18 @@ public class EmisBaseService {
          order.put("kdgs", "TANEX");
          order.put("pdfInfo", waybill.getThirdCode());
 
+         String packageWJC="";
+         String package3dm="";
+
          String pdfInfo = waybill.getThirdCode();
-         pdfInfo = pdfInfo.replace("][", "||");
-
-//         String[] striparr = pdfInfo.split("||");
-         String[] striparr = pdfInfo.split("\\|\\|");
-
-         String packageWJC = striparr[1].replace("]", "");
-         String package3dm = striparr[0].replace("[", "");
+         if(!StringUtils.isEmpty(pdfInfo)) {
+             pdfInfo = pdfInfo.replace("][", "||");
+             String[] striparr = pdfInfo.split("\\|\\|");
+             if(striparr.length == 2) {
+                 packageWJC = striparr[1].replace("]", "");
+                 package3dm = striparr[0].replace("[", "");
+             }
+         }
 
          order.put("packageWJC", packageWJC);
          order.put("package3dm", package3dm);
@@ -428,13 +431,6 @@ public class EmisBaseService {
          order.put("mobile", waybill.getReceiveMobile());
          order.put("consignee", waybill.getReceiveName());
 
-
-
-
-
-
-
-
          String custName=waybill.getReceiveCompany();
          if ( "2".equals(waybill.getPaymentType()) || "4".equals(waybill.getPaymentType())  || "5".equals(waybill.getPaymentType()) ) {
              EmisCustomerUser custUser=getCustomerUserByMonthlyPayCode(waybill.getCustNo());
@@ -490,8 +486,19 @@ public class EmisBaseService {
          order.put("parcelQty", parcelQty);
          order.put("billWeight", billWeight);
          order.put("totalVolume", totalVolume);
-         order.put("packType", DictUtils.getDictLabel("emis_tab_packing_type",waybill.getPackType()) );
-         order.put("paymentType", DictUtils.getDictLabel("emis_payment_type",waybill.getPaymentType()));
+
+         String packType="";
+         if(!StringUtils.isEmpty(waybill.getPackType())){
+             packType=DictUtils.getDictLabel("emis_tab_packing_type",waybill.getPackType());
+         }
+         order.put("packType",packType);
+
+         String paymentType="";
+         if(!StringUtils.isEmpty(waybill.getPaymentType())){
+             paymentType=DictUtils.getDictLabel("emis_payment_type",waybill.getPaymentType());
+         }
+
+         order.put("paymentType",paymentType);
          order.put("printDay", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,new Date()));
          order.put("printDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date()));
          order.put("printMan", empName);