From b8732e7139a1cbfd36ee15c62b0920d6c726439a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Wed, 25 Feb 2026 13:48:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=86=E9=85=8D=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BB=93=E5=BA=93=E6=9F=A5=E8=AF=A2;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/stockOutOrder/StockOutOrderApplicationService.java  | 2 ++
 .../repository/persistence/OutMaterialDetailImpl.java           | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
index f0e390f00..55b5f0316 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
@@ -609,10 +609,12 @@ public class StockOutOrderApplicationService {
                 String sheetRefNo = detail.getSheetRefNo();
                 String boxPalletNo = detail.getBoxPalletNo();
                 Long materialBaseInfoId = detail.getMaterialBaseInfoId();
+                Long warehouseId = detail.getWarehouseId();
                 List<MaterialInventory> materialInventories = materialInventoryMapper.selectList(new QueryWrapper<MaterialInventory>().lambda()
                         .eq(MaterialInventory::getBatchRefNo, batchRefNo)
                         .eq(MaterialInventory::getSheetRefNo, sheetRefNo)
                         .eq(MaterialInventory::getBoxPalletNo, boxPalletNo)
+                        .eq(MaterialInventory::getWarehouseId, warehouseId)
                         .eq(MaterialInventory::getMaterialBaseInfoId, materialBaseInfoId));
                 if (materialInventories == null || materialInventories.isEmpty()) {
                     throw new ServiceException("库存不存在：" + batchRefNo + " " + sheetRefNo + " " + boxPalletNo);
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
index fb841f5af..2c9426bc3 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
@@ -302,7 +302,6 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
         //分配(修改库存)
         xgkc(outMaterialDetailList,outOrderNumber,loginUser);
         //保存物料明细信息
-        //给MaterialDetailList中的每一项的isAllocated赋值为1
         outMaterialDetailList.forEach(outMaterialDetail -> {
             outMaterialDetail.setIsAllocated("1");
         });