From be9da335cb28e12e1439c24e4596f069e342d83f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Aug 2022 15:16:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 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..8c8b82c 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;
@@ -219,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) {
@@ -324,26 +326,35 @@
Stock stock = stockService.getById(stockRecord.getSid());
//对库存表操作
//判断stockType1 0出库 1入库
- if (stockRecord.getStockType1() == 0){
- //0出库 删除记录后原库存添加
- stock.setAmount(stock.getAmount()+stockRecord.getAmount1());
- //对已出库表操作 soldr出库数量记录表已出库农资减少 soldrecord出库记录表的数据也要删除
+ if (stockRecord.getStockType1() == 0) {
//根据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());
+ if (soldr.getAmount1()<soldrecord.getAmount1()){//已出库农资的数量比出库记录表中的数量少，不能回退
+ throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
}else {
- soldr.setAmount1(sub);
- soldrService.updateById(soldr);
+ //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 {
+ }
+ else {
//1 入库 删除记录后原库存减少
- stock.setAmount(stock.getAmount()-stockRecord.getAmount1());
+ if (stockRecord.getAmount1() > stock.getAmount()) { //出入库记录表中的数量比库存的数量多不让回退
+ throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
+ } else {
+ stock.setAmount(stock.getAmount() - stockRecord.getAmount1());
+ }
}
stockService.UpdaeAmountc(stock);
return R.status(stockrecordService.deleteLogic(Func.toLongList(ids)));
--
Gitblit v1.9.3