From fa326e87de2805d8b66b301daee596b1d959e430 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 15 Sep 2022 11:42:45 +0800
Subject: [PATCH] 出入库记录删除回滚逻辑修改
---
src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java b/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java
index 86bc7fd..4052e52 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java
+++ b/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java
@@ -28,6 +28,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.modules.farmplant.entity.FarmProductStock;
import org.springblade.modules.farmplant.service.FarmProductStockService;
import org.springblade.modules.InventoryLoss.entity.Inventory;
import org.springblade.modules.InventoryLoss.service.InventoryService;
@@ -36,6 +37,7 @@
import org.springblade.modules.processInv.entity.ProcessInv;
import org.springblade.modules.processInv.service.IProcessInvService;
import org.springblade.modules.processInv.vo.ProcessInvVO;
+import org.springblade.modules.sale.entity.Sale;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -124,6 +126,7 @@
//库存充足，减去相应库存
farmProductStockService.stockReduce(inventory.getSaleNum(),inventory.getProid());
}
+ inventory.setProdId(inventory.getProid());
return R.status(inventoryService.saveOrUpdate(inventory));
}
@@ -157,6 +160,7 @@
inventory.setLandId(processInvVO.getLandId());
processInvService.updateById(processInv);
}
+ inventory.setProdId(inventory.getProid());
return R.status(inventoryService.saveOrUpdate(inventory));
}
@@ -167,6 +171,18 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ Inventory inventory = inventoryService.getById(Long.parseLong(ids));
+ 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)));
}
--
Gitblit v1.9.3