Merge remote-tracking branch 'origin/master'

zengh

2022-08-01 daa6dce26ec80c58a0013b73c44a409a96f4cfc7

 src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java

@@ -110,13 +110,13 @@
   @PostMapping("/submit")
   @ApiOperationSupport(order = 6)
   @ApiOperation(value = "新增或修改", notes = "传入sale")
   public R submit(@Valid @RequestBody Inventory inventory) {
      boolean res = farmProductStockService.stockCompare(inventory.getSaleNum(),inventory.getStrainId());
   public R submit(@Valid @RequestBody InventoryVO inventory) {
      boolean res = farmProductStockService.stockCompare(inventory.getSaleNum(),inventory.getProid());
      if (!res){
         throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
      }else {
         //库存充足，减去相应库存
         farmProductStockService.stockReduce(inventory.getSaleNum(),inventory.getStrainId());
         farmProductStockService.stockReduce(inventory.getSaleNum(),inventory.getProid());
      }
      return R.status(inventoryService.saveOrUpdate(inventory));
   }