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

guoyujie

2 天以前 c4b9a339caff12e95f61c3d5dc950aafcc8c566c

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

@@ -23,7 +23,7 @@

    //查询第一次排版数据
    @ApiOperation("加载时查询排版数据接口")
    @SaCheckPermission("ProductionScheduling.search")
    @SaCheckPermission("productionScheduling.search")
    @PostMapping  ("/selectLastScheduling/{selectTime1}/{selectTime2}/{processes}/{orderId}")
    public Result selectLastScheduling(
            @PathVariable String selectTime1,
@@ -36,40 +36,27 @@
    }
    //点击查询排版数据
    @ApiOperation("点击查询排版数据接口")
    @SaCheckPermission("ProductionScheduling.search")
    @PostMapping  ("/selectScheduling/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
    @SaCheckPermission("productionScheduling.search")
    @PostMapping  ("/selectScheduling/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderIds}/{processes}/{state}")
    public Result selectScheduling(
            @PathVariable Integer pageNum,
            @PathVariable Integer pageSize,
            @PathVariable String selectTime1,
            @PathVariable String selectTime2,
            @PathVariable String orderId,
            @PathVariable String orderIds,
            @PathVariable String processes,
            @PathVariable Integer state,
            @RequestBody ProductionScheduling productionScheduling){

        return Result.seccess(productionSchedulingService.selectSchedulingSv(pageNum, pageSize,selectTime1,selectTime2,orderId,processes,state,productionScheduling));
        return Result.seccess(productionSchedulingService.selectSchedulingSv(pageNum, pageSize,selectTime1,selectTime2,orderIds,processes,state,productionScheduling));

    }

    //点击查询排版数据（带订单号查询）
    @ApiOperation("根据条件查询排版数据接口")
    @SaCheckPermission("ProductionScheduling.search")
    @PostMapping  ("/selectSchedulingNot/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
    public Result selectSchedulingNot(
            @PathVariable String selectTime1,
            @PathVariable String selectTime2,
            @PathVariable String orderId,
            @PathVariable String processes,
            @PathVariable Integer state,
            @RequestBody ProductionScheduling productionScheduling){
        return Result.seccess(productionSchedulingService.selectSchedulingNotSv(selectTime1,selectTime2,orderId,processes,state,productionScheduling));

    }

    //添加排产数据
    @ApiOperation("添加排产数据接口")
    @SaCheckPermission("ProductionScheduling.add")
    @SaCheckPermission("productionScheduling.add")
    @PostMapping("/addScheduling")
    public Result addScheduling( @RequestBody Map<String,Object>  object){

@@ -83,7 +70,7 @@

    //删除排产数据
    @ApiOperation("删除排产数据接口")
    @SaCheckPermission("ProductionScheduling.delete")
    @SaCheckPermission("productionScheduling.delete")
    @PostMapping("/deleteScheduling")
    public Result deleteScheduling( @RequestBody Map<String,Object>  object) throws Exception{

@@ -96,7 +83,7 @@
    }

    @ApiOperation("排版审核接口")
    @SaCheckPermission("ProductionScheduling.review")
    @SaCheckPermission("productionScheduling.review")
    @PostMapping("/examineScheduling")
    public Result examineScheduling( @RequestBody Map<String,Object>  object){

@@ -108,4 +95,17 @@
        }
    }

    @ApiOperation("排版反审接口")
    @SaCheckPermission("productionScheduling.review")
    @PostMapping("/cancelReviewScheduling")
    public Result cancelReviewScheduling( @RequestBody Map<String,Object>  object){

        if(productionSchedulingService.cancelReviewSchedulingSv(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"反审失败");

        }
    }

}