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

廖井涛

3 小时以前 e73c7b07535af2593083d21c9c5ba7761a5c40df

 north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGlassShelfController.java

@@ -31,43 +31,43 @@
    @ApiOperation("玻璃料架新增接口")
    @PostMapping("/saveFinishedGlassShelf")
    public Result saveFinishedGlassShelf( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGlassShelfService.saveFinishedGlassShelf(object));
        return Result.success(finishedGlassShelfService.saveFinishedGlassShelf(object));
    }

    @ApiOperation("玻璃料架库存查询接口")
    @PostMapping("/getSelectFinishedGlassShelfInformation/{pageNum}/{pageSize}/{type}")
    public Result getSelectFinishedGlassShelfInformation(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable String type){
        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfInformation(pageNum,pageSize,type));
        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfInformation(pageNum,pageSize,type));
    }

    @ApiOperation("玻璃料架库存查询接口")
    @PostMapping("/getSelectFinishedGlassShelfInformationById/{id}")
    public Result getSelectFinishedGlassShelfInformationById(@PathVariable Long id){
        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfInformationById(id));
        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfInformationById(id));
    }

    @ApiOperation("删除玻璃料架接口")
    @PostMapping("/deleteFinishedGlassShelfInformationById")
    public Result deleteFinishedGlassShelfInformationById( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGlassShelfService.deleteFinishedGlassShelfInformationById(object));
        return Result.success(finishedGlassShelfService.deleteFinishedGlassShelfInformationById(object));
    }

    @ApiOperation("玻璃料架新增出库明细查询接口")
    @PostMapping("/getSelectFinishedGlassShelfInformationDetails/{pageNum}/{pageSize}")
    public Result getSelectFinishedGlassShelfInformationDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody List<Map<String, Object>> object){
        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfInformationDetails(pageNum,pageSize,object));
        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfInformationDetails(pageNum,pageSize,object));
    }

    @ApiOperation("玻璃料架编辑出库明细查询接口")
    @PostMapping("/getSelectFinishedGlassShelfEmitDetails/{pageNum}/{pageSize}")
    public Result getSelectFinishedGlassShelfEmitDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody String emitId){
        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfEmitDetails(pageNum,pageSize,emitId));
        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfEmitDetails(pageNum,pageSize,emitId));
    }

    @ApiOperation("玻璃料架出库新增接口")
    @PostMapping("/insertFinishedGlassShelfEmit")
    public Result insertFinishedGlassShelfEmit( @RequestBody Map<String,Object> object){
        return Result.seccess(finishedGlassShelfService.insertFinishedGlassShelfEmit(object));
        return Result.success(finishedGlassShelfService.insertFinishedGlassShelfEmit(object));
    }


@@ -75,45 +75,45 @@
    @PostMapping("/getSelectFinishedGlassShelfEmit/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectFinishedGlassShelfEmit(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,
                                                  @RequestBody FinishedGlassShelfEmit finishedGlassShelfEmit) throws JsonProcessingException {
        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfEmit(pageNum,pageSize,selectDate,finishedGlassShelfEmit));
        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfEmit(pageNum,pageSize,selectDate,finishedGlassShelfEmit));
    }

    @ApiOperation("玻璃料架出库删除接口")
    @PostMapping("/deleteFinishedGlassShelfEmit")
    public Result deleteFinishedGlassShelfEmit( @RequestBody Map<String,Object> object){
        return Result.seccess(finishedGlassShelfService.deleteFinishedGlassShelfEmit(object));
        return Result.success(finishedGlassShelfService.deleteFinishedGlassShelfEmit(object));
    }

    @ApiOperation("玻璃料架入库新增接口")
    @PostMapping("/insertFinishedGlassShelfWithdraw")
    public Result insertFinishedGlassShelfWithdraw( @RequestBody Map<String,Object> object){
        return Result.seccess(finishedGlassShelfService.insertFinishedGlassShelfWithdraw(object));
        return Result.success(finishedGlassShelfService.insertFinishedGlassShelfWithdraw(object));
    }

    @ApiOperation("玻璃料架入库查询接口")
    @PostMapping("/getSelectFinishedGlassShelfWithdraw/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectFinishedGlassShelfWithdraw(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,
                                                  @RequestBody FinishedGlassShelfWithdraw finishedGlassShelfWithdraw) throws JsonProcessingException {
        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfWithdraw(pageNum,pageSize,selectDate,finishedGlassShelfWithdraw));
        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfWithdraw(pageNum,pageSize,selectDate,finishedGlassShelfWithdraw));
    }

    @ApiOperation("玻璃料架编辑入库明细查询接口")
    @PostMapping("/getSelectFinishedGlassShelfWithdrawDetails/{pageNum}/{pageSize}")
    public Result getSelectFinishedGlassShelfWithdrawDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody String withdrawId){
        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfWithdrawDetails(pageNum,pageSize,withdrawId));
        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfWithdrawDetails(pageNum,pageSize,withdrawId));
    }

    @ApiOperation("玻璃料架入库删除接口")
    @PostMapping("/deleteFinishedGlassShelfWithdraw")
    public Result deleteFinishedGlassShelfWithdraw( @RequestBody Map<String,Object> object){
        return Result.seccess(finishedGlassShelfService.deleteFinishedGlassShelfWithdraw(object));
        return Result.success(finishedGlassShelfService.deleteFinishedGlassShelfWithdraw(object));
    }

    @ApiOperation("玻璃料架记录查询接口")
    @PostMapping("/getFinishedGlassShelfLogReport/{type}/{pageNum}/{pageSize}/{selectDate}")
    public Result getFinishedGlassShelfLogReport(@PathVariable String type,@PathVariable Integer pageNum, @PathVariable Integer pageSize,
                                                 @PathVariable List<String> selectDate, @RequestBody FinishedGlassShelfLog finishedGlassShelfLog){
        return Result.seccess(finishedGlassShelfService.getFinishedGlassShelfLogReport(type,pageNum,pageSize,selectDate,finishedGlassShelfLog));
        return Result.success(finishedGlassShelfService.getFinishedGlassShelfLogReport(type,pageNum,pageSize,selectDate,finishedGlassShelfLog));
    }

    @ApiOperation("玻璃料架记录报表导出")