From 7c630cad69350f9bc3a3c67eb13b8d6bbef3c9ee Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 08 十月 2024 09:10:47 +0800
Subject: [PATCH] 修改订单保存表头以及发货报表导出

---
 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml |    8 +++++---
 1 files changed, 5 insertions(+), 3 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 c0c95f4..2259a24 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -718,7 +718,9 @@
                opd.stock_id,
                od.quantity,
                od.other_columns,
-               od.bend_radius
+               od.bend_radius,
+               od.order_number as heat_layout_id,
+               ogd.technology_number as heat_layout_sort
         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
@@ -744,7 +746,6 @@
                ogd.glass_child,
                ogd.process,
                e.type_name,
-               opd.stock_id,
                od.quantity,
                od.other_columns,
                od.bend_radius,
@@ -995,7 +996,8 @@
                ogd.glass_child,
                fc.print_status,
                pl.reporting_work_id,
-               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01'))                AS glassNumber
+               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01'))                AS glassNumber,
+               pl.patch_id
 
         from flow_card as fc
                  left join sd.order_glass_detail as ogd

--
Gitblit v1.8.0