Merge remote-tracking branch 'origin/master'

于杰

2025-08-04 fd89fbfa59d40f4016b43bcac8286bdcdb5e4df9

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

@@ -83,14 +83,17 @@
            @RequestBody ReportingWork reportingWork){
        return Result.seccess(reportingWorkService.selectReportingWorkSv(pageNum,pageSize,selectTime1,selectTime2,orderId,reportingWork));


    }

    @ApiOperation("删除报工接口")
    @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
    ,@PathVariable String userName){
    public Result deleteWork(@PathVariable String reportingWorkId,
                             @PathVariable String processId,
                             @PathVariable String thisProcess,
                             @PathVariable String userId
            ,@PathVariable String userName){

        return Result.seccess(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess,userId,userName));

@@ -182,4 +185,13 @@
        return Result.seccess(reportingWorkService.selectReportingWorkRecordByPhoneSv(selectPam));
    }

}
@ApiOperation("手机查询本工序设备")
    @PostMapping("/selectEquipmentByProcess/{process}")
    public Result selectEquipmentByProcess(@PathVariable String process)    {
        return Result.seccess(reportingWorkService.selectEquipmentByProcessSv(process));
    }@ApiOperation("报工入库接口")
    @PostMapping("/saveWorkStorage")
    public Result saveWorkStorage( @RequestBody Map<String,Object>  object){
        return Result.seccess(reportingWorkService.saveWorkStorage(object));

    }}