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

@@ -20,6 +20,7 @@
        #child: abpAlgorithmPostProcessing
        #child: ActionBarPagePlan
        #child: ActionBarPageReport
        #child: ActionBarPageArchivePublish
      ]
    }
    Component dhBinaryDataPR id:dhBinaryDataPR_688
@@ -192,5 +193,47 @@
        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
      ]
    }
  ]
}