From 7f5f1615ae1e5861a5adf2b9de3f326a006338f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Tue, 24 Feb 2026 16:03:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E6=9F=A5=E8=AF=A2=E4=BD=93?=
 =?UTF-8?q?=E7=A7=AF=E7=AD=89=E4=BF=A1=E6=81=AF=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/facade/IPickingMaterialDetailService.java      | 2 +-
 .../repository/mapper/PickingMaterialDetailMapper.java        | 2 +-
 .../repository/persistence/PickingMaterialDetailImpl.java     | 4 ++--
 .../stockOutOrder/service/StockOutOrderDomainService.java     | 3 ++-
 .../pickingMaterialDetail/PickingMaterialDetailMapper.xml     | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/facade/IPickingMaterialDetailService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/facade/IPickingMaterialDetailService.java
index c2153d9a2..6bec7acd7 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/facade/IPickingMaterialDetailService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/facade/IPickingMaterialDetailService.java
@@ -24,7 +24,7 @@ public interface IPickingMaterialDetailService extends IService<PickingMaterialD
      */
     public List<PickingMaterialDetailPO> queryList(PickingMaterialDetailDO pickingMaterialDetailDO);
 
-    public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId(String orderNumber, Long materialBaseInfoId);
+    public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId(String orderNumber, Long materialBaseInfoId, Long materialInventoryId);
 
     /**
      * 新增拣货单物料明细
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/mapper/PickingMaterialDetailMapper.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/mapper/PickingMaterialDetailMapper.java
index 7c6d87b66..6f1583503 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/mapper/PickingMaterialDetailMapper.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/mapper/PickingMaterialDetailMapper.java
@@ -22,7 +22,7 @@ public interface PickingMaterialDetailMapper extends BaseMapper<PickingMaterialD
      */
     public List<PickingMaterialDetailPO> queryList(PickingMaterialDetailDO pickingMaterialDetailDO);
 
-    public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId( @Param("orderNumber") String orderNumber, @Param("materialBaseInfoId") Long materialBaseInfoId);
+    public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId(@Param("orderNumber") String orderNumber, @Param("materialBaseInfoId") Long materialBaseInfoId, @Param("materialInventoryId") Long materialInventoryId);
 
     /**
      * @description 根据拣货单增加拣货数量
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java
index 11599e643..5e05d9f35 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java
@@ -62,9 +62,9 @@ public class PickingMaterialDetailImpl extends ServiceImpl<PickingMaterialDetail
     }
 
     @Override
-    public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId( String orderNumber, Long materialBaseInfoId)
+    public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId(String orderNumber, Long materialBaseInfoId, Long materialInventoryId)
     {
-        return pickingMaterialDetailMapper.queryTotalsByOutNumberAndBaseId(orderNumber, materialBaseInfoId);
+        return pickingMaterialDetailMapper.queryTotalsByOutNumberAndBaseId(orderNumber, materialBaseInfoId, materialInventoryId);
     }
 
     /**
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
index 9bf5e6612..428566e11 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
@@ -699,7 +699,8 @@ public class StockOutOrderDomainService {
             outMaterialDetailPO.setMaterialCode(outMaterialDetailPO.getMaterialNo());
             outMaterialDetailPO.setMaterialName(outMaterialDetailPO.getCommodityName());
             Long materialBaseInfoId = outMaterialDetailPO.getMaterialBaseInfoId();
-            PickingMaterialDetailPO pickingMaterialDetailPO = pickingMaterialDetailService.queryTotalsByOutNumberAndBaseId(outOrderNumber, materialBaseInfoId);
+            Long materialInventoryId = outMaterialDetailPO.getMaterialInventoryId();
+            PickingMaterialDetailPO pickingMaterialDetailPO = pickingMaterialDetailService.queryTotalsByOutNumberAndBaseId(outOrderNumber, materialBaseInfoId, materialInventoryId);
             if (ObjectUtils.isNotEmpty(pickingMaterialDetailPO)) {
                 outMaterialDetailPO.setTotalArea(pickingMaterialDetailPO.getTotalArea());
                 outMaterialDetailPO.setTotalVolume(pickingMaterialDetailPO.getTotalVolume());
diff --git a/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml
index 78a13aa09..1a8de8ba3 100644
--- a/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml
@@ -190,7 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             "PICKING_ORDER" a
                 LEFT JOIN PICKING_MATERIAL_DETAIL b ON a.PICKING_ORDER_NUMBER = b.PICKING_ORDER_NUMBER
         WHERE
-            a.ORDER_NUMBER = #{orderNumber} and b.MATERIAL_BASE_INFO_ID = #{materialBaseInfoId}
+            a.ORDER_NUMBER = #{orderNumber} and b.MATERIAL_BASE_INFO_ID = #{materialBaseInfoId} and b.MATERIAL_INVENTORY_ID = #{materialInventoryId}
     </select>
 
     <update id="addQuantity" parameterType="com.mhd.wms.domain.pickingMaterialDetail.repository.todo.PickingMaterialDetailDOByUpdate">