From 79f094ecc2d1b7bec8c577fa6237a615cdb8773b Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 23 十二月 2024 16:52:57 +0800
Subject: [PATCH] 添加 工程信息显示流程卡功能
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index cd6fa30..3a7c802 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -255,7 +255,7 @@
WHERE
fc.process_id = #{processIdStr}
- <if test="process != '涓┖' and process != '澶硅兌' and process != '鍖呰' and process != '鎵撹兌鍜岀矘妗�' ">
+ <if test="laminating != 'laminating'">
AND POSITION(fc.technology_number in #{technologyStr})
</if>
AND odpd.process = #{process}
@@ -987,17 +987,21 @@
from reporting_work as a
left join reporting_work_detail as b on a.reporting_work_id = b.reporting_work_id
where this_process=#{previousProcess} and reviewed_state=0 and process_id= #{processIdStr}
- and POSITION(b.technology_number in #{technologyStr})
+
GROUP BY a.reporting_work_id,b.order_number,b.technology_number
) as rws
on rws.process_id = fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number
WHERE
fc.process_id = #{processIdStr}
- <if test="process != '涓┖' and process != '澶硅兌' and process != '鍖呰' and process != '鎵撹兌鍜岀矘妗�' ">
+ <if test="laminating != 'laminating' ">
AND POSITION(fc.technology_number in #{technologyStr})
</if>
AND odpd.process = #{process}
and rws.reviewed_state=0
order by fc.order_number
</select>
+
+ <select id="getProcessLaminating">
+ select IFNULL(nickname,'') from sd.basic_data where basic_category='process' and basic_name=#{process}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0