Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-09-25 b5a9dccccaf5bed064891a05ec8ff3f21de9cff0

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

@@ -28,12 +28,9 @@
    @SaCheckPermission("CreateOutbound.add")
    @PostMapping("/saveMaterialOutbound")
    public Result saveMaterialOutbound( @RequestBody Map<String,Object>  object){
        if(materialInventoryService.saveMaterialOutbound(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");

        }
        return Result.seccess(materialInventoryService.saveMaterialOutbound(object));

    }

    @ApiOperation("物料新增接口")
@@ -95,39 +92,21 @@
    @SaCheckPermission("CreateOutbound.review")
    @PostMapping("/updateMaterialOutboundToExamine")
    public Result updateMaterialOutboundToExamine( @RequestBody Map<String,Object> object){
        if(materialInventoryService.updateMaterialOutboundToExamine(object)){
            return Result.seccess();

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

        }
        return Result.seccess(materialInventoryService.updateMaterialOutboundToExamine(object));
    }

    @ApiOperation("材料出库删除接口")
    @SaCheckPermission("MaterialOutbound.delete")
    @PostMapping("/deleteMaterialOutbound")
    public Result deleteMaterialOutbound( @RequestBody Map<String,Object>  object){
        if(materialInventoryService.deleteMaterialOutbound(object)){

            return Result.seccess();

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

        }
        return Result.seccess(materialInventoryService.deleteMaterialOutbound(object));
    }

    @ApiOperation("物料返库新增接口")
    @SaCheckPermission("ReturnToStorageCreate.add")
    @PostMapping("/saveReturningWarehouse")
    public Result saveReturningWarehouse( @RequestBody Map<String,Object>  object){
        if(materialInventoryService.saveReturningWarehouse(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");

        }
        return Result.seccess(materialInventoryService.saveReturningWarehouse(object));
    }

    @ApiOperation("物料返库新增查询接口")
@@ -141,13 +120,7 @@
    @SaCheckPermission("ReturnToStorageCreate.review")
    @PostMapping("/updateReturningWarehouseToExamine")
    public Result updateReturningWarehouseToExamine( @RequestBody Map<String,Object> object){
        if(materialInventoryService.updateReturningWarehouseToExamine(object)){
            return Result.seccess();

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

        }
        return Result.seccess(materialInventoryService.updateReturningWarehouseToExamine(object));
    }


@@ -159,6 +132,28 @@
    }


    @ApiOperation("余料库存查询接口")
    @SaCheckPermission("SelectIngredientsStock.search")
    @PostMapping("/getSelectSurplusMaterialsDate/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectSurplusMaterialsDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody SurplusMaterials surplusMaterials){
        return Result.seccess(materialInventoryService.getSelectSurplusMaterialsDate(pageNum,pageSize,selectDate,surplusMaterials));
    }

    @ApiOperation("余料新增接口")
    @SaCheckPermission("SelectIngredientsStock.search")
    @PostMapping("/addSelectSurplusMaterialsDate")
    public Result addSelectSurplusMaterialsDate( @RequestBody Map<String,Object> object){
        return Result.seccess(materialInventoryService.addSelectSurplusMaterialsDate(object));
    }

    @ApiOperation("物料出库打印接口")
    @SaCheckPermission("SelectIngredientsStock.search")
    @GetMapping ("/printCreateOutbound/{materialOutboundId}")
    public Result printCreateOutbound(@PathVariable String materialOutboundId)  {
        return   Result.seccess(materialInventoryService.printCreateOutbound(materialOutboundId));
    }




}