From e658dfb56dcd4a48248107fbf945f4203f852189 Mon Sep 17 00:00:00 2001 From: zhaoqing <1670883518@qq.com> Date: Fri, 17 Apr 2026 14:12:54 +0800 Subject: [PATCH] =?UTF-8?q?wms-=E6=8F=90=E8=B4=A7=E5=8D=95sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockOutOrder/StockOutOrderApplicationService.java | 4 ++-- .../repository/facade/IStockOutOrderService.java | 2 +- .../stockOutOrder/repository/mapper/StockOutOrderMapper.java | 2 +- .../repository/persistence/StockOutOrderImpl.java | 4 ++-- .../stockOutOrder/service/StockOutOrderDomainService.java | 4 ++-- .../interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java | 2 +- .../resources/mapper/stockOutOrder/StockOutOrderMapper.xml | 4 +++- 7 files changed, 12 insertions(+), 10 deletions(-) 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 17e3b10d6..07c3967a6 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 @@ -1407,8 +1407,8 @@ public class StockOutOrderApplicationService { return stockOutOrderDomainService.queryOutStockNoticePrintDetailGF(stockOutOrderDTO); } - public List queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId) { - return stockOutOrderDomainService.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId); + public List queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId, String boxPalletNo) { + return stockOutOrderDomainService.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId,boxPalletNo); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/facade/IStockOutOrderService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/facade/IStockOutOrderService.java index f6c37ab1e..c5088a224 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/facade/IStockOutOrderService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/facade/IStockOutOrderService.java @@ -48,7 +48,7 @@ public interface IStockOutOrderService extends IService List queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO); - List queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId); + List queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId, String boxPalletNo); List queryOutStockNoticePrintDetailGF(StockOutOrderDTO stockOutOrderDTO); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/mapper/StockOutOrderMapper.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/mapper/StockOutOrderMapper.java index 91c7eca64..4dfb5ba24 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/mapper/StockOutOrderMapper.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/mapper/StockOutOrderMapper.java @@ -27,7 +27,7 @@ public interface StockOutOrderMapper extends BaseMapper List queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO); - List queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId); + List queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId, String boxPalletNo); List queryOutStockNoticePrintDetailGF(StockOutOrderDTO stockOutOrderDTO); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/persistence/StockOutOrderImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/persistence/StockOutOrderImpl.java index 2beca8759..864ebfcfe 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/persistence/StockOutOrderImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/persistence/StockOutOrderImpl.java @@ -132,8 +132,8 @@ public class StockOutOrderImpl extends ServiceImpl queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId) { - return stockOutOrderMapper.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId); + public List queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId, String boxPalletNo) { + return stockOutOrderMapper.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId,boxPalletNo); } 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 caf7082f2..e85793e79 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 @@ -1680,8 +1680,8 @@ public class StockOutOrderDomainService { return stockOutOrderService.queryOutStockNoticePrintDetail(stockOutOrderDTO); } - public List queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId) { - return stockOutOrderService.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId); + public List queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId, String boxPalletNo) { + return stockOutOrderService.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId,boxPalletNo); } public List queryOutStockNoticePrintDetailGF(StockOutOrderDTO stockOutOrderDTO) { diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java index 2ad78375f..ed892dc9c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java +++ b/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 weightList = stockOutOrderApplicationService.queryCopyCodeWeightListByBatch( - detail.getBatchNumber(), detail.getMaterialBaseInfoId(), detail.getWarehouseId()); + detail.getBatchNumber(), detail.getMaterialBaseInfoId(), detail.getWarehouseId(), detail.getBoxPalletNo()); detail.setWeightList(weightList); } } diff --git a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml index a4cf71e60..de940797d 100644 --- a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml @@ -382,7 +382,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -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} @@ -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