From fc73852c04d30c7b4b2dec773b16093dbb5179a7 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 19 Jun 2024 22:57:27 +0800
Subject: [PATCH] md

---
 .../emis/service/impl/EmisWaybillServiceImpl.java   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 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 e2fbcc54f..d07db3545 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
@@ -465,7 +465,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             // 把历史发货日期带过来用于重新计算预估到到时间
             emisWaybillSave.setSendDate(emisWaybillOld.getSendDate());
 
-            reUpdateWayBill(emisWaybillSave);
+            reUpdateWayBill(emisWaybillOld,emisWaybillSave);
         }
 
         return  1;
@@ -891,11 +891,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         // 占用进仓单号
         if(!StringUtils.isEmpty(emisWaybillSave.getWarehouseInNo())) {
             String warehouseInNo = WaybillHelper.formatQueryValue(emisWaybillSave.getWarehouseInNo());
-            useWarehouseInNo("",warehouseInNo);
+//            useWarehouseInNo(emisWaybillSave.getBillCode(),null,warehouseInNo);
+            useWarehouseInNo(emisWaybillSave.getBillCode(),null,warehouseInNo);
         }
 
-
-
         // 插入揽收记录
         ScanInfo scanInfo = new ScanInfo();
         List<Map<String,Object>> scanDataList = new ArrayList<>();
@@ -937,7 +936,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
      * @param emisWaybillSave
      * @throws EmisBizError
      */
-    private void reUpdateWayBill(EmisWaybill emisWaybillSave) throws EmisBizError {
+    private void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave) throws EmisBizError {
 
         // 公共计算部分
         calcWayBillCommonInfo(emisWaybillSave,false);
@@ -993,6 +992,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
                 emisWaybillAttachmentMapper.insertEmisWaybillAttachment(attachmentItem);
             }
         }
+
+        // 占用进仓单号
+        useWarehouseInNo(emisWaybillSave.getBillCode(),oldEmisWaybill.getWarehouseInNo(),emisWaybillSave.getWarehouseInNo());
+
     }
 
     /**