Merge branch 'dev' into dev_yx

yypsybs

2023-10-08 f5d6db2a9edfb82bbdb1ce5688c00df7dc101e83

 _Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Component_pnlContent.def

@@ -13,8 +13,10 @@
      [
        AllowEmpty: true
        DataBinding: 'DataHolderFillingCapacityOrder.Data.ProductID'
        Enabled: false
        Label: '商品编码'
        Taborder: 0
        Visible: false
      ]
    }
    Component dropDownStringListSalesSegmentName id:dropDownStringListSalesSegmentName_325
@@ -25,8 +27,10 @@
      [
        AllowEmpty: true
        DataBinding: 'DataHolderFillingCapacityOrder.Data.SalesSegmentName'
        Enabled: false
        Label: '销售部门'
        Taborder: 1
        Visible: false
      ]
    }
    Component dropDownStringListStockPointID id:dropDownStringListStockPointID_801
@@ -37,8 +41,10 @@
      [
        AllowEmpty: true
        DataBinding: 'DataHolderFillingCapacityOrder.Data.StockingPointID'
        Enabled: false
        Label: '库存点'
        Taborder: 2
        Visible: false
      ]
    }
    Component dropDownStringListCustomer id:dropDownStringListCustomer_957
@@ -49,8 +55,10 @@
      [
        AllowEmpty: true
        DataBinding: 'DataHolderFillingCapacityOrder.Data.Customer'
        Enabled: false
        Label: '客户'
        Taborder: 3
        Visible: false
      ]
    }
    Component edtQuantity id:edtQuantity_995
@@ -62,7 +70,7 @@
        DataBinding: 'DataHolderFillingCapacityOrder.Data.Quantity'
        Label: '数量'
        Mask: 'REAL'
        Taborder: 4
        Taborder: 12
      ]
    }
    Component dropDownStringListUnitOfMeasureName id:dropDownStringListUnitOfMeasureName_750
@@ -73,9 +81,11 @@
      [
        AllowEmpty: true
        DataBinding: 'DataHolderFillingCapacityOrder.Data.UnitOfMeasureName'
        Enabled: false
        Label: '数量单位'
        Strings: 'UnitName'
        Taborder: 5
        Taborder: 4
        Visible: false
      ]
    }
    Component edtSalesAmount id:edtSalesAmount_608
@@ -87,7 +97,7 @@
        DataBinding: 'DataHolderFillingCapacityOrder.Data.SalesAmount'
        Label: '销售额'
        Mask: 'NUMBER'
        Taborder: 6
        Taborder: 13
      ]
    }
    Component dsDemandDate
@@ -98,7 +108,7 @@
      [
        DataBinding: 'DataHolderFillingCapacityOrder.Data.DemandDate'
        Label: '需求日期'
        Taborder: 8
        Taborder: 15
      ]
    }
    Component dsForecastDemandDate
@@ -109,9 +119,180 @@
      [
        DataBinding: 'DataHolderFillingCapacityOrder.Data.ForecastDemandDate'
        Label: '预期需求日期'
        Taborder: 14
      ]
    }
    Component ddlSalesSegment
    {
      #keys: '[414702.0.525040441]'
      BaseType: 'WebDropDownList'
      Databinding: 'SalesSegment_MP'
      Children:
      [
        Component deSalesSegment
        {
          #keys: '[414702.0.525040443]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'structured[SalesSegment_MP]'
            FixedFilter: 'object.Child(relsize)=0'
            Source: 'ApplicationMacroPlanner.DataHolderSalesSegment'
            Taborder: 0
            Transformation: 'Elements'
          ]
        }
      ]
      Properties:
      [
        DisplayField: 'Name'
        Label: '销售部门'
        Taborder: 5
      ]
    }
    Component ddlProduct_MP
    {
      #keys: '[414702.0.525462899]'
      BaseType: 'WebDropDownList'
      Databinding: 'Product_MP'
      Children:
      [
        Component deContent
        {
          #keys: '[414702.0.525462901]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'structured[Product_MP]'
            FixedFilter: 'not object.IsSystem()'
            Source: 'ApplicationMacroPlanner.DataHolderProduct'
            Taborder: 0
            Transformation: 'Elements'
          ]
        }
      ]
      Properties:
      [
        DisplayField: 'Name'
        Label: '产品'
        Taborder: 6
      ]
    }
    Component ddlStockingPoint_MP
    {
      #keys: '[414702.0.525462922]'
      BaseType: 'WebDropDownList'
      Databinding: 'StockingPoint_MP'
      Children:
      [
        Component deContent345
        {
          #keys: '[414702.0.525462924]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'structured[StockingPoint_MP]'
            FixedFilter: 'not object.IsSystem()'
            Source: 'ApplicationMacroPlanner.DataHolderStockingPoint'
            Taborder: 0
            Transformation: 'Elements'
          ]
        }
      ]
      Properties:
      [
        DisplayField: 'Name'
        Label: '库存点'
        Taborder: 7
      ]
    }
    Component ddlBusinessType
    {
      #keys: '[414702.0.525012300]'
      BaseType: 'WebDropDownList'
      Databinding: 'BusinessType'
      Children:
      [
        Component deContent989
        {
          #keys: '[414702.0.525012302]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'GlobalOTDTable'
            Source: 'GlobalOTDTable'
            Taborder: 0
            Transformation: 'BusinessType'
          ]
        }
      ]
      Properties:
      [
        DisplayField: 'BusinessTypeName'
        Label: '事业部'
        Taborder: 8
      ]
    }
    Component ddlUnitOfMeasure_MP
    {
      #keys: '[414702.0.525669735]'
      BaseType: 'WebDropDownList'
      Databinding: 'UnitOfMeasure_MP'
      Children:
      [
        Component deContent703
        {
          #keys: '[414702.0.525669737]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'MacroPlan'
            Source: 'MacroPlan'
            Taborder: 0
            Transformation: 'UnitOfMeasure_MP'
          ]
        }
      ]
      Properties:
      [
        DisplayField: 'Name'
        Label: '单位'
        Taborder: 9
      ]
    }
    Component efCustomerName
    {
      #keys: '[414702.0.525734924]'
      BaseType: 'WebEditField'
      Properties:
      [
        DataBinding: 'DataHolderFillingCapacityOrder.Data.Customer'
        Label: 'Customer name'
        Taborder: 10
      ]
    }
    Component efCustomID
    {
      #keys: '[414702.0.525734943]'
      BaseType: 'WebEditField'
      Properties:
      [
        Label: 'Customer ID'
        Taborder: 11
      ]
    }
    Component ddslOrderType
    {
      #keys: '[414702.0.526239841]'
      BaseType: 'WebDropDownStringList'
      Properties:
      [
        DataBinding: 'DataHolderFillingCapacityOrder.Data.OrderType'
        Label: '订单类型'
        Strings: '反签;授权'
        Taborder: 16
      ]
    }
  ]
  Properties:
  [