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("物料新增接口")
@@ -149,6 +146,13 @@
        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));
    }