From e00b54ec7322cf7cba5883e17f2e2843f71b8833 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 20 十一月 2025 17:05:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 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 066f266..8cea4e5 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
@@ -6,7 +6,7 @@
<insert id="insertOrderProcessDetail" >
insert into
- order_process_detail(
+ sd.order_process_detail(
order_id,
order_number,
technology_number,
@@ -118,7 +118,9 @@
<select id="getGlassLRow">
select
max(a.technology_number) as rowCount,
- RowNum
+ RowNum,
+ a.order_number,
+ a.process_id
from pp.flow_card as a
left join
(select min((@i:=@i+1)) AS RowNum,c.*
@@ -130,7 +132,7 @@
on b.id = a.id
where a.order_id = #{orderId}
group by a.order_number,a.process_id
- order by RowNum
+ order by a.process_id,a.order_number
</select>
@@ -263,4 +265,44 @@
and b.process = #{thisProcess}
)
</select>
+
+ <select id="selectProcessCardProgressSv">
+ select a.*,(b.quantity-b.termination_quantity) as 'quantity'
+ from order_process_detail as a
+ inner join pp.flow_card as b
+ on a.order_id = b.order_id
+ and a.process_id = b.process_id
+ and a.order_number = b.order_number
+ and a.technology_number = b.technology_number
+ where termination_status = 0
+ <if test="orderId != null and orderId != ''">
+ and a.order_id=#{orderId}
+ </if>
+ <if test="processId != null and processId != ''">
+ and a.process_id=#{processId}
+ </if>
+ <if test="orderNumber != null and orderNumber != ''">
+ and a.order_number=#{orderNumber}
+ </if>
+ <if test="technologyNumber != null and technologyNumber != ''">
+ and a.technology_number=#{technologyNumber}
+ </if>
+ <if test="process != null and process != ''">
+ and a.process=#{process}
+ </if>
+
+ </select>
+
+ <select id="selectProcessSort">
+ select a.process,
+ ROW_NUMBER() OVER (ORDER BY (SELECT NULL)) AS sort,
+ ifnull(b.nickname,"") as recombination
+ from sd.order_process_detail as a
+ inner join sd.basic_data as b
+ on a.process = b.basic_name and b.basic_category = 'process'
+ where a.order_id = #{orderId}
+ and a.process_id = #{processId}
+ and a.order_number =#{orderNumber}
+ and a.technology_number =#{technologyNumber}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0