From c3e3920e4e7fcda3dd986c00bb80188381e93015 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 四月 2024 09:59:50 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

---
 north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetail.xml |   87 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetail.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetail.xml
index 2cc5ab6..770b887 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetail.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetail.xml
@@ -10,7 +10,8 @@
                 order_id,
                 order_number,
                 technology_number,
-                process
+                process,
+                process_id
             )
         values
         <foreach collection ="processDetailList" item="processDetail" separator =",">
@@ -18,11 +19,93 @@
              #{processDetail.orderId},
              #{processDetail.orderNumber},
              #{processDetail.technologyNumber},
-             #{processDetail.process}
+             #{processDetail.process},
+              #{processDetail.processId}
              )
         </foreach>
 
 
     </insert>
+    <update id="updateQuantity">
+        update sd.order_process_detail as a
+        inner join
+        (select
+             rwd.completed_quantity,
+             rwd.breakage_quantity,
+             rw.process_id,
+             rwd.order_number,
+             rwd.technology_number
+              from pp.reporting_work_detail as rwd
+            left join pp.reporting_work as rw
+                on rwd.reporting_work_id =  rw.reporting_work_id
+            where rwd.reporting_work_id =#{reportingWorkId} )  as b
+        on a.process_id = b.process_id
+        and a.order_number = b.order_number
+        and a.technology_number = b.technology_number
+
+        <if test="type == 'delete'">
+            set a.reporting_work_num_count
+                = a.reporting_work_num_count-b.completed_quantity,
+
+            a.reporting_work_num
+                = a.reporting_work_num-b.completed_quantity,
+
+            a.broken_num
+                = a.broken_num-b.breakage_quantity
+        </if>
+
+        <if test="type == 'add'">
+            set a.reporting_work_num_count
+            = a.reporting_work_num_count+b.completed_quantity,
+
+            a.reporting_work_num
+            = a.reporting_work_num+b.completed_quantity,
+
+            a.broken_num
+            = a.broken_num+b.breakage_quantity
+        </if>
+
+        where a.process = #{process}
+
+    </update>
+
+    <!--鏌ヨ绛涢�夊悗鍞竴鐨勬祦绋嬪崱鍙�-->
+    <select id="filterOrderProcess">
+        select id,process,order_number,technology_number
+        from order_process_detail
+        where order_id = #{orderId}
+        group by process
+
+    </select>
+
+    <select id="filterLastProcess">
+        select id,process,order_number,technology_number
+        from order_process_detail
+        where order_id = #{orderId}
+        and order_number = #{orderNumber}
+        and technology_number = #{technologyNumber}
+        and id &gt; #{id}
+        group by process
+    </select>
+
+
+
+    <select id="getGlassLRow">
+        select
+             max(a.technology_number) as rowCount,
+             RowNum
+        from order_process_detail as a
+        left join
+            (select min((@i:=@i+1)) AS RowNum,c.*
+             from sd.order_glass_detail as c,
+                  (SELECT @i:=-1) as d
+             where order_id = #{orderId}
+             GROUP BY order_number
+             ) as b
+        on b.order_number = a.order_number
+        where a.order_id = #{orderId}
+        group by a.order_number
+
+    </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0