From 1d829b91fcfa295ecc3e32dd7c105fe372789065 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 13 Sep 2022 17:44:01 +0800
Subject: [PATCH] 农事记录content添加品种名称，大屏查询未删除数据，农产品投入
---
src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java b/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
index a216c2f..8cfca56 100644
--- a/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
+++ b/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
@@ -29,6 +29,8 @@
import org.springblade.modules.farm.entity.FarmingRecord;
import org.springblade.modules.farm.service.FarmingRecordService;
import org.springblade.modules.farm.vo.FarmingRecordVO;
+import org.springblade.modules.farmplant.entity.Strain;
+import org.springblade.modules.farmplant.service.StrainService;
import org.springblade.modules.soldr.entity.Soldr;
import org.springblade.modules.soldr.service.ISoldrService;
import org.springblade.modules.soldrecord.service.ISoldrecordService;
@@ -58,7 +60,7 @@
private final ISoldrService soldrService;
private final ISoldrecordService soldrecordService;
private final IStockfactoryService stockfactoryService;
-
+ private final StrainService strainService;
/**
* 详情
*/
@@ -177,7 +179,8 @@
stockfactory.setId(ids);
Stockfactory detailstock = stockfactoryService.getOne(Condition.getQueryWrapper(stockfactory));
String agriculturalName = detailstock.getAgriculturalName();
- String content = agriculturalName + " " + v + "公斤";
+ Strain strain = strainService.getById(farm.getStrainId());
+ String content =strain.getStrainName()+"-"+ agriculturalName + " " + v + "公斤";
farm.setContent(content);
//使用农资数量等于已出农资数量
if (farm.getSnum() == detail.getAmount1()) {
--
Gitblit v1.9.3