feat(mes): 添加维修工单确认和不通过功能，更新相关服务和前端接口

YunaiV
1 parent c2d93baf
Showing 3 changed files with 55 additions and 0 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/MesDvRepairController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/repair/MesDvRepairService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/repair/MesDvRepairServiceImpl.java
@@ -111,6 +111,24 @@ public class MesDvRepairController {
                 buildRepairRespVOList(list));
     }
+    @PutMapping("/confirm")
+    @Operation(summary = "通过维修工单（草稿→已确认，结果=通过）")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('mes:dv-repair:update')")
+    public CommonResult<Boolean> confirmRepair(@RequestParam("id") Long id) {
+        repairService.confirmRepair(id);
+        return success(true);
+    }
+
+    @PutMapping("/reject")
+    @Operation(summary = "不通过维修工单（草稿→已确认，结果=不通过）")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('mes:dv-repair:update')")
+    public CommonResult<Boolean> rejectRepair(@RequestParam("id") Long id) {
+        repairService.rejectRepair(id);
+        return success(true);
+    }
+
     // ==================== 拼接 VO ====================
     private List<MesDvRepairRespVO> buildRepairRespVOList(List<MesDvRepairDO> list) {
@@ -59,4 +59,18 @@ public interface MesDvRepairService {
      */
     PageResult<MesDvRepairDO> getRepairPage(MesDvRepairPageReqVO pageReqVO);
+    /**
+     * 通过维修工单（草稿→已确认，结果=通过）
+     *
+     * @param id 编号
+     */
+    void confirmRepair(Long id);
+
+    /**
+     * 不通过维修工单（草稿→已确认，结果=不通过）
+     *
+     * @param id 编号
+     */
+    void rejectRepair(Long id);
+
 }
@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.mes.controller.admin.dv.repair.vo.MesDvRepairSave
 import cn.iocoder.yudao.module.mes.dal.dataobject.dv.repair.MesDvRepairDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.dv.repair.MesDvRepairLineMapper;
 import cn.iocoder.yudao.module.mes.dal.mysql.dv.repair.MesDvRepairMapper;
+import cn.iocoder.yudao.module.mes.enums.dv.MesDvRepairResultEnum;
 import cn.iocoder.yudao.module.mes.enums.dv.MesDvRepairStatusEnum;
 import cn.iocoder.yudao.module.mes.service.dv.machinery.MesDvMachineryService;
 import jakarta.annotation.Resource;
@@ -109,4 +110,26 @@ public class MesDvRepairServiceImpl implements MesDvRepairService {
         return repairMapper.selectPage(pageReqVO);
     }
+    @Override
+    public void confirmRepair(Long id) {
+        // 1. 校验存在，且状态为草稿
+        validateRepairDraft(id);
+
+        // 2. 更新状态为已确认，结果为通过
+        repairMapper.updateById(new MesDvRepairDO().setId(id)
+                .setStatus(MesDvRepairStatusEnum.CONFIRMED.getStatus())
+                .setResult(MesDvRepairResultEnum.PASS.getResult()));
+    }
+
+    @Override
+    public void rejectRepair(Long id) {
+        // 1. 校验存在，且状态为草稿
+        validateRepairDraft(id);
+
+        // 2. 更新状态为已确认，结果为不通过
+        repairMapper.updateById(new MesDvRepairDO().setId(id)
+                .setStatus(MesDvRepairStatusEnum.CONFIRMED.getStatus())
+                .setResult(MesDvRepairResultEnum.FAIL.getResult()));
+    }
+
 }