Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-07-18 b864a88a6d34cbed2cfaad7f5e843ea1330c9c91

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java

@@ -26,6 +26,7 @@
    }

    @ApiOperation("报工新增查询")
    @SaCheckPermission("AddReportingWork.search")
    @PostMapping  ("/addSelectLastWork/{processIdStr}/{technologyStr}/{process}")
    public Result AddSelectLastWork(
            @PathVariable String processIdStr,
@@ -83,12 +84,14 @@
    @SaCheckPermission("SelectReportingWorks.delete")
    @PostMapping("/deleteWork/{reportingWorkId}/{processId}/{thisProcess}")
    public Result deleteWork(@PathVariable String reportingWorkId,@PathVariable String processId,@PathVariable String thisProcess){
        if(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"删除失败,请检查是否符合删除条件");
//        if(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess)){
//            return Result.seccess();
//        }else {
//            throw new ServiceException(Constants.Code_500,"删除失败,请检查是否符合删除条件");
//
//        }
        return Result.seccess(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess));

        }
    }

    @ApiOperation("质检审核查询接口")
@@ -128,4 +131,17 @@
        return Result.seccess(reportingWorkService.detailsQualitySv(reportingWorkId,processId,thisProcess,reportingWork));

    }

    @ApiOperation("补片状态查询")
    @PostMapping  ("/getPatchCondition/{reportingWorkId}")
    public Result getPatchCondition(
            @PathVariable String reportingWorkId)  {
        return  Result.seccess(reportingWorkService.getPatchConditionSv(reportingWorkId));
    }

    @ApiOperation("报工新增日志")
    @PostMapping  ("/saveReportingWorkLog")
    public Result saveReportingWorkLog(@RequestBody Map<String,Object> reportingWork)  {
        return  Result.seccess(reportingWorkService.SaveReportingWorkSv(reportingWork));
    }
}