From ef7b2ab43d7cf2aeab6a456434a85fff22712f55 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 2 Mar 2026 19:38:23 +0800 Subject: [PATCH] ✨ feat(mes): 更新检验单完成接口及权限管理 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java | 8 ++++---- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java | 8 ++++---- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java | 8 ++++---- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java | 8 ++++---- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcService.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcService.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcService.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcService.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java index 69e501d..f2a73e9 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java @@ -82,12 +82,12 @@ public class MesQcIpqcController { return success(true); } - @PutMapping("/complete") + @PutMapping("/finish") @Operation(summary = "完成过程检验单") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:qc-ipqc:update')") - public CommonResult completeIpqc(@RequestParam("id") Long id) { - ipqcService.completeIpqc(id); + @PreAuthorize("@ss.hasPermission('mes:qc-ipqc:finish')") + public CommonResult finishIpqc(@RequestParam("id") Long id) { + ipqcService.finishIpqc(id); return success(true); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java index de1a369..1602160 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java @@ -74,12 +74,12 @@ public class MesQcIqcController { return success(true); } - @PutMapping("/complete") + @PutMapping("/finish") @Operation(summary = "完成来料检验单") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:qc-iqc:update')") - public CommonResult completeIqc(@RequestParam("id") Long id) { - iqcService.completeIqc(id); + @PreAuthorize("@ss.hasPermission('mes:qc-iqc:finish')") + public CommonResult finishIqc(@RequestParam("id") Long id) { + iqcService.finishIqc(id); return success(true); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java index 44e613d..279ba1e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java @@ -73,12 +73,12 @@ public class MesQcOqcController { return success(true); } - @PutMapping("/complete") + @PutMapping("/finish") @Operation(summary = "完成出货检验单") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:qc-oqc:update')") - public CommonResult completeOqc(@RequestParam("id") Long id) { - oqcService.completeOqc(id); + @PreAuthorize("@ss.hasPermission('mes:qc-oqc:finish')") + public CommonResult finishOqc(@RequestParam("id") Long id) { + oqcService.finishOqc(id); return success(true); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java index c79fe38..56f5c35 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java @@ -69,12 +69,12 @@ public class MesQcRqcController { return success(true); } - @PutMapping("/complete") + @PutMapping("/finish") @Operation(summary = "完成退货检验单") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:qc-rqc:update')") - public CommonResult completeRqc(@RequestParam("id") Long id) { - rqcService.completeRqc(id); + @PreAuthorize("@ss.hasPermission('mes:qc-rqc:finish')") + public CommonResult finishRqc(@RequestParam("id") Long id) { + rqcService.finishRqc(id); return success(true); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcService.java index f7f3c3f..1de46ff 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcService.java @@ -36,7 +36,7 @@ public interface MesQcIpqcService { * * @param id 编号 */ - void completeIpqc(Long id); + void finishIpqc(Long id); /** * 删除过程检验单 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java index dfd8ad9..9b284df 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java @@ -110,7 +110,7 @@ public class MesQcIpqcServiceImpl implements MesQcIpqcService { } @Override - public void completeIpqc(Long id) { + public void finishIpqc(Long id) { // 1.1 校验存在 + 草稿状态 MesQcIpqcDO ipqc = validateIpqcStatusPrepare(id); // 1.2 校验检测结论必填 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcService.java index d2619d4..49de3f2 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcService.java @@ -38,7 +38,7 @@ public interface MesQcIqcService { * * @param id 编号 */ - void completeIqc(Long id); + void finishIqc(Long id); /** * 删除来料检验单 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java index 2d94020..e86fd38 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java @@ -111,7 +111,7 @@ public class MesQcIqcServiceImpl implements MesQcIqcService { } @Override - public void completeIqc(Long id) { + public void finishIqc(Long id) { // 1.1 校验存在 + 草稿状态 MesQcIqcDO iqc = validateIqcStatusPrepare(id); if (iqc.getCheckResult() == null) { diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcService.java index b8bac60..cb36324 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcService.java @@ -36,7 +36,7 @@ public interface MesQcOqcService { * * @param id 编号 */ - void completeOqc(Long id); + void finishOqc(Long id); /** * 删除出货检验单 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java index f294f1c..35ec8c5 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java @@ -100,7 +100,7 @@ public class MesQcOqcServiceImpl implements MesQcOqcService { } @Override - public void completeOqc(Long id) { + public void finishOqc(Long id) { // 1. 校验存在 + 草稿状态 validateOqcStatusPrepare(id); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcService.java index e88729f..efc0c81 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcService.java @@ -36,7 +36,7 @@ public interface MesQcRqcService { * * @param id 编号 */ - void completeRqc(Long id); + void finishRqc(Long id); /** * 删除退货检验单 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java index 92f0a9b..0557b88 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java @@ -95,7 +95,7 @@ public class MesQcRqcServiceImpl implements MesQcRqcService { } @Override - public void completeRqc(Long id) { + public void finishRqc(Long id) { // 1.1 校验存在 + 草稿状态 MesQcRqcDO rqc = validateRqcStatusPrepare(id); // 1.2 校验合格品 + 不合格品 = 检测数量 -- libgit2 0.21.4