From 05ab6e3f69a5e73624b2573db043f5923e8f7d8b Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 05 十一月 2026 14:17:19 +0800
Subject: [PATCH] fix 修复bug
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdItemController.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdItemController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdItemController.java
index fdad22a..59e3119 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdItemController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdItemController.java
@@ -8,6 +8,8 @@
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.md.item.vo.MesMdItemImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.MesMdItemImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.MesMdItemPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.MesMdItemRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.MesMdItemSaveReqVO;
@@ -19,6 +21,7 @@
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
@@ -26,8 +29,11 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -103,6 +109,37 @@
buildItemVOList(pageResult.getList()));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱鐗╂枡瀵煎叆妯℃澘")
+ @PreAuthorize("@ss.hasPermission('mes:md-item:import')")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ List<MesMdItemImportExcelVO> list = Arrays.asList(
+ MesMdItemImportExcelVO.builder()
+ .code("ITEM_RAW_001").name("閾滄潌").specification("桅8mm").color("绾㈣壊")
+ .unitMeasureName("鍗冨厠").itemTypeName("鍘熸潗鏂�")
+ .safeStockFlag(true).minStock(new BigDecimal("100")).maxStock(new BigDecimal("10000"))
+ .highValue(false).batchFlag(true).remark("绀轰緥锛氳閲忓崟浣嶃�佺墿鏂欏垎绫昏濉啓绯荤粺涓凡瀛樺湪鐨勫悕绉�").build(),
+ MesMdItemImportExcelVO.builder()
+ .code("ITEM_RAW_002").name("閾濇潌").specification("桅9.5mm").color("钃濊壊")
+ .unitMeasureName("鍗冨厠").itemTypeName("鍘熸潗鏂�")
+ .safeStockFlag(false).highValue(false).batchFlag(false).remark("绀轰緥锛氶鑹茬敤浜庡尯鍒嗗悓鍨嬪彿涓嶅悓棰滆壊鐨勭墿鏂�").build()
+ );
+ ExcelUtils.writeTemplate(response, "鐗╂枡瀵煎叆妯℃澘.xls", "鐗╂枡", MesMdItemImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆鐗╂枡浜у搧")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true),
+ @Parameter(name = "updateSupport", description = "鏄惁鏀寔鏇存柊锛岄粯璁や负 false", example = "true")
+ })
+ @PreAuthorize("@ss.hasPermission('mes:md-item:import')")
+ public CommonResult<MesMdItemImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesMdItemImportExcelVO> list = ExcelUtils.read(file, MesMdItemImportExcelVO.class);
+ return success(itemService.importItemList(list, updateSupport));
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesMdItemRespVO> buildItemVOList(List<MesMdItemDO> list) {
--
Gitblit v1.9.3