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

guoyujie

6 天以前 1750abd11320f8d09ffe1580b7467dba87c86c89

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

@@ -31,7 +31,7 @@
            @PathVariable String processes,
            @PathVariable String orderId,
            @RequestBody ProductionScheduling productionScheduling){
        return Result.seccess(productionSchedulingService.selectLastScheduling(selectTime1,selectTime2,processes,orderId,productionScheduling));
        return Result.success(productionSchedulingService.selectLastScheduling(selectTime1,selectTime2,processes,orderId,productionScheduling));

    }
    //点击查询排版数据
@@ -48,7 +48,7 @@
            @PathVariable Integer state,
            @RequestBody ProductionScheduling productionScheduling){

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

    }

@@ -61,7 +61,7 @@
    public Result addScheduling( @RequestBody Map<String,Object>  object){

        if(productionSchedulingService.addSchedulingSv(object)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");

@@ -75,7 +75,7 @@
    public Result deleteScheduling( @RequestBody Map<String,Object>  object) throws Exception{

        if(productionSchedulingService.deleteSchedulingSv(object)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"删除失败");

@@ -88,7 +88,7 @@
    public Result examineScheduling( @RequestBody Map<String,Object>  object){

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

@@ -101,7 +101,7 @@
    public Result cancelReviewScheduling( @RequestBody Map<String,Object>  object){

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