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

xiaoding721

2024-11-11 fa4efe4ea4f7dc03c9872d7728f043fc27ae0644

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditProductionLineBatchData/Component_pnlContent.def

@@ -30,6 +30,7 @@
        DataBinding: 'DialogData.Data.Unit1'
        DisplayField: 'Name'
        Label: 'Line 1'
        NumberOfColumns: 50
        Taborder: 0
      ]
    }
@@ -58,6 +59,7 @@
        DataBinding: 'DialogData.Data.Unit2'
        DisplayField: 'Name'
        Label: 'Line 2'
        NumberOfColumns: 50
        Taborder: 1
      ]
    }
@@ -86,6 +88,7 @@
        DataBinding: 'DialogData.Data.ShiftPattern1'
        DisplayField: 'Name'
        Label: 'Shift pattern 1'
        NumberOfColumns: 50
        Taborder: 3
      ]
    }
@@ -114,6 +117,7 @@
        DataBinding: 'DialogData.Data.ShiftPattern2'
        DisplayField: 'Name'
        Label: 'Shift pattern 2'
        NumberOfColumns: 50
        Taborder: 4
      ]
    }
@@ -139,62 +143,8 @@
        Taborder: 7
      ]
    }
    Component ddlLine3
    {
      #keys: '[414996.1.106189463]'
      BaseType: 'WebDropDownList'
      Databinding: 'Unit'
      Children:
      [
        Component deContent872
        {
          #keys: '[414996.1.106189464]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'structured[Unit]'
            Source: 'ApplicationMacroPlanner.DataHolderUnit'
            Taborder: 0
            Transformation: 'Elements.astype(Unit)'
          ]
        }
      ]
      Properties:
      [
        DataBinding: 'DialogData.Data.Unit3'
        DisplayField: 'Name'
        Label: 'Line 3'
        Taborder: 2
      ]
    }
    Component ddlShiftPattern3
    {
      #keys: '[414996.1.108410230]'
      BaseType: 'WebDropDownList'
      Databinding: 'ShiftPattern'
      Children:
      [
        Component deContent529
        {
          #keys: '[414996.1.108410231]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'MacroPlan'
            Source: 'MacroPlan'
            Taborder: 0
            Transformation: 'ShiftPattern'
          ]
        }
      ]
      Properties:
      [
        DataBinding: 'DialogData.Data.ShiftPattern3'
        DisplayField: 'Name'
        Label: 'Shift pattern 3'
        Taborder: 5
      ]
    }
    #child: pLine3
    #child: pShiftPattern3
  ]
  Properties:
  [