From 2f316317e7c2bc535e630a532d3907e3e5b3cc43 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 21 Jun 2024 14:52:13 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/EmisBaseService.java     | 104 ++++++++----------
 1 file changed, 43 insertions(+), 61 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 d9ec43b8c..19ce89548 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
@@ -171,28 +171,16 @@ public class EmisBaseService {
       * @return
       */
      public  String getMainBillCode(String billCode){
-         // 判断是否是子单
-         String mainBillCode = "";
-         String subSeqNo="";
-         if(billCode.startsWith("T7080") && billCode.length()>14 ){
-             mainBillCode=billCode.substring(0,14);
+         // 查询数据看下是否主单，如果不是则同样剔除4位
+         boolean isExists=checkWaybillIsExists(billCode);
+         if(isExists){
+             return billCode;
          }
-         else{
-             // 不是探路主单号是否
-             // 查询数据看下是否主单，如果不是则同样剔除4位
-             boolean isExists=checkWaybillIsExists(billCode);
-             if(isExists){
-                 mainBillCode=billCode;
-             }else{
-
-                 if(billCode.length()>5){
-                     int len=billCode.length();
-                     mainBillCode=billCode.substring(0,len-4);
-                 }
-
-             }
+         String mainBillCode = billCode;
+         if(billCode.length()>4){
+             int len=billCode.length();
+             mainBillCode=billCode.substring(0,len-4);
          }
-
          return mainBillCode;
      }
 
@@ -1409,38 +1397,33 @@ public class EmisBaseService {
       * @return
       */
      public boolean checkWaybillIsExists(String billCode){
-         // 判断是否是子单
-         String mainBillCode = "";
-         String subNumStr="";
-         if(billCode.startsWith("T7080") && billCode.length()>14 ){
-             mainBillCode=billCode.substring(0,14);
-         }
-         else{
-             // 不是探路主单号是否
-             // 查询数据看下是否主单，如果不是则同样剔除4位
-             boolean isExists=emisWaybillMapper.checkWaybillIsExists(billCode)==1;
-             if(isExists){
-                 mainBillCode=billCode;
-                 return true;
-             }else{
 
-                 if(billCode.length()>4){
-                     int len=billCode.length();
-                     subNumStr=billCode.substring(len-4);
-
-                     if(Integer.valueOf(subNumStr)<=0){
-                         return false;
-                     }
-                 }
-                 else{
-                     return false;
-                 }
-
-             }
+         if(StringUtils.isEmpty(billCode)){
+            return false;
+         }
+
+         String queryBillCode=billCode.trim();
+
+         // 查询数据看下是否主单，如果不是则同样剔除4位
+         boolean isExists=emisWaybillMapper.checkWaybillIsExists(queryBillCode)==1;
+         if(isExists){
+             return true;
+         }
+
+         if(queryBillCode.trim().length()<=4){
+             return false;
+         }
+
+         int len=queryBillCode.length();
+         String subNumStr=queryBillCode.substring(len-4);
+         String mainBillCode=queryBillCode.substring(0,len-4);
+
+         try {
+             return emisWaybillMapper.checkSubBillIsExists(mainBillCode,Integer.valueOf(subNumStr))==1;
+         }catch (Exception ex){
+             return false;
          }
 
-         Integer subNum=Integer.valueOf(subNumStr);
-         return emisWaybillMapper.checkSubBillIsExists(mainBillCode,subNum)==1;
      }
 
 
@@ -2086,20 +2069,19 @@ public class EmisBaseService {
 //         System.out.println(packageWJC);
 //         System.out.println(package3dm);
 
-         String mainBillCode="T70803005000020002";
+         String billCode="T7080300200ab";
 
          boolean isSubBill=false;
-         // 判断是否是子单
-         String queryBillCode="";
-         if(mainBillCode.startsWith("T7080") && mainBillCode.length()>14 ){
-             isSubBill = true;
-             queryBillCode=mainBillCode.substring(0,14);
-             int len=mainBillCode.length();
-             String subBillSuffix=mainBillCode.substring(len-4);
-             System.out.println(mainBillCode);
-             System.out.println(subBillSuffix);
-             System.out.println(Integer.valueOf(subBillSuffix));
-         }
+
+
+         isSubBill = true;
+//         queryBillCode=mainBillCode.substring(0,14);
+         int len=billCode.length();
+         String subBillSuffix=billCode.substring(len-4);
+         String mainBillCode = billCode.substring(0,len-4);
+         System.out.println(mainBillCode);
+         System.out.println(subBillSuffix);
+         System.out.println(Integer.valueOf(subBillSuffix));