From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/MesQcNcrController.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/MesQcNcrController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/MesQcNcrController.java
index bc6e5d3..a35e5df 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/MesQcNcrController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/MesQcNcrController.java
@@ -8,10 +8,10 @@
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.qc.ncr.vo.*;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ncr.MesQcNcrDO;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.qc.ncr.MesQcNcrService;
+import cn.iocoder.yudao.module.mes.service.qc.support.MesQcItemResolver;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@@ -33,6 +33,11 @@
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
+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.ncr.vo.MesQcNcrImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ncr.vo.MesQcNcrImportRespVO;
@Tag(name = "绠＄悊鍚庡彴 - MES 涓嶅悎鏍煎搧澶勭悊鍗曪紙NCR锛�")
@RestController
@@ -44,7 +49,7 @@
private MesQcNcrService ncrService;
@Resource
- private MesMdItemService itemService;
+ private MesQcItemResolver qcItemResolver;
@Resource
private AdminUserApi adminUserApi;
@@ -138,8 +143,8 @@
if (CollUtil.isEmpty(list)) {
return Collections.emptyList();
}
- // 鎵归噺鏌ヨ鐗╂枡
- Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+ // 鎵归噺鏌ヨ鐗╂枡锛堝吋瀹� mdm_item.id / mes_md_item.id锛�
+ Map<Long, MdmItemRespDTO> itemMap = qcItemResolver.getItemMap(
convertSet(list, MesQcNcrDO::getItemId));
// 鎵归噺鏌ヨ璇勫浜�
Set<Long> reviewerUserIds = convertSet(list, MesQcNcrDO::getReviewerUserId);
@@ -175,4 +180,35 @@
});
}
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱涓嶅悎鏍煎搧澶勭悊鍗曞鍏ユā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesQcNcrImportExcelVO> list = Collections.singletonList(
+ MesQcNcrImportExcelVO.builder()
+ .code("NCR-001").name("涓嶅悎鏍煎搧澶勭悊鍗�").itemCode("M-001")
+ .defectLevel(1).unqualifiedQuantity(new java.math.BigDecimal("10"))
+ .defectDescription("").rootCause("").correctiveAction("").preventiveAction("")
+ .remark("")
+ .build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "涓嶅悎鏍煎搧澶勭悊鍗曞鍏ユā鏉�.xls", "涓嶅悎鏍煎搧澶勭悊鍗曞垪琛�", MesQcNcrImportExcelVO.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-ncr:import')")
+ public CommonResult<MesQcNcrImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesQcNcrImportExcelVO> list = ExcelUtils.read(file, MesQcNcrImportExcelVO.class);
+ return success(ncrService.importNcrList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3