From e131f6e16de1df9fdcb7ede55cb9f4dc93e48ae8 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 21 十月 2024 08:10:34 +0800
Subject: [PATCH] 修改发货报表以及新增单片周长字段

---
 north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
index 770b887..4021a29 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
@@ -75,6 +75,7 @@
         from order_process_detail
         where order_id = #{orderId}
         group by process
+        order by id
 
     </select>
 
@@ -107,5 +108,60 @@
         group by a.order_number
 
     </select>
+    <update id="insertByReportingWorkDetail">
+        update sd.order_process_detail as a
+        set
+            a.reporting_work_num_count=
+                a.reporting_work_num_count+#{reportingWorkDetail.completedQuantity},
+            a.reporting_work_num =a.reporting_work_num +#{reportingWorkDetail.completedQuantity},
+            a.broken_num =a.broken_num +#{reportingWorkDetail.breakageQuantity}
 
+        where
+            a.process_id = #{processId}
+            and a.order_number= #{reportingWorkDetail.orderNumber}
+            and a.technology_number= #{reportingWorkDetail.technologyNumber}
+            and a.process=#{thisProcess}
+
+    </update>
+
+    <select id="filterOrderProcessCollect">
+        select a.id,process,order_number,technology_number,a.order_id
+        from order_process_detail as a
+        left join `order` as b on a.order_id=b.order_id
+        where b.create_time BETWEEN #{selectTime1} and #{selectTime2}
+        group by process
+
+    </select>
+
+    <select id="getGlassLRowCollect">
+        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
+                   left join sd.`order` o2 on c.order_id = o2.order_id,
+                   (SELECT @i:=-1) as d
+              where o2.create_time BETWEEN #{selectTime1} and #{selectTime2}
+              GROUP BY order_number
+             ) as b
+             on b.order_number = a.order_number
+        left join sd.`order` o on a.order_id = o.order_id
+        where o.create_time BETWEEN #{selectTime1} and #{selectTime2}
+        group by a.order_number
+    </select>
+    
+    <select id="selectNextProcess">
+        select a.process from sd.order_process_detail as a,
+                              (select id,process from sd.order_process_detail
+                                  where process_id=#{processId}
+                                    and technology_number=#{technologyNumber}
+                                    and process=#{thisProcess}
+                                group by process) as b
+        where a.id = b.id + 1
+        and a.process_id=#{processId}
+        and a.technology_number=#{technologyNumber}
+
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0