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

chenlu

2024-06-07 2f640b1038fa331954f78ed1f4317212cf5bb34d

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

@@ -1,5 +1,6 @@
package com.example.erp.controller.pp;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.pp.Rework;
@@ -27,41 +28,31 @@

    /*发货订单查询*/
    @ApiOperation("可返工数据查询接口")
    @SaCheckPermission("AddRework.search")
    @PostMapping("/getSelectRework/{pageNum}/{pageSize}")
    public Result getSelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
        return Result.seccess(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 Rework rework){
        return Result.seccess(reworkService.SelectRework(pageNum,pageSize,selectDate,rework));
    }


    @ApiOperation("返工接口")
    @ApiOperation("返工接口新增")
    @SaCheckPermission("AddRework.add")
    @PostMapping("/saveRework")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
        if(reworkService.saveRework(object)){

            return Result.seccess();

        }else {
            throw new ServiceException(Constants.Code_500,"返工失败");

        }
        return Result.seccess(reworkService.saveRework(object));
    }

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

            return Result.seccess();

        }else {
            throw new ServiceException(Constants.Code_500,"审核失败");

        }
        return Result.seccess(reworkService.updateRework(object));
    }
}