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

admin

2025-01-22 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def

@@ -11,6 +11,228 @@
      [
        #child: ActionBarPageData
        #child: ActionBarPageSales
        #child: applicationConfigureActionBarPageDef
        #child: ActionBarPageInventory
        #child: ActionBarPageRestraint
        #child: ActionBarPageScenarioSelection
        #child: applicationFixedPageActionBarPageDef
        #child: applicationDevelopmentActionBarPageDef_1
        #child: abpAlgorithmPostProcessing
        #child: ActionBarPagePlan
        #child: ActionBarPageReport
        #child: ActionBarPageArchivePublish
      ]
    }
    Component dhBinaryDataPR id:dhBinaryDataPR_688
    {
      #keys: '[414996.0.393643308]'
      BaseType: 'WebDataHolder'
      Databinding: 'BinaryData*'
      Properties:
      [
        Taborder: 40
      ]
    }
    Component dhOriginalFileNamePR id:dhOriginalFileNamePR_648
    {
      #keys: '[414996.0.393612592]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Taborder: 41
      ]
    }
    Component dhBinaryDataPP id:dhBinaryDataPP_821
    {
      #keys: '[414996.0.393824611]'
      BaseType: 'WebDataHolder'
      Databinding: 'BinaryData*'
      Properties:
      [
        Taborder: 43
      ]
    }
    Component dhOriginalFileNamePP id:dhOriginalFileNamePP_14
    {
      #keys: '[414996.0.393824682]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Taborder: 44
      ]
    }
    Component dhBinaryDataBudget id:dhBinaryDataBudget_98
    {
      #keys: '[414996.0.393824752]'
      BaseType: 'WebDataHolder'
      Databinding: 'BinaryData*'
      Properties:
      [
        Taborder: 46
      ]
    }
    Component dhOriginalFileNameBudget id:dhOriginalFileNameBudget_623
    {
      #keys: '[414996.0.393824822]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Taborder: 47
      ]
    }
    Component dhBinaryDataPPA id:dhBinaryDataPPA_838
    {
      #keys: '[414996.0.393824892]'
      BaseType: 'WebDataHolder'
      Databinding: 'BinaryData*'
      Properties:
      [
        Taborder: 49
      ]
    }
    Component dhOriginalFileNamePPA id:dhOriginalFileNamePPA_673
    {
      #keys: '[414996.0.393824962]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Taborder: 50
      ]
    }
    Component dhBinaryDataCurve id:dhBinaryDataCurve_97
    {
      #keys: '[414996.0.393825033]'
      BaseType: 'WebDataHolder'
      Databinding: 'BinaryData*'
      Properties:
      [
        Taborder: 52
      ]
    }
    Component dhOriginalFileNameCurve id:dhOriginalFileNameCurve_971
    {
      #keys: '[414996.0.393825103]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Taborder: 53
      ]
    }
    Component dhBinaryDataIDS id:dhBinaryDataIDS_976
    {
      #keys: '[414996.0.393825179]'
      BaseType: 'WebDataHolder'
      Databinding: 'BinaryData*'
      Properties:
      [
        Taborder: 54
      ]
    }
    Component dhOriginalFileNameIDS id:dhOriginalFileNameIDS_878
    {
      #keys: '[414996.0.393825249]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Taborder: 55
      ]
    }
    Component dhIsPRArchive
    {
      #keys: '[414996.0.395211329]'
      BaseType: 'WebDataHolder'
      Databinding: 'Boolean*'
      Properties:
      [
        Taborder: 42
      ]
    }
    Component dhIsPPArchive
    {
      #keys: '[414996.0.395393587]'
      BaseType: 'WebDataHolder'
      Databinding: 'Boolean*'
      Properties:
      [
        Taborder: 45
      ]
    }
    Component dhIsBudgetArchive
    {
      #keys: '[414996.0.395393613]'
      BaseType: 'WebDataHolder'
      Databinding: 'Boolean*'
      Properties:
      [
        Taborder: 48
      ]
    }
    Component dhIsPPAArchive
    {
      #keys: '[414996.0.395393638]'
      BaseType: 'WebDataHolder'
      Databinding: 'Boolean*'
      Properties:
      [
        Taborder: 51
      ]
    }
    Component dhSelectedShiftDay
    {
      #keys: '[413988.0.1371211822]'
      BaseType: 'WebDataHolder'
      Databinding: 'ShiftDay'
      Properties:
      [
        Taborder: 56
      ]
    }
    Component dhStartDate
    {
      #keys: '[415754.0.240181339]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Taborder: 57
      ]
    }
    Component dhEndDate
    {
      #keys: '[415754.0.240181500]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Taborder: 58
      ]
    }
    Component dhSelectedFactory
    {
      #keys: '[415754.0.350439827]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Description: '包装计划所选工厂'
        Taborder: 59
      ]
    }
    Component dhSelectedFactoryMCRR
    {
      #keys: '[415754.0.434272020]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Description: '机加物流成本报表工厂参数'
        Taborder: 60
      ]
    }
  ]