From 9d9928e3a79c202c1718f7fec7c154090627eaba Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Aug 2022 10:45:16 +0800
Subject: [PATCH] 农资管理添加农场过滤条件，修复出入库记录表删除回滚问题
---
src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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 54ba321..8c8b82c 100644
--- a/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
+++ b/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
@@ -220,6 +220,7 @@
soldr.setSpecsVal2(stockrecord.getSpecsVal2());
soldr.setType(stockrecord.getType1());
soldr.setCensus(v);
+ soldr.setDeptId(stockrecord.getDeptId());
//已出库农资数量
List<Map<String, Object>> maps = soldrService.selectCz(stockrecord.getSid());
if (maps.size()!=0) {
@@ -323,16 +324,16 @@
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 (soldr.getAmount1()!=soldrecord.getAmount1()){
- throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
- }else {
- if (stockRecord.getStockType1() == 0) {
+ if (stockRecord.getStockType1() == 0) {
+ //根据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());
+ if (soldr.getAmount1()<soldrecord.getAmount1()){//已出库农资的数量比出库记录表中的数量少，不能回退
+ throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
+ }else {
//0出库 删除记录后原库存添加
stock.setAmount(stock.getAmount() + stockRecord.getAmount1());
//对已出库表操作 soldr出库数量记录表已出库农资减少 soldrecord出库记录表的数据也要删除
@@ -345,8 +346,13 @@
soldr.setAmount1(sub);
soldrService.updateById(soldr);
}
+ }
+ }
+ else {
+ //1 入库 删除记录后原库存减少
+ if (stockRecord.getAmount1() > stock.getAmount()) { //出入库记录表中的数量比库存的数量多不让回退
+ throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
} else {
- //1 入库 删除记录后原库存减少
stock.setAmount(stock.getAmount() - stockRecord.getAmount1());
}
}
--
Gitblit v1.9.3