✨ feat(mes): 更新检验单完成接口及权限管理

YunaiV
1 parent 67173a4f
Showing 12 changed files with 24 additions and 24 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.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<Boolean> completeIpqc(@RequestParam("id") Long id) {
-        ipqcService.completeIpqc(id);
+    @PreAuthorize("@ss.hasPermission('mes:qc-ipqc:finish')")
+    public CommonResult<Boolean> finishIpqc(@RequestParam("id") Long id) {
+        ipqcService.finishIpqc(id);
         return success(true);
     }
  
@@ -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<Boolean> completeIqc(@RequestParam("id") Long id) {
-        iqcService.completeIqc(id);
+    @PreAuthorize("@ss.hasPermission('mes:qc-iqc:finish')")
+    public CommonResult<Boolean> finishIqc(@RequestParam("id") Long id) {
+        iqcService.finishIqc(id);
         return success(true);
     }
  
@@ -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<Boolean> completeOqc(@RequestParam("id") Long id) {
-        oqcService.completeOqc(id);
+    @PreAuthorize("@ss.hasPermission('mes:qc-oqc:finish')")
+    public CommonResult<Boolean> finishOqc(@RequestParam("id") Long id) {
+        oqcService.finishOqc(id);
         return success(true);
     }
  
@@ -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<Boolean> completeRqc(@RequestParam("id") Long id) {
-        rqcService.completeRqc(id);
+    @PreAuthorize("@ss.hasPermission('mes:qc-rqc:finish')")
+    public CommonResult<Boolean> finishRqc(@RequestParam("id") Long id) {
+        rqcService.finishRqc(id);
         return success(true);
     }
  
@@ -36,7 +36,7 @@ public interface MesQcIpqcService {
      *
      * @param id 编号
      */
-    void completeIpqc(Long id);
+    void finishIpqc(Long id);
  
     /**
      * 删除过程检验单
@@ -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 校验检测结论必填
@@ -38,7 +38,7 @@ public interface MesQcIqcService {
      *
      * @param id 编号
      */
-    void completeIqc(Long id);
+    void finishIqc(Long id);
  
     /**
      * 删除来料检验单
@@ -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) {
@@ -36,7 +36,7 @@ public interface MesQcOqcService {
      *
      * @param id 编号
      */
-    void completeOqc(Long id);
+    void finishOqc(Long id);
  
     /**
      * 删除出货检验单
@@ -100,7 +100,7 @@ public class MesQcOqcServiceImpl implements MesQcOqcService {
     }
  
     @Override
-    public void completeOqc(Long id) {
+    public void finishOqc(Long id) {
         // 1. 校验存在 + 草稿状态
         validateOqcStatusPrepare(id);
  
@@ -36,7 +36,7 @@ public interface MesQcRqcService {
      *
      * @param id 编号
      */
-    void completeRqc(Long id);
+    void finishRqc(Long id);
  
     /**
      * 删除退货检验单
@@ -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 校验合格品 + 不合格品 = 检测数量