From 46f580350af9ee2bbccfa88fea8532b129564ce0 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 30 九月 2024 17:28:12 +0800
Subject: [PATCH] 修复一些bug
---
_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_GetColumnXML.qbl | 50 ++++++++------------------------------------------
1 files changed, 8 insertions(+), 42 deletions(-)
diff --git a/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_GetColumnXML.qbl b/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_GetColumnXML.qbl
index 6d45dc4..1de038a 100644
--- a/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_GetColumnXML.qbl
+++ b/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_GetColumnXML.qbl
@@ -13,14 +13,14 @@
// rislai Jun-21-2024 (created)
// rislai Jun-20-2024 (created)
columnXML := "";
- cells := selectsortedset( column, LocalCell.astype( LocalCell_DemandComparison ), cell,
+ cells := selectsortedset( column, LocalCell.astype( LocalCell_OfflinePlanComparison ), cell,
exists( rows,Elements,element,element = cell.LocalRow()), cell.LocalRow().Index());
if( type = "data" ){
columnXML := "";
if( column.IsAttrbuteColumn() ){
columnXML := "<column><name>" + column.Name() + "</name><type>String</type>";
}else{
- columnXML := "<column><name>" + column.Name() + "</name><type>Number</type>";
+ columnXML := "<column><name>" + column.Date().Format( "Y/M2/D2") + "</name><type>Number</type>";
}
traverse ( cells, Elements, cell ) {
traverse( attributeNames ,Elements,e ){
@@ -31,12 +31,12 @@
columnXML := columnXML + "</column>";
}
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_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>";
- columnXML1 := "<column><name>Product ID</name><type>String</type>";
+ columnXML1 := "<column><name>Line</name><type>String</type>";
columnXML2 := "<column><name>Attribute</name><type>String</type>";
traverse ( cells, Elements, cell ) {
@@ -46,50 +46,16 @@
cellXML := '<cell value="' + cell.LocalRow().Name() + '"/>'
columnXML1 := columnXML1 + cellXML;
- salesSegment := select( cell.LocalRow().LocalTable(),LocalColumn.LocalCell.astype( LocalCell_DemandComparison ),temp_cell,temp_cell.LocalRow() = cell.LocalRow() and temp_cell.LocalColumn().Name() = "浜у湴");
- if( not isnull( salesSegment )){
- cellXML0_1 := '<cell value="' + ifexpr( salesSegment.BaseVersionValue() <> "绌�",salesSegment.BaseVersionValue(),salesSegment.CompareVersionValue()) + '"/>';
- columnXML0_1 := columnXML0_1 + cellXML0_1;
- }else{
- cellXML0_1 := '<cell value=" "/>'
- columnXML0_1 := columnXML0_1 + cellXML0_1;
- }
-
- product := select( macroPlan,Product_MP,product,product.ID() = cell.LocalRow().Name() );
- 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=" "/>'
- cellXML0_2 := '<cell value=" "/>';
- cellXML0_3 := '<cell value=" "/>';
- cellXML0_4 := '<cell value=" "/>';
- columnXML0_1 := columnXML0_1 + cellXML0_1;
- 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 := columnXML0_1 + "</column>" + columnXML0_2 + "</column>" + columnXML0_3 + "</column>" + columnXML0_4 + "</column>" + columnXML1 + "</column>" + columnXML2 + "</column>";
+ columnXML := columnXML1 + "</column>" + columnXML2 + "</column>";
}
return columnXML;
--
Gitblit v1.9.3