From d64a5b5aa83fe566f43216ac718b970fbb9c96f7 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 30 十二月 2024 16:46:13 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index bf580a8..d1cb5ec 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -492,7 +492,7 @@
</select>
<select id="selectPrintMp">
- select *
+ SELECT result.*,fcc.print_status from ( select *
from ((select fc.id,
fc.order_id,
fc.process_id,
@@ -507,7 +507,6 @@
ogdss.concatenated_glass_child as glass_child,
fc.founder,
date(fc.splitFrame_time) as splitFrame_time,
- fc.print_status,
processed_part as process
from flow_card as fc
@@ -549,7 +548,6 @@
ogdss.concatenated_glass_child as glass_child,
fc.founder,
date(fc.splitFrame_time) as splitFrame_time,
- fc.print_status,
processed_part as process
from flow_card as fc
@@ -587,7 +585,6 @@
ogdss.concatenated_glass_child as glass_child,
fc.founder,
date(fc.splitFrame_time) as splitFrame_time,
- fc.print_status,
processed_part as process
from flow_card as fc
@@ -618,7 +615,9 @@
where process is not null
and process != ""
GROUP BY order_id, process_id, technology_number, process
- order by order_id, process_id, length(technology_number)
+ order by order_id, process_id, length(technology_number)) as result
+ LEFT JOIN (SELECT * from flow_card GROUP BY process_id,technology_number) as fcc
+ on result.process_id = fcc.process_id and result.technology_number = fcc.technology_number
</select>
<select id="getPrimaryList">
@@ -2637,14 +2636,14 @@
ogd.glass_child,
fc.patch_state,
ogd.process
- from (select process_id,count(*) as quantity,order_sort,project_no,layer,patch_state from pp.optimize_detail where project_no = #{printProject} group by process_id,order_sort,layer) as fc
+ from (select process_id,count(*) as quantity,order_sort,project_no,layer,patch_state from pp.optimize_detail where project_no = #{printProject} group by process_id,layer) as fc
left join sd.order_glass_detail as ogd
on ogd.order_id = SUBSTRING(fc.process_id,1,10) and ogd.order_number = fc.order_sort and
ogd.technology_number = fc.layer
left join sd.order_detail as od on od.order_id = SUBSTRING(fc.process_id,1,10) and od.order_number = fc.order_sort
left join sd.`order` as o on o.order_id = SUBSTRING(fc.process_id,1,10)
where fc.project_no = #{printProject}
- GROUP BY fc.process_id,fc.order_sort, ogd.technology_number
+ GROUP BY fc.process_id, ogd.technology_number
order by fc.process_id, ogd.technology_number
</select>
--
Gitblit v1.8.0