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/qc/pendinginspect/MesQcPendingInspectController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/pendinginspect/MesQcPendingInspectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/pendinginspect/MesQcPendingInspectController.java
index e478c57..53d7e81 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/pendinginspect/MesQcPendingInspectController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/pendinginspect/MesQcPendingInspectController.java
@@ -18,6 +18,7 @@
import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
import cn.iocoder.yudao.module.mes.service.qc.pendinginspect.MesQcPendingInspectService;
import cn.iocoder.yudao.module.mes.service.qc.support.MesQcItemResolver;
+import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
@@ -27,6 +28,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -54,6 +56,8 @@
private MesMdWorkstationService workstationService;
@Resource
private MesProTaskService taskService;
+ @Resource
+ private MesQcTemplateItemService templateItemService;
@GetMapping("/page")
@Operation(summary = "鑾峰緱寰呮浠诲姟鍒嗛〉")
@@ -90,6 +94,8 @@
// 鎵归噺鏌ヨ浠诲姟锛圛PQC 鍦烘櫙锛�
Map<Long, MesProTaskDO> taskMap = taskService.getTaskMap(
convertSet(list, MesQcPendingInspectRespVO::getTaskId));
+ // 鍚屼竴 鐗╂枡+妫�楠岀被鍨� 鐨勬ā鏉垮尮閰嶇粨鏋滅紦瀛橈紝閬垮厤閲嶅鏌ヨ
+ Map<String, Boolean> canInspectCache = new HashMap<>();
// 鎷艰
list.forEach(vo -> {
findAndThen(itemMap, vo.getItemId(), item -> {
@@ -102,6 +108,9 @@
findAndThen(workstationMap, vo.getWorkstationId(),
workstation -> vo.setWorkstationName(workstation.getName()));
findAndThen(taskMap, vo.getTaskId(), task -> vo.setTaskCode(task.getCode()));
+ vo.setCanInspect(canInspectCache.computeIfAbsent(
+ vo.getQcType() + ":" + vo.getItemId(),
+ key -> templateItemService.hasEnabledTemplate(vo.getItemId(), vo.getQcType())));
});
}
--
Gitblit v1.9.3