From 7c0f3850004643f9786b0afee1c5503244fe3c8f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 04 七月 2024 13:20:32 +0800
Subject: [PATCH] 流程卡打印同时显示订单明细加工要求和备注

---
 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml |    2 +-
 1 files changed, 1 insertions(+), 1 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 0fb3fac..bacba8e 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -505,7 +505,7 @@
                round(ogd.total_area, 2)                                     as total_area,
                od.perimeter,
                od.bend_radius,
-               od.remarks
+               concat(od.processing_note,od.remarks) as remarks
         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