From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题(不含物料颜色字段)

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 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 c42ffc3..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
@@ -9,6 +9,9 @@
 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;
@@ -71,6 +74,24 @@
     @Resource
     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")

--
Gitblit v1.9.3