From ac2e2b5af3726ee64dc37c3ebf26989a0346f22a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 07 十一月 2026 19:16:05 +0800
Subject: [PATCH] feat(feedback): 优化报工审批流程并增加报工人校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/MesTmToolController.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/MesTmToolController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/MesTmToolController.java
index 86bbcf5..b0404c2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/MesTmToolController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/MesTmToolController.java
@@ -6,6 +6,8 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
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.tm.tool.vo.MesTmToolImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.tm.tool.vo.MesTmToolImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.tm.tool.vo.MesTmToolPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.tm.tool.vo.MesTmToolRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.tm.tool.vo.MesTmToolSaveReqVO;
@@ -15,6 +17,7 @@
import cn.iocoder.yudao.module.mes.service.tm.tool.MesTmToolTypeService;
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;
@@ -22,6 +25,7 @@
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 cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
@@ -73,7 +77,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱宸ュ叿")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:tm-tool:query')")
public CommonResult<MesTmToolRespVO> getTool(@RequestParam("id") Long id) {
MesTmToolDO tool = toolService.getTool(id);
MesTmToolRespVO respVO = BeanUtils.toBean(tool, MesTmToolRespVO.class);
@@ -89,7 +92,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱宸ュ叿鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:tm-tool:query')")
public CommonResult<PageResult<MesTmToolRespVO>> getToolPage(@Valid MesTmToolPageReqVO pageReqVO) {
PageResult<MesTmToolDO> pageResult = toolService.getToolPage(pageReqVO);
return success(new PageResult<>(buildToolRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -108,9 +110,38 @@
ExcelUtils.write(response, "宸ュ叿鍙拌处.xls", "鏁版嵁", MesTmToolRespVO.class, voList);
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱宸ュ叿瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesTmToolImportExcelVO> list = Collections.singletonList(
+ MesTmToolImportExcelVO.builder()
+ .code("T-001").name("绀轰緥宸ュ叿").brand("").specification("")
+ .toolTypeName("").quantity(1).availableQuantity(1)
+ .maintenType(1).nextMaintenPeriod(100)
+ .nextMaintenDate(java.time.LocalDateTime.of(2026, 12, 31, 0, 0))
+ .status(1).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "宸ュ叿瀵煎叆妯℃澘.xls", "宸ュ叿鍒楄〃", MesTmToolImportExcelVO.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:tm-tool:import')")
+ public CommonResult<MesTmToolImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesTmToolImportExcelVO> list = ExcelUtils.read(file, MesTmToolImportExcelVO.class);
+ return success(toolService.importToolList(list, updateSupport));
+ }
+
@GetMapping("/simple-list")
@Operation(summary = "鑾峰緱宸ュ叿绮剧畝鍒楄〃")
- @PreAuthorize("@ss.hasPermission('mes:tm-tool:query')")
public CommonResult<List<MesTmToolRespVO>> getToolSimpleList() {
List<MesTmToolDO> list = toolService.getToolList();
return success(BeanUtils.toBean(list, MesTmToolRespVO.class));
--
Gitblit v1.9.3