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

lazhen

2024-08-19 7a87b3288bf41e1a42ba3b2558e86116555596ff

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

 _Main/BL/Relations/Relation_InterfacePlanInventoryDataPush_InterfaceDataset_InterfaceDataset_In.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
Quintiq file version 2.0
#parent: #root
Relation InterfacePlanInventoryDataPush_InterfaceDataset_InterfaceDataset_InterfacePlanInventoryDataPush
{
  #keys: '1[413988.0.1493874639]'
  DefaultRelationStrategy
  {
  }
  RelationSide.LeftSide InterfaceDataset
  {
    #keys: '3[413988.0.1493874641][413988.0.1493874640][413988.0.1493874642]'
    Cardinality: '0to1'
    ObjectDefinition: InterfacePlanInventoryDataPush
    OwningSide: 'Reference'
  }
  RelationSide.RightSide InterfacePlanInventoryDataPush
  {
    #keys: '3[413988.0.1493874644][413988.0.1493874643][413988.0.1493874645]'
    Cardinality: '1toN'
    ObjectDefinition: InterfaceDataset
    OwningSide: 'Owned'
  }
}

 _Main/BL/Type_InterfacePlanInventoryDataPush/Attribute_Fac.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute Fac
{
  #keys: '3[413988.0.1493874711][413988.0.1493874710][413988.0.1493874712]'
  Description: '工厂简写'
  ValueType: String
}

 _Main/BL/Type_InterfacePlanInventoryDataPush/Attribute_FactoryName.qbl

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

 _Main/BL/Type_InterfacePlanInventoryDataPush/Attribute_InventoryDate.qbl

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

 _Main/BL/Type_InterfacePlanInventoryDataPush/Attribute_PlanningInventory.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute PlanningInventory
{
  #keys: '3[413988.0.1493874681][413988.0.1493874680][413988.0.1493874682]'
  Description: '对应日期的计划库存数量'
  ValueType: Number
}

 _Main/BL/Type_InterfacePlanInventoryDataPush/Attribute_Product.qbl

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

 _Main/BL/Type_InterfacePlanInventoryDataPush/Attribute_VersionName.qbl

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

 _Main/BL/Type_InterfacePlanInventoryDataPush/StaticMethod_GenerateData.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
Quintiq file version 2.0
#parent: #root
StaticMethod GenerateData (
  MacroPlan macroPlan,
  InterfaceDataset interfaceDataset
)
{
  TextBody:
  [*
    interfaceDataset.InterfacePlanInventoryDataPush( relflush );
    
    traverse ( macroPlan, Product_MP.ProductInStockingPoint_MP, pispmp, not pispmp.IsSystem() and pispmp.IsLeaf() ) {
      traverse ( pispmp, ProductInStockingPointInPeriodPlanning.astype( ProductInStockingPointInPeriodPlanningLeaf ), pispippl, not pispippl.IsPeriodFrozen() ) {
        interfaceDataset.InterfacePlanInventoryDataPush( relnew,
                                                         Product           := pispmp.ProductID(),
                                                         InventoryDate     := pispippl.Start().Date(),
                                                         PlanningInventory := [Number]pispippl.InventoryLevelEnd(),
                                                         VersionName       := macroPlan.ScenarioName(),
                                                         FactoryName       := ifexpr( pispmp.StockingPointID().Regex( "大连" ) or pispmp.StockingPointID().Regex( "DL" ), "大连工厂", "长春工厂" ),
                                                         Fac               := ifexpr( pispmp.StockingPointID().Regex( "大连" ) or pispmp.StockingPointID().Regex( "DL" ), "DL", "CC" )
                                                        );
      } 
    }
  *]
}

 _Main/BL/Type_InterfacePlanInventoryDataPush/_ROOT_Type_InterfacePlanInventoryDataPush.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
Quintiq file version 2.0
#root
#parent: #DomainModel
Type InterfacePlanInventoryDataPush
{
  #keys: '5[413988.0.1493874636][413988.0.1493874634][0.0.0][413988.0.1493874635][413988.0.1493874637]'
  BaseType: Object
  StructuredName: 'InterfacePlanInventoryDataPushs'
}

 _Main/BL/Type_TransferPlanCell/StaticMethod_GenerateReport.qbl

@@ -16,14 +16,14 @@
      traverse ( u, Lane.LaneLeg.Trip, t ) {
        traverse ( t, ProductInTrip, pit, pit.Quantity() > 0.0 ) {
          // æ‰¾è¡Œ
          tpr := TransferPlanRow::FindTransferPlanRowTypeIndex( t.LaneLeg().AsOriginStockingPointLeg().StockingPoint_MP().Name(),
                                                                t.LaneLeg().AsDestinationStockingPointLeg().StockingPoint_MP().Name(),
          tpr := TransferPlanRow::FindTransferPlanRowTypeIndex( TransferPlanRow::IdentifyTheFactory( t.LaneLeg().AsOriginStockingPointLeg().StockingPoint_MP() ),
                                                                TransferPlanRow::IdentifyTheFactory( t.LaneLeg().AsDestinationStockingPointLeg().StockingPoint_MP() ),
                                                                pit.Product_MP().ID() );
          if ( isnull( tpr ) ) {
            tpr := macroPlan.TransferPlanRow( relnew, 
                                              RowNr                   := rowNr,
                                              SourceStockpoingPointID := t.LaneLeg().AsOriginStockingPointLeg().StockingPoint_MP().Name(),
                                              TargetStockpoingPointID := t.LaneLeg().AsDestinationStockingPointLeg().StockingPoint_MP().Name(),
                                              SourceStockpoingPointID := TransferPlanRow::IdentifyTheFactory( t.LaneLeg().AsOriginStockingPointLeg().StockingPoint_MP() ),
                                              TargetStockpoingPointID := TransferPlanRow::IdentifyTheFactory( t.LaneLeg().AsDestinationStockingPointLeg().StockingPoint_MP() ),
                                              ProductID               := pit.Product_MP().ID() );     
          }
          

 _Main/BL/Type_TransferPlanRow/StaticMethod_IdentifyTheFactory.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
Quintiq file version 2.0
#parent: #root
StaticMethod IdentifyTheFactory (
  StockingPoint_MP spmp
) as String
{
  TextBody:
  [*
    factory := "";
    
    if ( spmp.Name().Regex( "长春" ) or spmp.Name().Regex( "CC" ) ) {
      factory := "CC";
    } else if ( spmp.Name().Regex( "大连" ) or spmp.Name().Regex( "DL" ) ) {
      factory := "DL";
    } else {
      factory := "找不到属于哪个工厂";
    }
    
    return factory;
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def

@@ -91,17 +91,6 @@
        Taborder: 6
      ]
    }
    Component bMachineLogisticsCostReport
    {
      #keys: '[413988.0.1467117990]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'LOCATION_PIN'
        Label: '机加物流成本报表'
        Taborder: 7
      ]
    }
    Component ButtonScenarioComparisonDemandComparison id:ButtonScenarioComparisonDemandComparison_256
    {
      #keys: '[412672.1.90201789]'
@@ -110,7 +99,7 @@
      [
        Image: 'EQUALS'
        Label: '需求对比'
        Taborder: 8
        Taborder: 7
      ]
    }
    Component ButtonScheduleSummaryReport
@@ -135,28 +124,6 @@
        Taborder: 9
      ]
    }
    Component bCC_EngineRackReport
    {
      #keys: '[413988.0.1477120930]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'SATELLITE'
        Label: '长春发动机料架报表'
        Taborder: 10
      ]
    }
    Component bDL_EngineRackReport
    {
      #keys: '[413988.0.1488511896]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'EARTH_LOCATION'
        Label: '大连发动机料架报表'
        Taborder: 11
      ]
    }
    Component ButtonEngineLogisticsCostReport
    {
      #keys: '[415136.0.989557433]'
@@ -169,7 +136,7 @@
      [
        Image: 'MONEY2'
        Label: '发动机物流成本报表'
        Taborder: 12
        Taborder: 10
      ]
    }
    Component ButtonAnnualPlanReport
@@ -180,7 +147,7 @@
      [
        Image: 'DOCUMENT_HEART'
        Label: '全年计划报表'
        Taborder: 13
        Taborder: 11
      ]
    }
  ]

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuEngineLogisticsCostReport.def

@@ -12,8 +12,8 @@
      Properties:
      [
        Description: 'CC engine logistics cost report'
        Image: 'MONEY2'
        Taborder: 0
        Image: 'MONEY_COINS2'
        Taborder: 1
        Title: '长春发动机物流成本报表'
      ]
    }
@@ -24,11 +24,44 @@
      Properties:
      [
        Description: 'DL engine logistics cost report'
        Image: 'MONEY2'
        Taborder: 1
        Image: 'PIGGY_BANK'
        Taborder: 2
        Title: '大连发动机物流成本报表'
      ]
    }
    Component mMachineLogisticsCostReport
    {
      #keys: '[413988.0.1492770837]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'LOCATION_PIN'
        Taborder: 0
        Title: '机加物流成本报表'
      ]
    }
    Component mCC_EngineRackReport
    {
      #keys: '[413988.0.1492701081]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'SATELLITE'
        Taborder: 3
        Title: '长春发动机料架报表'
      ]
    }
    Component mDL_EngineRackReport
    {
      #keys: '[413988.0.1492780876]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'EARTH_LOCATION'
        Taborder: 4
        Title: '大连发动机料架报表'
      ]
    }
  ]
  Properties:
  [

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuInterface.def

@@ -38,6 +38,16 @@
        Title: 'Finished engine inventory'
      ]
    }
    Component mInterfacePlanInventoryDataPush
    {
      #keys: '[413988.0.1495640230]'
      BaseType: 'WebMenu'
      Properties:
      [
        Taborder: 3
        Title: '计划库存数据推送接口测试'
      ]
    }
  ]
  Properties:
  [

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupReport_bCC_EngineRackReport_OnClick.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupReport_bDL_EngineRackReport_OnClick.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupReport_bMachineLogisticsCostReport_OnCli.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuEngineLogisticsCostReport_mCC_EngineRackRep.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: ContextMenuEngineLogisticsCostReport/mCC_EngineRackReport
Response OnClick () id:Response_MacroPlanner_ContextMenuEngineLogisticsCostReport_mCC_EngineRackReport_OnClick
{
  #keys: '[413988.0.1494079933]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebMenu_OnClick'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      ApplicationScope.ViewManager().ResetUserViewById( "CCEngineRackReport", true);
    *]
  }
}

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuEngineLogisticsCostReport_mDL_EngineRackRep.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: ContextMenuEngineLogisticsCostReport/mDL_EngineRackReport
Response OnClick () id:Response_MacroPlanner_ContextMenuEngineLogisticsCostReport_mDL_EngineRackReport_OnClick
{
  #keys: '[413988.0.1494298669]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebMenu_OnClick'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      ApplicationScope.ViewManager().ResetUserViewById( "DLEngineRackReport", true);
    *]
  }
}

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuEngineLogisticsCostReport_mMachineLogistics.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: ContextMenuEngineLogisticsCostReport/mMachineLogisticsCostReport
Response OnClick () id:Response_MacroPlanner_ContextMenuEngineLogisticsCostReport_mMachineLogisticsCostReport_OnClick
{
  #keys: '[413988.0.1492720600]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebMenu_OnClick'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      ApplicationScope.ViewManager().ResetUserViewById( "MachineLogisticsCostReport", true);
    *]
  }
}

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_mInterfacePlanInventoryDataPush_O.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: ContextMenuInterface/mInterfacePlanInventoryDataPush
Response OnClick () id:Response_MacroPlanner_ContextMenuInterface_mInterfacePlanInventoryDataPush_OnClick
{
  #keys: '[413988.0.1495640258]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebMenu_OnClick'
  QuillAction
  {
    Body:
    [*
      InterfacePlanInventoryDataPush::GenerateData( MacroPlan, InterfaceDataset );
    *]
    GroupServerCalls: false
  }
}