From 98666fb3add2c1b2529318d1aec463c7360f2be3 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期四, 07 十一月 2024 17:00:11 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_GetColumnXML.qbl | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_GetColumnXML.qbl b/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_GetColumnXML.qbl
index 1de038a..04b7d69 100644
--- a/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_GetColumnXML.qbl
+++ b/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_GetColumnXML.qbl
@@ -32,9 +32,9 @@
}
if( type = "attribute" ){
// columnXML0_1 := "<column><name>Sales Segment</name><type>String</type>";
- // columnXML0_2 := "<column><name>Generation</name><type>String</type>";
- // columnXML0_3 := "<column><name>MQB/MLB</name><type>String</type>";
- // columnXML0_4 := "<column><name>鍔熺巼</name><type>String</type>";
+ columnXML0_2 := "<column><name>Generation</name><type>String</type>";
+ columnXML0_3 := "<column><name>MQB/MLB</name><type>String</type>";
+ columnXML0_4 := "<column><name>鍔熺巼</name><type>String</type>";
columnXML1 := "<column><name>Line</name><type>String</type>";
columnXML2 := "<column><name>Attribute</name><type>String</type>";
@@ -46,16 +46,43 @@
cellXML := '<cell value="' + cell.LocalRow().Name() + '"/>'
columnXML1 := columnXML1 + cellXML;
+ product := select( macroPlan,Product_MP,product,product.ID() = cell.LocalRow().ProductID() );
+ if( not isnull( product )){
+ cellXML0_2 := '<cell value="' + product.Generation() + '"/>';
+ cellXML0_3 := '<cell value="' + product.MQBMLB() + '"/>';
+ cellXML0_4 := '<cell value="' + product.Power() + '"/>';
+ columnXML0_2 := columnXML0_2 + cellXML0_2;
+ columnXML0_3 := columnXML0_3 + cellXML0_3;
+ columnXML0_4 := columnXML0_4 + cellXML0_4;
+ }else{
+ cellXML0_2 := '<cell value=" "/>';
+ cellXML0_3 := '<cell value=" "/>';
+ cellXML0_4 := '<cell value=" "/>';
+ columnXML0_2 := columnXML0_2 + cellXML0_2;
+ columnXML0_3 := columnXML0_3 + cellXML0_3;
+ columnXML0_4 := columnXML0_4 + cellXML0_4;
+ }
+
flag := false;
}else{
cellXML := '<cell value=" "/>'
columnXML1 := columnXML1 + cellXML;
+
+ // cellXML0_1 := '<cell value=" "/>'
+ // columnXML0_1 := columnXML0_1 + cellXML0_1;
+
+ cellXML0_2 := '<cell value=" "/>';
+ cellXML0_3 := '<cell value=" "/>';
+ cellXML0_4 := '<cell value=" "/>';
+ columnXML0_2 := columnXML0_2 + cellXML0_2;
+ columnXML0_3 := columnXML0_3 + cellXML0_3;
+ columnXML0_4 := columnXML0_4 + cellXML0_4;
}
cellXML := '<cell value="' + e + '"/>'
columnXML2 := columnXML2 + cellXML;
}
}
- columnXML := columnXML1 + "</column>" + columnXML2 + "</column>";
+ columnXML := columnXML1 + "</column>" + columnXML0_2 + "</column>" + columnXML0_3 + "</column>" + columnXML0_4 + "</column>" + columnXML2 + "</column>";
}
return columnXML;
--
Gitblit v1.9.3