Merge remote-tracking branch 'refs/remotes/origin/dev'

Administrator

2023-09-24 e528264b38b96ad2f59ba9d7ab5d5b17385cb777

 _Main/UI/MacroPlannerWebApp/Component_FrmMaterial/_ROOT_Component_FrmMaterial.def

@@ -14,7 +14,7 @@
    {
      #keys: '[414724.0.53475285]'
      BaseType: 'WebDataHolder'
      Databinding: 'structured[Product_MP]*'
      Databinding: 'structured[H_MaterialInfo]*'
      Children:
      [
        Component de_dh_FM_ProductMP
@@ -26,7 +26,7 @@
            DataType: 'MacroPlan'
            Source: 'MacroPlan'
            Taborder: 0
            Transformation: 'Product_MP'
            Transformation: 'H_MaterialInfo'
          ]
        }
      ]
@@ -35,10 +35,26 @@
        Taborder: 2
      ]
    }
    Component txtSaveForecastData_FM
    {
      #keys: '[414724.0.143737386]'
      BaseType: 'WebEditField'
      Properties:
      [
        Description: '存储所选物料信息'
        Enabled: false
        ReadOnly: true
        Taborder: 4
        Visible: false
      ]
    }
  ]
  Properties:
  [
    Description: '原料列表页'
    Image: 'NAV_REDO_LIGHT_BLUE'
    MinimumColumns: 80
    MinimumRows: 40
    Title: '原料列表页'
  ]
}