From 333b21935de3f6f7e81e38760bea2b857ed152dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Thu, 26 Feb 2026 10:16:59 +0800
Subject: [PATCH] =?UTF-8?q?pda=E6=9F=A5=E8=AF=A2=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StockReceiptOrderApplicationService.java                 | 5 ++---
 .../shiftManage/repository/persistence/ShiftManageImpl.java  | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
index eb10158c2..9c0001448 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
@@ -143,7 +143,7 @@ public class StockReceiptOrderApplicationService {
                 if (associationWarehouseCacheDO != null) {
                     // 如果前端没有传仓库ID，则使用关联仓库ID；前端传了则以前端为准
                     if (stockReceiptOrderDO.getWarehouseId() == null && associationWarehouseCacheDO.getWarehouseId() != null) {
-                        stockReceiptOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
+                        // stockReceiptOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
                     }
                 }
             } catch (Exception e) {
@@ -1226,5 +1226,4 @@ public class StockReceiptOrderApplicationService {
         receiptMaterialDetailDO.setDistributeRuleCode(materialGoodsRulePO.getRuleCode());
         receiptMaterialDetailDO.setDistributeRuleName(materialGoodsRulePO.getRuleName());
     }
-}
-
+}
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/persistence/ShiftManageImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/persistence/ShiftManageImpl.java
index ba4795f9f..54bdd1ddc 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/persistence/ShiftManageImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/persistence/ShiftManageImpl.java
@@ -39,6 +39,7 @@ import com.mhd.wms.domain.shiftMaterialDetail.repository.mapper.ShiftMaterialDet
 import com.mhd.wms.domain.shiftMaterialDetail.repository.todo.ShiftMaterialDetailDO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;