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

guoyujie

2025-10-14 81cad8df0f1b33700e7fc80f271eda7f1180efb0

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

@@ -101,16 +101,15 @@

    @ApiOperation("质检审核查询接口")
    @SaCheckPermission("qualityInspectionReview.search")
    @PostMapping  ("/selectQualityTesting/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{state}/{processId}")
    @PostMapping  ("/selectQualityTesting/{pageNum}/{pageSize}/{selectDate}/{state}/{processId}")
    public Result selectQualityTesting(
            @PathVariable Integer pageNum,
            @PathVariable Integer pageSize,
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2,
            @PathVariable List<String> selectDate,
            @PathVariable Integer state,
            @PathVariable String processId,
            @RequestBody ReportingWork reportingWork){
        return Result.seccess(reportingWorkService.selectQualityTestingSv(pageNum,pageSize,selectTime1,selectTime2,state,processId,reportingWork));
        return Result.seccess(reportingWorkService.selectQualityTestingSv(pageNum,pageSize,selectDate,state,processId,reportingWork));

    }

@@ -194,4 +193,14 @@
    public Result saveWorkStorage( @RequestBody Map<String,Object>  object){
        return Result.seccess(reportingWorkService.saveWorkStorage(object));

    }}
    }

    @ApiOperation("Mes报工基础数据")
    @PostMapping  ("/mesBasicData")
    public Result mesBasicData()  {
        return  Result.seccess(reportingWorkService.mesBasicDataSv());
    }

}