From 9075785a9e14f6220783d052d231f915c6930b87 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:21:45 +0800
Subject: [PATCH] revert(collect): 撤销 collect 数采模块（新高设备管理已有自己的采集方式）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/MesQcNcrController.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 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 89d1e37..239e94b 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;
@@ -49,7 +49,7 @@
private MesQcNcrService ncrService;
@Resource
- private MesMdItemService itemService;
+ private MesQcItemResolver qcItemResolver;
@Resource
private AdminUserApi adminUserApi;
@@ -111,7 +111,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱涓嶅悎鏍煎搧澶勭悊鍗曡鎯�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:qc-ncr:query')")
public CommonResult<MesQcNcrRespVO> getNcr(@RequestParam("id") Long id) {
MesQcNcrDO ncr = ncrService.getNcr(id);
return success(buildNcrRespVOList(Collections.singletonList(ncr)).get(0));
@@ -119,7 +118,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱涓嶅悎鏍煎搧澶勭悊鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:qc-ncr:query')")
public CommonResult<PageResult<MesQcNcrRespVO>> getNcrPage(@Valid MesQcNcrPageReqVO pageReqVO) {
PageResult<MesQcNcrDO> pageResult = ncrService.getNcrPage(pageReqVO);
return success(new PageResult<>(buildNcrRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -143,8 +141,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);
--
Gitblit v1.9.3