From 83edc5703ad62e71bafe8838e0f5e60cda060825 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 3 Nov 2025 17:06:17 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=96=B0=E5=A2=9E=E6=8C=89?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E5=BA=93=E5=8C=BA=E6=9F=A5=E8=AF=A2=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E5=88=86=E5=B8=83=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 IWmsMaterialCoilService 接口中新增 getDistributionByActualWarehouse 方法 - 实现钢卷按实际库区统计数量和重量的查询逻辑 - 添加对应的 Mapper XML 查询语句，支持按物品类型和 ID 过滤 - 在 Controller 中暴露新的 REST 接口 /distributionByActualWarehouse - 扩展 WmsStockBo 和 WmsStockVo 类以支持实际库区相关字段 - 新增 queryPageListActual 方法用于分页查询实际库区库存数据 - 实现递归查询子实际库区的功能，并应用到查询条件中 - 更新 Mapper 文件及服务实现类以支持新查询逻辑 --- .../controller/WmsMaterialCoilController.java | 12 +++ .../klp/controller/WmsStockController.java | 4 + .../java/com/klp/domain/bo/WmsStockBo.java | 2 + .../java/com/klp/domain/vo/WmsStockVo.java | 4 + .../com/klp/mapper/WmsMaterialCoilMapper.java | 2 + .../java/com/klp/mapper/WmsStockMapper.java | 2 + .../klp/service/IWmsMaterialCoilService.java | 2 + .../com/klp/service/IWmsStockService.java | 1 + .../impl/WmsMaterialCoilServiceImpl.java | 20 +++++ .../klp/service/impl/WmsStockServiceImpl.java | 81 +++++++++++++++++-- .../mapper/klp/WmsMaterialCoilMapper.xml | 22 ++++- .../resources/mapper/klp/WmsStockMapper.xml | 24 ++++++ 12 files changed, 169 insertions(+), 7 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java index dfe54468..54681662 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java @@ -135,6 +135,18 @@ public class WmsMaterialCoilController extends BaseController { return R.ok(distribution); } + /** + * 查询各个库区中不同类型的钢卷分布情况 + * 按库区分组，统计每种物品类型和物品ID的钢卷数量和重量 + */ + @GetMapping("/distributionByActualWarehouse") + public R> getDistributionByActualWarehouse( + @RequestParam(required = false) String itemType, + @RequestParam(required = false) Long itemId) { + List distribution = iWmsMaterialCoilService.getDistributionByActualWarehouse(itemType, itemId); + return R.ok(distribution); + } + /** * 查询不同类型的钢卷在不同库区的分布情况 * 按物品类型和物品ID分组，统计每个库区的钢卷数量和重量 diff --git a/klp-wms/src/main/java/com/klp/controller/WmsStockController.java b/klp-wms/src/main/java/com/klp/controller/WmsStockController.java index ca72d545..cf13778e 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsStockController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsStockController.java @@ -43,6 +43,10 @@ public class WmsStockController extends BaseController { public TableDataInfo list(WmsStockBo bo, PageQuery pageQuery) { return iWmsStockService.queryPageList(bo, pageQuery); } + @GetMapping("/listActual") + public TableDataInfo listActual(WmsStockBo bo, PageQuery pageQuery) { + return iWmsStockService.queryPageListActual(bo, pageQuery); + } /** * 导出库存：原材料/产品与库区/库位的存放关系列表 diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsStockBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsStockBo.java index 1d2528af..2e97ef02 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsStockBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsStockBo.java @@ -49,5 +49,7 @@ public class WmsStockBo extends BaseEntity { */ private String remark; + private Long actualWarehouseId; + } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsStockVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsStockVo.java index af71cfec..d3b7a1bd 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsStockVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsStockVo.java @@ -95,4 +95,8 @@ public class WmsStockVo { */ private java.util.List stockDistribution; + + //实际库区/库位自关联 + private Long actualWarehouseId; + private String actualWarehouseName; } diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java index bdbb4d2e..416a8091 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java @@ -41,5 +41,7 @@ public interface WmsMaterialCoilMapper extends BaseMapperPlus selectVoPagePlus(Page build,@Param("ew") QueryWrapper lqw); List selectVoListWithDynamicJoin(@Param("ew")QueryWrapper lqw); + + List> getDistributionByActualWarehouse(@Param("itemType") String itemType, @Param("itemId") Long itemId); } diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsStockMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsStockMapper.java index 6fc4e1dd..a97a86f2 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsStockMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsStockMapper.java @@ -1,5 +1,6 @@ package com.klp.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.klp.common.core.validate.AddGroup; import com.klp.common.core.validate.EditGroup; import com.klp.domain.WmsStock; @@ -34,4 +35,5 @@ public interface WmsStockMapper extends BaseMapperPlus selectStockDistribution(@Param("itemType") String itemType, @Param("itemId") Long itemId); + Page selectVoPagePlusActual(Page build,@Param("ew") Wrapper lqw); } diff --git a/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java b/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java index 5d15f315..ca14ccd5 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java @@ -84,5 +84,7 @@ public interface IWmsMaterialCoilService { * @return 分布情况列表，包含物品类型、物品ID、库区信息、数量、重量等 */ List getDistributionByItemType(String itemType, Long itemId); + + List getDistributionByActualWarehouse(String itemType, Long itemId); } diff --git a/klp-wms/src/main/java/com/klp/service/IWmsStockService.java b/klp-wms/src/main/java/com/klp/service/IWmsStockService.java index 8796bd70..f4a3c3d2 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsStockService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsStockService.java @@ -58,4 +58,5 @@ public interface IWmsStockService { */ WmsStockVo queryStockDistribution(WmsStockBo bo); + TableDataInfo queryPageListActual(WmsStockBo bo, PageQuery pageQuery); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 36b5de5e..69ddf842 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -1125,6 +1125,26 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { return convertMapListToVoList(mapList); } + @Override + public List getDistributionByActualWarehouse(String itemType, Long itemId) { + List> mapList = baseMapper.getDistributionByActualWarehouse(itemType, itemId); + return convertMapListToVoListActual(mapList); + } + private List convertMapListToVoListActual(List> mapList) { + List voList = new ArrayList<>(); + for (Map map : mapList) { + WmsMaterialCoilVo vo = new WmsMaterialCoilVo(); + vo.setActualWarehouseId(map.get("actual_warehouse_id") != null ? Long.valueOf(map.get("actual_warehouse_id").toString()) : null); + vo.setActualWarehouseName(map.get("actual_warehouse_name") != null ? map.get("actual_warehouse_name").toString() : null); + vo.setItemType(map.get("item_type") != null ? map.get("item_type").toString() : null); + vo.setItemId(map.get("item_id") != null ? Long.valueOf(map.get("item_id").toString()) : null); + vo.setCoilCount(map.get("coil_count") != null ? Long.valueOf(map.get("coil_count").toString()) : 0L); + vo.setTotalGrossWeight(map.get("total_gross_weight") != null ? new BigDecimal(map.get("total_gross_weight").toString()) : BigDecimal.ZERO); + vo.setTotalNetWeight(map.get("total_net_weight") != null ? new BigDecimal(map.get("total_net_weight").toString()) : BigDecimal.ZERO); + voList.add(vo); + } + return voList; + } /** * 查询不同类型的钢卷在不同库区的分布情况 * 按物品类型和物品ID分组，统计每个库区的钢卷数量和重量 diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java index 165952f3..da5553d9 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.klp.common.utils.StringUtils; +import com.klp.domain.WmsActualWarehouse; +import com.klp.mapper.WmsActualWarehouseMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.klp.domain.bo.WmsStockBo; @@ -33,6 +35,7 @@ public class WmsStockServiceImpl implements IWmsStockService { private final WmsStockMapper baseMapper; private final WmsWarehouseMapper warehouseMapper; + private final WmsActualWarehouseMapper actualWarehouseMapper; /** @@ -53,6 +56,70 @@ public class WmsStockServiceImpl implements IWmsStockService { return TableDataInfo.build(result); } + @Override + public TableDataInfo queryPageListActual(WmsStockBo bo, PageQuery pageQuery) { + QueryWrapper lqw = buildQueryWrapperPlusActual(bo); + Page result = baseMapper.selectVoPagePlusActual(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + private QueryWrapper buildQueryWrapperPlusActual(WmsStockBo bo) { // 注意：这里改用 QueryWrapper 而非 LambdaQueryWrapper + QueryWrapper qw = Wrappers.query(); // 使用普通 QueryWrapper + + // 固定条件：未删除的现存数据 + qw.eq("mc.del_flag", 0); + qw.eq("mc.data_type", 1); + + // 处理仓库ID查询，支持递归查询子节点 + if (bo.getActualWarehouseId() != null) { + List warehouseIds = getActualWarehouseIdsWithChildren(bo.getActualWarehouseId()); + if (warehouseIds.size() == 1) { + qw.eq("mc.actual_warehouse_id", warehouseIds.get(0)); + } else { + qw.in("mc.actual_warehouse_id", warehouseIds); + } + } + qw.eq(StringUtils.isNotBlank(bo.getItemType()), "mc.item_type", bo.getItemType()); + qw.eq(bo.getItemId() != null, "mc.item_id", bo.getItemId()); + qw.like(StringUtils.isNotBlank(bo.getBatchNo()), "mc.enter_coil_no", bo.getBatchNo()); + + // 使用 groupBy 进行分组 + qw.groupBy( + "mc.actual_warehouse_id", + "mc.item_type", + "mc.item_id", + "w.actual_warehouse_name", + "CASE WHEN mc.item_type = 'product' THEN p.product_name WHEN mc.item_type = 'raw_material' THEN r.raw_material_name ELSE NULL END", + "CASE WHEN mc.item_type = 'product' THEN p.product_code WHEN mc.item_type = 'raw_material' THEN r.raw_material_code ELSE NULL END" + ); + + return qw; + } + + private List getActualWarehouseIdsWithChildren(Long actualWarehouseId) { + + List actualWarehouseIds = new ArrayList<>(); + actualWarehouseIds.add(actualWarehouseId); // 添加当前仓库ID + + // 递归获取所有子仓库ID + getChildActualWarehouseIds(actualWarehouseId,actualWarehouseIds); + + return actualWarehouseIds; + } + private void getChildActualWarehouseIds(Long parentId, List actualWarehouseIds) { + // 查询直接子仓库 + List children = actualWarehouseMapper.selectList( + Wrappers.lambdaQuery() + .eq(WmsActualWarehouse::getActualParentId, parentId) + .eq(WmsActualWarehouse::getDelFlag, 0) + ); + + // 递归处理每个子仓库 + for (WmsActualWarehouse child : children) { + actualWarehouseIds.add(child.getActualWarehouseId()); + getChildActualWarehouseIds(child.getActualWarehouseId(), actualWarehouseIds); + } + } + /** * 查询库存：原材料/产品与库区/库位的存放关系列表 */ @@ -93,7 +160,7 @@ public class WmsStockServiceImpl implements IWmsStockService { // 使用 groupBy 进行分组 qw.groupBy( "mc.warehouse_id", - "mc.item_type", + "mc.item_type", "mc.item_id", "w.warehouse_name", "CASE WHEN mc.item_type = 'product' THEN p.product_name WHEN mc.item_type = 'raw_material' THEN r.raw_material_name ELSE NULL END", @@ -158,30 +225,32 @@ public class WmsStockServiceImpl implements IWmsStockService { if (bo.getItemType() == null || bo.getItemId() == null) { throw new RuntimeException("物品类型和物品ID不能为空"); } - + // 1. 计算总库存量 BigDecimal totalQuantity = BigDecimal.ZERO; - + // 2. 按仓库统计库存分布 List distributionList = baseMapper.selectStockDistribution(bo.getItemType(), bo.getItemId()); - + // 计算总量 for (WmsStockVo vo : distributionList) { if (vo.getTotalQuantity() != null) { totalQuantity = totalQuantity.add(vo.getTotalQuantity()); } } - + // 构建返回对象 WmsStockVo result = new WmsStockVo(); result.setItemType(bo.getItemType()); result.setItemId(bo.getItemId()); result.setTotalQuantity(totalQuantity); result.setStockDistribution(distributionList); - + return result; } + + /** * 获取指定仓库ID及其所有子仓库ID * @param warehouseId 仓库ID diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml index a059441b..130ee2e2 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml @@ -138,7 +138,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN wms_actual_warehouse aw ON mc.actual_warehouse_id = aw.actual_warehouse_id ${ew.customSqlSegment} - + diff --git a/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml index 84291791..ac95b5bd 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml @@ -65,5 +65,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY mc.warehouse_id, w.warehouse_name, mc.item_type, mc.item_id ORDER BY totalQuantity DESC +