xiaoding721
2024-12-04 7738d23499684bc91a6907ddbe7f892983aa6de2
Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
已重命名5个文件
已修改12个文件
已添加3个文件
239 ■■■■■ 文件已修改
_Main/BL/Type_InventoryInterfaceData/StaticMethod_Generate.qbl 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory#575.qbl 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory.qbl 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_MachineStockData/StaticMethod_Synchronize.qbl 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_NewAssemblyOnlinePlanCell/Attribute_Note.qbl 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_NewOfflinePlanCell/Attribute_Note.qbl 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_NewOfflinePlanCell/StaticMethod_DeductionOfReplacementLoss.qbl 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/Sys/Repr/Global/NewAssemblyOnlinePlanCell.qrp 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/Sys/Repr/Global/NewOfflinePlanCell.qrp 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupPlanViews.def 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupPlanViews_bNewAssemblyOnlinePlan_OnC#171.def 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupPlanViews_bNewOfflinePlan_OnClick#653.def 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupPlanViews_bPackagingPlan_OnClick#832.def 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupPlanViews_bShippingActualData_OnClic#778.def 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupPlanViews_bTransferPlan_OnClick#100.def 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgSecondDevelopmentPlan_bOfflinePlan_OnClick.def 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormNewAssemblyOnlinePlan/Component_MatrixEditor515#474.def 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_MatrixEditor583.def 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_MatrixEditor583_OnCheckEditability.def 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InventoryInterfaceData/StaticMethod_Generate.qbl
@@ -1,6 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod Generate (
  MacroPlan macroplan,
  InterfaceDataset interfaceDataset,
  Date date,
  String partno,
@@ -16,9 +17,15 @@
    if( isnull( iid ) ){
      iid := interfaceDataset.InventoryInterfaceData( relnew, Date := date, PartNumber := partno );
    }
    product    := selectobject( macroplan, Product_MP, product, product.ID() = partno );
    if( not isnull( product ) and exists( product.GetAllParent(), Elements, proparent, proparent.ID() = 'PL' ) ){
      quantitiy   := floor( [Real]quantitiy / 4 );
    }
    iidl := selectobject( iid, InventoryInterfaceDataDetail, detail, detail.InventoryPoint() = inventory and detail.Fac() = fac );
    if( isnull( iidl ) ){
      iid.InventoryInterfaceDataDetail( relnew, Date := date, PartNumber := partno, InventoryPoint := inventory, Fac := fac, Quantity := quantitiy );
    }else{
      iidl.Quantity( );
    }
  *]
}
_Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory#575.qbl
@@ -17,7 +17,7 @@
    // èŽ·å–æŒ‡å®šæ—¥æœŸåº“å­˜æŽ¥å£æ•°æ®
    //发动机成品库存
    traverse( inventorys, Elements, inventory ){
      InventoryInterfaceData::Generate( owner, inventory.DDay(), inventory.FourCode(), inventory.BIPlace(), inventory.Fac(), [Number]inventory.Total() );
      InventoryInterfaceData::Generate( macroplan, owner, inventory.DDay(), inventory.FourCode(), inventory.BIPlace(), inventory.Fac(), [Number]inventory.Total() );
    }
  *]
}
_Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod SynchronizeInventory (
  const MacroPlan macroPlan,
  MacroPlan macroPlan,
  InterfaceDataset interfaceDataset
)
{
@@ -22,11 +22,11 @@
        if( inventory.Fac() = 'DL' and inventory.Lgort() = 'All' ){
          inventoryname := inventory.LineType();
        }
        InventoryInterfaceData::Generate( interfaceDataset, inventory.DDay(), inventory.MaterialNo(), inventoryname, inventory.Fac(), [Number]inventory.Total() );
        InventoryInterfaceData::Generate( macroPlan, interfaceDataset, inventory.DDay(), inventory.MaterialNo(), inventoryname, inventory.Fac(), [Number]inventory.Total() );
      }
      //发动机成品库存
      traverse( loginfo, FinishedEngineInventory, inventory ){
        InventoryInterfaceData::Generate( interfaceDataset, inventory.DDay(), inventory.FourCode(), inventory.BIPlace(), inventory.Fac(), [Number]inventory.Total() );
        InventoryInterfaceData::Generate( macroPlan, interfaceDataset, inventory.DDay(), inventory.FourCode(), inventory.BIPlace(), inventory.Fac(), [Number]inventory.Total() );
      }
    }
  *]
_Main/BL/Type_MachineStockData/StaticMethod_Synchronize.qbl
@@ -30,7 +30,10 @@
        if( inventory.Fac() = 'DL' and inventory.Lgort() = 'All' ){
          inventoryname := inventory.LineType();
        }
        InventoryInterfaceData::Generate( owner, inventory.DDay(), inventory.MaterialNo(), inventoryname, inventory.Fac(), [Number]inventory.Total() );
        options := DatasetFindOptions::Construct( 'MacroPlan' ).IncludeOffline( true ); //to load we must search offline datasets.
        mdskey := DatasetController::FindUnique( options );
        MDSMacroPlan::Root( mdskey ) -> InventoryInterfaceData::Generate( owner, inventory.DDay(), inventory.MaterialNo(), inventoryname, inventory.Fac(), [Number]inventory.Total() );
    //    sadatalist.Add( sadata );
      }
    }
_Main/BL/Type_NewAssemblyOnlinePlanCell/Attribute_Note.qbl
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute Note
{
  #keys: '3[413988.1.211533432][413988.1.211533431][413988.1.211533433]'
  Description: '备注'
  ValueType: String
}
_Main/BL/Type_NewOfflinePlanCell/Attribute_Note.qbl
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute Note
{
  #keys: '3[413988.1.211533287][413988.1.211533286][413988.1.211533288]'
  Description: '备注'
  ValueType: String
}
_Main/BL/Type_NewOfflinePlanCell/StaticMethod_DeductionOfReplacementLoss.qbl
@@ -14,7 +14,7 @@
    allProductionLines := selectuniquevalues( newNOPT, NewOfflinePlanRow, tempNOPR, true, tempNOPR.ProductionLine() );
    
    traverse ( allProductionLines, Elements, pl
    //           , pl = "CC MoMo"
    //           , pl = "CC ZKG"
             ) 
    {
      // ä¸‹çº¿è®¡åˆ’当前产线下的行
@@ -24,14 +24,15 @@
      preNOPCell := null( NewOfflinePlanCell );
      
      traverse ( newNOPT, NewOfflinePlanColumn, nopc
    //             , nopc.StartDate() >= macroPlan.StartOfPlanning().Date() and nopc.StartDate() <= Date::Construct( 2025, 1, 16 ) // æµ‹è¯•时可以过滤时间
    //             , nopc.StartDate() >= macroPlan.StartOfPlanning().Date() and nopc.StartDate() <= Date::Construct( 2025, 1, 7 ) // æµ‹è¯•时可以过滤时间
               ) 
      {         
        for ( i := 1; i < 10; i++ ) {
          nopcell := select( noprs, Elements.NewOfflinePlanCell, tempNOPC, tempNOPC.NewOfflinePlanColumn() = nopc and tempNOPC.OrderNr() = i and tempNOPC.Order() <> "" );
          
          // æ¢åž‹æŸå¤±å‚æ•°
          cls     := select( macroPlan, ChangeLossSetting, tempCLS,
          cls     := select( macroPlan, ChangeLossSetting, tempCLS,
                             tempCLS.Unit().ID()          = pl                                                      and
                             tempCLS.ProductFirst().ID()  = guard( preNOPCell.NewOfflinePlanRow().ProductID(), "" ) and
                             tempCLS.ProductSecond().ID() = guard( nopcell.NewOfflinePlanRow().ProductID(), "" )    and
                             tempCLS.StartDate()          <= nopc.StartDate()                                       and
_Main/Sys/Repr/Global/NewAssemblyOnlinePlanCell.qrp
@@ -7,6 +7,12 @@
    Alignment: 'Right'
    AttributeKey: '[415754.0.554840209]'
  }
  AttributeRepresentation Note
  {
    Alignment: 'Right'
    AttributeKey: '[413988.1.211533431]'
    Synonym: '备注'
  }
  AttributeRepresentation Order
  {
    Alignment: 'Right'
_Main/Sys/Repr/Global/NewOfflinePlanCell.qrp
@@ -2,6 +2,12 @@
#parent: #root
TypeRepresentation NewOfflinePlanCell
{
  AttributeRepresentation Note
  {
    Alignment: 'Right'
    AttributeKey: '[413988.1.211533286]'
    Synonym: '备注'
  }
  AttributeRepresentation Order
  {
    Alignment: 'Right'
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupPlanViews.def
@@ -14,5 +14,61 @@
        Taborder: 8
      ]
    }
    Component bTransferPlan id:bTransferPlan_697
    {
      #keys: '[413988.1.207593018]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'HAND_TRUCK_BOX'
        Label: 'Transfer plan'
        Taborder: 9
      ]
    }
    Component bNewOfflinePlan id:bNewOfflinePlan_667
    {
      #keys: '[413988.1.207593152]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'LIGHTBULB'
        Label: 'Output plan'
        Taborder: 10
      ]
    }
    Component bNewAssemblyOnlinePlan id:bNewAssemblyOnlinePlan_670
    {
      #keys: '[413988.1.207593219]'
      BaseType: 'WebButton'
      Properties:
      [
        Description: '新版上线计划'
        Image: 'PALM_TREE'
        Label: 'Filing plan'
        Taborder: 11
      ]
    }
    Component bPackagingPlan id:bPackagingPlan_368
    {
      #keys: '[413988.1.207540470]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'SIXPACK_BEER'
        Label: 'Packaging plan'
        Taborder: 12
      ]
    }
    Component bShippingActualData id:bShippingActualData_957
    {
      #keys: '[413988.1.207540537]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'TABLE_CONNECTION'
        Label: 'Shipping data'
        Taborder: 13
      ]
    }
  ]
}
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def
@@ -5,36 +5,13 @@
  BaseType: 'WebActionBarGroup'
  Children:
  [
    Component bTransferPlan
    {
      #keys: '[413988.0.1290300652]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'HAND_TRUCK_BOX'
        Label: 'Transfer plan'
        Taborder: 0
      ]
    }
    Component bBlank
    {
      #keys: '[413988.0.1291640400]'
      BaseType: 'WebButton'
      Properties:
      [
        Taborder: 7
      ]
    }
    Component bOfflinePlan
    {
      #keys: '[413988.0.1296872738]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'LIGHTBULB'
        Label: 'Output plan'
        Taborder: 1
        Visible: false
        Taborder: 2
      ]
    }
    Component bAssemblyOnlinePlan
@@ -46,53 +23,20 @@
        Description: 'AssemblyOnlinePlan'
        Image: 'PALM_TREE'
        Label: 'Filing plan'
        Taborder: 3
        Taborder: 1
        Visible: false
      ]
    }
    Component bPackagingPlan
    Component bOfflinePlan
    {
      #keys: '[413988.0.1291640400]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'SIXPACK_BEER'
        Label: 'Packaging plan'
        Taborder: 5
      ]
    }
    Component bShippingActualData
    {
      #keys: '[415136.0.905520117]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'TABLE_CONNECTION'
        Label: 'Shipping data'
        Taborder: 6
      ]
    }
    Component bNewOfflinePlan
    {
      #keys: '[413988.0.1607471411]'
      #keys: '[413988.1.207540403]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'LIGHTBULB'
        Label: 'Output plan'
        Taborder: 2
      ]
    }
    Component bNewAssemblyOnlinePlan
    {
      #keys: '[413988.0.1701710485]'
      BaseType: 'WebButton'
      Properties:
      [
        Description: '新版上线计划'
        Image: 'PALM_TREE'
        Label: 'Filing plan'
        Taborder: 4
        Taborder: 0
        Visible: false
      ]
    }
  ]
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupPlanViews_bNewAssemblyOnlinePlan_OnC#171.def
ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgSecondDevelopmentPlan_bNewAssemblyOnlinePlan_OnClic.def ÐÞ¸Ä
@@ -1,8 +1,8 @@
Quintiq file version 2.0
#parent: abgSecondDevelopmentPlan/bNewAssemblyOnlinePlan
Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bNewAssemblyOnlinePlan_OnClick
#parent: ActionBarGroupPlanViews/bNewAssemblyOnlinePlan_670
Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bNewAssemblyOnlinePlan_OnClick_171
{
  #keys: '[413988.0.1699330508]'
  #keys: '[413988.1.207593218]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebButton_OnClick'
  GroupServerCalls: true
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupPlanViews_bNewOfflinePlan_OnClick#653.def
ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgSecondDevelopmentPlan_bNewOfflinePlan_OnClick.def ÐÞ¸Ä
@@ -1,8 +1,8 @@
Quintiq file version 2.0
#parent: abgSecondDevelopmentPlan/bNewOfflinePlan
Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bNewOfflinePlan_OnClick
#parent: ActionBarGroupPlanViews/bNewOfflinePlan_667
Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bNewOfflinePlan_OnClick_653
{
  #keys: '[413988.0.1607471572]'
  #keys: '[413988.1.207593151]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebButton_OnClick'
  GroupServerCalls: true
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupPlanViews_bPackagingPlan_OnClick#832.def
ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgSecondDevelopmentPlan_bPackagingPlan_OnClick.def ÐÞ¸Ä
@@ -1,8 +1,8 @@
Quintiq file version 2.0
#parent: abgSecondDevelopmentPlan/bPackagingPlan
Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bPackagingPlan_OnClick
#parent: ActionBarGroupPlanViews/bPackagingPlan_368
Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bPackagingPlan_OnClick_832
{
  #keys: '[413988.0.1400700759]'
  #keys: '[413988.1.207540469]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebButton_OnClick'
  GroupServerCalls: true
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupPlanViews_bShippingActualData_OnClic#778.def
ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgSecondDevelopmentPlan_bShippingActualData_OnClick.def ÐÞ¸Ä
@@ -1,8 +1,8 @@
Quintiq file version 2.0
#parent: abgSecondDevelopmentPlan/bShippingActualData
Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bShippingActualData_OnClick
#parent: ActionBarGroupPlanViews/bShippingActualData_957
Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bShippingActualData_OnClick_778
{
  #keys: '[415136.0.905520217]'
  #keys: '[413988.1.207540536]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebButton_OnClick'
  QuillAction
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupPlanViews_bTransferPlan_OnClick#100.def
ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgSecondDevelopmentPlan_bTransferPlan_OnClick.def ÐÞ¸Ä
@@ -1,8 +1,8 @@
Quintiq file version 2.0
#parent: abgSecondDevelopmentPlan/bTransferPlan
Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bTransferPlan_OnClick
#parent: ActionBarGroupPlanViews/bTransferPlan_697
Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bTransferPlan_OnClick_100
{
  #keys: '[413988.0.1290322113]'
  #keys: '[413988.1.207593017]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebButton_OnClick'
  GroupServerCalls: true
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgSecondDevelopmentPlan_bOfflinePlan_OnClick.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
#parent: abgSecondDevelopmentPlan/bOfflinePlan
Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bOfflinePlan_OnClick
Response OnClick () id:Response_MacroPlanner_ActionBarGroupPlanViews_bOfflinePlan_OnClick
{
  #keys: '[413988.0.1296872869]'
  #keys: '[413988.1.207540402]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebButton_OnClick'
  GroupServerCalls: true
_Main/UI/MacroPlannerWebApp/Component_FormNewAssemblyOnlinePlan/Component_MatrixEditor515#474.def
@@ -26,7 +26,7 @@
      ]
      Properties:
      [
        Attributes: 'Quantity;Order'
        Attributes: 'Quantity;Order;Note'
        Column: 'NewAssemblyOnlinePlanColumn'
        Row: 'NewAssemblyOnlinePlanRow'
        Taborder: 0
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_MatrixEditor583.def
@@ -26,7 +26,7 @@
      ]
      Properties:
      [
        Attributes: 'TotalQuantity;ShiftPatternName;ShiftPatternStart;ShiftPatternEnd'
        Attributes: 'TotalQuantity;ShiftPatternName;ShiftPatternStart;ShiftPatternEnd;Note'
        Column: 'NewOfflinePlanColumn'
        Row: 'NewOfflinePlanRow'
        Taborder: 0
@@ -92,7 +92,6 @@
    AllowMultipleAttributes: true
    Columns: 'MatrixEditorColumns473'
    ContextMenu: 'matrixeditorContextMenu267'
    Editable: false
    Rows: 'MatrixEditorRows569'
    Taborder: 0
  ]
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_MatrixEditor583_OnCheckEditability.def
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
Quintiq file version 2.0
#parent: MatrixEditor583
Response OnCheckEditability () id:Response_MatrixEditor583_OnCheckEditability
{
  #keys: '[413988.1.216511947]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebMatrixEditor_OnCheckEditability'
  QuillAction
  {
    Body:
    [*
      feedback := "不能编辑";
      cond     := focusedattribute = "Note";
      editinfo.CanEdit( cond );
      editinfo.UserHint( feedback );
    *]
    GroupServerCalls: false
  }
}