From 25beb21519ef5d2ca32e9aaade1fc0b4770524ff Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 23 Jun 2025 21:31:18 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=20-=20=E7=8E=B0=E9=87=91?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=A2=9D=E5=BA=A6=20-=20=E8=B6=85=E6=9C=9F?=
 =?UTF-8?q?=E5=B7=B2=E7=94=A8=E9=A2=9D=E5=BA=A6=20=E4=B8=8E=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E5=8D=95=E5=8F=B7=E8=BF=90=E8=B4=B9?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=EF=BC=9B=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xdadan/erp/emis/service/EmisBaseService.java   | 10 ++++------
 1 file changed, 4 insertions(+), 6 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 b39f011a9..3a59bcda7 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
@@ -4833,15 +4833,14 @@ public class EmisBaseService {
          EmisWaybill masterWaybill = checkVirtualParam(emisWaybillSave, emisWaybillOld);
          String virtualRemark = masterWaybill.getVirtualRemark();
          String virtualBillCode = emisWaybillSave.getBillCode();
-         String virtualBillCodeLastSix = virtualBillCode.substring(virtualBillCode.length() - 6);
          if (StringUtil.isNotBlank(virtualRemark)) {
              Set<String> virtualBillSet = new LinkedHashSet<>();
              String[] codes = virtualRemark.split(",");
              virtualBillSet.addAll(Arrays.asList(codes));
-             virtualBillSet.add(virtualBillCodeLastSix);
+             virtualBillSet.add(virtualBillCode);
              virtualRemark = String.join(",", virtualBillSet);
          } else {
-             virtualRemark = virtualBillCodeLastSix;
+             virtualRemark = virtualBillCode;
          }
          EmisWaybill emisWaybill = new EmisWaybill();
          emisWaybill.setVirtualRemark(virtualRemark);
@@ -4904,12 +4903,11 @@ public class EmisBaseService {
         } else {
             String masterBillCode = emisWaybillOld.getMasterBillCode();
             if (StringUtil.isNotBlank(masterBillCode)) {
-                String virtualBillCodeLastSix = emisWaybillSave.getBillCode()
-                        .substring(emisWaybillSave.getBillCode().length() - 6);
+                String virtualBillCode = emisWaybillSave.getBillCode();
                 EmisWaybill masterWaybill = emisWaybillMapper
                         .selectEmisWaybillByBillCode(masterBillCode);
                 List<String> filterVirtualRemark = Arrays.stream(masterWaybill.getVirtualRemark().split(","))
-                        .filter(i -> !i.equals(virtualBillCodeLastSix)).collect(Collectors.toList());
+                        .filter(i -> !i.equals(virtualBillCode)).collect(Collectors.toList());
                 String virtualRemark = String.join(",", filterVirtualRemark);
                 masterWaybill.setVirtualRemark(virtualRemark);
                 emisWaybillMapper.updateEmisWaybill(masterWaybill);