feat(ncr): 完善NCR处置联动逻辑与关闭校验

云

4 天以前 f02d0df2f1dfc7a8b775cf50d45375e57628a5ef

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/MesQcNcrController.java

@@ -80,9 +80,16 @@
    @PutMapping("/dispose")
    @Operation(summary = "执行不合格品处置")
    @PreAuthorize("@ss.hasPermission('mes:qc-ncr:dispose')")
    public CommonResult<Boolean> disposeNcr(@Valid @RequestBody MesQcNcrDisposeReqVO disposeReqVO) {
        ncrService.disposeNcr(disposeReqVO.getId(),
                disposeReqVO.getHandlerUserId(), disposeReqVO.getHandleResult());
    public CommonResult<MesQcNcrDisposeRespVO> disposeNcr(@Valid @RequestBody MesQcNcrDisposeReqVO disposeReqVO) {
        return success(ncrService.disposeNcr(disposeReqVO));
    }

    @PutMapping("/submit-approval")
    @Operation(summary = "提交不合格品处理单审批")
    @Parameter(name = "id", description = "编号", required = true)
    @PreAuthorize("@ss.hasPermission('mes:qc-ncr:update')")
    public CommonResult<Boolean> submitNcrApproval(@RequestParam("id") Long id) {
        ncrService.submitNcrApproval(id);
        return success(true);
    }

@@ -90,7 +97,7 @@
    @Operation(summary = "关闭不合格品处理单")
    @PreAuthorize("@ss.hasPermission('mes:qc-ncr:close')")
    public CommonResult<Boolean> closeNcr(@Valid @RequestBody MesQcNcrCloseReqVO closeReqVO) {
        ncrService.closeNcr(closeReqVO.getId(), closeReqVO.getCloseOpinion());
        ncrService.closeNcr(closeReqVO.getId(), closeReqVO.getCloseOpinion(), closeReqVO.getReinspectionIpqcId());
        return success(true);
    }