Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401

mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java

@@ -1407,8 +1407,8 @@ public class StockOutOrderApplicationService {
         return stockOutOrderDomainService.queryOutStockNoticePrintDetailGF(stockOutOrderDTO);
     }
 
-    public List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId) {
+    public List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId, String boxPalletNo) {
-        return stockOutOrderDomainService.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId);
+        return stockOutOrderDomainService.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId,boxPalletNo);
     }
 
 

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/facade/IStockOutOrderService.java

@@ -48,7 +48,7 @@ public interface IStockOutOrderService extends IService<StockOutOrder>
 
     List<OutMaterialDetailPO> queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO);
 
-    List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId);
+    List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId, String boxPalletNo);
 
     List<OutMaterialDetailPO> queryOutStockNoticePrintDetailGF(StockOutOrderDTO stockOutOrderDTO);
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/mapper/StockOutOrderMapper.java

@@ -27,7 +27,7 @@ public interface StockOutOrderMapper extends BaseMapper<StockOutOrder>
 
     List<OutMaterialDetailPO> queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO);
 
-    List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId);
+    List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId, String boxPalletNo);
 
     List<OutMaterialDetailPO> queryOutStockNoticePrintDetailGF(StockOutOrderDTO stockOutOrderDTO);
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/persistence/StockOutOrderImpl.java

@@ -132,8 +132,8 @@ public class StockOutOrderImpl extends ServiceImpl<StockOutOrderMapper, StockOut
 
 
     @Override
-    public List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId) {
+    public List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId, String boxPalletNo) {
-        return stockOutOrderMapper.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId);
+        return stockOutOrderMapper.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId,boxPalletNo);
     }
 
 

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java

@@ -1680,8 +1680,8 @@ public class StockOutOrderDomainService {
         return stockOutOrderService.queryOutStockNoticePrintDetail(stockOutOrderDTO);
     }
 
-    public List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId) {
+    public List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId, String boxPalletNo) {
-        return stockOutOrderService.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId);
+        return stockOutOrderService.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId,boxPalletNo);
     }
 
     public List<OutMaterialDetailPO> queryOutStockNoticePrintDetailGF(StockOutOrderDTO stockOutOrderDTO) {

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java

@@ -436,7 +436,7 @@ public class StockOutOrderApi extends BaseController {
         for (OutMaterialDetailPO detail : detailList) {
             if (detail.getCopyCode() != null && detail.getCopyCode() == 1) {
                 List<CopyCodeReferencePO> weightList = stockOutOrderApplicationService.queryCopyCodeWeightListByBatch(
-                        detail.getBatchNumber(), detail.getMaterialBaseInfoId(), detail.getWarehouseId());
+                        detail.getBatchNumber(), detail.getMaterialBaseInfoId(), detail.getWarehouseId(), detail.getBoxPalletNo());
                 detail.setWeightList(weightList);
             }
         }

mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml

@@ -382,7 +382,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="copyCode" column="copy_code"/>
         <result property="outboundQuantity" column="outbound_quantity"/>
         <result property="packName" column="pack_name"/>
-
+        <result property="boxPalletNo" column="box_pallet_no"/>
     </resultMap>
 
 
@@ -408,6 +408,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND ccr.batch_number = #{batchNumber}
           AND ccr.material_base_info_id = #{materialBaseInfoId}
           AND ccr.warehouse_id = #{warehouseId}
+          AND ccr.box_pallet_no = #{boxPalletNo}
     </select>
 
 
@@ -427,6 +428,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             b.piece_count,
             b.material_base_info_id,
             b.outbound_quantity,
+            b.box_pallet_no,
             mbi.copy_code
         FROM out_material_detail b
                  LEFT JOIN material_base_info mbi ON b.material_base_info_id = mbi.material_base_info_id