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

xiaoding721

2024-09-02 fcb023061a7be2ce3d954abc1eeed30faf71590e

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

 _Main/BL/InfoMessages.qbl

@@ -134,6 +134,10 @@
  {
    DefaultText: '/data-service/api/service/post-data/V1.101/f084aa52d19c48d090416936a94f1dab'
  }
  InfoMessage InterfaceDataset_InventoryReport_Name
  {
    DefaultText: 'Inventory report'
  }
  InfoMessage InterfaceDataset_MachineStockData_Name
  {
    DefaultText: 'Machine stock data'
@@ -166,6 +170,10 @@
  {
    DefaultText: 'The import field is empty.'
  }
  InfoMessage MP_ChangeLossSettingExcel_Import_PositiveInteger
  {
    DefaultText: 'The import ChangeLossNr is not positive integer.'
  }
  InfoMessage MP_ChangeLossSettingExcel_Import_ProductNoExist
  {
    DefaultText: 'The entered product does not exist.'

 _Main/BL/Relations/Relation_InterfaceInventoryReport_InterfaceDataset_InterfaceDataset_Inventor.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
Quintiq file version 2.0
#parent: #root
Relation InterfaceInventoryReport_InterfaceDataset_InterfaceDataset_InventoryReport
{
  #keys: '1[415136.0.1094697716]'
  DefaultRelationStrategy
  {
  }
  RelationSide.LeftSide InterfaceDataset
  {
    #keys: '3[415136.0.1094697718][415136.0.1094697717][415136.0.1094697719]'
    Cardinality: '0to1'
    ObjectDefinition: InterfaceInventoryReport
    OwningSide: 'Reference'
  }
  RelationSide.RightSide InventoryReport
  {
    #keys: '3[415136.0.1094697721][415136.0.1094697720][415136.0.1094697722]'
    Cardinality: '1toN'
    ObjectDefinition: InterfaceDataset
    OwningSide: 'Owned'
  }
}

 _Main/BL/Relations/Relation_InterfaceInventoryReport_Loginfo_InterfaceLoginfo_InventoryReport.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
Quintiq file version 2.0
#parent: #root
Relation InterfaceInventoryReport_Loginfo_InterfaceLoginfo_InventoryReport
{
  #keys: '1[415136.0.1094697729]'
  DefaultRelationStrategy
  {
  }
  RelationSide.LeftSide Loginfo
  {
    #keys: '3[415136.0.1094697731][415136.0.1094697730][415136.0.1094697732]'
    Cardinality: '0to1'
    ObjectDefinition: InterfaceInventoryReport
    OwningSide: 'Reference'
  }
  RelationSide.RightSide InventoryReport
  {
    #keys: '3[415136.0.1094697734][415136.0.1094697733][415136.0.1094697735]'
    Cardinality: '1toN'
    ObjectDefinition: InterfaceLoginfo
    OwningSide: 'Reference'
  }
}

 _Main/BL/Type_ChangeLossSettingExcel/StaticMethod_CheckImport.qbl

@@ -13,6 +13,10 @@
                or excel.ChangeLossNr() = 0 ) ){
      error( Translations::MP_ChangeLossSettingExcel_Import_NullInputRequiredField() );
    }
    //导入的数量小于0
    if( exists( macroplan, ChangeLossSettingExcel, excel, excel.ChangeLossNr() < 0 ) ){
      error( Translations::MP_ChangeLossSettingExcel_Import_PositiveInteger() );
    }
    //导入产品是否存在
    if( exists( macroplan, ChangeLossSettingExcel, excel, not exists( macroplan, Product_MP, product, product.ID() = excel.Product1() or product.ID() = excel.Product2() ) ) ){
      error( Translations::MP_ChangeLossSettingExcel_Import_ProductNoExist() );

 _Main/BL/Type_InterfaceInventoryReport/Attribute_Category.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute Category
{
  #keys: '3[415136.0.1094697746][415136.0.1094697745][415136.0.1094697747]'
  Description: '日期类型'
  ValueType: String
}

 _Main/BL/Type_InterfaceInventoryReport/Attribute_FactoryName.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute FactoryName
{
  #keys: '3[415136.0.1094697851][415136.0.1094697850][415136.0.1094697852]'
  Description: '工厂名称'
  ValueType: String
}

 _Main/BL/Type_InterfaceInventoryReport/Attribute_Generation.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute Generation
{
  #keys: '3[415136.0.1094697756][415136.0.1094697755][415136.0.1094697757]'
  Description: '发动机代数'
  ValueType: String
}

 _Main/BL/Type_InterfaceInventoryReport/Attribute_InterfaceTime.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute InterfaceTime
{
  #keys: '3[415136.0.1094697861][415136.0.1094697860][415136.0.1094697862]'
  Description: '接口事件'
  ValueType: DateTime
}

 _Main/BL/Type_InterfaceInventoryReport/Attribute_InventoryAveQty.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute InventoryAveQty
{
  #keys: '3[415136.0.1094697834][415136.0.1094697833][415136.0.1094697835]'
  Description: '平均库存量'
  ValueType: Number
}

 _Main/BL/Type_InterfaceInventoryReport/Attribute_InventoryDate.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute InventoryDate
{
  #keys: '3[415136.0.1094697806][415136.0.1094697805][415136.0.1094697807]'
  Description: '库存日期'
  ValueType: Date
}

 _Main/BL/Type_InterfaceInventoryReport/Attribute_InventoryEndQty.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute InventoryEndQty
{
  #keys: '3[415136.0.1094697796][415136.0.1094697795][415136.0.1094697797]'
  Description: '期末库存量'
  ValueType: Number
}

 _Main/BL/Type_InterfaceInventoryReport/Attribute_InventoryMaxQty.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute InventoryMaxQty
{
  #keys: '3[415136.0.1094697827][415136.0.1094697826][415136.0.1094697828]'
  Description: '最大库存量'
  ValueType: Number
}

 _Main/BL/Type_InterfaceInventoryReport/Attribute_InventoryMinQty.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute InventoryMinQty
{
  #keys: '3[415136.0.1094697816][415136.0.1094697815][415136.0.1094697817]'
  Description: '最小库存量'
  ValueType: Number
}

 _Main/BL/Type_InterfaceInventoryReport/Attribute_MLBMQB.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute MLBMQB
{
  #keys: '3[415136.0.1094697766][415136.0.1094697765][415136.0.1094697767]'
  Description: '横纵制'
  ValueType: String
}

 _Main/BL/Type_InterfaceInventoryReport/Attribute_Power.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute Power
{
  #keys: '3[415136.0.1094697776][415136.0.1094697775][415136.0.1094697777]'
  Description: '功率'
  ValueType: String
}

 _Main/BL/Type_InterfaceInventoryReport/Attribute_Product.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute Product
{
  #keys: '3[415136.0.1094697786][415136.0.1094697785][415136.0.1094697787]'
  Description: '物料号'
  ValueType: String
}

 _Main/BL/Type_InterfaceInventoryReport/Attribute_VersionName.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute VersionName
{
  #keys: '3[415136.0.1094697841][415136.0.1094697840][415136.0.1094697842]'
  Description: '版本名称'
  ValueType: String
}

 _Main/BL/Type_InterfaceInventoryReport/StaticMethod_GenerateData.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
Quintiq file version 2.0
#parent: #root
StaticMethod GenerateData (
  const MacroPlan macroplan,
  InterfaceDataset interfaceDataset,
  String executor
)
{
  TextBody:
  [*
    // ç”„兰鸽 Aug-30-2024 (created)
    loginfo                := maxobject(  interfaceDataset, InterfaceLoginfo, loginfo, loginfo.Name() = Translations::InterfaceDataset_InventoryReport_Name(), loginfo.InterfaceDateTime() );
    if( not isnull( loginfo ) ){
      if( not loginfo.IsShow() ){
        loginfo.Delete();
      }else{
        loginfo.Last( false );
      }
      interfaceDataset.InventoryReport( relflush );
    }
    nowdate                := DateTime::ActualTime();
    loginfo                := interfaceDataset.InterfaceLoginfo( relnew, ExecuteUser         := executor
                                                                 , Name                      := Translations::InterfaceDataset_InventoryReport_Name()
                                                                 , InterfaceDateTime         := nowdate
                                                                 , Message                   := '库存报表- æ•°æ®ä¸­å°'
                                                                 , Last                      := true
                                                                 , IsShow                    := false
                                                                 , ReturnSuccess             := true
                                                                 , ReturnMsg                 := 'Success'
                                                                 , Success                   := true
                                                                  );
    traverse( macroplan, InventorySummarySource.InventorySummaryReport, report, not report.IsShow() ){
      traverse( report,InventroySummaryRow, row ){
        product           := selectobject( macroplan, Product_MP, product, product.ID() = row.Name() );
        traverse( row, InventorySummaryCell, cell ){
          column          := cell.InventorySummaryColumn();
          inventory       :=interfaceDataset.InventoryReport( relnew, Category          := column.TimeUnit()
                                                              , Generation              := product.Generation()
                                                              , MLBMQB                  := product.MQBMLB()
                                                              , Power                   := product.Power()
                                                              , Product                 := product.ID()
                                                              , InventoryDate           := column.Period()
                                                              , InventoryEndQty         := cell.EndingInventory()
                                                              , InventoryMinQty         := cell.MinimumInventory()
                                                              , InventoryMaxQty         := cell.MaximumInventory()
                                                              , InventoryAveQty         := cell.AverageInventory()
                                                              , FactoryName             := row.Unit()
                                                              , VersionName             := macroplan.ScenarioName()
                                                              , InterfaceTime           := nowdate
                                                              );
          loginfo.InventoryReport( relinsert, inventory );
        }
      }
    }
    loginfo.TotalRow( loginfo.InventoryReport( relsize ) );
  *]
}

 _Main/BL/Type_InterfaceInventoryReport/_ROOT_Type_InterfaceInventoryReport.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
Quintiq file version 2.0
#root
#parent: #DomainModel
Type InterfaceInventoryReport
{
  #keys: '5[415136.0.1094697713][415136.0.1094697711][0.0.0][415136.0.1094697712][415136.0.1094697714]'
  BaseType: Object
  Description: '库存报表'
  StructuredName: 'InterfaceInventoryReports'
}

 _Main/BL/Type_LibCal_CalendarRegistry/Method_InitializeEventTypes.qbl

@@ -6,8 +6,8 @@
  [*
    // Always create a general EventCategory.
    //LibCal_EventCategory::Create( this, LibCal_EventType::DEFAULT_TYPE() );
    this.EventType( relnew,ID := "blank", Name := LibCal_EventType::DEFAULT_TYPE() );
    
    eventtype := this.EventType( relnew,ID := "blank", Name := LibCal_EventType::DEFAULT_TYPE() );
    eventtype.SetRootEvent();
    // Create additional EventCategories.
    //LibCal_EventCategory::InitializeEventCategories( this );
  *]

 _Main/BL/Type_LibCal_EventEvent/StaticMethod_ValidateInput.qbl

@@ -3,6 +3,7 @@
StaticMethod ValidateInput (
  output String feedback,
  LibCal_CalendarRegistry owner,
  LibCal_EventType eventtype,
  String id,
  String name
) as Boolean
@@ -12,7 +13,7 @@
    // ç”„兰鸽 May-31-2024 (created)
    feedback := '';
    
    if( exists( owner, EventType, et, et.ID() = id or et.Name() = name ) ){
    if( exists( owner, EventType, et, ( et.ID() = id or et.Name() = name ) and ( isnull( eventtype ) or eventtype <> et ) ) ){
      feedback := Translations::MP_LibCal_EventType_Exist();
    }
        

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def

@@ -135,7 +135,7 @@
      Properties:
      [
        Image: 'MONEY2'
        Label: '发动机物流成本报表'
        Label: '物流成本报表'
        Taborder: 10
      ]
    }

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuInterface.def

@@ -113,6 +113,17 @@
        Title: '装配上线计划+机加下线计划-MS64'
      ]
    }
    Component MenuInterfaceInventoryReport
    {
      #keys: '[415136.0.1097611829]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'WAREHOUSE'
        Taborder: 10
        Title: 'Inventory report'
      ]
    }
  ]
  Properties:
  [

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_MenuInterfaceInventoryReport_OnCl.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
Quintiq file version 2.0
#parent: ContextMenuInterface/MenuInterfaceInventoryReport
Response OnClick () id:Response_MacroPlanner_ContextMenuInterface_MenuInterfaceInventoryReport_OnClick
{
  #keys: '[415136.0.1097612114]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebMenu_OnClick'
  QuillAction
  {
    Body:
    [*
      currentuser     := QuintiqUser::CurrentUser().DisplayName();
      InterfaceInventoryReport::GenerateData( MacroPlan, InterfaceDataset, currentuser );
      
      WebMessageBox::Success( "推送成功！" );
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditEventType/Response_pnlActions_btnOk_OnClick.def

@@ -9,7 +9,7 @@
  [*
    owner := LibCal_GlobalState.dhGlobalCalendarRegistry().Data();
    
    return LibCal_EventType::ValidateInput( feedback, owner, efID.Text(), efName.Text() );
    return LibCal_EventType::ValidateInput( feedback, owner, dhDialogData.Data().WrappedInstance(), efID.Text(), efName.Text() );
  *]
  QuillAction
  {

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPeriodSpec/Component_PanelNumberOfPeriods.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
Quintiq file version 2.0
Component PanelNumberOfPeriods #extension
{
  Children:
  [
    Component EditFieldNrOfFuturePeriods #extension
    {
      Properties:
      [
        Taborder: 2
      ]
    }
    Component DateSelectorNumberOfPeriods
    {
      #keys: '[413988.0.1518900544]'
      BaseType: 'WebDateSelector'
      Properties:
      [
        Label: 'EndDate'
        Taborder: 1
      ]
    }
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPeriodSpec/Component_pnlContent.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
Component pnlContent #extension
{
  Children:
  [
    #child: PanelNumberOfPeriods
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPeriodSpec/Response_MacroPlanner_PanelNumberOfPeriods_DateSelectorNumberOfPeriods_OnCre.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
Quintiq file version 2.0
#parent: PanelNumberOfPeriods/DateSelectorNumberOfPeriods
Response OnCreated () id:Response_MacroPlanner_PanelNumberOfPeriods_DateSelectorNumberOfPeriods_OnCreated
{
  #keys: '[413988.0.1519140003]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnCreated'
  Precondition:
  [*
    return not isnull( MacroPlan );
  *]
  QuillAction
  {
    Body:
    [*
      this.Date( MacroPlan.StartOfPlanning().Date() + DataHolderDialogData.Data().NrOfFuturePeriod() );
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPeriodSpec/Response_MacroPlanner_PanelNumberOfPeriods_DateSelectorNumberOfPeriods_OnUse.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
Quintiq file version 2.0
#parent: PanelNumberOfPeriods/DateSelectorNumberOfPeriods
Response OnUserChanged () id:Response_MacroPlanner_PanelNumberOfPeriods_DateSelectorNumberOfPeriods_OnUserChanged
{
  #keys: '[413988.0.1519178748]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnUserChanged'
  Precondition:
  [*
    return not isnull( MacroPlan );
  *]
  QuillAction
  {
    Body:
    [*
      EditFieldNrOfFuturePeriods.Text( [String] ( this.Date() - MacroPlan.StartOfPlanning().Date() ) );
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPeriodSpec/_ROOT_Component_DialogCreateEditPeriodSpec.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
Quintiq file version 2.0
#root
#parent: LibMacroPlannerWebUI
OrphanComponent DialogCreateEditPeriodSpec #extension
{
  Children:
  [
    #child: pnlContent
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Response_pnlContent_dtsEnd_OnCreated.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: pnlContent/dtsEnd
Response OnCreated () id:Response_pnlContent_dtsEnd_OnCreated
{
  #keys: '[415754.0.188441775]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnCreated'
  QuillAction
  {
    Body:
    [*
      this.DateTime( DateTime::Construct( 2024, 1, 1 ) );
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Response_pnlContent_dtsStart_OnCreated.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: pnlContent/dtsStart
Response OnCreated () id:Response_pnlContent_dtsStart_OnCreated
{
  #keys: '[415754.0.186290699]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnCreated'
  QuillAction
  {
    Body:
    [*
      this.DateTime( DateTime::Construct( 2024, 1, 1 ) );
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCustomerDemandPPAIDS/Method_OnOK.def

@@ -17,7 +17,7 @@
      AssemblyOnlinePlanPPPSPush::GenerateData( MacroPlan, InterfaceDataset, currentuser, isactive );
    }
    
    
    WebMessageBox::Success( "推送成功！" );
    Form.Close();
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Method_OnOk.def

@@ -18,7 +18,7 @@
    currentuser     := QuintiqUser::CurrentUser().DisplayName();
    
    AOnlineAndMOfflinePlanMS64::GenerateData( InterfaceDataset, ddslFactory.Text(), dsStartDate.Date(), dsEndDate.Date(), efVersionFrom.Text(), efVersionTo.Text(), cbActiveVersion.Checked(), dhProducts.Data(), currentuser );
    
    WebMessageBox::Success( "推送成功！" );
    Form.Close();
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSPIR/Method_OnOk.def

@@ -11,7 +11,7 @@
    handle          := mdsinstance.GetMDSHandle()
    macroplan       := handle.AsMacroPlan();
    AOnlineAndMOfflinePlanPIR::GenerateData( InterfaceDataset, ddslFactory.Text(), macroplan, dsStartDate.Date(), dsEndDate.Date(), QuintiqUser::CurrentUser().DisplayName() );
    
    WebMessageBox::Success( "推送成功！" );
    Form.Close();
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_ListCalendarEventTypes.def

@@ -49,7 +49,9 @@
  ]
  Properties:
  [
    CheckboxBehavior: 'include descendants'
    CheckboxBehavior: 'must have descendants'
    CheckboxCopy: true
    CheckboxDecoration: 'detailed'
    SelectionCheckboxes: true
    Taborder: 1
  ]

 _Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def

@@ -95,7 +95,6 @@
      [
        Identifier: 'Cell:sec'
        ObjectType: 'LibCal_SubscriberEventCell'
        Precondition: 'object.LibCal_SubscriberEventColumn().Index() > 1'
        Taborder: 5
        Tooltip: "VALUE(guard( object.GetMatrixTooltip() , '' ))"
      ]