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

2026-04-17 08:59:25 +08:00
parent ddc1f5d2ea 2dbc309e35
commit f7434a592b
8 changed files with 140 additions and 2 deletions
@@ -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<OutMaterialDetailPO> queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO) {
        return stockOutOrderDomainService.queryOutStockNoticePrintDetail(stockOutOrderDTO);
    }
+
+    public List<OutMaterialDetailPO> queryOutStockNoticePrintDetailGF(StockOutOrderDTO stockOutOrderDTO) {
+        return stockOutOrderDomainService.queryOutStockNoticePrintDetailGF(stockOutOrderDTO);
+    }
+
+    public List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId) {
+        return stockOutOrderDomainService.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId);
+    }
+
+
 }
@@ -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<CopyCodeReferencePO> weightList;
 }
@@ -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<StockOutOrder>
    List<StockOutOrderPO> queryOutStockNoticePrint(StockOutOrderDTO stockOutOrderDTO);

    List<OutMaterialDetailPO> queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO);
+
+    List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId);
+
+    List<OutMaterialDetailPO> queryOutStockNoticePrintDetailGF(StockOutOrderDTO stockOutOrderDTO);
 }
@@ -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<StockOutOrder>
    List<StockOutOrderPO> queryOutStockNoticePrint(StockOutOrderDTO stockOutOrderDTO);

    List<OutMaterialDetailPO> queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO);
+
+    List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId);
+
+    List<OutMaterialDetailPO> queryOutStockNoticePrintDetailGF(StockOutOrderDTO stockOutOrderDTO);
 }
@@ -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<StockOutOrderMapper, StockOut
        return stockOutOrderMapper.queryOutStockNoticePrintDetail(stockOutOrderDTO);
    }

+    @Override
+    public List<OutMaterialDetailPO> queryOutStockNoticePrintDetailGF(StockOutOrderDTO stockOutOrderDTO) {
+        return stockOutOrderMapper.queryOutStockNoticePrintDetailGF(stockOutOrderDTO);
+    }
+
+
+    @Override
+    public List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId) {
+        return stockOutOrderMapper.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId);
+    }
+
+
+

 }
@@ -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<OutMaterialDetailPO> queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO) {
        return stockOutOrderService.queryOutStockNoticePrintDetail(stockOutOrderDTO);
    }
+
+    public List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId) {
+        return stockOutOrderService.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId);
+    }
+
+    public List<OutMaterialDetailPO> queryOutStockNoticePrintDetailGF(StockOutOrderDTO stockOutOrderDTO) {
+        return stockOutOrderService.queryOutStockNoticePrintDetailGF(stockOutOrderDTO);
+    }
 }
@@ -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<StockOutOrderPO> headerList = stockOutOrderApplicationService.queryOutStockNoticePrint(stockOutOrderDTO);
+        List<OutMaterialDetailPO> detailList = stockOutOrderApplicationService.queryOutStockNoticePrintDetailGF(stockOutOrderDTO);
+
+        for (OutMaterialDetailPO detail : detailList) {
+            if (detail.getCopyCode() != null && detail.getCopyCode() == 1) {
+                List<CopyCodeReferencePO> weightList = stockOutOrderApplicationService.queryCopyCodeWeightListByBatch(
+                        detail.getBatchNumber(), detail.getMaterialBaseInfoId(), detail.getWarehouseId());
+                detail.setWeightList(weightList);
+            }
+        }
+        Map<String, Object> result = new HashMap<>();
+        if (!headerList.isEmpty()) {
+            result.put("header", headerList.get(0));
+        }
+        result.put("detailList", detailList);
+        return AjaxResult.success(result);
+    }
+
 }