From 13f6db875c31758f04f1236ec2495651275da4df Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期一, 19 八月 2024 14:27:28 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl b/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl
index 3c0055a..c29bb51 100644
--- a/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl
+++ b/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl
@@ -47,7 +47,6 @@
columnNames := selectvalues( columns,Elements,column,true,column.Name() );
// 鐢熸垚鏁版嵁
-
for ( rowIndex := 0; rowIndex < rowKeys.Size(); rowIndex++ ) {
rowKey := rowKeys.Element( rowIndex );
@@ -87,7 +86,10 @@
CompareVersionValue := ifexpr( isnull( compareVersionCell ),"绌�",compareVersionCell.Value()));
column.IsAttrbuteColumn( true );
if( columnName = "鍙戝姩鏈洪浂浠跺彿" ){
- row.CustomName( ifexpr( isnull( baseVersionCell ), ifexpr( isnull( compareVersionCell ),"绌�",compareVersionCell.Value()), baseVersionCell.Value()) );
+ row.ProductID( ifexpr( isnull( baseVersionCell ), ifexpr( isnull( compareVersionCell ),"绌�",compareVersionCell.Value()), baseVersionCell.Value()) );
+ }
+ if( columnName = "浜у湴" ){
+ row.CustomName( row.ProductID() + " > " + ifexpr( isnull( baseVersionCell ), ifexpr( isnull( compareVersionCell ),"绌�",compareVersionCell.Value()), baseVersionCell.Value()) );
}
}else{
row.LocalCell( relnew,LocalCell_DemandComparison,LocalColumn := column,
--
Gitblit v1.9.3