From 3a91fc2b0e923f1b697113cd7de879f61a452e9b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 02 七月 2025 14:07:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml | 27 ++++++++++++++++++++++++++-
1 files changed, 26 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 4021a29..c3588ee 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
@@ -95,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,
@@ -157,11 +157,36 @@
(select id,process from sd.order_process_detail
where process_id=#{processId}
and technology_number=#{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 a.technology_number=#{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