From 77f2529af2d44b291ee97c439cbb010479985932 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 02 Jun 2022 17:40:28 +0800
Subject: [PATCH] 农事操作查询修改
---
src/main/java/org/springblade/modules/stock/controller/StockController.java | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 102 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/stock/controller/StockController.java b/src/main/java/org/springblade/modules/stock/controller/StockController.java
index e8a132f..1398a8a 100644
--- a/src/main/java/org/springblade/modules/stock/controller/StockController.java
+++ b/src/main/java/org/springblade/modules/stock/controller/StockController.java
@@ -21,12 +21,18 @@
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
+
import javax.validation.Valid;
import org.springblade.core.mp.support.Condition;
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.stock.vo.StocksVO;
+import org.springblade.modules.stockrecord.entity.Stockrecord;
+import org.springblade.modules.stockrecord.service.IStockrecordService;
+import org.springblade.modules.system.entity.DictBiz;
+import org.springblade.modules.system.service.IDictBizService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,6 +40,8 @@
import org.springblade.modules.stock.vo.StockVO;
import org.springblade.modules.stock.service.IStockService;
import org.springblade.core.boot.ctrl.BladeController;
+
+import java.util.List;
/**
* 农资库存表 控制器
@@ -48,6 +56,7 @@
public class StockController extends BladeController {
private final IStockService stockService;
+ private final IStockrecordService stockrecordService;
/**
* 详情
@@ -78,7 +87,18 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入stock")
public R<IPage<StockVO>> page(StockVO stock, Query query) {
- IPage<StockVO> pages = stockService.selectStockPage(Condition.getPage(query), stock);
+ IPage<StockVO> pages = stockService.selectLists(Condition.getPage(query), stock);
+ for (int i = 0; i < pages.getRecords().size(); i++) {
+ String specs = pages.getRecords().get(i).getSpecs();
+ Integer amount = pages.getRecords().get(i).getAmount();
+ Integer num = Integer.parseInt(specs);
+ String dic1 = pages.getRecords().get(i).getDic1();
+ String dic2 = pages.getRecords().get(i).getDic2();
+ String s = specs + dic1 + "/" + dic2;
+ pages.getRecords().get(i).setSpn(s);
+ pages.getRecords().get(i).setCnum(num * amount);
+
+ }
return R.data(pages);
}
@@ -89,7 +109,60 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入stock")
public R save(@Valid @RequestBody Stock stock) {
- return R.status(stockService.save(stock));
+ stock.setState("0");
+ stock.setSp1("stockSpecs1");
+ stock.setSp2("stockSpecs2");
+ boolean save = stockService.save(stock);
+ //农资记录表
+ Stockrecord stockrecord = new Stockrecord();
+ //农资ID
+ stockrecord.setSid(stock.getId());
+ stockrecord.setStockId1(stock.getStockId());
+ stockrecord.setAmount1(stock.getAmount());
+ stockrecord.setTime1(stock.getTime());
+ stockrecord.setType1(stock.getType());
+ stockrecord.setStockType1(1);
+ stockrecord.setPicture1(stock.getPicture());
+ stockrecord.setRemarks1(stock.getRemarks());
+ stockrecord.setSpecs1(stock.getSpecs());
+ stockrecord.setSpecsVal1(stock.getSpecsValue1());
+ stockrecord.setSpecsVal2(stock.getSpecsValue2());
+ stockrecord.setSp1("stockSpecs1");
+ stockrecord.setSp2("stockSpecs2");
+ //统计公斤
+ Integer amount = stock.getAmount();
+ Integer specsValue1 = stock.getSpecsValue1();
+ double v = 0;
+ //克
+ if (specsValue1 == 0) {
+ v = amount * 0.001;
+ }
+ //斤
+ if (specsValue1 == 1) {
+ v = amount * 0.5;
+ }
+ //公斤
+ if (specsValue1 == 2) {
+ v = amount;
+ }
+ //吨
+ if (specsValue1 == 3) {
+ v = amount * 1000;
+ }
+ //毫升
+ if (specsValue1 == 4) {
+ //毫升换成升
+ double s = amount * 0.001;
+ //升换成公斤
+ v = s;
+ }
+ //升
+ if (specsValue1 == 5) {
+ v = amount;
+ }
+ stockrecord.setCensus(v);
+ stockrecordService.save(stockrecord);
+ return R.status(save);
}
/**
@@ -112,7 +185,7 @@
return R.status(stockService.saveOrUpdate(stock));
}
-
+
/**
* 删除 农资库存表
*/
@@ -123,5 +196,30 @@
return R.status(stockService.deleteLogic(Func.toLongList(ids)));
}
-
+ /**
+ * 数据统计
+ *
+ * @param stock
+ * @param query
+ * @return
+ */
+ @PostMapping("/pagenum")
+ public R<IPage<StocksVO>> pagenum(StocksVO stock, Query query) {
+ IPage<StocksVO> pages = stockService.slectNum(Condition.getPage(query), stock);
+ for (int i = 0; i < pages.getRecords().size(); i++) {
+ Double cgnum = pages.getRecords().get(i).getCgnum();
+ Double dbrknum = pages.getRecords().get(i).getDbrknum();
+ double v = cgnum + dbrknum;
+ pages.getRecords().get(i).setRknum(v);
+ Double lycknum = pages.getRecords().get(i).getLycknum();
+ Double dbcknum = pages.getRecords().get(i).getDbcknum();
+ Double bfcknum = pages.getRecords().get(i).getBfcknum();
+ double v1 = lycknum + dbcknum + bfcknum;
+ pages.getRecords().get(i).setCknum(v1);
+ }
+
+ return R.data(pages);
+ }
+
+
}
--
Gitblit v1.9.3