From 97f048ce14db07ee41ca05f9c7010dfe132150e4 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 11:06:59 +0800
Subject: [PATCH] feat(mes): 补生产准备检查与仓储收发存汇总接口，附 CFWJ 演示数据种子脚本
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java
index 10faf64..850003f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java
@@ -3,8 +3,11 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.transaction.vo.MesWmStockSummaryReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.transaction.vo.MesWmStockSummaryRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.transaction.vo.MesWmTransactionPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.transaction.vo.MesWmTransactionRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.transaction.MesWmTransactionDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
@@ -12,6 +15,7 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
+import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
@@ -52,11 +56,12 @@
private MesWmWarehouseLocationService locationService;
@Resource
private MesWmWarehouseAreaService areaService;
+ @Resource
+ private MesMdUnitMeasureService unitMeasureService;
@GetMapping("/page")
@Operation(summary = "鑾峰彇搴撳瓨浜嬪姟娴佹按鍒嗛〉")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1")
- @PreAuthorize("@ss.hasPermission('mes:wm-transaction:query')")
public CommonResult<PageResult<MesWmTransactionRespVO>> getTransactionPage(@Valid MesWmTransactionPageReqVO pageReqVO) {
PageResult<MesWmTransactionDO> pageResult = transactionService.getTransactionPage(pageReqVO);
if (pageResult.getTotal() == 0) {
@@ -111,6 +116,42 @@
return success(new PageResult<>(voList, pageResult.getTotal()));
}
+ @GetMapping("/summary")
+ @Operation(summary = "鑾峰彇浠撳偍鏀跺彂瀛樻眹鎬伙紙鎸夌墿鏂� + 浠撳簱锛�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-transaction:query')")
+ public CommonResult<PageResult<MesWmStockSummaryRespVO>> getStockSummary(@Valid MesWmStockSummaryReqVO reqVO) {
+ PageResult<MesWmStockSummaryRespVO> pageResult = transactionService.getStockSummaryPage(reqVO);
+ if (pageResult.getList().isEmpty()) {
+ return success(PageResult.empty(pageResult.getTotal()));
+ }
+ // 鍏宠仈鐗╂枡銆佷粨搴撱�佸崟浣嶅悕绉�
+ Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(
+ convertSet(pageResult.getList(), MesWmStockSummaryRespVO::getItemId));
+ Map<Long, MesWmWarehouseDO> warehouseMap = warehouseService.getWarehouseMap(
+ convertSet(pageResult.getList(), MesWmStockSummaryRespVO::getWarehouseId));
+ Map<Long, MesMdUnitMeasureDO> unitMap = unitMeasureService.getUnitMeasureMap(
+ itemMap.values().stream().map(MesMdmItemDO::getUnitMeasureId)
+ .filter(java.util.Objects::nonNull).collect(Collectors.toSet()));
+ for (MesWmStockSummaryRespVO vo : pageResult.getList()) {
+ MesMdmItemDO item = itemMap.get(vo.getItemId());
+
+ if (item != null) {
+ vo.setItemCode(item.getCode());
+ vo.setItemName(item.getName());
+ vo.setSpecification(item.getSpecification());
+ MesMdUnitMeasureDO unit = unitMap.get(item.getUnitMeasureId());
+ if (unit != null) {
+ vo.setUnitMeasureName(unit.getName());
+ }
+ }
+ MesWmWarehouseDO warehouse = warehouseMap.get(vo.getWarehouseId());
+ if (warehouse != null) {
+ vo.setWarehouseName(warehouse.getName());
+ }
+ }
+ return success(pageResult);
+ }
+
/**
* 鑾峰彇涓氬姟绫诲瀷鍚嶇О
*/
--
Gitblit v1.9.3