From b99e22c06c023b82d5062fee06e2f8a29ce04977 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期四, 24 十月 2024 17:22:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl b/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl
index 577d26c..0851470 100644
--- a/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl
+++ b/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl
@@ -45,7 +45,7 @@
localRowHandle := localRowIndexTree.GetHandle( rowKey );
localRowIndex := guard( localRowIndexTree.Root().Child( localRowHandle ),null( NamedValue ));
if( isnull( localRowIndex )){
- localRow := table.LocalRow( relnew,Index := table.GetRowIndexCache(),ProductID := row.ProductID(),CustomName := row.ProductID() + " > " + row.ProductionLine(),Remark := rowKey );
+ localRow := table.LocalRow( relnew,Index := table.GetRowIndexCache(),ProductID := row.ProductID(),ProductionLine := row.ProductionLine(),CustomName := row.ProductID() + " > " + row.ProductionLine(),Remark := rowKey );
localRows.Add( localRow );
localRowIndexTree.Root().AddChild( localRowHandle,localRows.Size() - 1 );
}
@@ -62,7 +62,7 @@
localRowHandle := localRowIndexTree.GetHandle( rowKey );
localRowIndex := guard( localRowIndexTree.Root().Child( localRowHandle ),null( NamedValue ));
if( isnull( localRowIndex )){
- localRow := table.LocalRow( relnew,Index := table.GetRowIndexCache(),ProductID := row.ProductID(),CustomName := row.ProductID() + " > " + row.ProductionLine(),Remark := rowKey );
+ localRow := table.LocalRow( relnew,Index := table.GetRowIndexCache(),ProductID := row.ProductID(),ProductionLine := row.ProductionLine(),CustomName := row.ProductID() + " > " + row.ProductionLine(),Remark := rowKey );
localRows.Add( localRow );
localRowIndexTree.Root().AddChild( localRowHandle,localRows.Size() - 1 );
}
@@ -75,6 +75,8 @@
}
traverse( localRows,Elements,localRow ){
+ info( localRow.ProductionLine() );
+
rowKey := localRow.Remark();
traverse( localColumns,Elements,localColumn ){
columnKey := localColumn.CustomDate().AsQUILL();
--
Gitblit v1.9.3