From ac2e2b5af3726ee64dc37c3ebf26989a0346f22a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 07 十一月 2026 19:16:05 +0800
Subject: [PATCH] feat(feedback): 优化报工审批流程并增加报工人校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java | 82 ++++++++++++++++++++++++++++++++--------
1 files changed, 65 insertions(+), 17 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 a665b66..b40fee0 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
@@ -8,19 +8,26 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
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.MesWmStockImportExcelVO;
+import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmStockImportService;
+import org.springframework.web.multipart.MultipartFile;
+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.mes.dal.dataobject.md.item.MesMdItemDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO;
+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;
+
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
-import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
-import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService;
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
+
import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
@@ -40,6 +47,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -54,9 +62,9 @@
@Resource
private MesWmMaterialStockService materialStockService;
@Resource
- private MesMdItemService itemService;
+ private MdmItemApi mdmItemApi;
@Resource
- private MesMdUnitMeasureService unitMeasureService;
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
@Resource
private MesWmWarehouseService warehouseService;
@Resource
@@ -64,12 +72,29 @@
@Resource
private MesWmWarehouseAreaService areaService;
@Resource
- private MesMdVendorService vendorService;
+ private SrmSupplierApi srmSupplierApi;
+ @Resource
+ private MesWmStockImportService stockImportService;
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "涓嬭浇搴撳瓨瀵煎叆妯℃澘")
+ @PreAuthorize("@ss.hasPermission('mes:wm-material-stock:adjust')")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ ExcelUtils.writeTemplate(response, "搴撳瓨瀵煎叆妯℃澘.xls", "搴撳瓨鏄庣粏", MesWmStockImportExcelVO.class, Collections.emptyList());
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆搴撳瓨澧為噺")
+ @PreAuthorize("@ss.hasPermission('mes:wm-material-stock:adjust')")
+ public CommonResult<Map<String, Object>> importStock(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", defaultValue = "false") boolean updateSupport) throws IOException {
+ if (updateSupport) throw new IllegalArgumentException("搴撳瓨瀵煎叆浠呮敮鎸佺疮鍔犲叆搴擄紝涓嶆敮鎸佽鐩�");
+ return success(stockImportService.importRows(ExcelUtils.read(file, MesWmStockImportExcelVO.class)));
+ }
@GetMapping("/get")
@Operation(summary = "鑾峰緱搴撳瓨璁板綍")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-material-stock:query')")
public CommonResult<MesWmMaterialStockRespVO> getMaterialStock(@RequestParam("id") Long id) {
MesWmMaterialStockDO stock = materialStockService.getMaterialStock(id);
if (stock == null) {
@@ -80,7 +105,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱搴撳瓨鍙拌处鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:wm-material-stock:query')")
public CommonResult<PageResult<MesWmMaterialStockRespVO>> getMaterialStockPage(
@Valid MesWmMaterialStockPageReqVO pageReqVO) {
PageResult<MesWmMaterialStockDO> pageResult = materialStockService.getMaterialStockPage(pageReqVO);
@@ -93,6 +117,28 @@
public CommonResult<Boolean> updateMaterialStockFrozen(
@Valid @RequestBody MesWmMaterialStockFreezeReqVO updateReqVO) {
materialStockService.updateMaterialStockFrozen(updateReqVO);
+ return success(true);
+ }
+
+ @PostMapping("/adjust-in")
+ @Operation(summary = "鑷畾涔夊叆搴�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-material-stock:adjust')")
+ public CommonResult<Long> adjustMaterialStockIn(@Valid @RequestBody MesWmMaterialStockAdjustReqVO reqVO) {
+ return success(materialStockService.adjustMaterialStockIn(reqVO));
+ }
+
+ @PostMapping("/adjust-out")
+ @Operation(summary = "鑷畾涔夊嚭搴�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-material-stock:adjust')")
+ public CommonResult<Long> adjustMaterialStockOut(@Valid @RequestBody MesWmMaterialStockAdjustReqVO reqVO) {
+ 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);
}
@@ -115,18 +161,20 @@
return Collections.emptyList();
}
// 1. 鑾峰緱鍏宠仈鏁版嵁
- Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
convertSet(list, MesWmMaterialStockDO::getItemId));
- Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
- convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureList(
+ convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId)).getCheckedData()
+ .stream().collect(Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
Map<Long, MesWmWarehouseDO> warehouseMap = warehouseService.getWarehouseMap(
convertSet(list, MesWmMaterialStockDO::getWarehouseId));
Map<Long, MesWmWarehouseLocationDO> locationMap = locationService.getWarehouseLocationMap(
convertSet(list, MesWmMaterialStockDO::getLocationId));
Map<Long, MesWmWarehouseAreaDO> areaMap = areaService.getWarehouseAreaMap(
convertSet(list, MesWmMaterialStockDO::getAreaId));
- Map<Long, MesMdVendorDO> vendorMap = vendorService.getVendorMap(
- convertSet(list, MesWmMaterialStockDO::getVendorId));
+ Map<Long, SrmSupplierRespDTO> vendorMap = srmSupplierApi.getSupplierList(
+ convertSet(list, MesWmMaterialStockDO::getVendorId)).getCheckedData().stream()
+ .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