From f96e13df01e5a0ea8c78662b66a1ad36e2ba86f4 Mon Sep 17 00:00:00 2001
From: 你好啊 <1536384743@qq.com>
Date: 星期日, 29 十二月 2024 12:37:35 +0800
Subject: [PATCH] 删除注释

---
 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 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 75ffa13..3099e9c 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}
@@ -343,10 +343,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
@@ -993,11 +993,15 @@
         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