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

xiaoding721

2024-10-17 ed2537cd89fa7c3d3d231d236ebf1f1de59d6531

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Component_pnlContent.def

@@ -5,14 +5,15 @@
  BaseType: 'WebPanel'
  Children:
  [
    Component ddslProductionLine
    Component ddslFactory
    {
      #keys: '[413988.0.1596148502]'
      BaseType: 'WebDropDownStringList'
      Properties:
      [
        DataBinding: 'DataHolderDialogData.Data.ProductionLine'
        DataBinding: 'DataHolderDialogData.Data.Factory'
        Label: 'Production line'
        Strings: '大连工厂;长春工厂'
        Taborder: 0
      ]
    }
@@ -24,7 +25,7 @@
      [
        DataBinding: 'DataHolderDialogData.Data.MaximumDailyPackagingQuantity'
        Label: 'Maximum daily packaging quantity'
        Taborder: 1
        Taborder: 2
      ]
    }
    Component npMaximumDailyUnpackingQuantity
@@ -35,7 +36,18 @@
      [
        DataBinding: 'DataHolderDialogData.Data.MaximumDailyUnpackingQuantity'
        Label: 'Maximum daily unpacking quantity'
        Taborder: 2
        Taborder: 3
      ]
    }
    Component ddslProductID
    {
      #keys: '[415754.0.415211304]'
      BaseType: 'WebDropDownStringList'
      Properties:
      [
        DataBinding: 'DataHolderDialogData.Data.ProductID'
        Label: 'Product ID'
        Taborder: 1
      ]
    }
  ]