From 680b380e3d9189f2bfd79fb33a6428d82219e4bc Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 17 Sep 2022 10:29:44 +0800
Subject: [PATCH] 新增加工产品出库，修改加工产品数据存储逻辑
---
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml | 80 +++++++++++++++++++++++++++-------------
1 files changed, 54 insertions(+), 26 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 bf912cd..e30f44e 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
@@ -29,42 +29,70 @@
<select id="selectSalePage" resultMap="saleResultMap">
+<!-- SELECT-->
+<!-- sale.*,-->
+<!-- user.real_name,-->
+<!-- strain.strain_name,-->
+<!-- strain.url,-->
+<!-- district.name as district,-->
+<!-- region.city_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
sale.*,
- user.real_name,
+ USER.real_name,
strain.strain_name,
+ mach.machining_type AS proName,
strain.url,
- district.name as district,
+ district.NAME AS district,
region.city_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
+ region.district_name
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
+ 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
+ LEFT JOIN sys_process_inv inv ON inv.id = sale.prod_id
+ LEFT JOIN sys_machining mach ON mach.id = inv.product_id
WHERE
- <if test="sale.strainId !=null and sale.strainId != '' ">
- sale.strain_id = #{sale.strainId} AND
- </if>
+ 1 = 1
<if test="sale.farmId != null and sale.farmId !=''">
- land.farm_id = #{sale.farmId} AND
+ AND (land.farm_id = #{sale.farmId} OR inv.fps_id = #{sale.farmId})
</if>
- sale.is_deleted = 0 ORDER BY sale.create_time DESC
+ AND sale.is_deleted = 0
+ ORDER BY
+ sale.create_time DESC
+
</select>
--
Gitblit v1.9.3