Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2 天以前 c4b9a339caff12e95f61c3d5dc950aafcc8c566c

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

@@ -30,7 +30,7 @@
    }

    @ApiOperation("报工新增查询")
    @SaCheckPermission("AddReportingWork.search")
    @SaCheckPermission("addReportingWork.search")
    @PostMapping  ("/addSelectLastWork/{processIdStr}/{technologyStr}/{process}/{reportType}")
    public Result AddSelectLastWork(
            @PathVariable String processIdStr,
@@ -40,20 +40,20 @@
        return  Result.seccess(reportingWorkService.AddSelectLastWorkSv(processIdStr,technologyStr,process,reportType));
    }
    @ApiOperation("查询工序")
    @PostMapping  ("/selectProcess")
    public Result SelectProcess()  {
        return  Result.seccess(reportingWorkService.SelectProcessSv());
    @PostMapping  ("/selectProcess/{userId}")
    public Result SelectProcess(@PathVariable String userId)  {
        return  Result.seccess(reportingWorkService.SelectProcessSv(userId));
    }

    @ApiOperation("报工新增")
    @SaCheckPermission("AddReportingWork.add")
    @SaCheckPermission("addReportingWork.add")
    @PostMapping  ("/saveReportingWork")
    public Result SaveReportingWork(@RequestBody Map<String,Object> reportingWork)  {
        return  Result.seccess(reportingWorkService.SaveReportingWorkSv(reportingWork));
    }

    @ApiOperation("报工审核")
    @SaCheckPermission("AddReportingWork.review")
    @SaCheckPermission("addReportingWork.review")
    @PostMapping  ("/reviewReportingWork")
    public Result ReviewReportingWork(@RequestBody Map<String,String> reportingWork)  {
        return  Result.seccess(reportingWorkService.ReviewReportingWorkSv(reportingWork));
@@ -65,14 +65,14 @@
        return  Result.seccess(reportingWorkService.selectUpdateReportingWorkSv(reportingWorkId));
    }
    @ApiOperation("报工修改")
    @SaCheckPermission("AddReportingWork.update")
    @SaCheckPermission("addReportingWork.update")
    @PostMapping  ("/updateReportingWork/{reviewState}")
    public Result updateReportingWork(@PathVariable String reviewState,@RequestBody Map<String,Object> reportingWork)  {
        return  Result.seccess(reportingWorkService.updateReportingWork(reportingWork,reviewState));
    }

    @ApiOperation("报工查询接口")
    @SaCheckPermission("SelectReportingWorks.search")
    @SaCheckPermission("selectReportingWorks.search")
    @PostMapping  ("/selectReportingWork/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderId}")
    public Result selectReportingWork(
            @PathVariable Integer pageNum,
@@ -86,7 +86,7 @@
    }

    @ApiOperation("删除报工接口")
    @SaCheckPermission("SelectReportingWorks.delete")
    @SaCheckPermission("selectReportingWorks.delete")
    @PostMapping("/deleteWork/{reportingWorkId}/{processId}/{thisProcess}/{userId}/{userName}")
    public Result deleteWork(@PathVariable String reportingWorkId,@PathVariable String processId,
                             @PathVariable String thisProcess,@PathVariable String userId
@@ -97,7 +97,7 @@
    }

    @ApiOperation("质检审核查询接口")
    @SaCheckPermission("QualityInspectionReview.search")
    @SaCheckPermission("qualityInspectionReview.search")
    @PostMapping  ("/selectQualityTesting/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{state}/{processId}")
    public Result selectQualityTesting(
            @PathVariable Integer pageNum,
@@ -111,8 +111,15 @@

    }

    @ApiOperation("APP质检审核查询接口")
    @SaCheckPermission("qualityInspectionReview.search")
    @PostMapping ("qualityReviewSearch")
    public Result qualityReviewSearch(){
        return Result.seccess(reportingWorkService.qualityReviewSearchSv());
    }

    @ApiOperation("质检审核审核")
    @SaCheckPermission("QualityInspectionReview.review")
    @SaCheckPermission("qualityInspectionReview.review")
    @PostMapping  ("/updateQualityStatus/{reportingWorkId}/{username}")
    public Result updateQualityStatus(@PathVariable String reportingWorkId,@PathVariable String username)  {
        if(reportingWorkService.updateQualityStatusSv(reportingWorkId,username)){
@@ -141,4 +148,38 @@
        return  Result.seccess(reportingWorkService.getPatchConditionSv(reportingWorkId));
    }

    @ApiOperation("mes报工接口")
    @PostMapping  ("/mesReportingWork")
    public Result mesReportingWork(@RequestBody Map<String,Object> reportingWork){
        Boolean aBoolean = reportingWorkService.mesReportingWorkSv(reportingWork);
        if(aBoolean){
            return Result.seccess(aBoolean);
        }else{
            throw new ServiceException(Constants.Code_600, "上工序已完工数量小于本工序报工数量，请检查");
        }
    }
    @ApiOperation("mes报工次破新增")
    @PostMapping  ("/mesSaveReportingWorkWorn")
    public Result mesSaveReportingWorkWorn(@RequestBody Map<String,Object> reportingWork)  {
        return  Result.seccess(reportingWorkService.SaveReportingWorkSv(reportingWork));
    }

    @ApiOperation("报工转移")
    @PostMapping  ("/reportingWorkTransfer")
    public Result reportingWorkTransfer(@RequestBody Map<String,String> reportingWork)  {
        return  Result.seccess(reportingWorkService.reportingWorkTransferSv(reportingWork));
    }

    @ApiOperation("手机查询当班产量")
    @PostMapping  ("/selectShiftQuantity")
    public Result selectShiftQuantity(@RequestBody Map<String,Object> reportingWork)  {
        return  Result.seccess(reportingWorkService.selectShiftQuantitySv(reportingWork));
    }

    @ApiOperation("手机查询本班组报工记录")
    @PostMapping("/selectReportingWorkRecordByPhone")
    public Result selectReportingWorkRecordByPhone(@RequestBody Map<String,Object> selectPam)  {
        return Result.seccess(reportingWorkService.selectReportingWorkRecordByPhoneSv(selectPam));
    }

}