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

lihongji

2024-07-18 0484f38ab11ce42c08d523da39c094d1a157e909

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

 _Main/BL/EDI/Broker_AES_TemporaryDemandData.qbl

@@ -16,6 +16,7 @@
      EDIMLColumn DemandUncertaintyPercentage { Attribute: DemandUncertaintyPercentage ValueType: Number }
      EDIMLColumn EndDate { Attribute: EndDate ValueType: Date }
      EDIMLColumn ID { Attribute: ID ValueType: Number }
      EDIMLColumn Origin { Attribute: Origin ValueType: String }
      EDIMLColumn Price { Attribute: Price ValueType: Number }
      EDIMLColumn PriorityName { Attribute: PriorityName ValueType: String }
      EDIMLColumn ProductID { Attribute: ProductID ValueType: String }
@@ -64,6 +65,11 @@
      {
        OthersMayUpdateColumn: true
        ValueType: Boolean
      }
      EDIODBCLinkColumn ORIGIN
      {
        OthersMayUpdateColumn: true
        ValueType: String
      }
      EDIODBCLinkColumn PRICE
      {
@@ -134,6 +140,7 @@
        }
      }
      EDIColumnMatch { InputColumn: ID OutputColumn: ID }
      EDIColumnMatch { InputColumn: ORIGIN OutputColumn: Origin }
      EDIColumnMatch { InputColumn: PRICE OutputColumn: Price }
      EDIColumnMatch { InputColumn: PRIORITY_NAME OutputColumn: PriorityName }
      EDIColumnMatch { InputColumn: PRODUCT_ID OutputColumn: ProductID }

 _Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl

@@ -16,7 +16,7 @@
      targetStockingPoint_MP := select( macroPlan, StockingPoint_MP, tempSPMP, tempSPMP.ID() = tdd.StockingPointID() );
      info( tdd.SalesSegmentName() );
      if ( not isnull( targetProduct_MP ) and not isnull( targetStockingPoint_MP ) ) {
        Forecast::Create( targetProduct_MP,
        forcest := Forecast::Create( targetProduct_MP,
                          targetStockingPoint_MP,
                          [String]tdd.ID(),
                          tdd.StartDate(),
@@ -31,6 +31,7 @@
                          false,
                          false
                         );
        forcest.Origin( tdd.Origin() );
      }
    }
  *]

 _Main/BL/Type_Forecast/Attribute_Origin.qbl

对比新文件
@@ -0,0 +1,7 @@
Quintiq file version 2.0
#parent: #root
Attribute Origin
{
  #keys: '3[411860.0.51771534][411860.0.51771533][411860.0.51771535]'
  ValueType: String
}

 _Main/BL/Type_Forecast/DefaultValue_Origin.qbl

对比新文件
@@ -0,0 +1,6 @@
Quintiq file version 2.0
#parent: #root
DefaultValue
{
  TargetAttribute: Origin
}

 _Main/BL/Type_Forecast/_ROOT_Type_Forecast.qbl

对比新文件
@@ -0,0 +1,6 @@
Quintiq file version 2.0
#root
#parent: #DomainModel
TypeSpecialization Forecast #extension
{
}

 _Main/BL/Type_LibCal_SubscriberEventTable/Method_InitializeTable.qbl

@@ -20,8 +20,8 @@
    traverse( subscribers, Elements, subscriber ){
    //  info( '------------------------', subscriber.CalendarID(), subscriber.CalendarType() );
    //  traverse( subscriber,Participation.astype( LibCal_Subscription ).LeadingParticipation, participation ){
      traverse( subscriber,Participation.astype( LibCal_Subscription ).LeadingParticipation, participation, participation.Event().EventCategory().Name() = 'Unavailable' and participation.Event().Subject() = '娴嬭瘯' ){
    //    info( '------------------------', participation.Event().Subject(), '------', participation.Event().EventCategory().Name() );
      traverse( subscriber,Participation.astype( LibCal_Subscription ).LeadingParticipation, participation, participation.Event().EventCategory().Name() = 'Unavailable' ){
    //    info( '---------------1---------', participation.Event().Subject(), '------', participation.Event().EventCategory().Name() );
        event := participation.Event();
        
        row := selectobject( this, LibCal_SubscriberEventRow, row, row.Subscriber() = subscriber.CalendarID() 

 _Main/BL/Type_TemporaryDemandData/Attribute_Origin.qbl

对比新文件
@@ -0,0 +1,7 @@
Quintiq file version 2.0
#parent: #root
Attribute Origin
{
  #keys: '3[411860.0.51771485][411860.0.51771484][411860.0.51771486]'
  ValueType: String
}

 _Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_ListList.def

@@ -12,9 +12,10 @@
      Properties:
      [
        DataType: 'LibCal_EventCategory'
        FixedFilter: "object.Participation().Calendar().CalendarID() <> 'Common Calendar'"
        Source: 'dhCategory'
        Taborder: 0
        Transformation: 'Event.Participation'
        Transformation: 'Event.Participation.ExplicitTimeInterval'
      ]
    }
    #child: listActionBarPage902
@@ -28,7 +29,7 @@
      ]
      Properties:
      [
        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Calendar.CalendarID","title":"CalendarID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Calendar.CalendarID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Event.EventType.Name","title":"Name","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Event.EventType.Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Event.Subject","title":"Subject","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Event.Subject"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StartDate","title":"StartDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StartDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Event.StartTimeOfDay","title":"StartTimeOfDay","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Event.StartTimeOfDay"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Event.EndTimeOfDay","title":"EndTimeOfDay","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Event.EndTimeOfDay"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Event.Description","title":"Description","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Event.Description"}}]'
        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StartDate","title":"StartDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":""}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Participation.Calendar.CalendarID","title":"CalendarID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Participation.Calendar.CalendarID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Participation.Event.EventType.Name","title":"Name","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Participation.Event.EventType.Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Participation.Event.Subject","title":"Subject","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Participation.Event.Subject"}},{"attribute":{"classtype":"WebApiDefinitionAttributeExpression","columnid":"StartDate","title":"StartDate","subtotals":"","tooltip":"","width":-1,"display":"shown","expressionbody":"object.Start().Date()"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Participation.Event.StartTimeOfDay","title":"StartTimeOfDay","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Participation.Event.StartTimeOfDay"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Participation.Event.EndTimeOfDay","title":"EndTimeOfDay","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Participation.Event.EndTimeOfDay"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Participation.Event.Description","title":"Description","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Participation.Event.Description"}}]'
        ContextMenu: 'listContextMenu967'
        Taborder: 2
      ]