From b99d0a8fa9241994769eb0e51ff70ea5d90ba559 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 9 Jul 2025 08:16:12 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisSettleBillController.java       |  8 --------
 .../emis/service/impl/EmisWaybillServiceImpl.java    | 12 +++++++++++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
index c8d6c75d9..a5d82b36a 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
@@ -107,11 +107,6 @@ public class EmisSettleBillController extends BaseController
     }
 
 
-
-
-
-
-
     /**
      * 开票统计
      * @param emisSettleBill
@@ -148,7 +143,6 @@ public class EmisSettleBillController extends BaseController
             }
         }
 
-
         if(!StringUtils.isEmpty(emisSettleBill.getSettleBillNo())){
             emisSettleBill.setSettleBillNo(WaybillHelper.formatQueryValue(emisSettleBill.getSettleBillNo()));
             String[] settleBillNoSortList = emisSettleBill.getSettleBillNo().split(",");
@@ -157,8 +151,6 @@ public class EmisSettleBillController extends BaseController
             }
         }
 
-
-
         List<EmisSettleBill> list = emisSettleBillService.selectEmisSettleBillList(emisSettleBill);
         return getDataTable(list);
     }
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 4098c5ba1..60d50f294 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
@@ -1742,6 +1742,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
         checkBillFee(emisWaybillSave);
 
+        // 接单:上门取件时根据接单取件员更改寄件网点，仓库收货不调整
+        // bug:1685
+        // 如果专属业务员不为空，则寄件网点使用业务员的网点
+        if(!StringUtils.isEmpty(emisWaybillSave.getTakePieceEmployeeCode()) && "2".equals(emisWaybillSave.getPickupMethod()) ){
+            SysUser empUser = getEmisStaffByCode(emisWaybillSave.getTakePieceEmployeeCode());
+            if(empUser!=null) {
+                emisWaybillSave.setSendSiteCode(empUser.getOwnerSiteCode());
+            }
+        }
+
         // 基础信息更新
         emisWaybillMapper.updateEmisWaybill(emisWaybillSave);
 
@@ -1757,7 +1767,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         // 绑定专属业务员
         String bindEmpCode=emisWaybillSave.getTakePieceEmployeeCode();
         if(StringUtils.isEmpty(bindEmpCode)){
-            bindEmpCode=emisWaybillSave.getOperateEmployeeCode();
+            bindEmpCode=emisWaybillSave.getTakePieceEmployeeCode();
         }
         String customerCode=emisWaybillSave.getCustomerCode();