From 2648880bec1583ce4fe1886de65300f0a22638d0 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 26 Sep 2022 17:09:31 +0800
Subject: [PATCH] 更改种类描述的判断方式、溯源时地图详情sql调整、农资出库时删除数据回滚修复、大屏接受数据增加展示判断
---
src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 c86d6f7..0e154d3 100644
--- a/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
+++ b/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
@@ -333,9 +333,9 @@
//对库存表操作
//判断stockType1 0出库 1入库
if (stockRecord.getStockType1() == 0) {
+ Soldrecord soldrecord = soldrecordService.getById(stockRecord.getSrId());
+ Soldr soldr = soldrService.getByServalParam(soldrecord.getStockId1(), soldrecord.getSpecs1(), soldrecord.getSpecsVal1(), soldrecord.getSpecsVal2(), soldrecord.getSid(), "0");
if (stockRecord.getType1().equals("4")){ //如果是农资退回
- Soldrecord soldrecord = soldrecordService.getById(stockRecord.getSrId());
- Soldr soldr = soldrService.getByServalParam(soldrecord.getStockId1(), soldrecord.getSpecs1(), soldrecord.getSpecsVal1(), soldrecord.getSpecsVal2(), soldrecord.getSid(), "0");
if (stock.getAmount()<stockRecord.getAmount1()){//库存数量比出入库记录表数量少 没那么多库存补
throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
}else {
@@ -347,6 +347,10 @@
}
}else {//其他出库类型
stock.setAmount(stock.getAmount() + stockRecord.getAmount1());
+ soldrecordService.deleteLogic(Func.toLongList(soldrecord.getId().toString()));
+ Integer sub = soldr.getAmount1() - stockRecord.getAmount1();
+ soldr.setAmount1(sub);
+ soldrService.updateById(soldr);
}
}
else {
--
Gitblit v1.9.3