Merge remote-tracking branch 'origin/dev_New' into dev_New

zss

5 天以前 5a6ac2ffb3815f1ef510144dd6e88c64ee96f973

 src/main/java/com/ruoyi/stock/controller/StockInventoryController.java

@@ -40,6 +40,8 @@
    @PostMapping("/addstockInventory")
    @ApiOperation("新增库存")
    public R addstockInventory(StockInventoryDto stockInventoryDto) {
        stockInventoryDto.setRecordType("合格自定义入库");
        stockInventoryDto.setRecordId(0L);
        return R.ok(stockInventoryService.addstockInventory(stockInventoryDto));
    }

@@ -47,6 +49,8 @@
    @PostMapping("/subtractStockInventory")
    @ApiOperation("扣减库存")
    public R subtractStockInventory(StockInventoryDto stockInventoryDto) {
        stockInventoryDto.setRecordType("合格自定义出库库");
        stockInventoryDto.setRecordId(0L);
        return R.ok(stockInventoryService.subtractStockInventory(stockInventoryDto));
    }
}