From 3def2ae30b07bb1f9ed8627de90b821481e5e2d5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 25 七月 2025 14:00:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index e0d1dcc..36d8203 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -169,6 +169,7 @@
b.glass_child,
d.order_type,
concat(c.process_id, '/', c.technology_number) as process_id,
+ c.order_id,
c.order_number,
c.technology_number,
b.child_width,
@@ -193,7 +194,9 @@
if(c.technology_number=1,ifnull(dd.quantity, 0) ,0) as shippedQuantity,
- ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber,
+ b.`group`
+
from pp.flow_card as c
left join
sd.order_detail as a
--
Gitblit v1.8.0