From 1e159ffbf027d1c8a2de5a92ff257d3b02411415 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 06 Aug 2022 16:50:11 +0800
Subject: [PATCH] 修复使用农资后，已出库待使用农资数据不变。修复使用农资后还能删除出库数据
---
src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java b/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
index ffd0859..54ba321 100644
--- a/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
+++ b/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
@@ -28,6 +28,7 @@
import org.springblade.core.mp.support.Query;
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.soldr.entity.Soldr;
import org.springblade.modules.soldr.service.ISoldrService;
import org.springblade.modules.soldr.vo.SoldrVO;
@@ -322,28 +323,32 @@
Stockrecord stockRecord = stockrecordService.getById(ids);
//根据stockRecord中的库存记录id找到对应的库存数据
Stock stock = stockService.getById(stockRecord.getSid());
+ //根据stockRecord中的srId找到对应的已出库记录表的对应数据
+ Soldrecord soldrecord = soldrecordService.getById(stockRecord.getSrId());
+ //根据stockId、specs1、specs_val1、specs_val2、sid、type找到soldr表中对应的数据
+ Soldr soldr = soldrService.getByServalParam(soldrecord.getStockId1(),soldrecord.getSpecs1(),soldrecord.getSpecsVal1(),soldrecord.getSpecsVal2(),soldrecord.getSid(),soldrecord.getType());
//对库存表操作
//判断stockType1 0出库 1入库
- if (stockRecord.getStockType1() == 0){
- //0出库 删除记录后原库存添加
- stock.setAmount(stock.getAmount()+stockRecord.getAmount1());
- //对已出库表操作 soldr出库数量记录表已出库农资减少 soldrecord出库记录表的数据也要删除
- //根据stockRecord中的srId找到对应的已出库记录表的对应数据
- Soldrecord soldrecord = soldrecordService.getById(stockRecord.getSrId());
- //对soldrecord表逻辑删除
- soldrecordService.deleteLogic(Func.toLongList(soldrecord.getId().toString()));
- //根据stockId、specs1、specs_val1、specs_val2、sid、type找到soldr表中对应的数据
- Soldr soldr = soldrService.getByServalParam(soldrecord.getStockId1(),soldrecord.getSpecs1(),soldrecord.getSpecsVal1(),soldrecord.getSpecsVal2(),soldrecord.getSid(),soldrecord.getType());
- Integer sub = soldr.getAmount1()-soldrecord.getAmount1();
- if (sub<=0){
- soldrService.dels(soldr.getId());
- }else {
- soldr.setAmount1(sub);
- soldrService.updateById(soldr);
- }
+ if (soldr.getAmount1()!=soldrecord.getAmount1()){
+ throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
}else {
- //1 入库 删除记录后原库存减少
- stock.setAmount(stock.getAmount()-stockRecord.getAmount1());
+ if (stockRecord.getStockType1() == 0) {
+ //0出库 删除记录后原库存添加
+ stock.setAmount(stock.getAmount() + stockRecord.getAmount1());
+ //对已出库表操作 soldr出库数量记录表已出库农资减少 soldrecord出库记录表的数据也要删除
+ //对soldrecord表逻辑删除
+ soldrecordService.deleteLogic(Func.toLongList(soldrecord.getId().toString()));
+ Integer sub = soldr.getAmount1() - soldrecord.getAmount1();
+ if (sub <= 0) {
+ soldrService.dels(soldr.getId());
+ } else {
+ soldr.setAmount1(sub);
+ soldrService.updateById(soldr);
+ }
+ } else {
+ //1 入库 删除记录后原库存减少
+ stock.setAmount(stock.getAmount() - stockRecord.getAmount1());
+ }
}
stockService.UpdaeAmountc(stock);
return R.status(stockrecordService.deleteLogic(Func.toLongList(ids)));
--
Gitblit v1.9.3