From 6d910029b6c81db0a2b66caa66952781397b153a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 29 八月 2026 13:45:52 +0800
Subject: [PATCH] feat(mes): 实现H5溯源页面与二维码内容集成
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
index 621ebc8..26cb544 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
@@ -9,11 +9,14 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockAdjustReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockFreezeReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockMoveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockRespVO;
-import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockFreezeReqVO;
-import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
-import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockListReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmStockSummaryRespVO;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
@@ -68,7 +71,7 @@
@Resource
private MesWmWarehouseAreaService areaService;
@Resource
- private ErpSupplierApi supplierApi;
+ private SrmSupplierApi srmSupplierApi;
@GetMapping("/get")
@Operation(summary = "鑾峰緱搴撳瓨璁板綍")
@@ -114,6 +117,38 @@
return success(materialStockService.adjustMaterialStockOut(reqVO));
}
+ @PostMapping("/move")
+ @Operation(summary = "搴撳瓨绉诲簱")
+ @PreAuthorize("@ss.hasPermission('mes:wm-material-stock:update')")
+ public CommonResult<Boolean> moveMaterialStock(@Valid @RequestBody MesWmMaterialStockMoveReqVO reqVO) {
+ materialStockService.moveMaterialStock(reqVO);
+ return success(true);
+ }
+
+ @GetMapping("/summary-by-item")
+ @Operation(summary = "鎸夊搧绉嶆眹鎬诲簱瀛樻暟閲�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-material-stock:query')")
+ public CommonResult<List<MesWmStockSummaryRespVO>> getStockSummaryByItem(
+ MesWmMaterialStockListReqVO reqVO) {
+ return success(materialStockService.getStockSummaryByItem(reqVO));
+ }
+
+ @GetMapping("/summary-by-batch")
+ @Operation(summary = "鎸夋壒娆℃眹鎬诲簱瀛樻暟閲�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-material-stock:query')")
+ public CommonResult<List<MesWmStockSummaryRespVO>> getStockSummaryByBatch(
+ MesWmMaterialStockListReqVO reqVO) {
+ return success(materialStockService.getStockSummaryByBatch(reqVO));
+ }
+
+ @GetMapping("/summary-by-warehouse")
+ @Operation(summary = "鎸変粨搴撴眹鎬诲簱瀛樻暟閲�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-material-stock:query')")
+ public CommonResult<List<MesWmStockSummaryRespVO>> getStockSummaryByWarehouse(
+ MesWmMaterialStockListReqVO reqVO) {
+ return success(materialStockService.getStockSummaryByWarehouse(reqVO));
+ }
+
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭搴撳瓨鍙拌处 Excel")
@PreAuthorize("@ss.hasPermission('mes:wm-material-stock:export')")
@@ -144,9 +179,9 @@
convertSet(list, MesWmMaterialStockDO::getLocationId));
Map<Long, MesWmWarehouseAreaDO> areaMap = areaService.getWarehouseAreaMap(
convertSet(list, MesWmMaterialStockDO::getAreaId));
- Map<Long, ErpSupplierRespDTO> vendorMap = supplierApi.getSupplierList(
+ Map<Long, SrmSupplierRespDTO> vendorMap = srmSupplierApi.getSupplierList(
convertSet(list, MesWmMaterialStockDO::getVendorId)).getCheckedData().stream()
- .collect(Collectors.toMap(ErpSupplierRespDTO::getId, s -> s));
+ .collect(Collectors.toMap(SrmSupplierRespDTO::getId, s -> s));
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmMaterialStockRespVO.class, vo -> {
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
--
Gitblit v1.9.3