From 7ad11bc782e6f84bbca75e621c5cea1e7f2543f7 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 21 Jun 2024 15:10:36 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/mapper/EmisWaybillMapper.java     | 4 ++--
 .../java/com/xdadan/erp/emis/service/EmisBaseService.java | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
index 2859386d0..6956b4c3c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
@@ -117,10 +117,10 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
     public int updateTransferInfo(EmisWaybill emisWaybill);
 
     // 检查子单是否存在
-    public int checkSubBillIsExists(@Param("billCode")String billCode,@Param("subNum") Integer subNum);
+    public int checkDbSubBillIsExists(@Param("billCode")String billCode,@Param("subNum") Integer subNum);
 
     // 检查主单是否存在
-    public int checkWaybillIsExists(@Param("billCode")String billCode);
+    public int checkDbWaybillIsExists(@Param("billCode")String billCode);
 
     public int checkWaybillIsSign(@Param("billCode")String billCode);
 
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 19ce89548..bdb0d90ff 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
@@ -172,7 +172,7 @@ public class EmisBaseService {
       */
      public  String getMainBillCode(String billCode){
          // 查询数据看下是否主单，如果不是则同样剔除4位
-         boolean isExists=checkWaybillIsExists(billCode);
+         boolean isExists=emisWaybillMapper.checkDbWaybillIsExists(billCode)==1;
          if(isExists){
              return billCode;
          }
@@ -1405,7 +1405,7 @@ public class EmisBaseService {
          String queryBillCode=billCode.trim();
 
          // 查询数据看下是否主单，如果不是则同样剔除4位
-         boolean isExists=emisWaybillMapper.checkWaybillIsExists(queryBillCode)==1;
+         boolean isExists=emisWaybillMapper.checkDbWaybillIsExists(queryBillCode)==1;
          if(isExists){
              return true;
          }
@@ -1419,7 +1419,7 @@ public class EmisBaseService {
          String mainBillCode=queryBillCode.substring(0,len-4);
 
          try {
-             return emisWaybillMapper.checkSubBillIsExists(mainBillCode,Integer.valueOf(subNumStr))==1;
+             return emisWaybillMapper.checkDbSubBillIsExists(mainBillCode,Integer.valueOf(subNumStr))==1;
          }catch (Exception ex){
              return false;
          }
@@ -2069,7 +2069,7 @@ public class EmisBaseService {
 //         System.out.println(packageWJC);
 //         System.out.println(package3dm);
 
-         String billCode="T7080300200ab";
+         String billCode="T70803000037160001";
 
          boolean isSubBill=false;