From 8e4eee5ad4d74e1a4e6ab4de3a9c28000700dce0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 13:49:04 +0800
Subject: [PATCH] 修复采购退货页面 ERP 模块已禁用报错
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockCompatController.java | 43 +++++++++++++++++++++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpWarehouseCompatController.java | 40 ++++++++++++++++++++
yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wm/warehouse/MesWmWarehouseApi.java | 7 +++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wm/warehouse/MesWmWarehouseApiImpl.java | 5 ++
4 files changed, 95 insertions(+), 0 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockCompatController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockCompatController.java
new file mode 100644
index 0000000..65edf22
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockCompatController.java
@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.erp.controller.admin.stock;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.mes.api.wms.stock.WmsStockApi;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * ERP 搴撳瓨鍏煎鎺ュ彛
+ *
+ * 搴撳瓨鏁版嵁宸茬粺涓�鐢� MES锛坢es_wm_material_stock锛夌淮鎶わ紝鏈帴鍙d粎淇濈暀鍓嶇閲囪喘/閿�鍞崟鎹槑缁�
+ * 浣跨敤鐨� {@code /erp/stock/get-count} 璋冪敤璺緞锛屽唴閮ㄨ浆璋� MES 搴撳瓨 API銆�
+ */
+@Tag(name = "绠$悊鍚庡彴 - ERP 搴撳瓨锛堝吋瀹癸級")
+@RestController
+@RequestMapping("/erp/stock")
+@Validated
+public class ErpStockCompatController {
+
+ @Resource
+ private WmsStockApi wmsStockApi;
+
+ @GetMapping("/get-count")
+ @Operation(summary = "鑾峰緱浜у搧搴撳瓨鏁伴噺锛堟暟鎹潵鑷� MES 搴撳瓨锛�")
+ @Parameter(name = "productId", description = "浜у搧缂栧彿", required = true, example = "1024")
+ @Parameter(name = "warehouseId", description = "浠撳簱缂栧彿锛屼笉浼犲垯缁熻鍏ㄩ儴浠撳簱", example = "2048")
+ public CommonResult<BigDecimal> getStockCount(@RequestParam("productId") Long productId,
+ @RequestParam(value = "warehouseId", required = false) Long warehouseId) {
+ return success(wmsStockApi.getStockQuantity(productId, warehouseId));
+ }
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpWarehouseCompatController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpWarehouseCompatController.java
new file mode 100644
index 0000000..3ef7932
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpWarehouseCompatController.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.erp.controller.admin.stock;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.mes.api.wm.warehouse.MesWmWarehouseApi;
+import cn.iocoder.yudao.module.mes.api.wm.warehouse.dto.MesWmWarehouseRespDTO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * ERP 浠撳簱鍏煎鎺ュ彛
+ *
+ * 浠撳簱涓绘暟鎹凡缁熶竴鐢� MES锛坢es_wm_warehouse锛夌淮鎶わ紝鏈帴鍙d粎淇濈暀鍓嶇閲囪喘/閿�鍞崟鎹〉闈㈢殑
+ * {@code /erp/warehouse/simple-list} 璋冪敤璺緞锛屽唴閮ㄨ浆璋� MES 浠撳簱 API锛岄伩鍏嶈姹傝惤鍒�
+ * DefaultController 杩斿洖鈥淓RP 妯″潡宸茬鐢ㄢ�濄��
+ */
+@Tag(name = "绠$悊鍚庡彴 - ERP 浠撳簱锛堝吋瀹癸級")
+@RestController
+@RequestMapping("/erp/warehouse")
+@Validated
+public class ErpWarehouseCompatController {
+
+ @Resource
+ private MesWmWarehouseApi mesWmWarehouseApi;
+
+ @GetMapping("/simple-list")
+ @Operation(summary = "鑾峰緱浠撳簱绮剧畝鍒楄〃锛堟暟鎹潵鑷� MES 浠撳簱锛�")
+ public CommonResult<List<MesWmWarehouseRespDTO>> getWarehouseSimpleList() {
+ return success(mesWmWarehouseApi.getWarehouseSimpleList());
+ }
+
+}
diff --git a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wm/warehouse/MesWmWarehouseApi.java b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wm/warehouse/MesWmWarehouseApi.java
index 9767668..aac1b16 100644
--- a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wm/warehouse/MesWmWarehouseApi.java
+++ b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wm/warehouse/MesWmWarehouseApi.java
@@ -18,4 +18,11 @@
*/
List<MesWmWarehouseRespDTO> getWarehouseList(Collection<Long> ids);
+ /**
+ * 鑾峰彇鍏ㄩ儴浠撳簱锛堢簿绠�鍒楄〃锛屼富瑕佺敤浜庡墠绔笅鎷夛級
+ *
+ * @return 浠撳簱鍒楄〃
+ */
+ List<MesWmWarehouseRespDTO> getWarehouseSimpleList();
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wm/warehouse/MesWmWarehouseApiImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wm/warehouse/MesWmWarehouseApiImpl.java
index ef7755c..9ff0f7d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wm/warehouse/MesWmWarehouseApiImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wm/warehouse/MesWmWarehouseApiImpl.java
@@ -32,4 +32,9 @@
return BeanUtils.toBean(list, MesWmWarehouseRespDTO.class);
}
+ @Override
+ public List<MesWmWarehouseRespDTO> getWarehouseSimpleList() {
+ return BeanUtils.toBean(warehouseMapper.selectSimpleList(), MesWmWarehouseRespDTO.class);
+ }
+
}
--
Gitblit v1.9.3