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 | 249 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 231 insertions(+), 18 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 fe17e69..54c4124 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;
@@ -39,6 +42,8 @@
import org.springblade.modules.soldr.vo.SoldrVO;
import org.springblade.modules.soldr.service.ISoldrService;
import org.springblade.core.boot.ctrl.BladeController;
+
+import java.util.*;
/**
* 已出库存数量记录表 控制器
@@ -55,6 +60,7 @@
private final ISoldrService soldrService;
private final ISoldrecordService soldrecordService;
private final IStockService stockService;
+ private final IStockrecordService stockrecordService;
/**
* 详情
@@ -67,6 +73,14 @@
return R.data(detail);
}
+ /**
+ * 自定义详情
+ */
+ @GetMapping("/details")
+ public R<SoldrVO> details(SoldrVO soldr) {
+ SoldrVO detail = soldrService.getSoldrInfo(soldr);
+ return R.data(detail);
+ }
/**
* 分页 已出库存数量记录表
*/
@@ -142,49 +156,154 @@
}
+ /**
+ * 后台退回
+ * @param num 数量
+ * @param id 农资id
+ * @param type
+ * @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) {
- Stock stock = new Stock();
- stock.setId(id);
- Stock detail1 = stockService.getOne(Condition.getQueryWrapper(stock));
- Integer amount = detail1.getAmount();
- stock.setAmount(amount + num);
- stockService.Updaet(stock);
- //删除
- soldrService.del(id);
- }
- //如果小于就修改
- else {
+ if (type == 0) {//退回数量等于库存数量
Soldr soldr = new Soldr();
soldr.setSid(id);
+ //通过农资库存id找到已出库农资表中对应的农资
Soldr detail = soldrService.getOne(Condition.getQueryWrapper(soldr));
- Integer amount1 = detail.getAmount1();
- soldrecordService.updateSold(amount1 - num, id);
+ 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);
+ soldrService.delLogic(id);
+ }
+ //如果小于就修改
+ else {//退回数量小于库存数量
+ Soldr soldr = new Soldr();
+ soldr.setSid(id);
+ //通过农资库存id找到已出库农资表中对应的农资
+ Soldr detail = soldrService.getOne(Condition.getQueryWrapper(soldr));
+ Integer amount1 = detail.getAmount1();
+ Double census = detail.getCensus();
+ //统计公斤
+ Integer specsValue1 = detail.getSpecsVal1();
+ double v = 0;
+ //克
+ if (specsValue1 == 0) {
+ v = num * 0.001;
+ }
+ //斤
+ else if (specsValue1 == 1) {
+ v = num * 0.5;
+ }
+ //公斤
+ else if (specsValue1 == 2) {
+ v = num;
+ }
+ //吨
+ else if (specsValue1 == 3) {
+ v = num * 1000;
+ }
+ //毫升
+ else if (specsValue1 == 4) {
+ //毫升换成升
+ double s = num * 0.001;
+ //升换成公斤
+ v = s;
+ }
+ //升
+ else{
+ v = num;
+ }
+ census1 = v;
+ //更新已出库农资的数据
+ soldrecordService.updateSold(amount1 - num, id,census-v);
+ Stock stock = new Stock();
+ stock.setId(id);
+ //根据传过来的sid获取对应的库存表数据
+ 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("退回成功");
}
-
+ /**
+ * 小程序退回
+ * @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 {
@@ -192,15 +311,109 @@
soldr.setSid(soldrVOs.getId());
Soldr detail = soldrService.getOne(Condition.getQueryWrapper(soldr));
Integer amount1 = detail.getAmount1();
- soldrecordService.updateSold(amount1 - soldrVOs.getNum(), soldrVOs.getId());
+ Double census = detail.getCensus();
+ //统计公斤
+ Integer specsValue1 = detail.getSpecsVal1();
+ double v = 0;
+ //克
+ if (specsValue1 == 0) {
+ v = soldrVOs.getNum() * 0.001;
+ }
+ //斤
+ if (specsValue1 == 1) {
+ v = soldrVOs.getNum() * 0.5;
+ }
+ //公斤
+ if (specsValue1 == 2) {
+ v = soldrVOs.getNum();
+ }
+ //吨
+ if (specsValue1 == 3) {
+ v = soldrVOs.getNum() * 1000;
+ }
+ //毫升
+ if (specsValue1 == 4) {
+ //毫升换成升
+ double s = soldrVOs.getNum() * 0.001;
+ //升换成公斤
+ v = s;
+ }
+ //升
+ 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("退回成功");
}
+ /**
+ * 已出农资列表
+ *
+ * @return
+ */
+ @GetMapping("/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();
+ String dic2 = soldrVOS.get(i).getDic2();
+ String agrname = soldrVOS.get(i).getAgrname();
+ String s = agrname + specs1 + dic1 + "/" + dic2;
+ soldrVOS.get(i).setSpn(s);
+ }
+
+ return R.data(soldrVOS);
+ }
+
}
--
Gitblit v1.9.3