From fa326e87de2805d8b66b301daee596b1d959e430 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 15 Sep 2022 11:42:45 +0800
Subject: [PATCH] 出入库记录删除回滚逻辑修改
---
src/main/java/org/springblade/modules/soldr/controller/SoldrController.java | 127 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 118 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java b/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java
index 1362fdb..e922e37 100644
--- a/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java
+++ b/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java
@@ -29,9 +29,12 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.soldr.vo.SoldrVOs;
+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.stockrecord.entity.Stockrecord;
+import org.springblade.modules.stockrecord.service.IStockrecordService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -40,10 +43,7 @@
import org.springblade.modules.soldr.service.ISoldrService;
import org.springblade.core.boot.ctrl.BladeController;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 已出库存数量记录表 控制器
@@ -60,6 +60,7 @@
private final ISoldrService soldrService;
private final ISoldrecordService soldrecordService;
private final IStockService stockService;
+ private final IStockrecordService stockrecordService;
/**
* 详情
@@ -72,6 +73,14 @@
return R.data(detail);
}
+ /**
+ * 自定义详情
+ */
+ @GetMapping("/details")
+ public R<SoldrVO> details(SoldrVO soldr) {
+ SoldrVO detail = soldrService.getSoldrInfo(soldr);
+ return R.data(detail);
+ }
/**
* 分页 已出库存数量记录表
*/
@@ -155,20 +164,27 @@
* @return
*/
@PostMapping("/out")
- public R out(Integer num, Long id, Integer type) {
+ public R out(Integer num, Long id, Integer type,Long createUser,Long createDept) {
+ double census1 = 0;
//如果等于就修改并删除
- if (type == 0) {
+ if (type == 0) {//退回数量等于库存数量
+ Soldr soldr = new Soldr();
+ soldr.setSid(id);
+ //通过农资库存id找到已出库农资表中对应的农资
+ Soldr detail = soldrService.getOne(Condition.getQueryWrapper(soldr));
+ census1 = detail.getCensus();
Stock stock = new Stock();
stock.setId(id);
Stock detail1 = stockService.getOne(Condition.getQueryWrapper(stock));
Integer amount = detail1.getAmount();
stock.setAmount(amount + num);
+ stock.setState("0");
stockService.Updaet(stock);
//删除
soldrService.del(id);
}
//如果小于就修改
- else {
+ else {//退回数量小于库存数量
Soldr soldr = new Soldr();
soldr.setSid(id);
//通过农资库存id找到已出库农资表中对应的农资
@@ -205,6 +221,7 @@
else{
v = num;
}
+ census1 = v;
//更新已出库农资的数据
soldrecordService.updateSold(amount1 - num, id,census-v);
Stock stock = new Stock();
@@ -213,22 +230,71 @@
Stock detail1 = stockService.getOne(Condition.getQueryWrapper(stock));
Integer amount = detail1.getAmount();
stock.setAmount(amount + num);
+ stock.setState("0");
//更新库存表
stockService.Updaet(stock);
}
+ Stock stock = new Stock();
+ stock.setId(id);
+ Stock detail1 = stockService.getOne(Condition.getQueryWrapper(stock));
+ //更新已出库待使用农资记录表
+ Soldrecord soldrecord = new Soldrecord();
+ soldrecord.setAmount1(num);
+ soldrecord.setSid(detail1.getId());
+ soldrecord.setSpecs1(detail1.getSpecs());
+ soldrecord.setSpecsVal1(detail1.getSpecsValue1());
+ soldrecord.setSpecsVal2(detail1.getSpecsValue2());
+ soldrecord.setType("4");
+ soldrecord.setStockId1(detail1.getStockId());
+ soldrecord.setIsDeleted(0);
+ soldrecord.setStatus(1);
+ soldrecord.setCreateTime(new Date());
+ soldrecord.setUpdateTime(new Date());
+ soldrecord.setCreateUser(createUser);
+ soldrecord.setCreateDept(createDept);
+ soldrecord.setUpdateUser(createUser);
+ soldrecordService.save(soldrecord);
+ //更新出入库记录表
+ Stockrecord stockrecord = new Stockrecord();
+ stockrecord.setAmount1(num);
+ stockrecord.setCensus(census1);
+ stockrecord.setDeptId(detail1.getDeptId());
+ stockrecord.setSid(detail1.getId());
+ stockrecord.setStockId1(detail1.getStockId());
+ stockrecord.setTime1(new Date());
+ stockrecord.setType1(soldrecord.getType());//入库类型？
+ stockrecord.setSpecs1(detail1.getSpecs());
+ stockrecord.setSpecsVal1(detail1.getSpecsValue1());
+ stockrecord.setSpecsVal2(detail1.getSpecsValue2());
+ stockrecord.setCreateUser(createUser);
+ stockrecord.setCreateDept(createDept);
+ stockrecord.setCreateTime(new Date());
+// stockrecord.setUpdateUser();
+ stockrecord.setStatus(1);
+ stockrecord.setIsDeleted(0);
+ stockrecord.setStockType1(0);
+ stockrecord.setSrId(soldrecord.getId());
+ stockrecordService.save(stockrecord);
return R.success("退回成功");
}
@GetMapping("/outs")
public R outs(SoldrVOs soldrVOs) {
+ double census1 = 0;
//如果等于就修改并删除
if (soldrVOs.getType().equals("0")) {
+ Soldr soldr = new Soldr();
+ soldr.setSid(soldrVOs.getId());
+ //通过农资库存id找到已出库农资表中对应的农资
+ Soldr detail = soldrService.getOne(Condition.getQueryWrapper(soldr));
+ census1 = detail.getCensus();
Stock stock = new Stock();
stock.setId(soldrVOs.getId());
Stock detail1 = stockService.getOne(Condition.getQueryWrapper(stock));
Integer amount = detail1.getAmount();
stock.setAmount(amount + soldrVOs.getNum());
+ stock.setState("0");
stockService.Updaet(stock);
//删除
soldrService.del(soldrVOs.getId());
@@ -270,14 +336,57 @@
if (specsValue1 == 5) {
v = soldrVOs.getNum();
}
+ census1 = v;
soldrecordService.updateSold(amount1 - soldrVOs.getNum(), soldrVOs.getId(),census-v);
Stock stock = new Stock();
stock.setId(soldrVOs.getId());
Stock detail1 = stockService.getOne(Condition.getQueryWrapper(stock));
Integer amount = detail1.getAmount();
stock.setAmount(amount + soldrVOs.getNum());
+ stock.setState("0");
stockService.Updaet(stock);
}
+ Stock stock = new Stock();
+ stock.setId(soldrVOs.getId());
+ Stock detail1 = stockService.getOne(Condition.getQueryWrapper(stock));
+ //更新已出库待使用农资记录表
+ Soldrecord soldrecord = new Soldrecord();
+ soldrecord.setAmount1(soldrVOs.getNum());
+ soldrecord.setSid(detail1.getId());
+ soldrecord.setSpecs1(detail1.getSpecs());
+ soldrecord.setSpecsVal1(detail1.getSpecsValue1());
+ soldrecord.setSpecsVal2(detail1.getSpecsValue2());
+ soldrecord.setType("4");
+ soldrecord.setStockId1(detail1.getStockId());
+ soldrecord.setIsDeleted(0);
+ soldrecord.setStatus(1);
+ soldrecord.setCreateTime(new Date());
+ soldrecord.setUpdateTime(new Date());
+ soldrecord.setCreateUser(soldrVOs.getCreateUser());
+ soldrecord.setCreateDept(soldrVOs.getCreateDept());
+ soldrecord.setUpdateUser(soldrVOs.getCreateUser());
+ soldrecordService.save(soldrecord);
+ //更新出入库记录表
+ Stockrecord stockrecord = new Stockrecord();
+ stockrecord.setAmount1(soldrVOs.getNum());
+ stockrecord.setCensus(census1);
+ stockrecord.setDeptId(detail1.getDeptId());
+ stockrecord.setSid(detail1.getId());
+ stockrecord.setStockId1(detail1.getStockId());
+ stockrecord.setTime1(new Date());
+ stockrecord.setType1(soldrecord.getType());//入库类型？
+ stockrecord.setSpecs1(detail1.getSpecs());
+ stockrecord.setSpecsVal1(detail1.getSpecsValue1());
+ stockrecord.setSpecsVal2(detail1.getSpecsValue2());
+ stockrecord.setCreateUser(soldrVOs.getCreateUser());
+ stockrecord.setCreateDept(soldrVOs.getCreateDept());
+ stockrecord.setCreateTime(new Date());
+// stockrecord.setUpdateUser();
+ stockrecord.setStatus(1);
+ stockrecord.setIsDeleted(0);
+ stockrecord.setStockType1(0);
+ stockrecord.setSrId(soldrecord.getId());
+ stockrecordService.save(stockrecord);
return R.success("退回成功");
}
@@ -287,8 +396,8 @@
* @return
*/
@GetMapping("/selectSol")
- public R selectSol() {
- List<SoldrVO> soldrVOS = soldrService.selectSol();
+ public R selectSol(String farmId) {
+ List<SoldrVO> soldrVOS = soldrService.selectSol(farmId);
for (int i = 0; i < soldrVOS.size(); i++) {
String specs1 = soldrVOS.get(i).getSpecs1();
String dic1 = soldrVOS.get(i).getDic1();
--
Gitblit v1.9.3