From 4aff3b8d0640e9a84f7408100551e740bacaa2a0 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 09 八月 2024 11:24:28 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 3 +++
1 files changed, 3 insertions(+), 0 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 a255700..76714ad 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -88,6 +88,7 @@
left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id and rwd.technology_number=fc.technology_number
where fc.process_id = #{processIdStr}
and fc.technology_number = #{technologyStr}
+ and if(#{reportType}=1,o.order_type!='鏍峰搧璁㈠崟',o.order_id!='')
GROUP BY fc.process_id
</select>
@@ -166,11 +167,13 @@
on patch.process_id = fc.process_id
and patch.order_sort = fc.order_number
and patch.technology_number = fc.technology_number
+ left join sd.`order` as o on o.order_id=od.order_id
WHERE
fc.process_id = #{processIdStr}
AND fc.technology_number = #{technologyStr}
AND odpd.process = #{process}
+ and if(#{reportType}=1,o.order_type!='鏍峰搧璁㈠崟',o.order_id!='')
order by fc.order_number
</select>
--
Gitblit v1.8.0