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

guoyujie

2025-11-17 613e4e92157dd697629dbad17fd091ae37637bc7

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

@@ -34,14 +34,14 @@
    @SaCheckPermission("addRework.search")
    @PostMapping("/getSelectRework/{pageNum}/{pageSize}")
    public Result getSelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
        return Result.seccess(reworkService.getSelectRework(pageNum,pageSize));
        return Result.success(reworkService.getSelectRework(pageNum,pageSize));
    }

    @ApiOperation("返工数据查询接口")
    @SaCheckPermission("selectRework.search")
    @PostMapping("/SelectRework/{pageNum}/{pageSize}/{selectDate}")
    public Result SelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody ReworkDTO rework){
        return Result.seccess(reworkService.SelectRework(pageNum,pageSize,selectDate,rework));
        return Result.success(reworkService.SelectRework(pageNum,pageSize,selectDate,rework));
    }


@@ -49,14 +49,14 @@
    @SaCheckPermission("addRework.add")
    @PostMapping("/saveRework")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
        return Result.seccess(reworkService.saveRework(object));
        return Result.success(reworkService.saveRework(object));
    }

    @ApiOperation("返工审核接口")
    @SaCheckPermission("selectRework.review")
    @PostMapping("/updateRework")
    public Result updateRework( @RequestBody Map<String,Object> object){
        return Result.seccess(reworkService.updateRework(object));
        return Result.success(reworkService.updateRework(object));
    }

    @ApiOperation("返工流程卡明细查询接口")
@@ -66,7 +66,7 @@
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(reworkService.selectPrintSv(selectTime1,selectTime2, flowCard));
        return Result.success(reworkService.selectPrintSv(selectTime1,selectTime2, flowCard));

    }

@@ -74,7 +74,7 @@
    @SaCheckPermission("selectRework.delete")
    @PostMapping("/deleteRework")
    public Result deleteRework( @RequestBody Map<String,Object> object){
        return Result.seccess(reworkService.deleteReworkSv(object));
        return Result.success(reworkService.deleteReworkSv(object));
    }

    @ApiOperation("返工打印自定义标签数据查询接口")
@@ -82,7 +82,7 @@
    public Result getSelectReworkPrintCustomLabel( @PathVariable String type,
                                                   @PathVariable Integer lableType,
                                                   @RequestBody Map<String, Object> object) {
        return Result.seccess(reworkService.getSelectReworkPrintCustomLabel(type,lableType,object));
        return Result.success(reworkService.getSelectReworkPrintCustomLabel(type,lableType,object));

    }
}