From 0f51855b9046632aef8b517eb35b9116e5ea8b72 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 30 May 2022 14:50:27 +0800
Subject: [PATCH] 农资管理

---
 src/main/java/org/springblade/modules/stock/controller/StockController.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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 36b6034..23dbb2f 100644
--- a/src/main/java/org/springblade/modules/stock/controller/StockController.java
+++ b/src/main/java/org/springblade/modules/stock/controller/StockController.java
@@ -87,10 +87,13 @@
 		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);
@@ -106,9 +109,11 @@
 		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());
@@ -122,7 +127,7 @@
 		stockrecord.setSp1("stockSpecs1");
 		stockrecord.setSp2("stockSpecs2");
 		stockrecordService.save(stockrecord);
-		return R.status(stockService.save(stock));
+		return R.status(save);
 	}
 
 	/**

--
Gitblit v1.9.3