From 6de868b732a7d76c3a9cc735e88d93eecf7322d2 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 25 七月 2025 13:35:49 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml | 85 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 84 insertions(+), 1 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..02be7dc 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>
@@ -94,7 +95,7 @@
select
max(a.technology_number) as rowCount,
RowNum
- from order_process_detail as a
+ from sd.order_process_detail as a
left join
(select min((@i:=@i+1)) AS RowNum,c.*
from sd.order_glass_detail as c,
@@ -107,5 +108,87 @@
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}
+ and position(#{orderId} in b.order_id)
+ 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}
+ and position(#{orderId} in o2.order_id)
+ 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} and position(#{orderId} in o.order_id)
+ 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 position(technology_number in #{technologyNumber})
+ and order_number=#{orderNumber}
+ and process=#{thisProcess}
+ group by process) as b
+ where a.id = b.id + 1
+ and a.process_id=#{processId}
+ and a.order_number=#{orderNumber}
+ and position(a.technology_number in #{technologyNumber})
+
+ </select>
+
+ <select id="selectShiftQuantitySv">
+ select * from(select CAST(concat(b.order_id,'/',a.order_number,'/',a.technology_number) as char ) as 'order_id',
+ c.child_width,
+ c.child_height,
+ a.completed_quantity,
+ a.breakage_quantity,
+ a.order_number
+ from pp.reporting_work as b
+ left join pp.reporting_work_detail as a
+ on a.reporting_work_id = b.reporting_work_id
+ left join sd.order_glass_detail as c
+ on b.order_id = c.order_id
+ and c.order_number = a.order_number
+ and c.technology_number = a.technology_number
+ where b.reviewed_state >=0
+ and b.creator_id = #{creatorId}
+ and UNIX_TIMESTAMP(b.reporting_work_time) BETWEEN UNIX_TIMESTAMP(#{startDatetime}) and UNIX_TIMESTAMP(#{endDatetime})
+ order by b.id desc ) as e
+ <if test="step != null and step != ''">
+ group by e.order_number
+ </if>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0