From 84b467ef04e13e2eb2ccd63f21c634ce7916af7f Mon Sep 17 00:00:00 2001 From: zhaoqing <1670883518@qq.com> Date: Thu, 16 Apr 2026 18:05:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?wms=20=E5=87=BA=E5=BA=93=E5=8D=95=E6=8F=90?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E6=89=93=E5=8D=B0FG=20=E6=8F=90=E8=B4=A7?= =?UTF-8?q?=E5=8D=95=E6=89=93=E5=8D=B0=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockOutOrderApplicationService.java | 11 +++ .../repository/po/OutMaterialDetailPO.java | 4 ++ .../facade/IStockOutOrderService.java | 5 ++ .../mapper/StockOutOrderMapper.java | 5 ++ .../persistence/StockOutOrderImpl.java | 14 ++++ .../service/StockOutOrderDomainService.java | 9 +++ .../stockOutOrder/StockOutOrderApi.java | 24 +++++++ .../stockOutOrder/StockOutOrderMapper.xml | 68 ++++++++++++++++++- 8 files changed, 138 insertions(+), 2 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 d21f1a87f..17e3b10d6 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 @@ -25,6 +25,7 @@ import com.mhd.system.api.domain.WarehouseFeignPO; import com.mhd.system.api.domain.cache.AssociationWarehouseCacheDO; import com.mhd.system.api.domain.cache.SystemServiceCacheUtil; import com.mhd.system.api.model.LoginUser; +import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO; import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail; import com.mhd.wms.domain.materialInventory.entity.MaterialInventory; import com.mhd.wms.domain.materialInventory.repository.mapper.MaterialInventoryMapper; @@ -1401,4 +1402,14 @@ public class StockOutOrderApplicationService { public List queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO) { return stockOutOrderDomainService.queryOutStockNoticePrintDetail(stockOutOrderDTO); } + + public List queryOutStockNoticePrintDetailGF(StockOutOrderDTO stockOutOrderDTO) { + return stockOutOrderDomainService.queryOutStockNoticePrintDetailGF(stockOutOrderDTO); + } + + public List queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId) { + return stockOutOrderDomainService.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId); + } + + } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java index 1bf8b6f16..aa7ec09a5 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.mhd.common.core.annotation.Excel; +import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO; import com.mhd.wms.domain.materialMoreDetail.repository.po.MaterialMoreDetailPO; import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderBaseDO; import io.swagger.annotations.ApiModel; @@ -537,4 +538,7 @@ public class OutMaterialDetailPO extends StockOutOrderBaseDO { @ApiModelProperty("是否抄码: 1-是 2-否") @Excel(name = "是否抄码: 1-是 2-否") private Integer copyCode; + + @ApiModelProperty("重量列表（抄码商品使用）") + private List weightList; } \ No newline at end of file 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 15b11c6dd..f6c37ab1e 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 @@ -1,6 +1,7 @@ package com.mhd.wms.domain.stockOutOrder.repository.facade; import com.baomidou.mybatisplus.extension.service.IService; +import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO; import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO; import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder; import com.mhd.wms.domain.stockOutOrder.repository.po.StockOutOrderPO; @@ -46,4 +47,8 @@ public interface IStockOutOrderService extends IService List queryOutStockNoticePrint(StockOutOrderDTO stockOutOrderDTO); List queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO); + + List queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId); + + 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 bd67d81f0..91c7eca64 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 @@ -1,6 +1,7 @@ package com.mhd.wms.domain.stockOutOrder.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO; import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO; import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder; import com.mhd.wms.domain.stockOutOrder.repository.po.StockOutOrderPO; @@ -25,4 +26,8 @@ public interface StockOutOrderMapper extends BaseMapper List queryOutStockNoticePrint(StockOutOrderDTO stockOutOrderDTO); List queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO); + + List queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId); + + 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 aa0eb6e8f..2beca8759 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mhd.common.security.utils.SecurityUtils; import com.mhd.system.api.model.LoginUser; +import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO; import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskTypeService; import com.mhd.wms.domain.deliveTask.repository.todo.DeliveTaskDO; import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO; @@ -124,5 +125,18 @@ public class StockOutOrderImpl extends ServiceImpl queryOutStockNoticePrintDetailGF(StockOutOrderDTO stockOutOrderDTO) { + return stockOutOrderMapper.queryOutStockNoticePrintDetailGF(stockOutOrderDTO); + } + + + @Override + public List queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId) { + return stockOutOrderMapper.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId); + } + + + } 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 d0c01c716..1397525a0 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 @@ -17,6 +17,7 @@ import com.mhd.system.api.SystemServiceFeign; import com.mhd.system.api.domain.BatchDetailFeignPO; import com.mhd.system.api.domain.PackDetailFeignPO; import com.mhd.system.api.model.LoginUser; +import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO; import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskService; import com.mhd.wms.domain.deliveTask.repository.todo.DeliveTaskDO; import com.mhd.wms.domain.handoverTaskOrder.repository.facade.IHandoverTaskOrderService; @@ -1674,4 +1675,12 @@ public class StockOutOrderDomainService { public List queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO) { return stockOutOrderService.queryOutStockNoticePrintDetail(stockOutOrderDTO); } + + public List queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId) { + return stockOutOrderService.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId); + } + + public List queryOutStockNoticePrintDetailGF(StockOutOrderDTO stockOutOrderDTO) { + return stockOutOrderService.queryOutStockNoticePrintDetailGF(stockOutOrderDTO); + } } \ No newline at end of file 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 2d62345d4..2ad78375f 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 @@ -7,9 +7,12 @@ import com.mhd.common.core.web.domain.AjaxResult; import com.mhd.common.core.web.page.TableDataInfo; import com.mhd.wms.application.service.handoverTaskOrder.HandoverTaskOrderApplicationService; import com.mhd.wms.application.service.stockOutOrder.StockOutOrderApplicationService; +import com.mhd.wms.domain.copyCodeReference.entity.CopyCodeReference; +import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO; import com.mhd.wms.domain.handoverTaskOrder.entity.HandoverTaskOrder; import com.mhd.wms.domain.handoverTaskOrder.repository.facade.IHandoverTaskOrderService; import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail; +import com.mhd.wms.domain.materialInventory.repository.po.MaterialInventoryPO; import com.mhd.wms.domain.outMaterialDetail.entity.OutMaterialDetail; import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO; import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO; @@ -424,4 +427,25 @@ public class StockOutOrderApi extends BaseController { } + @ApiOperation("出库单提货单打印") + @PostMapping("/queryOutStockNoticePrintGF") + public AjaxResult queryOutStockNoticePrintGF(@RequestBody StockOutOrderDTO stockOutOrderDTO) { + List headerList = stockOutOrderApplicationService.queryOutStockNoticePrint(stockOutOrderDTO); + List detailList = stockOutOrderApplicationService.queryOutStockNoticePrintDetailGF(stockOutOrderDTO); + + for (OutMaterialDetailPO detail : detailList) { + if (detail.getCopyCode() != null && detail.getCopyCode() == 1) { + List weightList = stockOutOrderApplicationService.queryCopyCodeWeightListByBatch( + detail.getBatchNumber(), detail.getMaterialBaseInfoId(), detail.getWarehouseId()); + detail.setWeightList(weightList); + } + } + Map result = new HashMap<>(); + if (!headerList.isEmpty()) { + result.put("header", headerList.get(0)); + } + result.put("detailList", detailList); + return AjaxResult.success(result); + } + } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml index 59e3e5b82..37f2a1700 100644 --- a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml @@ -334,6 +334,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT a.notice_number, a.out_order_number, + a.supply_chain_number, a.shipper_name, a.expect_time, a.document_creator_name, @@ -350,10 +351,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT b.lot_no, b.warehouse_code, + b.warehouse_name, b.material_name, b.storage_location_name, b.piece_count, - b.unit_code + b.unit_name FROM out_material_detail b WHERE b.del_flag = 1 AND b.out_order_number = (SELECT out_order_number FROM stock_out_order WHERE out_order_id = #{outOrderId} AND del_flag = 1) @@ -364,10 +366,72 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 2dbc309e3520b6174ad0a54986de7140e51b118a Mon Sep 17 00:00:00 2001 From: zhaoqing <1670883518@qq.com> Date: Fri, 17 Apr 2026 08:52:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?wms=20=E5=87=BA=E5=BA=93=E5=8D=95=E6=8F=90?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E6=89=93=E5=8D=B0=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml index 37f2a1700..a4cf71e60 100644 --- a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml @@ -354,6 +354,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.warehouse_name, b.material_name, b.storage_location_name, + b.storage_location_code, b.piece_count, b.unit_name FROM out_material_detail b @@ -369,6 +370,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +