From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/MesQcIndicatorResultController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/MesQcIndicatorResultController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/MesQcIndicatorResultController.java
index 1c186b8..ffe1b19 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/MesQcIndicatorResultController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/MesQcIndicatorResultController.java
@@ -57,14 +57,14 @@
@PostMapping("/create")
@Operation(summary = "鍒涘缓妫�楠岀粨鏋�")
- @PreAuthorize("@ss.hasPermission('mes:qc-iqc:create')")
+ @PreAuthorize("@ss.hasAnyPermissions('mes:qc-iqc:create', 'mes:qc-ipqc:create', 'mes:qc-oqc:create', 'mes:qc-rqc:create')")
public CommonResult<Long> createIndicatorResult(@Valid @RequestBody MesQcIndicatorResultSaveReqVO createReqVO) {
return success(resultService.createIndicatorResult(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "鏇存柊妫�楠岀粨鏋�")
- @PreAuthorize("@ss.hasPermission('mes:qc-iqc:update')")
+ @PreAuthorize("@ss.hasAnyPermissions('mes:qc-iqc:update', 'mes:qc-ipqc:update', 'mes:qc-oqc:update', 'mes:qc-rqc:update')")
public CommonResult<Boolean> updateIndicatorResult(@Valid @RequestBody MesQcIndicatorResultSaveReqVO updateReqVO) {
resultService.updateIndicatorResult(updateReqVO);
return success(true);
@@ -73,7 +73,7 @@
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎妫�楠岀粨鏋�")
@Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:qc-iqc:delete')")
+ @PreAuthorize("@ss.hasAnyPermissions('mes:qc-iqc:delete', 'mes:qc-ipqc:delete', 'mes:qc-oqc:delete', 'mes:qc-rqc:delete')")
public CommonResult<Boolean> deleteIndicatorResult(@RequestParam("id") Long id) {
resultService.deleteIndicatorResult(id);
return success(true);
@@ -153,6 +153,12 @@
return Collections.emptyList();
}
+ // 杩囩▼妫�楠屾敮鎸佽川妫�鎵嬪伐澧炲垹妫�楠岃锛氬凡鏈夋槑缁嗘椂浠ユ槑缁嗗疄闄呮寚鏍囧強椤哄簭涓哄噯锛�
+ // 閬垮厤妯℃澘閲岀殑鎸囨爣鎶婂凡鍒犻櫎鐨勮閲嶆柊甯﹀嚭鏉ャ��
+ if (Objects.equals(qcType, MesQcTypeEnum.IPQC.getType()) && CollUtil.isNotEmpty(details)) {
+ indicatorIds = details.stream().map(MesQcIndicatorResultDetailDO::getIndicatorId)
+ .filter(Objects::nonNull).distinct().toList();
+ }
// 1.2 鎵归噺鏌ヨ妫�娴嬫寚鏍�
Map<Long, MesQcIndicatorDO> indicatorMap = indicatorService.getIndicatorMap(new HashSet<>(indicatorIds));
// 1.3 鏋勫缓宸叉湁鏄庣粏 Map锛堟寜 indicatorId 绱㈠紩锛�
--
Gitblit v1.9.3