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

xiaoding721

2024-12-24 d4a08c8d814543094e3ac1f1288c9a3820c210c1

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

 _Main/BL/Type_CustomerDemandPPAIDS/Attribute_StockingPoint.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
Quintiq file version 2.0
#parent: #root
Attribute StockingPoint
{
  #keys: '3[415136.0.1367364685][415136.0.1367364684][415136.0.1367364686]'
  ValueType: String
}

 _Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateDataNew.qbl

@@ -34,6 +34,7 @@
                                                                     , DemandQty               := [Number]archivedata.Quantity()
                                                                     , VersionName             := macroplan.ScenarioName()
                                                                     , InterfaceTime           := nowdate
                                                                     , StockingPoint           := archivedata.StockingPointID() 
                                                                     , FactoryName             := archivedata.FactoryName()
                                                                     , Fac                     := ifexpr( archivedata.FactoryName() = FinancialProductionReport::GetDefaultCCUnit(), 'CC', 'DL' )  
    //                                                                 , VersionFlag             := versionflag

 _Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_Publish.qbl

@@ -13,6 +13,7 @@
      idsjson          := JSON::Object().Add( "product", ids.Product() ).Add( "demandDate", ids.DemandDate().Format( 'Y-M2-D2' ) )//"2024-10-01" )
                                    .Add( "demandQty", ids.DemandQty() )
                                    .Add( "versionName", ids.VersionName() )
                                    .Add( "stockingPoint", ids.StockingPoint() )
                                    .Add( "interfaceTime", ids.InterfaceTime().Format( 'Y-M2-D2 H:m:s' ) ).Build();/*"2024-10-01 12:00:00" )*/
      jsonarray.Add( idsjson );
    }

 _Main/BL/Type_FinancialProductionSource/StaticMethod_Initialize.qbl

@@ -24,7 +24,7 @@
    //取当前版本的product planning里new supply字段，分大连和长春工厂的产线，进行加总
    traverse( owner, StockingPoint_MP, stockingpoint, stockingpoint.ID().EndsWith( '厂内库' ) or stockingpoint.ID() = '大连外租库' ){
      iscc                    := stockingpoint.ID().StartsWith( 'CC' ) or stockingpoint.ID().StartsWith( '长春' );
      isdl                    := stockingpoint.ID().StartsWith( 'DL' ) or stockingpoint.ID().StartsWith( '大连' );
      isdl                    := stockingpoint.ID().StartsWith( '大连' );
      
      if( iscc or isdl ){
        traverse( stockingpoint, ProductInStockingPoint_MP, pisp,  pisp.Product_MP().IsLeaf() 

 _Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl

@@ -42,7 +42,7 @@
          //获取合计行
          allrow              := table.GetRow( allunit, pisp.Product_MP() );
          
          pispips             := selectsortedset( pisp, ProductInStockingPointInPeriod, pispip, pispip.Start() < startofnextyear 
          pispips             := selectsortedset( pisp, ProductInStockingPointInPeriod, pispip, pispip.Start() < startofnextyear and pispip.Start() >= startofyear
                                                  and pispip.Period_MP().TimeUnit() = Translations::MP_GlobalParameters_Day(), pispip.Start() );
    
          traverse( pispips, Elements, pispip ){

 _Main/BL/Type_LibCal_SubscriberEventRow/Attribute_RowNr.qbl

@@ -3,6 +3,5 @@
Attribute RowNr
{
  #keys: '3[415136.0.671975114][415136.0.671975113][415136.0.671975115]'
  IsReadOnly: true
  ValueType: Number
}

 _Main/BL/Type_LibCal_SubscriberEventRow/Method_InitializeDate.qbl

@@ -19,6 +19,16 @@
      daytime         := this.GetTimeByTimeUnit( starttime, startTime, Translations::MP_GlobalParameters_Day() );
      daycolumn       := table.GetColumnByTimeUnit( table, daytime, Translations::MP_GlobalParameters_Day() );
      daycell         := daycolumn.GetCellByTimeUnit( this, desc );
      if( table.MaxDayDate().IsInfinite() ){
        table.MaxDayDate( daytime );
      }else{
        table.MaxDayDate( ifexpr( table.MaxDayDate() < daytime, daytime, table.MaxDayDate() ) );
      }
      if( table.MinDayDate().IsInfinite() ){
        table.MinDayDate( daytime );
      }else{
        table.MinDayDate( ifexpr( table.MinDayDate() > daytime, daytime, table.MinDayDate() ) );
      }
      
      dayvalue        := [Real]daycell.Value();
      if( startTime.StartOfNextDay() > endtime ){
@@ -36,7 +46,16 @@
        weektime      := this.GetTimeByTimeUnit( starttime, startTime, Translations::MP_GlobalParameters_Week() );
        weekcolumn    := table.GetColumnByTimeUnit( table, weektime, Translations::MP_GlobalParameters_Week() );
        weekcell      := weekcolumn.GetCellByTimeUnit( this, desc );
        
        if( table.MaxWeekDate().IsInfinite() ){
          table.MaxWeekDate( weektime );
        }else{
          table.MaxWeekDate( ifexpr( table.MaxWeekDate() < weektime, weektime, table.MaxWeekDate() ) );
        }
        if( table.MinWeekDate().IsInfinite() ){
          table.MinWeekDate( weektime );
        }else{
          table.MinWeekDate( ifexpr( table.MinWeekDate() > weektime, weektime, table.MinWeekDate() ) );
        }
        weekvalue     := [Real]weekcell.Value();
        if( startTime.StartOfNextWeek() > endtime ){
          duration    := endtime - startTime;
@@ -56,7 +75,17 @@
        monthtime     := this.GetTimeByTimeUnit( starttime, startTime, Translations::MP_GlobalParameters_Month() );
        monthcolumn   := table.GetColumnByTimeUnit( table, monthtime, Translations::MP_GlobalParameters_Month() );
        monthcell     := monthcolumn.GetCellByTimeUnit( this, desc );
        info( nextmonthtime, startTime, monthtime, isnull( monthcolumn ), isnull( monthcell ) );
        if( table.MaxMonthDate().IsInfinite() ){
          table.MaxMonthDate( monthtime );
        }else{
          table.MaxMonthDate( ifexpr( table.MaxMonthDate() < monthtime, monthtime, table.MaxMonthDate() ) );
        }
        if( table.MinMonthDate().IsInfinite() ){
          table.MinMonthDate( monthtime );
        }else{
          table.MinMonthDate( ifexpr( table.MinMonthDate() > monthtime, monthtime, table.MinMonthDate() ) );
        }
    //    info( nextmonthtime, startTime, monthtime, isnull( monthcolumn ), isnull( monthcell ) );
        monthvalue    := [Real]monthcell.Value();
        if( startTime.StartOfNextMonth() > endtime ){
          duration    := endtime - startTime;

 _Main/BL/Type_LibCal_SubscriberEventTable/Function_CalcMaxDayDate.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LibCal_SubscriberEventTable/Function_CalcMaxMonthDate.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LibCal_SubscriberEventTable/Function_CalcMaxWeekDate.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LibCal_SubscriberEventTable/Function_CalcMinDayDate.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LibCal_SubscriberEventTable/Function_CalcMinMonthDate.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LibCal_SubscriberEventTable/Function_CalcMinWeekDate.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_LibCal_SubscriberEventTable/Method_GetColumnByTimeUnit.qbl

@@ -9,7 +9,7 @@
  TextBody:
  [*
    // ç”„兰鸽 Jul-26-2024 (created)
    column := selectobject( table, LibCal_SubscriberEventColumn, column, column.Name() = time.Format( 'M/D/Y' ), column.TimeUnit() = timeunit );
    column := selectobject( table, LibCal_SubscriberEventColumn, column,  column.TimeUnit() = timeunit and column.Period() = time );
    if( isnull( column ) ){
      column := table.LibCal_SubscriberEventColumn( relnew, Name := time.Format( 'M/D/Y' ), Period := time, TimeUnit := timeunit );
    }

 _Main/BL/Type_LibCal_SubscriberEventTable/Method_InitializeTable.qbl

@@ -7,27 +7,21 @@
  TextBody:
  [*
    // ç”„兰鸽 May-28-2024 (created)
    rownr                 := this.LibCal_SubscriberEventRow( relsize );
    
    traverse( subscribers, Elements, subscriber ){
    
      traverse( subscriber,Participation.astype( LibCal_Subscription ).LeadingParticipation, participation, participation.Event().EventCategory().Name() = 'Unavailable' ){
        event := participation.Event();
        
        row := selectobject( this, LibCal_SubscriberEventRow, row, row.Subscriber() = subscriber.CalendarID() 
                             and row.Event() = event.Subject() 
                             and row.EventType() = guard( event.EventType().Name(), '' )
                             );
    //rownr                 := this.LibCal_SubscriberEventRow( relsize );
    traverse( this.LibCal_Calendar(), Event.LeadingParticipation, lp, lp.Event().EventCategory().Name() = 'Unavailable' ){
      event               := lp.Event();
      rows                := selectset( this, LibCal_SubscriberEventRow, row, row.Event() = event.Subject() and row.EventType() = guard( event.EventType().Name(), '' ) );
      traverse( lp, Subscription, subscription ){
        row               := selectobject( rows, Elements, row, row.Subscriber() = subscription.Calendar().CalendarID() );
        
        if( isnull( row ) ){
          row := this.LibCal_SubscriberEventRow( relnew, RowNr := rownr, Subscriber := subscriber.CalendarID(), 
                                                 Event := event.Subject(), 
                                                 EventType := guard( event.EventType().Name(), '' ) );
          row             := this.LibCal_SubscriberEventRow( relnew, Subscriber   := subscription.Calendar().CalendarID()
                                                             , Event              := event.Subject()
                                                             , EventType          := guard( event.EventType().Name(), '' ) );
          
          rownr := rownr + 1;
        }
        
        traverse( participation, ExplicitTimeInterval, eti ){
        traverse( subscription, ExplicitTimeInterval, eti ){
          row.InitializeDate( this, eti.Start(), eti.End(), event.Description() );
        }
    
@@ -37,13 +31,13 @@
    //traverse( this, LibCal_SubscriberEventColumn, column ){
    //  info( '------------------------', column.Name(), column.Period(), column.TimeUnit() );
    //}
            
    Transaction::Transaction().Propagate( attribute( LibCal_SubscriberEventTable, MaxDayDate ) );
    Transaction::Transaction().Propagate( attribute( LibCal_SubscriberEventTable, MaxWeekDate ) );
    Transaction::Transaction().Propagate( attribute( LibCal_SubscriberEventTable, MaxMonthDate ) );
    Transaction::Transaction().Propagate( attribute( LibCal_SubscriberEventTable, MinDayDate ) );
    Transaction::Transaction().Propagate( attribute( LibCal_SubscriberEventTable, MinWeekDate ) );
    Transaction::Transaction().Propagate( attribute( LibCal_SubscriberEventTable, MinMonthDate ) );
    //        
    //Transaction::Transaction().Propagate( attribute( LibCal_SubscriberEventTable, MaxDayDate ) );
    //Transaction::Transaction().Propagate( attribute( LibCal_SubscriberEventTable, MaxWeekDate ) );
    //Transaction::Transaction().Propagate( attribute( LibCal_SubscriberEventTable, MaxMonthDate ) );
    //Transaction::Transaction().Propagate( attribute( LibCal_SubscriberEventTable, MinDayDate ) );
    //Transaction::Transaction().Propagate( attribute( LibCal_SubscriberEventTable, MinWeekDate ) );
    //Transaction::Transaction().Propagate( attribute( LibCal_SubscriberEventTable, MinMonthDate ) );
    this.ProcessColumnDay();
    this.ProcessColumnWeek();
    this.ProcessColumnMonth();

 _Main/BL/Type_LibCal_SubscriberEventTable/StaticMethod_InitializeTable.qbl

@@ -9,12 +9,8 @@
  [*
    // ç”„兰鸽 May-28-2024 (created)
    owner.LibCal_SubscriberEventTable( relflush );
    if( owner.LibCal_SubscriberEventTable( relsize ) < 1 ){
      owner.LibCal_SubscriberEventTable( relnew, ID := LibCal_SubscriberEventTable::GetDefaultName(), Name := LibCal_SubscriberEventTable::GetDefaultName() );
    }
    table         := owner.LibCal_SubscriberEventTable( relnew, ID := LibCal_SubscriberEventTable::GetDefaultName(), Name := LibCal_SubscriberEventTable::GetDefaultName() );
    
    traverse( owner, LibCal_SubscriberEventTable, table ){
      table.InitializeTable( subscribers );
    }
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def

@@ -54,7 +54,7 @@
      Properties:
      [
        Legend: 'Name'
        SortCriteria: 'RowNr'
        SortCriteria: 'Name'
        Taborder: 1
      ]
    }