From 3b57e97dc5180bf730357a93d5ded238a6ea80d1 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 06 九月 2024 16:53:41 +0800
Subject: [PATCH] 流程卡多选删除
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 3f27de0..04e5891 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -249,6 +249,7 @@
p.thickness,
od.weight,
od.remarks,
+ od.bend_radius,
ods.S01,
ods.S02,
ods.S03,
@@ -509,12 +510,10 @@
ogds.child_height
from sd.order_glass_detail as ogds
where ogds.order_id = #{orderId}
- GROUP BY order_id, order_number, ogds.glass_child, process, ogds.child_width,
- ogds.child_height) as ogdss
+ GROUP BY order_id, order_number, ogds.glass_child, process) as ogdss
on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number
where fc.order_id = #{orderId}
- GROUP BY fc.process_id, ogdss.concatenated_glass_child, ogdss.processed_part, ogdss.child_width,
- ogdss.child_height
+ GROUP BY fc.process_id, ogdss.concatenated_glass_child, ogdss.processed_part
order by fc.process_id, ogdss.technology_number)
UNION
@@ -1272,7 +1271,8 @@
dd.responsible_team,
concat('瀵瑰簲鎴戝徃鍗曞彿', o.batch) AS otherRemarks,
dd.responsible_personnel,
- #{mergeTechnologyNumber} as mergeTechnologyNumber
+ #{mergeTechnologyNumber} as mergeTechnologyNumber,
+ pl.patch_id
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
--
Gitblit v1.8.0