From 7b93bac497d5b698bb4d852dbd25c6397eaea0f2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 04 Aug 2022 17:25:26 +0800
Subject: [PATCH] 查询时新增损耗原因名
---
src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 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 15a8de6..ffd0859 100644
--- a/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
+++ b/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
@@ -45,6 +45,7 @@
import org.springblade.modules.stockrecord.service.IStockrecordService;
import org.springblade.core.boot.ctrl.BladeController;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -233,6 +234,10 @@
}
//已出库农资
soldrecordService.save(soldrecord);
+ //填充stock_record表中的srId
+ stockrecord.setSrId(soldrecord.getId());
+ stockrecordService.updateById(stockrecord);
+ soldrService.cancelDel(soldr.getId());
}
}
//入库
@@ -313,12 +318,29 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ //根据出入库记录表找到对应的stockRecord
Stockrecord stockRecord = stockrecordService.getById(ids);
+ //根据stockRecord中的库存记录id找到对应的库存数据
Stock stock = stockService.getById(stockRecord.getSid());
+ //对库存表操作
//判断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);
+ }
}else {
//1 入库 删除记录后原库存减少
stock.setAmount(stock.getAmount()-stockRecord.getAmount1());
--
Gitblit v1.9.3