From 918032ec4d745924bbed1d405e93a219b6a6f6f0 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 23 Aug 2022 17:37:55 +0800
Subject: [PATCH] 后台销售、出库、损耗记录添加删除功能并能回滚
---
src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java | 10 ++++++++++
1 files changed, 10 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 ebd86c8..eec1f07 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;
@@ -35,6 +36,8 @@
import org.springblade.modules.process.service.IProcessService;
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;
@@ -152,6 +155,8 @@
processInv.setUpdateUser(inventory.getCreateUser());
processInv.setUpdateTime(new Date());
processInv.setId(Long.parseLong(inventory.getProid()));
+ ProcessInvVO processInvVO = processInvService.getLand(processInv);
+ inventory.setLandId(processInvVO.getLandId());
processInvService.updateById(processInv);
}
return R.status(inventoryService.saveOrUpdate(inventory));
@@ -164,6 +169,11 @@
@ApiOperationSupport(order = 7)
@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());
+ Double weight = Double.parseDouble(farmProductStock.getWeight())+inventory.getSaleNum();
+ farmProductStock.setWeight(weight.toString());
+ farmProductStockService.updateById(farmProductStock);
return R.status(inventoryService.deleteLogic(Func.toLongList(ids)));
}
--
Gitblit v1.9.3