From 90ce2d07c80f049262f729d4a9c886c2189c8632 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 18 Dec 2024 15:28:38 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java | 5 ++++-
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

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 74e500272..e3a53721d 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
@@ -1299,10 +1299,13 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             throw new EmisBizError(EmisBizErrorType.FAIL,"订单已取消");
         }
 
-
         if(!"2".equals(emisWaybillOld.getPickupMethod()) ){
             throw new EmisBizError(EmisBizErrorType.FAIL,"非上门取件不需要指派取件员");
         }
+
+        // 同时修改网点为取件员所在的网点
+        SysUser sysUser = getEmisStaffByCode(emisWaybillOld.getTakePieceEmployeeCode());
+        emisWaybill.setSendSiteCode(sysUser.getOwnerSiteCode());
         emisWaybill.setBillCode(emisWaybillOld.getBillCode());
 
         return emisWaybillMapper.assignTakeMan(emisWaybill);
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 14198a35e..239197548 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -2631,7 +2631,7 @@
     <!--  分配取件员 -->
     <update id="assignTakeMan" parameterType="EmisWaybill">
         update emis_waybill set
-            take_piece_employee_code = #{takePieceEmployeeCode}
+            take_piece_employee_code = #{takePieceEmployeeCode},send_site_code=#{sendSiteCode}
             <if test="updateBy != null and updateBy != ''">,update_by = #{updateBy}</if>
             <if test="updateSite != null and updateSite != ''">,update_site = #{updateSite}</if>
         where order_sn=#{orderSn}