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

---
 .../xdadan/erp/emis/service/EmisBaseService.java   | 14 +++++++++-----
 1 file changed, 9 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 5bd6057f3..132b143f6 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
@@ -397,23 +397,23 @@ public class EmisBaseService {
 
          boolean isSubBill=false;
          // 判断是否是子单
-         String queryBillCode = "";
+         String mainBillCode = "";
          String subBillSuffix = "";
 
          if(billCode.startsWith("T7080") && billCode.length()>14 ){
              isSubBill = true;
-             queryBillCode=billCode.substring(0,14);
+             mainBillCode=billCode.substring(0,14);
              subBillSuffix=billCode.substring(14);
          }else{
-             queryBillCode=billCode;
+             mainBillCode=billCode;
          }
 
-         if(StringUtils.isEmpty(queryBillCode)){
+         if(StringUtils.isEmpty(mainBillCode)){
              return null;
          }
 
 
-         EmisWaybill waybill = emisWaybillMapper.selectEmisWaybillByBillCode(queryBillCode);
+         EmisWaybill waybill = emisWaybillMapper.selectEmisWaybillByBillCode(mainBillCode);
          if (waybill == null) {
              return null;
          }
@@ -437,6 +437,10 @@ public class EmisBaseService {
          order.put("ydSn", billCode);
          order.put("logisticNo", billCode);
 
+         // 子单后缀
+         order.put("mainBillCode", mainBillCode);
+         order.put("subBillSuffix", subBillSuffix);
+
          String mainBillCode=waybill.getBillCode();
          String shortLogisticNo=mainBillCode.substring(mainBillCode.length() - 6);
          String shortLogisticNo4Number=mainBillCode.substring(mainBillCode.length() - 4);