From 67bcaeb7e16e5701a8455b34e2a9f3083ae78016 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 二月 2025 09:56:34 +0800
Subject: [PATCH] 进度报表动态求和，优化流程卡半径显示

---
 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 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 3a7c802..48f7c41 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -91,6 +91,7 @@
         where fc.process_id = #{processIdStr}
           and POSITION(fc.technology_number in #{technologyStr})
           and if(#{reportType}=1,o.order_type!='鏍峰搧璁㈠崟',o.order_id!='')
+        and o.create_order>0
         GROUP BY fc.process_id
     </select>
 
@@ -179,6 +180,7 @@
           AND  POSITION(fc.technology_number in #{technologyStr})
           AND odpd.process = #{process}
           and if(#{reportType}=1,o.order_type!='鏍峰搧璁㈠崟',o.order_id!='')
+        and o.create_order>0
         group by fc.order_number,
                  ogd.technology_number
         order by fc.order_number
@@ -213,7 +215,7 @@
         LEFT JOIN sd.order_glass_detail AS ogd
                 ON od.order_id = ogd.order_id
                 AND od.order_number = ogd.order_number
-        <if test="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�' and previousProcess=='澶硅兌')">
+        <if test="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�')">
             AND ogd.`group` = (select `group`
                                from sd.order_glass_detail
                                where order_id = ogd.order_id
@@ -343,10 +345,10 @@
     </select>
     <select id="selectGlassProcessNum" resultType="java.lang.Integer">
         select
-        if((d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)&lt; 0,
+        ifnull(if((d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)&lt; 0,
            0,
            (d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)
-            )
+            ),0)
         from flow_card as a
         left join sd.order_process_detail as b
         on
@@ -533,7 +535,8 @@
                            on rwd.reporting_work_id = rw.reporting_work_id and rwd.order_number = ogd.order_number and
                               rwd.technology_number = ogd.technology_number
         where rw.reviewed_state != 2
-          and DATE_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
+          and rw.reporting_work_time >= #{selectTime1}
+    AND rw.reporting_work_time &lt;  #{selectTime2}
           and position(#{orderId} in rw.order_id)
           and rw.reviewed_state!=-1
           and o.create_order>0
@@ -576,7 +579,8 @@
                            on rwd.reporting_work_id = rw.reporting_work_id and rwd.order_number = ogd.order_number and
                               rwd.technology_number = ogd.technology_number
         where rw.reviewed_state != 2
-          and DATE_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2} and position(#{orderId} in rw.order_id)
+          and rw.reporting_work_time >= #{selectTime1}
+        AND rw.reporting_work_time &lt;  #{selectTime2} and position(#{orderId} in rw.order_id)
           and rw.reviewed_state!=-1
           and o.create_order>0
         <if test="reportingWork.reportingWorkId != null and reportingWork.reportingWorkId != ''">
@@ -943,7 +947,7 @@
         LEFT JOIN sd.order_glass_detail AS ogd
         ON od.order_id = ogd.order_id
         AND od.order_number = ogd.order_number
-        <if test="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�' and previousProcess=='澶硅兌')">
+        <if test="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�')">
             AND ogd.`group` = (select `group`
             from sd.order_glass_detail
             where order_id = ogd.order_id
@@ -1004,4 +1008,8 @@
     <select id="getProcessLaminating">
         select IFNULL(nickname,'') from sd.basic_data where basic_category='process' and basic_name=#{process}
     </select>
+
+    <select id="selectOrderid">
+        select order_id from  pp.flow_card where process_id=#{processIdStr} group by order_id
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0