From e46dc56bff94272d828c712fcbb06c9ab0309374 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 11 Jul 2025 14:13:51 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=E8=BF=90=E5=8D=95=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8F=96=E4=BB=B6=E6=96=B9=E5=BC=8F=E4=BC=9A=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=AF=84=E4=BB=B6=E7=BD=91=E7=82=B9=E4=B8=8D=E5=87=86=E7=A1=AE?=
 =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java  | 2 +-
 .../xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
index 7cee9f0a8..c9b0550ed 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
@@ -208,7 +208,7 @@ public class EmisWaybill extends BaseEntity
     @TableField
     @DataAuditField(fieldComment = "派件方式",dictType="emis_dispatch_method")
     private String dispatchMethod;
-    /* 取件方式:1-上门取件 2-仓库收货 3-整柜提货 */
+    /* 取件方式:1-仓库收货 2-上门取件 3-整柜提货 */
     @TableField
     @DataAuditField(fieldComment = "取件方式",dictType="emis_qujian_fangshi")
     private String pickupMethod;
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 fb8f7ebed..2f7445acc 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
@@ -2071,6 +2071,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             emisWaybillSave.setPackType("2");
         }
 
+        if ("1".equals(emisWaybillSave.getPickupMethod()) || "3".equals(emisWaybillSave.getPickupMethod())) {
+            emisWaybillSave.setTakePieceEmployeeCode(null);
+        }
         // 如果专属业务员不为空，则寄件网点使用业务员的网点
         if(!StringUtils.isEmpty(emisWaybillSave.getTakePieceEmployeeCode()) && "2".equals(emisWaybillSave.getPickupMethod()) ){
             SysUser empUser = getEmisStaffByCode(emisWaybillSave.getTakePieceEmployeeCode());