From 3df8757ade3bdef3b5a142c846680102589260bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 10:36:37 +0800
Subject: [PATCH] 农事操作，种植记录查询新增，地块，溯源码查询修改
---
src/main/java/org/springblade/modules/soldr/controller/SoldrController.java | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 119 insertions(+), 1 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 3aed84d..c57d149 100644
--- a/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java
+++ b/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java
@@ -28,6 +28,7 @@
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.vo.SoldrVOs;
import org.springblade.modules.soldrecord.service.ISoldrecordService;
import org.springblade.modules.stock.entity.Stock;
import org.springblade.modules.stock.service.IStockService;
@@ -38,6 +39,11 @@
import org.springblade.modules.soldr.vo.SoldrVO;
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;
/**
* 已出库存数量记录表 控制器
@@ -160,7 +166,38 @@
soldr.setSid(id);
Soldr detail = soldrService.getOne(Condition.getQueryWrapper(soldr));
Integer amount1 = detail.getAmount1();
- soldrecordService.updateSold(amount1 - num, id);
+ Double census = detail.getCensus();
+ //统计公斤
+ Integer specsValue1 = detail.getSpecsVal1();
+ double v = 0;
+ //克
+ if (specsValue1 == 0) {
+ v = num * 0.001;
+ }
+ //斤
+ if (specsValue1 == 1) {
+ v = num * 0.5;
+ }
+ //公斤
+ if (specsValue1 == 2) {
+ v = num;
+ }
+ //吨
+ if (specsValue1 == 3) {
+ v = num * 1000;
+ }
+ //毫升
+ if (specsValue1 == 4) {
+ //毫升换成升
+ double s = num * 0.001;
+ //升换成公斤
+ v = s;
+ }
+ //升
+ if (specsValue1 == 5) {
+ v = num;
+ }
+ soldrecordService.updateSold(amount1 - num, id,census-v);
Stock stock = new Stock();
stock.setId(id);
Stock detail1 = stockService.getOne(Condition.getQueryWrapper(stock));
@@ -172,4 +209,85 @@
}
+ @GetMapping("/outs")
+ public R outs(SoldrVOs soldrVOs) {
+ //如果等于就修改并删除
+ if (soldrVOs.getType().equals("0")) {
+ Stock stock = new Stock();
+ stock.setId(soldrVOs.getId());
+ Stock detail1 = stockService.getOne(Condition.getQueryWrapper(stock));
+ Integer amount = detail1.getAmount();
+ stock.setAmount(amount + soldrVOs.getNum());
+ stockService.Updaet(stock);
+ //删除
+ soldrService.del(soldrVOs.getId());
+ }
+ //如果小于就修改
+ else {
+ Soldr soldr = new Soldr();
+ soldr.setSid(soldrVOs.getId());
+ 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 = 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();
+ }
+ 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());
+ stockService.Updaet(stock);
+ }
+ return R.success("退回成功");
+ }
+
+ /**
+ * 已出农资列表
+ *
+ * @return
+ */
+ @GetMapping("/selectSol")
+ public R selectSol() {
+ List<SoldrVO> soldrVOS = soldrService.selectSol();
+ 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