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/qc/indicator/MesQcIndicatorController.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/MesQcIndicatorController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/MesQcIndicatorController.java
index 14f49fe..506a25b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/MesQcIndicatorController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/MesQcIndicatorController.java
@@ -26,6 +26,11 @@
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import org.springframework.web.multipart.MultipartFile;
+import io.swagger.v3.oas.annotations.Parameters;
+import java.util.Collections;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.indicator.vo.MesQcIndicatorImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.indicator.vo.MesQcIndicatorImportRespVO;
@Tag(name = "绠＄悊鍚庡彴 - MES 璐ㄦ鎸囨爣")
@RestController
@@ -63,7 +68,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱璐ㄦ鎸囨爣")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:qc-indicator:query')")
public CommonResult<MesQcIndicatorRespVO> getIndicator(@RequestParam("id") Long id) {
MesQcIndicatorDO indicator = indicatorService.getIndicator(id);
return success(BeanUtils.toBean(indicator, MesQcIndicatorRespVO.class));
@@ -71,7 +75,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱璐ㄦ鎸囨爣鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:qc-indicator:query')")
public CommonResult<PageResult<MesQcIndicatorRespVO>> getIndicatorPage(@Valid MesQcIndicatorPageReqVO pageReqVO) {
PageResult<MesQcIndicatorDO> pageResult = indicatorService.getIndicatorPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, MesQcIndicatorRespVO.class));
@@ -90,4 +93,34 @@
BeanUtils.toBean(list, MesQcIndicatorRespVO.class));
}
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱璐ㄦ鎸囨爣瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesQcIndicatorImportExcelVO> list = Collections.singletonList(
+ MesQcIndicatorImportExcelVO.builder()
+ .code("QC-001").name("澶栬妫�鏌�").type(1).tool("鐩")
+ .resultType(1).resultSpecification("鏃犲垝浼�")
+ .remark("")
+ .build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "璐ㄦ鎸囨爣瀵煎叆妯℃澘.xls", "璐ㄦ鎸囨爣鍒楄〃", MesQcIndicatorImportExcelVO.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:qc-indicator:import')")
+ public CommonResult<MesQcIndicatorImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesQcIndicatorImportExcelVO> list = ExcelUtils.read(file, MesQcIndicatorImportExcelVO.class);
+ return success(indicatorService.importIndicatorList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3