From 2f44fc75c78e9291f07a0864199235cde689fa8d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 十二月 2025 12:29:37 +0800
Subject: [PATCH] 订单明细报表新增楼层编号跟其他列
---
north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 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 2116d07..d513211 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,
@@ -78,11 +78,13 @@
when 'stepA' then 3
when 'stepD' then 4
when 'stepB' then 4
- end as sort
+ else 1
+ end as sortByprocess,
+ b.sort as 'sort2'
from order_process_detail
- left join (select DISTINCT basic_name,nickname from basic_data where basic_category = 'process') as b
+ left join (select DISTINCT basic_name,nickname,sort from basic_data where basic_category = 'process') as b
on b.basic_name = process
where order_id = #{orderId}
group by process) as a
@@ -99,7 +101,7 @@
group by opd.id) as a
GROUP BY process) as sort1
on sort1.process = a.process
- order by sort,sort1.count,id
+ order by sortByprocess,sort1.count,sort2,id
</select>
@@ -265,4 +267,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