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 610af11d4..3ba20e655 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
@@ -1132,18 +1132,20 @@ public class EmisBaseService {
              order.put("bagNo",emisTmsPack.getPackNo());
              order.put("ydSn",emisTmsPack.getPackNo());
              order.put("logisticNo",emisTmsPack.getPackNo());
+             order.put("printStatus", emisTmsPack.getPrintStatus());
+
              return order;
          }
 
          boolean isSubBill=false;
          // 判断是否是子单
-         String mainBillCode = "";
          String subBillSuffix = "";
+         String mainBillCode=getMainBillCode(billCode);
 
-         if(billCode.startsWith("T7080") && billCode.length()>14 ){
+         if(!billCode.equals(mainBillCode) ){
              isSubBill = true;
-             mainBillCode=billCode.substring(0,14);
-             subBillSuffix=billCode.substring(14);
+             int len=billCode.length();
+             subBillSuffix=billCode.substring(len-4);
          }else{
              mainBillCode=billCode;
          }
@@ -1152,7 +1154,6 @@ public class EmisBaseService {
              return null;
          }
 
-
          EmisWaybill waybill = emisWaybillMapper.selectEmisWaybillByBillCode(mainBillCode);
          if (waybill == null) {
              return null;
@@ -1164,14 +1165,14 @@ public class EmisBaseService {
          }
 
          if(isSubBill) {
-             if (Integer.valueOf(subBillSuffix) > waybill.getParcelQty()) {
+             if ( Integer.valueOf(subBillSuffix) > waybill.getParcelQty()
+               || Integer.valueOf(subBillSuffix)<= 0;
+             ) {
                  // 子单尾数超过总件数,查不到信息
                  return null;
              }
-
          }
 
-
          order.put("orderSn", waybill.getOrderSn());
          order.put("ydSn", billCode);
          order.put("logisticNo", billCode);