From 0c90b05a7df664f8dcab2c4b330c07c7b80745a4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 30 May 2022 16:05:53 +0800
Subject: [PATCH] 种养结束修改
---
src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 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 be66516..4513540 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,10 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.soldr.entity.Soldr;
+import org.springblade.modules.soldr.service.ISoldrService;
+import org.springblade.modules.soldrecord.entity.Soldrecord;
+import org.springblade.modules.soldrecord.service.ISoldrecordService;
import org.springblade.modules.stock.entity.Stock;
import org.springblade.modules.stock.service.IStockService;
import org.springblade.modules.system.entity.DictBiz;
@@ -57,6 +61,8 @@
private final IStockrecordService stockrecordService;
private final IStockService stockService;
private final IDictBizService dictService;
+ private final ISoldrecordService soldrecordService;
+ private final ISoldrService soldrService;
/**
* 详情
@@ -143,14 +149,48 @@
//当前总量
int i = num - amount1;
Stock stock = new Stock();
- stock.setStockId(stockrecord.getStockId1());
+ stock.setId(stockrecord.getSid());
stock.setAmount(i);
if (i == 0) {
stock.setState("1");
stockService.UpdaeAmountc(stock);
+ //同时删除所有农资记录
+ soldrecordService.delc(stockrecord.getStockId1());
+ soldrService.del(stockrecord.getSid());
} else {
stock.setState("0");
stockService.UpdaeAmountc(stock);
+ }
+ //已出库农资记录
+ Soldrecord soldrecord = new Soldrecord();
+ soldrecord.setStockId1(stockrecord.getStockId1());
+ soldrecord.setAmount1(amount1);
+ soldrecord.setSpecs1(stockrecord.getSpecs1());
+ soldrecord.setSpecsVal1(stockrecord.getSpecsVal1());
+ soldrecord.setSpecsVal2(stockrecord.getSpecsVal2());
+ soldrecord.setType(stockrecord.getType1());
+ String type1 = stockrecord.getType1();
+ if (type1.equals("0")) {
+ //已出库农资数量记录
+ Soldr soldr = new Soldr();
+ soldr.setSid(stockrecord.getSid());
+ soldr.setStockId1(stockrecord.getStockId1());
+ soldr.setStockId1(stockrecord.getStockId1());
+ soldr.setAmount1(amount1);
+ soldr.setSpecs1(stockrecord.getSpecs1());
+ soldr.setSpecsVal1(stockrecord.getSpecsVal1());
+ soldr.setSpecsVal2(stockrecord.getSpecsVal2());
+ soldr.setType(stockrecord.getType1());
+ //已出库农资数量
+ Soldr detail = soldrService.getOne(Condition.getQueryWrapper(soldr));
+ if (null != detail) {
+ Integer amount11 = detail.getAmount1();
+ soldrecordService.updateSold(amount11 + amount1, detail.getSid());
+ } else {
+ soldrService.save(soldr);
+ }
+ //已出库农资
+ soldrecordService.save(soldrecord);
}
}
//入库
@@ -162,7 +202,7 @@
//当前总量
int i = num + amount1;
Stock stock = new Stock();
- stock.setStockId(stockrecord.getStockId1());
+ stock.setId(stockrecord.getSid());
stock.setAmount(i);
stock.setState("0");
stockService.UpdaeAmountc(stock);
--
Gitblit v1.9.3