From fa326e87de2805d8b66b301daee596b1d959e430 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 15 Sep 2022 11:42:45 +0800
Subject: [PATCH] 出入库记录删除回滚逻辑修改
---
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
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 64d4e09..bf912cd 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
@@ -36,16 +36,33 @@
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
LEFT JOIN sys_strain strain on sale.strain_id = strain.id
LEFT JOIN sys_district district on sale.sale_destination = district.code
LEFT JOIN blade_region region on sale.county = region.district_code
+ LEFT JOIN sys_land land ON land.id = sale.land_id
WHERE
<if test="sale.strainId !=null and sale.strainId != '' ">
sale.strain_id = #{sale.strainId} AND
+ </if>
+ <if test="sale.farmId != null and sale.farmId !=''">
+ land.farm_id = #{sale.farmId} AND
</if>
sale.is_deleted = 0 ORDER BY sale.create_time DESC
</select>
@@ -128,7 +145,7 @@
sys_sale sale
LEFT JOIN sys_district dis ON sale.sale_destination = dis.CODE
LEFT JOIN sys_land sl ON sl.id = sale.land_id
- WHERE 1 = 1
+ WHERE 1 = 1 AND sale.is_deleted = 0
<if test="startTime != null and startTime != ''">
and sale_time >= #{startTime}
</if>
--
Gitblit v1.9.3