Merge branch 'dev' into dev_lrs

xiaoding721

2023-11-01 d2ec6798fa2cc711abd8c4e0bad8e4dbe431ddcc

 _Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Component_pnlContent.def

@@ -70,7 +70,7 @@
        DataBinding: 'DataHolderFillingCapacityOrder.Data.Quantity'
        Label: '数量'
        Mask: 'REAL'
        Taborder: 12
        Taborder: 13
      ]
    }
    Component dropDownStringListUnitOfMeasureName id:dropDownStringListUnitOfMeasureName_750
@@ -97,7 +97,7 @@
        DataBinding: 'DataHolderFillingCapacityOrder.Data.SalesAmount'
        Label: '销售额'
        Mask: 'NUMBER'
        Taborder: 13
        Taborder: 14
      ]
    }
    Component dsDemandDate
@@ -108,7 +108,7 @@
      [
        DataBinding: 'DataHolderFillingCapacityOrder.Data.DemandDate'
        Label: '需求日期'
        Taborder: 15
        Taborder: 16
      ]
    }
    Component dsForecastDemandDate
@@ -119,7 +119,7 @@
      [
        DataBinding: 'DataHolderFillingCapacityOrder.Data.ForecastDemandDate'
        Label: '预期需求日期'
        Taborder: 14
        Taborder: 15
      ]
    }
    Component ddlSalesSegment
@@ -268,7 +268,7 @@
      [
        DataBinding: 'DataHolderFillingCapacityOrder.Data.Customer'
        Label: 'Customer name'
        Taborder: 10
        Taborder: 11
      ]
    }
    Component efCustomID
@@ -277,8 +277,9 @@
      BaseType: 'WebEditField'
      Properties:
      [
        DataBinding: 'DataHolderFillingCapacityOrder.Data.CustomerID'
        Label: 'Customer ID'
        Taborder: 11
        Taborder: 12
      ]
    }
    Component ddslOrderType
@@ -290,7 +291,34 @@
        DataBinding: 'DataHolderFillingCapacityOrder.Data.OrderType'
        Label: '订单类型'
        Strings: '反签;授权'
        Taborder: 16
        Taborder: 17
      ]
    }
    Component ddlCurrency_MP
    {
      #keys: '[414502.0.395021898]'
      BaseType: 'WebDropDownList'
      Databinding: 'Currency_MP'
      Children:
      [
        Component deContent593
        {
          #keys: '[414502.0.395021900]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'MacroPlan'
            Source: 'MacroPlan'
            Taborder: 0
            Transformation: 'Currency_MP'
          ]
        }
      ]
      Properties:
      [
        DisplayField: 'Name'
        Label: '货币'
        Taborder: 10
      ]
    }
  ]