From 9b386ddaa6c8892d346d1e09b8bea20cb9000f58 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 16:14:04 +0800
Subject: [PATCH] 代码提交
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 51d117b..621ebc8 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
@@ -12,10 +12,11 @@
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.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO;
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;
@@ -23,7 +24,6 @@
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.md.vendor.MesMdVendorService;
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;
@@ -68,7 +68,7 @@
@Resource
private MesWmWarehouseAreaService areaService;
@Resource
- private MesMdVendorService vendorService;
+ private ErpSupplierApi supplierApi;
@GetMapping("/get")
@Operation(summary = "鑾峰緱搴撳瓨璁板綍")
@@ -100,11 +100,18 @@
return success(true);
}
- @PostMapping("/adjust")
- @Operation(summary = "搴撳瓨璋冩暣锛堣嚜瀹氫箟鍑哄叆搴擄級")
+ @PostMapping("/adjust-in")
+ @Operation(summary = "鑷畾涔夊叆搴�")
@PreAuthorize("@ss.hasPermission('mes:wm-material-stock:adjust')")
- public CommonResult<Long> adjustMaterialStock(@Valid @RequestBody MesWmMaterialStockAdjustReqVO reqVO) {
- return success(materialStockService.adjustMaterialStock(reqVO));
+ 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));
}
@GetMapping("/export-excel")
@@ -137,8 +144,9 @@
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, ErpSupplierRespDTO> vendorMap = supplierApi.getSupplierList(
+ convertSet(list, MesWmMaterialStockDO::getVendorId)).getCheckedData().stream()
+ .collect(Collectors.toMap(ErpSupplierRespDTO::getId, s -> s));
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmMaterialStockRespVO.class, vo -> {
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
--
Gitblit v1.9.3