Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

lazhen

2024-07-22 52e314fa22dd8904a8c3ab8a68392b1b4e9cf514

Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

 _Main/BL/Type_LocalColumn/Attribute_CustomDate.qbl

对比新文件
@@ -0,0 +1,7 @@
Quintiq file version 2.0
#parent: #root
Attribute CustomDate
{
  #keys: '3[412672.1.50711484][412672.1.50711483][412672.1.50711485]'
  ValueType: Date
}

 _Main/BL/Type_LocalColumn/Function_CalcDate.qbl

@@ -7,7 +7,7 @@
    // rislai Jun-28-2024 (created)
    if( not this.IsAttrbuteColumn() ){
      names := this.Name().Tokenize( "/" );
      this.Date( guard( Date::Construct( [Number]names.Element( 0 ),[Number]names.Element( 1 ),[Number]names.Element( 2 )),Date::MinDate() ));
      this.Date( ifexpr( this.CustomDate() <> Date::MinDate(),this.CustomDate(),guard( Date::Construct( [Number]names.Element( 0 ),[Number]names.Element( 1 ),[Number]names.Element( 2 )),Date::MinDate() )));
    }
  *]
}

 _Main/BL/Type_OfflinePlanTable/Method_Comparison.qbl

对比新文件
@@ -0,0 +1,37 @@
Quintiq file version 2.0
#parent: #root
Method Comparison (
  RecycleBin recycleBin
) as LocalTable
{
  TextBody:
  [*
    // rislai Jul-17-2024 (created)
    macroPlan := this.MacroPlan();
    table := recycleBin.LocalTable( relnew,Name := "");
    
    localColumns := construct( LocalColumns );
    localColumnIndexTree := NamedValueTree::Create();
    traverse( this,OfflinePlanColumn,column,column.ColumnDate() >=  macroPlan.StartOfPlanning().Date()){
      localColumn := table.LocalColumn( relnew,CustomDate := column.ColumnDate());
      localColumnHandle := localColumnIndexTree.GetHandle( column.ColumnDate().AsQUILL() );
      localColumns.Add( localColumn );
      localColumnIndexTree.Root().AddChild( localColumnHandle,localColumns.Size() - 1 );
    }
    traverse( this,OfflinePlanRow,row,row.Type() = "1" ){
      productID := row.ProductID();
      
      localRow := table.LocalRow( relnew,Index := table.GetRowIndexCache(),CustomName := productID );
      traverse( row,OfflinePlanCell,cell,cell.OfflinePlanColumn().ColumnDate() >= macroPlan.StartOfPlanning().Date() ){
        localColumnHandle := localColumnIndexTree.GetHandle( cell.OfflinePlanColumn().ColumnDate().AsQUILL() );
        localColumnIndex := guard( localColumnIndexTree.Root().Child( localColumnHandle ),null( NamedValue ));
        if( not isnull( localColumnIndex )){
          localColumn := localColumns.Element( localColumnIndex.GetValueAsNumber() );
          localCell := localRow.LocalCell( relnew,LocalCell_DemandComparison ,LocalColumn := localColumn,
                                           BaseVersion := cell.Quantity(),CompareVersion := 0.0);
        }
      }
    }
    return table;
  *]
}