From 10ee450a249e4e5698765048472e7793056b7603 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 10:53:13 +0800
Subject: [PATCH] feat(mes): 增加物料编号集合查询参数并优化工艺路线验证逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/MesQcDefectController.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/MesQcDefectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/MesQcDefectController.java
index 9c76651..b72a462 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/MesQcDefectController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/MesQcDefectController.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.defect.vo.MesQcDefectImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectImportRespVO;
@Tag(name = "绠＄悊鍚庡彴 - MES 缂洪櫡绫诲瀷")
@RestController
@@ -97,4 +102,33 @@
BeanUtils.toBean(list, MesQcDefectRespVO.class));
}
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱缂洪櫡绫诲瀷瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesQcDefectImportExcelVO> list = Collections.singletonList(
+ MesQcDefectImportExcelVO.builder()
+ .code("D-001").name("鍒掍激").type(1).level(1)
+ .remark("")
+ .build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "缂洪櫡绫诲瀷瀵煎叆妯℃澘.xls", "缂洪櫡绫诲瀷鍒楄〃", MesQcDefectImportExcelVO.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-defect:import')")
+ public CommonResult<MesQcDefectImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesQcDefectImportExcelVO> list = ExcelUtils.read(file, MesQcDefectImportExcelVO.class);
+ return success(defectService.importDefectList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3