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 | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 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 65f6b13..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
@@ -5,29 +5,30 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.mes.controller.admin.qc.pendinginspect.vo.MesQcPendingInspectPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.pendinginspect.vo.MesQcPendingInspectRespVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
-import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
-import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
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;
import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
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;
@@ -44,21 +45,22 @@
@Resource
private MesQcPendingInspectService pendingInspectService;
@Resource
- private MesMdItemService itemService;
+ private MesQcItemResolver qcItemResolver;
@Resource
private MesMdUnitMeasureService unitMeasureService;
@Resource
- private MesMdVendorService vendorService;
+ private SrmSupplierApi srmSupplierApi;
@Resource
- private MesMdClientService clientService;
+ private CrmCustomerApi customerApi;
@Resource
private MesMdWorkstationService workstationService;
@Resource
private MesProTaskService taskService;
+ @Resource
+ private MesQcTemplateItemService templateItemService;
@GetMapping("/page")
@Operation(summary = "鑾峰緱寰呮浠诲姟鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:qc-pending-inspect:query')")
public CommonResult<PageResult<MesQcPendingInspectRespVO>> getPendingInspectPage(
@Valid MesQcPendingInspectPageReqVO pageReqVO) {
PageResult<MesQcPendingInspectRespVO> pageResult = pendingInspectService.getPendingInspectPage(pageReqVO);
@@ -73,17 +75,18 @@
if (CollUtil.isEmpty(list)) {
return;
}
- // 鎵归噺鏌ヨ鐗╂枡
- Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+ // 鎵归噺鏌ヨ鐗╂枡锛堝吋瀹� mdm_item.id / mes_md_item.id锛�
+ Map<Long, MdmItemRespDTO> itemMap = qcItemResolver.getItemMap(
convertSet(list, MesQcPendingInspectRespVO::getItemId));
// 鎵归噺鏌ヨ璁￠噺鍗曚綅锛堥�氳繃鐗╂枡鐨� unitMeasureId锛�
Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
- convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId));
// 鎵归噺鏌ヨ渚涘簲鍟嗭紙IQC 鍦烘櫙锛�
- Map<Long, MesMdVendorDO> vendorMap = vendorService.getVendorMap(
- convertSet(list, MesQcPendingInspectRespVO::getVendorId));
+ Map<Long, SrmSupplierRespDTO> vendorMap = srmSupplierApi.getSupplierList(
+ convertSet(list, MesQcPendingInspectRespVO::getVendorId)).getCheckedData().stream()
+ .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, s -> s));
// 鎵归噺鏌ヨ瀹㈡埛锛圤QC/RQC 鍦烘櫙锛�
- Map<Long, MesMdClientDO> clientMap = clientService.getClientMap(
+ Map<Long, CrmCustomerRespDTO> clientMap = customerApi.getCustomerMap(
convertSet(list, MesQcPendingInspectRespVO::getClientId));
// 鎵归噺鏌ヨ宸ヤ綔绔欙紙IPQC/RQC 鍦烘櫙锛�
Map<Long, MesMdWorkstationDO> workstationMap = workstationService.getWorkstationMap(
@@ -91,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 -> {
@@ -103,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