From 22f371e439738f421734ca7eda589dcf2a8ae1fc Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 24 Jun 2025 13:38:00 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=E6=89=93=E5=8D=B0=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=A7=8B=E5=8F=91=E7=BD=91?=
 =?UTF-8?q?=E7=82=B9=E4=B8=BA=E7=A9=BA=E6=97=B6=E8=AE=BE=E7=BD=AE=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xdadan/erp/emis/service/EmisBaseService.java     | 2 +-
 .../xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

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 02db2e8c9..0458792a2 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
@@ -2851,7 +2851,7 @@ public class EmisBaseService {
                      .filter(s -> s != null && s.length() >= 6)
                      .map(s -> s.substring(s.length() - 6))
                      .collect(Collectors.joining(","));
-             remark = remark + " " + "该运单为主单，对应虚拟单为" + shortCodes;
+             remark = remark + " " + "该运单为主单，对应虚拟单为" + shortCodes + "，";
          }
          // if (StringUtil.isNotBlank(waybill.getMasterBillCode())) {
          // remark = remark + " " + "该运单为虚拟单，对应主单为" + waybill.getMasterBillCode();
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 7f0c62c98..0121603d7 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -2286,6 +2286,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             emisWaybillSave.setOrderSn(orderSn);
         }
 
+        if(StringUtil.isBlank(emisWaybillSave.getStartSiteCode())){
+            emisWaybillSave.setStartSiteCode(emisWaybillSave.getSendSiteCode());
+        }
+
 
         if( StringUtils.isAnyEmpty(
                 emisWaybillSave.getTransLineType(),