From 72b971c98c46531064d74b68fc8fe8864ed0b544 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 08 Nov 2022 09:04:56 +0800
Subject: [PATCH] 大屏溯源统计次数sql修改
---
src/main/java/org/springblade/modules/soldr/controller/SoldrController.java | 72 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 insertions(+), 4 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 e818a92..54c4124 100644
--- a/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java
+++ b/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java
@@ -74,6 +74,14 @@
}
/**
+ * 自定义详情
+ */
+ @GetMapping("/details")
+ public R<SoldrVO> details(SoldrVO soldr) {
+ SoldrVO detail = soldrService.getSoldrInfo(soldr);
+ return R.data(detail);
+ }
+ /**
* 分页 已出库存数量记录表
*/
@GetMapping("/list")
@@ -149,7 +157,7 @@
/**
- * 退回
+ * 后台退回
* @param num 数量
* @param id 农资id
* @param type
@@ -173,7 +181,8 @@
stock.setState("0");
stockService.Updaet(stock);
//删除
- soldrService.del(id);
+// soldrService.del(id);
+ soldrService.delLogic(id);
}
//如果小于就修改
else {//退回数量小于库存数量
@@ -270,19 +279,31 @@
return R.success("退回成功");
}
-
+ /**
+ * 小程序退回
+ * @param soldrVOs
+ * @return
+ */
@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());
+// soldrService.del(soldrVOs.getId());
+ soldrService.delLogic(soldrVOs.getId());
}
//如果小于就修改
else {
@@ -321,14 +342,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("退回成功");
}
--
Gitblit v1.9.3