From b1c49ce18f24c7cf89c2b938f2737dba611d30ee Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 15 八月 2024 15:43:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 3 ++-
1 files changed, 2 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 69fc697..eaf2a1a 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -165,7 +165,8 @@
e.broken_num,
ifnull(f.inventory, 0) as inventory,
round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
- ifnull(dd.quantity, 0) as shippedQuantity
+ ifnull(dd.quantity, 0) as shippedQuantity,
+ JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')) AS glassNumber
from flow_card as c
left join
sd.order_detail as a
--
Gitblit v1.8.0