From ea9689d2a74932617eb5645a8c812deb846e4614 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:29:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E5=8F=AA=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=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    | 5 ++---
 .../pickingMaterialDetail/PickingMaterialDetailMapper.xml    | 5 ++---
 5 files changed, 8 insertions(+), 10 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 6bec7acd7..adf4361c3 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, Long materialInventoryId);
+    public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId(Long outUniqueId);
 
     /**
      * 新增拣货单物料明细
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 6f1583503..09d066e2c 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, @Param("materialInventoryId") Long materialInventoryId);
+    public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId(@Param("outUniqueId") Long outUniqueId);
 
     /**
      * @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 5e05d9f35..314955a01 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, Long materialInventoryId)
+    public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId(Long outUniqueId)
     {
-        return pickingMaterialDetailMapper.queryTotalsByOutNumberAndBaseId(orderNumber, materialBaseInfoId, materialInventoryId);
+        return pickingMaterialDetailMapper.queryTotalsByOutNumberAndBaseId(outUniqueId);
     }
 
     /**
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 428566e11..3ff091b00 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
@@ -698,9 +698,8 @@ public class StockOutOrderDomainService {
         for (OutMaterialDetailPO outMaterialDetailPO : outMaterialDetailPOList) {
             outMaterialDetailPO.setMaterialCode(outMaterialDetailPO.getMaterialNo());
             outMaterialDetailPO.setMaterialName(outMaterialDetailPO.getCommodityName());
-            Long materialBaseInfoId = outMaterialDetailPO.getMaterialBaseInfoId();
-            Long materialInventoryId = outMaterialDetailPO.getMaterialInventoryId();
-            PickingMaterialDetailPO pickingMaterialDetailPO = pickingMaterialDetailService.queryTotalsByOutNumberAndBaseId(outOrderNumber, materialBaseInfoId, materialInventoryId);
+            Long uniqueId = outMaterialDetailPO.getUniqueId();
+            PickingMaterialDetailPO pickingMaterialDetailPO = pickingMaterialDetailService.queryTotalsByOutNumberAndBaseId(uniqueId);
             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 1a8de8ba3..8aced6370 100644
--- a/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml
@@ -187,10 +187,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             b.TOTAL_AREA,b.TOTAL_VOLUME,b.TOTAL_NET_WEIGHT,b.TOTAL_GROSS_WEIGHT
         FROM
-            "PICKING_ORDER" a
-                LEFT JOIN PICKING_MATERIAL_DETAIL b ON a.PICKING_ORDER_NUMBER = b.PICKING_ORDER_NUMBER
+            PICKING_MATERIAL_DETAIL b
         WHERE
-            a.ORDER_NUMBER = #{orderNumber} and b.MATERIAL_BASE_INFO_ID = #{materialBaseInfoId} and b.MATERIAL_INVENTORY_ID = #{materialInventoryId}
+            b.OUT_UNIQUE_ID = #{outUniqueId}
     </select>
 
     <update id="addQuantity" parameterType="com.mhd.wms.domain.pickingMaterialDetail.repository.todo.PickingMaterialDetailDOByUpdate">