xiaoding721
2024-08-26 d5bc6e4fcadeea2a2e04d980736aa47be838310d
Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
已修改3个文件
已添加12个文件
186 ■■■■■ 文件已修改
_Main/BL/EDI/Broker_IL_InterfaceLogInfoMiddlesBroker.qbl 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Relations/Relation_InterfaceProductionSchedulingPlanPush_InterfaceDataset_InterfaceDat.qbl 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InterfaceLoginfo/DefaultValue_IsShow.qbl 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InterfaceProductionSchedulingPlanPush/Attribute_Fac.qbl 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InterfaceProductionSchedulingPlanPush/Attribute_FactoryName.qbl 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InterfaceProductionSchedulingPlanPush/Attribute_PlanningDate.qbl 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InterfaceProductionSchedulingPlanPush/Attribute_PlanningQty.qbl 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InterfaceProductionSchedulingPlanPush/Attribute_Product.qbl 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InterfaceProductionSchedulingPlanPush/Attribute_VersionName.qbl 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InterfaceProductionSchedulingPlanPush/StaticMethod_GenerateData.qbl 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InterfaceProductionSchedulingPlanPush/_ROOT_Type_InterfaceProductionSchedulingPlanPush.qbl 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuInterface.def 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_mInterfacePlanInventoryDataPush_O.def 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_mInterfaceProductionSchedulingPla.def 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormInterfaceLoginfo/Response_OnCreated.def 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/EDI/Broker_IL_InterfaceLogInfoMiddlesBroker.qbl
@@ -22,16 +22,17 @@
  {
    DataIntegrityStrategy: 'Disabled'
    SettingsEngineLink: 'domainmodel.ediremotedatasourcedefinition.remotestorage.vwed'
    EDIODBCLinkTable InterfaceLoginfoMiddle
    EDIODBCLinkTable A_InterfaceLogInfoMiddle
    {
      OthersMayCreateTable: true
      OthersMayDeleteRow: true
      OthersMayDropTable: true
      OthersMayFlushTable: true
      OthersMayInsertRow: true
      Parameters: '/owner="dbo"'
      PrimaryKeyColumns: ID
      RecordModificationHintStrategy: 'None'
      EDIODBCLinkColumn FinishTime
      EDIODBCLinkColumn FINISH_TIME
      {
        OthersMayUpdateColumn: true
        ValueType: DateTime
@@ -41,12 +42,12 @@
        OthersMayUpdateColumn: true
        ValueType: Number
      }
      EDIODBCLinkColumn Name
      EDIODBCLinkColumn NAME
      {
        OthersMayUpdateColumn: true
        ValueType: String
      }
      EDIODBCLinkColumn Response
      EDIODBCLinkColumn RESPONSE
      {
        OthersMayUpdateColumn: true
        ValueType: String
@@ -57,12 +58,12 @@
  {
    EDITableTransformation
    {
      InputTable: InterfaceLoginfoMiddle
      InputTable: A_InterfaceLogInfoMiddle
      OutputTable: InterfaceLoginfoMiddle
      EDIColumnMatch { InputColumn: FinishTime OutputColumn: FinishTime }
      EDIColumnMatch { InputColumn: FINISH_TIME OutputColumn: FinishTime }
      EDIColumnMatch { InputColumn: ID OutputColumn: ID }
      EDIColumnMatch { InputColumn: Name OutputColumn: Name }
      EDIColumnMatch { InputColumn: Response OutputColumn: Response }
      EDIColumnMatch { InputColumn: NAME OutputColumn: Name }
      EDIColumnMatch { InputColumn: RESPONSE OutputColumn: Response }
    }
  }
}
_Main/BL/Relations/Relation_InterfaceProductionSchedulingPlanPush_InterfaceDataset_InterfaceDat.qbl
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
Quintiq file version 2.0
#parent: #root
Relation InterfaceProductionSchedulingPlanPush_InterfaceDataset_InterfaceDataset_InterfaceProductionSchedulingPlanPush
{
  #keys: '1[415754.0.136725964]'
  DefaultRelationStrategy
  {
  }
  RelationSide.LeftSide InterfaceDataset
  {
    #keys: '3[415754.0.136725966][415754.0.136725965][415754.0.136725967]'
    Cardinality: '0to1'
    ObjectDefinition: InterfaceProductionSchedulingPlanPush
    OwningSide: 'Reference'
  }
  RelationSide.RightSide InterfaceProductionSchedulingPlanPush
  {
    #keys: '3[415754.0.136725969][415754.0.136725968][415754.0.136725970]'
    Cardinality: '1toN'
    ObjectDefinition: InterfaceDataset
    OwningSide: 'Owned'
  }
}
_Main/BL/Type_InterfaceLoginfo/DefaultValue_IsShow.qbl
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
Quintiq file version 2.0
#parent: #root
DefaultValue
{
  ISOValue: 'true'
  TargetAttribute: IsShow
}
_Main/BL/Type_InterfaceProductionSchedulingPlanPush/Attribute_Fac.qbl
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute Fac
{
  #keys: '3[415754.0.136760165][415754.0.136760164][415754.0.136760166]'
  Description: '工厂简写'
  ValueType: String
}
_Main/BL/Type_InterfaceProductionSchedulingPlanPush/Attribute_FactoryName.qbl
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute FactoryName
{
  #keys: '3[415754.0.136726097][415754.0.136726096][415754.0.136726098]'
  Description: '工厂名称'
  ValueType: String
}
_Main/BL/Type_InterfaceProductionSchedulingPlanPush/Attribute_PlanningDate.qbl
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute PlanningDate
{
  #keys: '3[415754.0.136726023][415754.0.136726022][415754.0.136726024]'
  Description: '排产日期'
  ValueType: Date
}
_Main/BL/Type_InterfaceProductionSchedulingPlanPush/Attribute_PlanningQty.qbl
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute PlanningQty
{
  #keys: '3[415754.0.136760128][415754.0.136760127][415754.0.136760129]'
  Description: '对应日期的计划数量'
  ValueType: Number
}
_Main/BL/Type_InterfaceProductionSchedulingPlanPush/Attribute_Product.qbl
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute Product
{
  #keys: '3[415754.0.136725988][415754.0.136725987][415754.0.136725989]'
  Description: '物料号'
  ValueType: String
}
_Main/BL/Type_InterfaceProductionSchedulingPlanPush/Attribute_VersionName.qbl
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute VersionName
{
  #keys: '3[415754.0.136726060][415754.0.136726059][415754.0.136726061]'
  Description: '版本名称'
  ValueType: String
}
_Main/BL/Type_InterfaceProductionSchedulingPlanPush/StaticMethod_GenerateData.qbl
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
Quintiq file version 2.0
#parent: #root
StaticMethod GenerateData (
  MacroPlan macroPlan,
  InterfaceDataset interfaceDataset
)
{
  TextBody:
  [*
    interfaceDataset.InterfaceProductionSchedulingPlanPush( relflush );
    traverse ( macroPlan, Product_MP.ProductInStockingPoint_MP, pispmp, not pispmp.IsSystem() and pispmp.IsLeaf() and ( pispmp.StockingPointID() = "DL-MoMo" or pispmp.StockingPointID() = "CC-MoMo" ) ) {
      info( pispmp.Name() );
      traverse ( pispmp, ProductInStockingPointInPeriodPlanning.astype( ProductInStockingPointInPeriodPlanningLeaf ), pispippl, not pispippl.IsPeriodFrozen() ) {
        interfaceDataset.InterfaceProductionSchedulingPlanPush( relnew,
                                                                Product      := pispmp.ProductID(),
                                                                PlanningDate := pispippl.Start().Date(),
                                                                PlanningQty  := [Number]pispippl.NewSupplyQuantity(),
                                                                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_InterfaceProductionSchedulingPlanPush/_ROOT_Type_InterfaceProductionSchedulingPlanPush.qbl
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
Quintiq file version 2.0
#root
#parent: #DomainModel
Type InterfaceProductionSchedulingPlanPush
{
  #keys: '5[415754.0.136750146][415754.0.136750144][0.0.0][415754.0.136750145][415754.0.136750147]'
  BaseType: Object
  StructuredName: 'InterfaceProductionSchedulingPlanPushs'
}
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuInterface.def
@@ -65,10 +65,20 @@
      Properties:
      [
        Image: 'FLAG_AMBER'
        Taborder: 5
        Taborder: 6
        Title: 'Customer demand(PPA + IDS)'
      ]
    }
    Component mInterfaceProductionSchedulingPlanPush
    {
      #keys: '[415754.0.140441770]'
      BaseType: 'WebMenu'
      Properties:
      [
        Taborder: 5
        Title: '生产排程计划数据推送接口测试'
      ]
    }
  ]
  Properties:
  [
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_mInterfacePlanInventoryDataPush_O.def
@@ -5,11 +5,17 @@
  #keys: '[413988.0.1495640258]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebMenu_OnClick'
  Precondition:
  [*
    return not isnull( MacroPlan ) and not isnull( InterfaceDataset );
  *]
  QuillAction
  {
    Body:
    [*
      InterfacePlanInventoryDataPush::GenerateData( MacroPlan, InterfaceDataset );
      WebMessageBox::Success( "推送成功!" );
    *]
    GroupServerCalls: false
  }
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ContextMenuInterface_mInterfaceProductionSchedulingPla.def
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
Quintiq file version 2.0
#parent: ContextMenuInterface/mInterfaceProductionSchedulingPlanPush
Response OnClick () id:Response_MacroPlanner_ContextMenuInterface_mInterfaceProductionSchedulingPlanPush_OnClick
{
  #keys: '[415754.0.141940525]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebMenu_OnClick'
  Precondition:
  [*
    return not isnull( MacroPlan ) and not isnull( InterfaceDataset );
  *]
  QuillAction
  {
    Body:
    [*
      InterfaceProductionSchedulingPlanPush::GenerateData( MacroPlan, InterfaceDataset );
      WebMessageBox::Success( "推送成功!" );
    *]
    GroupServerCalls: false
  }
}
_Main/UI/MacroPlannerWebApp/Component_FormInterfaceLoginfo/Response_OnCreated.def
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: #root
Response OnCreated () id:Response_FormInterfaceLoginfo_OnCreated
{
  #keys: '[415136.0.1043011769]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnCreated'
  QuillAction
  {
    Body:
    [*
      InterfaceLoginfo::SyncMiddle( InterfaceDataset );
    *]
    GroupServerCalls: false
  }
}