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 | 38 ++++++++++++++++----------------------
1 files changed, 16 insertions(+), 22 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 b9d9492..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
@@ -32,6 +32,8 @@
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;
@@ -65,19 +67,6 @@
@PreAuthorize("@ss.hasPermission('mes:md-item:update')")
public CommonResult<Boolean> updateItem(@Valid @RequestBody MesMdItemSaveReqVO updateReqVO) {
itemService.updateItem(updateReqVO);
- return success(true);
- }
-
- @PutMapping("/update-status")
- @Operation(summary = "鏇存柊鐗╂枡浜у搧鐘舵��")
- @Parameters({
- @Parameter(name = "id", description = "缂栧彿", required = true),
- @Parameter(name = "status", description = "鐘舵��", required = true)
- })
- @PreAuthorize("@ss.hasPermission('mes:md-item:update')")
- public CommonResult<Boolean> updateItemStatus(@RequestParam("id") Long id,
- @RequestParam("status") Integer status) {
- itemService.updateItemStatus(id, status);
return success(true);
}
@@ -122,26 +111,31 @@
@GetMapping("/get-import-template")
@Operation(summary = "鑾峰緱鐗╂枡瀵煎叆妯℃澘")
+ @PreAuthorize("@ss.hasPermission('mes:md-item:import')")
public void importTemplate(HttpServletResponse response) throws IOException {
- // 鎵嬪姩鍒涘缓瀵煎嚭 demo
- List<MesMdItemImportExcelVO> list = Collections.singletonList(
- MesMdItemImportExcelVO.builder().code("ITEM001").name("铻轰笣").specification("M6*20")
- .unitMeasureCode("PCS").itemTypeId(1L).status(0).build()
+ 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.write(response, "鐗╂枡瀵煎叆妯℃澘.xls", "鐗╂枡鍒楄〃", MesMdItemImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鐗╂枡瀵煎叆妯℃澘.xls", "鐗╂枡", MesMdItemImportExcelVO.class, list);
}
@PostMapping("/import")
- @Operation(summary = "瀵煎叆鐗╂枡")
+ @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 {
+ @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));
}
--
Gitblit v1.9.3