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/retrieval/mapper/RetrievalMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
index 10be15e..83d9e0f 100644
--- a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
+++ b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
@@ -52,19 +52,19 @@
SELECT
retrieval.*,
strain.strain_name,
+ mach.machining_type AS proName,
bdb.dict_value AS reDestination
FROM
sys_retrieval retrieval
LEFT JOIN sys_strain strain ON strain.id = retrieval.strain_id
LEFT JOIN blade_dict_biz bdb ON bdb.dict_key = retrieval.sale_destination1
LEFT JOIN sys_land land ON land.id = retrieval.land_id
+ LEFT JOIN sys_process_inv inv ON inv.id = retrieval.prod_id
+ LEFT JOIN sys_machining mach ON mach.id = inv.product_id
WHERE
bdb.code = "reDestination"
- <if test="retrieval.strainId !=null and retrieval.strainId != '' ">
- AND retrieval.strain_id = #{retrieval.strainId}
- </if>
<if test="retrieval.farmId != null and retrieval.farmId !=''">
- AND land.farm_id = #{retrieval.farmId}
+ AND (land.farm_id = #{retrieval.farmId} OR inv.fps_id = #{retrieval.farmId})
</if>
AND retrieval.is_deleted = 0 ORDER BY retrieval.create_time DESC
</select>
--
Gitblit v1.9.3