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

chenlu

2024-03-12 2780cb79b2239d64f4578e30c255fbd751e12c62

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

@@ -24,20 +24,20 @@


    /*发货订单查询*/
    @ApiOperation("发货订单查询接口")
    @ApiOperation("可返工数据查询接口")
    @PostMapping("/getSelectRework/{pageNum}/{pageSize}")
    public Result getSelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
        return Result.seccess(reworkService.getSelectRework(pageNum,pageSize));
    }

    @ApiOperation("发货订单查询接口")
    @ApiOperation("返工数据查询接口")
    @PostMapping("/SelectRework/{pageNum}/{pageSize}/{selectDate}")
    public Result SelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody Rework rework){
        return Result.seccess(reworkService.SelectRework(pageNum,pageSize,selectDate,rework));
    }


    @ApiOperation("订单调拨接口")
    @ApiOperation("返工接口")
    @PostMapping("/saveRework")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
        if(reworkService.saveRework(object)){
@@ -50,7 +50,7 @@
        }
    }

    @ApiOperation("订单调拨接口")
    @ApiOperation("返工审核接口")
    @PostMapping("/updateRework")
    public Result updateRework( @RequestBody Map<String,Object> object){
        if(reworkService.updateRework(object)){