From 067d751ccbedfe103c98cebbf282a964f908bfc7 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 30 May 2024 11:51:14 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/EmisBaseService.java      | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

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 00a07695e..0fbf1a000 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
@@ -399,12 +399,18 @@ public class EmisBaseService {
          // 判断是否是子单
          String queryBillCode = "";
          String subBillSuffix = "";
-         if(queryBillCode.startsWith("T7080") && queryBillCode.length()>14 ){
+
+         if(billCode.startsWith("T7080") && billCode.length()>14 ){
              isSubBill = true;
              queryBillCode=billCode.substring(0,14);
              subBillSuffix=billCode.substring(14);
          }
 
+         if(StringUtils.isEmpty(queryBillCode)){
+             return null;
+         }
+
+
          EmisWaybill waybill = emisWaybillMapper.selectEmisWaybillByBillCode(queryBillCode);
          if (waybill == null) {
              return null;
@@ -1061,15 +1067,17 @@ public class EmisBaseService {
 //         System.out.println(packageWJC);
 //         System.out.println(package3dm);
 
-         String mainBillCode="T70803000003790001";
+         String mainBillCode="T70803005000020002";
 
          boolean isSubBill=false;
          // 判断是否是子单
-         String queryBillCode=mainBillCode;
-         if(queryBillCode.startsWith("T7080") && queryBillCode.length()>14 ){
+         String queryBillCode="";
+         if(mainBillCode.startsWith("T7080") && mainBillCode.length()>14 ){
              isSubBill = true;
-             queryBillCode=queryBillCode.substring(0,14);
+             queryBillCode=mainBillCode.substring(0,14);
              String subBillSuffix=mainBillCode.substring(14);
+             System.out.println(mainBillCode);
+             System.out.println(queryBillCode);
              System.out.println(Integer.valueOf(subBillSuffix));
          }