复核查询体积等信息逻辑修改;

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);
 
     /**
      * 新增拣货单物料明细

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 根据拣货单增加拣货数量

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);
     }
 
     /**

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());

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">