From dce5f099e76ecfa92ad708a3d5565a67844ceda2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 二月 2025 12:34:28 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 91135dd..95d50cd 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -525,7 +525,7 @@
left join pp.flow_card as fc on op.project_no=fc.project_no
left join sd.`order` as o on o.order_id=fc.order_id
where date(op.create_time)>=#{selectTime1} and date(op.create_time) <= #{selectTime2}
- and state >= 20 and o.create_order>0
+ and state >= 20 and (o.create_order>0 or o.create_order is null)
GROUP BY op.project_no
order by op.create_time desc
</select>
@@ -853,7 +853,8 @@
od.other_columns,
od.bend_radius,
od.order_number as heat_layout_id,
- a.id as heat_layout_sort
+ a.id as heat_layout_sort,
+ od.product_name
from pp.optimize_detail opd
left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
left join sd.order_detail od
@@ -888,7 +889,8 @@
od.other_columns,
od.bend_radius,
opd.heat_layout_id,
- opd.heat_layout_sort
+ opd.heat_layout_sort,
+ od.product_name
from pp.optimize_detail opd
left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
left join sd.order_detail od
@@ -1455,7 +1457,8 @@
pd.separation,
fc.technology_number,
IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
- od.building_number
+ od.building_number,
+ fc.merge as merge
from flow_card as fc
left join sd.order_glass_detail as ogd
on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
@@ -2163,7 +2166,8 @@
fc.founder,
date(fc.splitFrame_time) as splitFrame_time,
fc.print_status,
- processed_part as process
+ processed_part as process,
+ merge
from flow_card as fc
left join sd.order_glass_detail as ogd
@@ -2201,7 +2205,8 @@
fc.founder,
date(fc.splitFrame_time) as splitFrame_time,
fc.print_status,
- processed_part as process
+ processed_part as process,
+ merge
from flow_card as fc
left join sd.order_glass_detail as ogd
--
Gitblit v1.8.0