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

lazhen

2024-10-18 55249f67b7312fe53439300d16afe0611582ec44

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

 _Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl

@@ -17,7 +17,7 @@
      localColumnHandle := localColumnIndexTree.GetHandle( column.StartDate().AsQUILL() );
      localColumnIndex := guard( localColumnIndexTree.Root().Child( localColumnHandle ),null( NamedValue ));
      if( isnull( localColumnIndex )){
        localColumn := table.LocalColumn( relnew,CustomDate := column.StartDate());
        localColumn := table.LocalColumn( relnew,CustomDate := column.StartDate(),TimeUnit := "Day");
        localColumns.Add( localColumn );
        localColumnIndexTree.Root().AddChild( localColumnHandle,localColumns.Size() - 1 );
      }
@@ -26,7 +26,7 @@
      localColumnHandle := localColumnIndexTree.GetHandle( column.StartDate().AsQUILL() );
      localColumnIndex := guard( localColumnIndexTree.Root().Child( localColumnHandle ),null( NamedValue ));
      if( isnull( localColumnIndex )){
        localColumn := table.LocalColumn( relnew,CustomDate := column.StartDate());
        localColumn := table.LocalColumn( relnew,CustomDate := column.StartDate(),TimeUnit := "Day");
        localColumns.Add( localColumn );
        localColumnIndexTree.Root().AddChild( localColumnHandle,localColumns.Size() - 1 );
      }
@@ -96,6 +96,53 @@
                            CompareVersion := ifexpr( isnull( compareOfflinePlanCell),0.0,compareOfflinePlanCell.Quantity()));
      }
    }
    
    startDate := minselect( table,LocalColumn,localColumn,localColumn.CustomDate() ).CustomDate();
    endDate := maxselect( table,LocalColumn,localColumn,localColumn.CustomDate() ).CustomDate();
    for( i := startDate.StartOfWeek(); i <= endDate.StartOfNextWeek(); i := i.StartOfNextWeek() ){
      timeUnit := "Week";
      localColumnHandle := localColumnIndexTree.GetHandle( i.AsQUILL() + timeUnit);
      localColumn := table.LocalColumn( relnew,CustomDate := i,TimeUnit := timeUnit );
      localColumns.Add( localColumn );
      localColumnIndexTree.Root().AddChild( localColumnHandle,localColumns.Size() - 1 );
    }
    for( i := startDate.StartOfMonth(); i <= endDate.StartOfNextMonth(); i := i.StartOfNextMonth() ){
      timeUnit := "Month";
      localColumnHandle := localColumnIndexTree.GetHandle( i.AsQUILL() + timeUnit);
      localColumn := table.LocalColumn( relnew,CustomDate := i,TimeUnit := timeUnit );
      localColumns.Add( localColumn );
      localColumnIndexTree.Root().AddChild( localColumnHandle,localColumns.Size() - 1 );
    }
    
    traverse( table,LocalRow,row ){
      traverse( table,LocalColumn,column,column.TimeUnit() = "Week"){
        baseVersionValue := sum( table,LocalRow.LocalCell.astype( LocalCell_OfflinePlanComparison ),cell,
                                 cell.LocalColumn().TimeUnit() = "Day" and
                                 cell.LocalColumn().CustomDate() >= column.CustomDate() and
                                 cell.LocalColumn().CustomDate() < column.CustomDate().StartOfNextWeek(), cell.BaseVersionValue());
        compareVersionValue := sum( table,LocalRow.LocalCell.astype( LocalCell_OfflinePlanComparison ),cell,
                                 cell.LocalColumn().TimeUnit() = "Day" and
                                 cell.LocalColumn().CustomDate() >= column.CustomDate() and
                                 cell.LocalColumn().CustomDate() < column.CustomDate().StartOfNextWeek(), cell.CompareVersionValue());
                                 
        row.LocalCell(relnew,LocalCell_OfflinePlanComparison,LocalColumn := column,BaseVersionValue := baseVersionValue,CompareVersionValue := compareVersionValue );
      } 
    }
    traverse( table,LocalRow,row ){
      traverse( table,LocalColumn,column,column.TimeUnit() = "Month "){
        baseVersionValue := sum( table,LocalRow.LocalCell.astype( LocalCell_OfflinePlanComparison ),cell,
                                 cell.LocalColumn().TimeUnit() = "Day" and
                                 cell.LocalColumn().CustomDate() >= column.CustomDate() and
                                 cell.LocalColumn().CustomDate() < column.CustomDate().StartOfNextMonth(), cell.BaseVersionValue());
        compareVersionValue := sum( table,LocalRow.LocalCell.astype( LocalCell_OfflinePlanComparison ),cell,
                                 cell.LocalColumn().TimeUnit() = "Day" and
                                 cell.LocalColumn().CustomDate() >= column.CustomDate() and
                                 cell.LocalColumn().CustomDate() < column.CustomDate().StartOfNextMonth(), cell.CompareVersionValue());
                                 
        row.LocalCell(relnew,LocalCell_OfflinePlanComparison,LocalColumn := column,BaseVersionValue := baseVersionValue,CompareVersionValue := compareVersionValue );
      } 
    }
    
    traverse( table,LocalColumn,column ){
      if( column.LocalCell( relsize ) = 0 ){
        column.Delete(); 

 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_CreateFullTable.qbl

@@ -51,7 +51,6 @@
    }
    
    
    //shiftPatternCount := NamedValueTree::Create();
    traverse( tables,Elements.MP_Row,row ){
       rowMacroPlan := row.MP_Table().MacroPlan();
       localRow := null( LocalRow );
@@ -101,25 +100,14 @@
            }
          }
          
          maxShiftPattern := "";
          maxShiftPatternCount := 0;
          
          workingDay := 0;
          capacity := 0.0;
          
          shiftPatterns := construct( Strings );
          traverse( cells,Elements,cell ){
             workingDay := workingDay + cell.WorkingDay();
             capacity := capacity + cell.Capacity();
             
             if( maxShiftPattern <> cell.ShiftPattern() ){
               if( maxShiftPatternCount = 0 ){
                  maxShiftPattern := cell.ShiftPattern();
                  maxShiftPatternCount ++;
               }else{
                  maxShiftPatternCount --; 
               }
             }else{
                maxShiftPatternCount ++; 
             if( cell.ShiftPattern() <> "" ){
               shiftPatterns.Add( cell.ShiftPattern() );
             }
          }
          localCell := null( LocalCell_ScheduleSummary );
@@ -135,9 +123,7 @@
            }
          }
          
          if( not maxShiftPattern = "" ){
            localCell.ShiftPattern( maxShiftPattern );
          }
          localCell.ShiftPattern( selectuniquevalues( shiftPatterns,Elements,element,element ).Concatenate( "/" ) );
          localCell.WorkingDay( localCell.WorkingDay() + workingDay );
          localCell.Capacity( localCell.Capacity() + capacity );
          localCell.Output( localCell.Output() + output );

 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def

@@ -73,8 +73,8 @@
          Properties:
          [
            DataType: 'LocalTable'
            FilterArguments: 'startDate:QMacroPlanner::FormOfflinePlanChanges.dhStartDate;endDate:QMacroPlanner::FormOfflinePlanChanges.dhEndDate'
            FixedFilter: 'not object.IsAttrbuteColumn() and startDate <= object.Date() and endDate > object.Date() '
            FilterArguments: 'startDate:QMacroPlanner::FormOfflinePlanChanges.dhStartDate;endDate:QMacroPlanner::FormOfflinePlanChanges.dhEndDate;timeUnit:QMacroPlanner::FormOfflinePlanChanges.dhTimeUnit'
            FixedFilter: 'not object.IsAttrbuteColumn() and startDate <= object.Date() and endDate > object.Date() and object.TimeUnit() = timeUnit'
            Source: 'dhTable'
            Taborder: 0
            Transformation: 'LocalColumn'

 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504#801.def

@@ -76,7 +76,7 @@
      Properties:
      [
        Image: 'EXPORT1'
        Taborder: 3
        Taborder: 5
      ]
    }
    Component dhXMLDataListener
@@ -102,6 +102,28 @@
      ]
      Properties:
      [
        Taborder: 6
      ]
    }
    Component rbgTimeUnit id:rbgTimeUnit_963
    {
      #keys: '[414996.1.146310444]'
      BaseType: 'WebRadioButtonGroup'
      Properties:
      [
        BoundValue: 'Day'
        ButtonLabels: 'Day;Week;Month'
        ButtonValues: 'Day;Week;Month'
        Taborder: 3
      ]
    }
    Component dhTimeUnit id:dhTimeUnit_384
    {
      #keys: '[414996.1.146310475]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Taborder: 4
      ]
    }

 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_dhTimeUnit_OnCreated#478.def

对比新文件
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: PanelRibbon504_801/dhTimeUnit_384
Response OnCreated () id:Response_PanelRibbon322_dhTimeUnit_OnCreated_478
{
  #keys: '[414996.1.146310473]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnCreated'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      this.Data( "Day" );
    *]
  }
}

 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_rbgTimeUnit_OnUserChanged#273.def

对比新文件
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: PanelRibbon504_801/rbgTimeUnit_963
Response OnUserChanged () id:Response_PanelRibbon322_rbgTimeUnit_OnUserChanged_273
{
  #keys: '[414996.1.146310443]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebRadioButtonGroup_OnUserChanged'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      dhTimeUnit.Data( this.BoundValue() );
    *]
  }
}

 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def

@@ -29,6 +29,7 @@
      [
        DisplayField: 'TableName'
        Label: '涓嬬嚎璁″垝:'
        NumberOfColumns: 50
        Taborder: 0
      ]
    }