删除回滚完善，销售损耗添加字段type、prodId、地块选择数据返回增加库存量和面积

guoshilong

2022-08-24 d18eb5bd8b9cf93ba7adb4ee97fdcaccd3838e79

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

@@ -126,6 +126,7 @@
         //库存充足，减去相应库存
         farmProductStockService.stockReduce(inventory.getSaleNum(),inventory.getProid());
      }
      inventory.setProdId(inventory.getProid());
      return R.status(inventoryService.saveOrUpdate(inventory));
   }

@@ -159,6 +160,7 @@
         inventory.setLandId(processInvVO.getLandId());
         processInvService.updateById(processInv);
      }
      inventory.setProdId(inventory.getProid());
      return R.status(inventoryService.saveOrUpdate(inventory));
   }

@@ -170,10 +172,17 @@
   @ApiOperation(value = "逻辑删除", notes = "传入ids")
   public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
      Inventory inventory = inventoryService.getById(Long.parseLong(ids));
      FarmProductStock farmProductStock = farmProductStockService.selectBy2Id(inventory.getStrainId(), inventory.getLandId());
      if (inventory.getType() == 0){
         FarmProductStock farmProductStock = farmProductStockService.getById(inventory.getProdId());
      Double weight = Double.parseDouble(farmProductStock.getWeight())+inventory.getSaleNum();
      farmProductStock.setWeight(weight.toString());
      farmProductStockService.updateById(farmProductStock);
      }else {
         ProcessInv inv = processInvService.findById(inventory.getProdId());
         Double weight = inv.getProductInventoryNum()+inventory.getSaleNum();
         inv.setProductInventoryNum(weight);
         processInvService.updateById(inv);
      }
      return R.status(inventoryService.deleteLogic(Func.toLongList(ids)));
   }