Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-07-31 8801592d280ff58beb5677a86c263f7c05c0b7c0

Merge remote-tracking branch 'origin/dev' into dev

 _Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory.qbl

@@ -18,7 +18,11 @@
                    or loginfo.Name() = Translations::InterfaceDataset_FinishedEngineInventory_Name() ) ){
      //机加库存
      traverse( loginfo, MachineStockData, inventory ){
        InventoryInterfaceData::Generate( interfaceDataset, inventory.DDay(), inventory.MaterialNo(), inventory.LineType(), [Number]inventory.Total() );
        inventoryname := inventory.Lgort();
        if( inventory.Fac() = 'DL' and inventory.Lgort() = 'All' ){
          inventoryname := inventory.LineType();
        }
        InventoryInterfaceData::Generate( interfaceDataset, inventory.DDay(), inventory.MaterialNo(), inventoryname, [Number]inventory.Total() );
      }
      //发动机成品库存
      traverse( loginfo, FinishedEngineInventory, inventory ){

 _Main/BL/Type_LibCal_ExplicitTimeInterval/StaticMethod_Delete.qbl

@@ -18,9 +18,13 @@
        }
      }
      if( not isnull( leadingeti ) ){
        eti.Delete();
        subscription := selectobject( eti, Participation.Event.LeadingParticipation.Subscription, subscription, subscription.Calendar().CalendarID() = eti.Participation().Calendar().CalendarID() );
        if( subscription.ExplicitTimeInterval( relsize ) = 1 ){
          subscription.Delete();
        }else{
          eti.Delete();
        }
      }
    
    }
  *]
}

 _Main/BL/Type_LibCal_SubscriberEventTable/Method_InitializeTable.qbl

@@ -16,13 +16,13 @@
        
        row := selectobject( this, LibCal_SubscriberEventRow, row, row.Subscriber() = subscriber.CalendarID() 
                             and row.Event() = event.Subject() 
                             and row.EventType() = event.EventType().Name() 
                             and row.EventType() = guard( event.EventType().Name(), '' )
                             );
        
        if( isnull( row ) ){
          row := this.LibCal_SubscriberEventRow( relnew, RowNr := rownr, Subscriber := subscriber.CalendarID(), 
                                                 Event := event.Subject(), 
                                                 EventType := event.EventType().Name() );
                                                 EventType := guard( event.EventType().Name(), '' ) );
          
          rownr := rownr + 1;
        }

 _Main/BL/Type_MachineStockData/Attribute_Lgort.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute Lgort
{
  #keys: '3[415136.0.951252825][415136.0.951252824][415136.0.951252826]'
  Description: '库存点，当fac为DL且lgort值为all则取linetyp的值'
  ValueType: String
}

 _Main/BL/Type_MachineStockData/StaticMethod_GenerateData.qbl

@@ -17,6 +17,7 @@
    all_total         := guard( item.Get( "all_total").GetReal(), 0 );
    dday              := guard( item.Get( "dday").GetString(),"");
    line_type         := guard( item.Get( "fac").GetString(),"");
    lgort             := guard( item.Get( "lgort").GetString(),"");
    
    msdata           := owner.MachineStockData( relnew, MaterialNo := material_no
                                                  , MaterialName := material_name
@@ -25,7 +26,8 @@
                                                  , Total := total
                                                  , AllTotal := all_total
                                                  , DDay := cnv.Convert( dday )
                                                  , LineType := line_type );
                                                  , LineType := line_type
                                                  , Lgort := lgort );
    
    return msdata;
  *]

 _Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_cmSubscribers.def

@@ -3,20 +3,6 @@
{
  #keys: '[415136.0.666211729]'
  BaseType: 'listContextMenu'
  Children:
  [
    Component mnDelete
    {
      #keys: '[415136.0.666211730]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'DELETE'
        Taborder: 3
        Title: 'Delete'
      ]
    }
  ]
  Properties:
  [
    Taborder: 0

 _Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Response_ListCalendarEventTypes_OnCheckedChanged#599.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: ListCalendarEventTypes
Response OnCheckedChanged () id:Response_ListCalendarEventTypes_OnCheckedChanged_599
{
  #keys: '[415136.0.954507945]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebList_OnCheckedChanged'
  QuillAction
  {
    Body:
    [*
      dhEventTypes.Data().Flush();
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Response_lstSubscribers_OnCheckedChanged#298.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: lstSubscribers
Response OnCheckedChanged () id:Response_lstSubscribers_OnCheckedChanged_298
{
  #keys: '[415136.0.953871349]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebList_OnCheckedChanged'
  QuillAction
  {
    Body:
    [*
      dhSubscribers.Data().Flush();
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Response_lstSubscribers_OnSelectionChanged.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Response_lstSubscribers_mnDelete_OnClick.def

ÎļþÒÑɾ³ý