修复一些bug

xiaoding721

2024-10-17 ffb76f7a9a094cd200367d23b6822f4c1f7c873c

修复一些bug

 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_Create.qbl

@@ -12,10 +12,11 @@
      table.Delete(); 
    }
    
    zeroDuration := Duration::Construct( 0,0,0,0 );
    
    table := owner.MP_Table( relnew,Name := MP_Cell_ScheduleSummary::GetTableName());
    
    startDate := owner.StartOfPlanning().Date();
    
    endDate := maxselect( owner,Unit.UnitPeriod.astype( UnitPeriodTime ).Period_MP,period,period.TimeUnit() = Translations::MP_GlobalParameters_Day(),period.EndDate()).EndDate();
    
    columns := construct( MP_Columns );
@@ -40,9 +41,14 @@
        columnHandle := columnIndexTree.GetHandle( unitPeriodTime.Period_MP().StartDate().AsQUILL() );
        columnIndex := guard( columnIndexTree.Root().Child( columnHandle ),null( NamedValue ));
        if( not isnull( columnIndex )){
          
          // 褰揳rrowedAvailableCapacity涓嶄负0锛屽伐浣滄棩 + 1
          arrowedAvailableCapacity := unitPeriodTime.TotalAvailableCapacity();
          zeroDuration := Duration::Construct( 0,0,0,0 );
          workDay := ifexpr( arrowedAvailableCapacity <> zeroDuration, 1,0 );
          
          if( workDay = 0 ){
            workDay := ifexpr( unitPeriodTime.ShiftPlan().Outcome() <> "",1,0 );
          }
          
          column := columns.Element( columnIndex.GetValueAsNumber() );
          
@@ -50,7 +56,7 @@
          workHours := select( unitPeriodTime,ShiftPattern.ShiftDay,shifDay,shifDay.Day_MP().ID() = dayOfWeek );
          capacity := 0.0;
          
          workDay := ifexpr( arrowedAvailableCapacity <> zeroDuration, 1,0 );
          
          if( not isnull( workHours )){
            capacity := workDay * throughput * workHours.Capacity().HoursAsReal()
          }

 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_CreateFullTable.qbl

@@ -80,10 +80,16 @@
            unitIndex := guard( unitIndexTree.Root().Child( unitHandle ),null( NamedValue ));
            if( not isnull( unitIndex )){
              unit := units.Element( unitIndex.GetValueAsNumber() );
              output := sum( unit,UnitPeriod.PeriodTask_MP.NewSupply,np,
              output := sum( unit,UnitPeriod.astype( UnitPeriodTime ).PeriodTask_MP.NewSupply,np,
                             np.PeriodTask_MP().UnitPeriod().StartDate() >= localColumn.CustomDate() and 
                             np.PeriodTask_MP().UnitPeriod().StartDate() < localColumn.CustomDate().StartOfNextMonth(),
                             np.PeriodTask_MP().UnitPeriod().StartDate() < localColumn.CustomDate().StartOfNextMonth() and
                             np.PeriodTask_MP().UnitPeriod().Period_MP().TimeUnit() = "Day",
                             np.Quantity() );
              output := sum( unit,StockingPoint_MP.ProductInStockingPoint_MP.ProductInStockingPointInPeriod,pispip,
                             pispip.Period_MP().StartDate() >= localColumn.CustomDate() and
                             pispip.Period_MP().StartDate() < localColumn.CustomDate().StartOfNextMonth() and
                             pispip.Period_MP().TimeUnit() = "Day",
                             pispip.NewSupplyProductionQuantity());
            }
          }else{
            scheduleSummaryOutputDataKey := row.Name() + localColumn.CustomDate().AsQUILL();
@@ -138,6 +144,11 @@
       }
    }
    
    traverse( localTable,LocalRow.LocalCell.astype( LocalCell_ScheduleSummary ),cell ){
      cell.Capacity( cell.Capacity() / tables.Size() );
      cell.Output( cell.Output() / tables.Size() );
    }
    
    //startDate := owner.StartOfPlanning().Date() + 7;
    //endDate := maxselect( owner,Unit.UnitPeriod.astype( UnitPeriodTime ).Period_MP,period,period.EndDate(),period.TimeUnit() = "Month" ).EndDate();
    //columns := construct( MP_Columns );

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Component_MatrixEditor#715.def

文件已删除

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Component_MatrixEditor510.def

@@ -97,6 +97,6 @@
    Columns: 'MatrixEditorColumns391'
    ContextMenu: 'matrixeditorContextMenuDemandComparison527'
    Rows: 'MatrixEditorRows221'
    Taborder: 2
    Taborder: 0
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Component_PanelRibbon322#88.def

@@ -136,6 +136,7 @@
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'C_CLAMP'
        Label: 'CreateFullTable'
        Taborder: 1
      ]
@@ -146,9 +147,9 @@
      BaseType: 'WebButton'
      Properties:
      [
        Label: 'Create'
        Image: 'C_CLAMP'
        Label: 'Create base data'
        Taborder: 0
        Visible: false
      ]
    }
  ]

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Component_PanelScheduleSummary.def

@@ -5,16 +5,6 @@
  BaseType: 'WebPanel'
  Children:
  [
    Component dhComparisonData
    {
      #keys: '[412672.1.94121859]'
      BaseType: 'WebDataHolder'
      Databinding: 'MP_Table'
      Properties:
      [
        Taborder: 1
      ]
    }
    Component dhCheckedEntity
    {
      #keys: '[412672.1.94121860]'
@@ -37,7 +27,7 @@
      ]
      Properties:
      [
        Taborder: 5
        Taborder: 3
      ]
    }
    Component dhFinelEntity
@@ -47,10 +37,9 @@
      Databinding: 'structured[Entity]*'
      Properties:
      [
        Taborder: 4
        Taborder: 2
      ]
    }
    #child: MatrixEditor_715
    #child: MatrixEditor510
    Component dhComparisonData854
    {
@@ -59,7 +48,7 @@
      Databinding: 'LocalTable'
      Properties:
      [
        Taborder: 3
        Taborder: 1
      ]
    }
  ]

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Component_matrixEditorActionBarPageDemandComparison#1.def

文件已删除

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Component_matrixeditorContextMenuDemandComparison#1.def

文件已删除

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_PanelRibbon322_88_ButtonRibbon820_OnClick#71.def

@@ -13,6 +13,8 @@
      table := MP_Cell_ScheduleSummary::CreateFullTable( macroPlans,RecycleBin ,Archive, MacroPlan );
      
      dhComparisonData854.Data( table );
      
      WebMessageBox::Success( "Success" );
    *]
    GroupServerCalls: false
  }

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_PanelRibbon322_88_ButtonRibbon_OnClick#88.def

@@ -9,9 +9,8 @@
  {
    Body:
    [*
      table := MP_Cell_ScheduleSummary::Create( MacroPlan );
      
      dhComparisonData.Data( table );
      MP_Table::CreateMP_Tables_ScheduleSummary( ApplicationMacroPlanner.GetMacroPlans() );
      WebMessageBox::Success( "Success" );
    *]
    GroupServerCalls: false
  }

 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_PanelScheduleSummary_dhComparisonData_OnCreated.def

文件已删除