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/process/mapper/ProcessMapper.xml | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml b/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
index da57229..9ef2abe 100644
--- a/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
+++ b/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
@@ -23,23 +23,32 @@
<select id="selectProcessPage" resultMap="processResultMap">
- SELECT p.strain_id,p.id,
- p.land_id,sale_time,sale_num,strain_name,process_id,
- SUM(p.process_num) as process_num,
+ SELECT DISTINCT p.id,
+ p.strain_id,
+ p.land_id,
+ p.sale_time,
+ p.sale_num,
+ strain_name,p.process_id,
+ p.parent_id,
+ p.process_num as process_num,
m.machining_type AS processName,
- m.machining_tp AS tpurl
+ m.machining_tp AS tpurl,
+ a.machining_type AS parentName
FROM sys_process p
LEFT JOIN sys_machining m ON m.id = p.process_id
LEFT JOIN sys_land sl ON sl.id = p.land_id
LEFT JOIN sys_strain strain ON p.strain_id = strain.id
+ LEFT JOIN sys_process_inv inv ON inv.product_id = p.process_id
+ LEFT JOIN (SELECT mm.id,mm.machining_type FROM sys_machining mm) a ON a.id = p.parent_id
WHERE p.is_deleted = 0
<if test="process.farmId!=null and process.farmId!=''">
- and sl.farm_id = #{process.farmId}
+ AND (sl.farm_id = #{process.farmId} or inv.fps_id = #{process.farmId})
</if>
<if test="process.strainId !=null and process.strainId !=''">
and p.strain_id = #{process.strainId}
</if>
- GROUP BY p.strain_id,m.machining_type,m.machining_tp,p.land_id,sale_time,sale_num,process_id,p.id ORDER BY p.create_time DESC
+ GROUP BY p.id
+ ORDER BY p.create_time DESC
</select>
<select id="stockCompare" resultType="boolean">
--
Gitblit v1.9.3