From 81523d36a8349d6a6fbef0dcd3e262bd05828d57 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 26 Aug 2022 17:33:20 +0800
Subject: [PATCH] 修改销售、损耗列表显示
---
src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java | 4 ++++
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml | 14 +++++++++++++-
src/main/java/org/springblade/modules/sale/vo/SaleVO.java | 4 ++++
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml | 15 ++++++++++++++-
src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml | 15 ++++++++++++++-
src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java | 7 ++++++-
6 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml b/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
index b37715e..56ac5ee 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
+++ b/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
@@ -12,7 +12,20 @@
<select id="selectSalePage" resultMap="inventoryResultMap">
select inventory.*,
- strain.strain_name,bdb.dict_value
+ strain.strain_name,bdb.dict_value,
+ CASE WHEN inventory.type = 1 THEN
+ (
+ SELECT m.machining_type FROM sys_process_inv inv
+ LEFT JOIN sys_machining m ON m.id = inv.product_id
+ WHERE inventory.prod_id = inv.id
+ )
+ ELSE
+ (
+ SELECT strain.strain_name FROM sys_farm_product_stock sfps
+ LEFT JOIN sys_strain strain ON strain.id = sfps.strain_id
+ WHERE inventory.prod_id = sfps.id
+ )
+ END AS proName
from sys_inventory inventory
LEFT JOIN sys_strain strain on inventory.strain_id = strain.id
LEFT JOIN blade_dict_biz bdb ON inventory.reason = bdb.dict_key
diff --git a/src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java b/src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java
index 22361ea..edd8683 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java
+++ b/src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java
@@ -46,4 +46,8 @@
* 农场id
*/
private String farmId;
+ /**
+ * 品种名
+ */
+ private String proName;
}
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
index ac473f4..9ac221e 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
@@ -4,13 +4,19 @@
<!--自定义查询农场养殖记录分页数据-->
<select id="selectFarmPlantPage" resultType="org.springblade.modules.farmplant.vo.FarmPlantVO">
- select sfp.*,ss.strain_name strainName,ss.url,sl.land_name landName,sl.land_area area,land_unit landUnit
+ select sfp.*,ss.strain_name strainName,ss.url,sl.land_name landName,sl.land_area area,land_unit landUnit,bdb.dict_value dica,a.farm_id AS otherFarmId
,(SELECT IFNULL(SUM(r.weight),0) from sys_recovery r where sfp.land_id = r.land_id and sfp.strain_id = r.strain_id) as outputNum
from
sys_farm_plant sfp
left join sys_strain ss on ss.id = sfp.strain_id
left join sys_land sl on sl.id = sfp.land_id
+ LEFT JOIN (
+ SELECT l.id,l.land_name,l.farm_id FROM sys_land l
+ ) a ON a.id = sfp.other_land_id
+ LEFT JOIN sys_farm farm ON farm.id = a.farm_id
+ LEFT JOIN blade_dict_biz bdb ON bdb.dict_key = sl.land_unit
where 1=1
+ AND bdb.code = "landunit"
<if test="farmPlant.plant!=null and farmPlant.plant!=''">
and sfp.plant = #{farmPlant.plant}
</if>
@@ -38,6 +44,9 @@
<if test="farmPlant.varieties!=null and farmPlant.varieties!=''">
and sfp.varieties like concat('%',#{farmPlant.varieties},'%')
</if>
+ <if test="farmPlant.landName!=null and farmPlant.landName!=''">
+ and sl.land_name like concat('%',#{farmPlant.landName},'%')
+ </if>
<if test="farmPlant.startTime!=null and farmPlant.startTime!=''">
and sfp.transplan_time >= #{farmPlant.startTime}
</if>
@@ -59,6 +68,9 @@
<if test="farmPlant.transplanTimeEnd !=null and farmPlant.transplanTimeEnd!= ''">
and sfp.transplan_time < #{farmPlant.transplanTimeEnd}
</if>
+ <if test="farmPlant.otherLandId !=null and farmPlant.otherLandId !=''">
+ AND sfp.other_land_id = #{farmPlant.otherLandId}
+ </if>
order by sfp.id desc
</select>
diff --git a/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java b/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java
index dd7fac1..38bc2e1 100644
--- a/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java
+++ b/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java
@@ -36,7 +36,10 @@
* 面积单位(0: 亩 1:分 2：平方米)
*/
private String landUnit;
-
+ /**
+ * 面积单位中文
+ */
+ private String dica;
/**
* 开始时间
*/
@@ -82,4 +85,6 @@
private String transplanTimeEnd;
private Long[] ids;
+
+ private String otherFarmId;
}
diff --git a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
index df266f2..ab93b76 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
@@ -36,7 +36,20 @@
strain.url,
district.name as district,
region.city_name,
- region.district_name
+ region.district_name,
+ CASE WHEN sale.type = 1 THEN
+ (
+ SELECT m.machining_type FROM sys_process_inv inv
+ LEFT JOIN sys_machining m ON m.id = inv.product_id
+ WHERE sale.prod_id = inv.id
+ )
+ ELSE
+ (
+ SELECT strain.strain_name FROM sys_farm_product_stock sfps
+ LEFT JOIN sys_strain strain ON strain.id = sfps.strain_id
+ WHERE sale.prod_id = sfps.id
+ )
+ END AS proName
FROM
sys_sale sale
LEFT JOIN blade_user user on sale.create_user = user.id
diff --git a/src/main/java/org/springblade/modules/sale/vo/SaleVO.java b/src/main/java/org/springblade/modules/sale/vo/SaleVO.java
index a45f41e..49a2b7c 100644
--- a/src/main/java/org/springblade/modules/sale/vo/SaleVO.java
+++ b/src/main/java/org/springblade/modules/sale/vo/SaleVO.java
@@ -80,4 +80,8 @@
* 库存量主键id
*/
private String proid;
+ /**
+ * 产品名
+ */
+ private String proName;
}
--
Gitblit v1.9.3