Merge branch 'master' of http://49.235.130.76/XXF_1122/DaisyNPILine

TeamAAS-VM/Views/SettingView.xaml

@@ -237,6 +237,22 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
@@ -311,6 +327,145 @@
                         <Button Style="{StaticResource MaterialDesignRaisedButton}"
                                 Command="{Binding SaveDeviceInfoCommand}">保存</Button>
                     </StackPanel>
+
+                    <TextBlock Grid.Row="7"
+                               Grid.Column="0"
+                               Text="PROCESS_NAME:"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Center" />
+                    <TextBox Grid.Row="7"
+                             Grid.Column="1"
+                             Text="{Binding DeviceInfo.MesSubmitUrl, Mode=TwoWay}"
+                             Margin="6" />
+
+                    <TextBlock Grid.Row="8"
+                               Grid.Column="0"
+                               Text="CTQ_LSL(扭力下限):"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Center" />
+                    <TextBox Grid.Row="8"
+                             Grid.Column="1"
+                             Text="{Binding DeviceInfo.MesSubmitUrl, Mode=TwoWay}"
+                             Margin="6" />
+
+                    <TextBlock Grid.Row="9"
+                               Grid.Column="0"
+                               Text="CTQ_USL(扭力上限)"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Center" />
+                    <TextBox Grid.Row="9"
+                             Grid.Column="1"
+                             Text="{Binding DeviceInfo.MesSubmitUrl, Mode=TwoWay}"
+                             Margin="6" />
+
+                    <TextBlock Grid.Row="10"
+                               Grid.Column="0"
+                               Text="CTQ_LSL(压力下限):"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Center" />
+                    <TextBox Grid.Row="10"
+                             Grid.Column="1"
+                             Text="{Binding DeviceInfo.MesSubmitUrl, Mode=TwoWay}"
+                             Margin="6" />
+
+                    <TextBlock Grid.Row="11"
+                               Grid.Column="0"
+                               Text="CTQ_USL(压力上限):"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Center" />
+                    <TextBox Grid.Row="11"
+                             Grid.Column="1"
+                             Text="{Binding DeviceInfo.MesSubmitUrl, Mode=TwoWay}"
+                             Margin="6" />
+
+                    <TextBlock Grid.Row="12"
+                               Grid.Column="0"
+                               Text="SUPPLIER_NAME:"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Center" />
+                    <TextBox Grid.Row="12"
+                             Grid.Column="1"
+                             Text="{Binding DeviceInfo.MesSubmitUrl, Mode=TwoWay}"
+                             Margin="6" />
+
+                    <TextBlock Grid.Row="13"
+                               Grid.Column="0"
+                               Text="COMMODITY_TYPE:"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Center" />
+                    <TextBox Grid.Row="13"
+                             Grid.Column="1"
+                             Text="{Binding DeviceInfo.MesSubmitUrl, Mode=TwoWay}"
+                             Margin="6" />
+
+                    <TextBlock Grid.Row="14"
+                               Grid.Column="0"
+                               Text="REVISION:"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Center" />
+                    <TextBox Grid.Row="14"
+                             Grid.Column="1"
+                             Text="{Binding DeviceInfo.MesSubmitUrl, Mode=TwoWay}"
+                             Margin="6" />
+
+                    <TextBlock Grid.Row="15"
+                               Grid.Column="0"
+                               Text="WO#:"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Center" />
+                    <TextBox Grid.Row="15"
+                             Grid.Column="1"
+                             Text="{Binding DeviceInfo.MesSubmitUrl, Mode=TwoWay}"
+                             Margin="6" />
+
+                    <TextBlock Grid.Row="16"
+                               Grid.Column="0"
+                               Text="MFG_LOT#:"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Center" />
+                    <TextBox Grid.Row="16"
+                             Grid.Column="1"
+                             Text="{Binding DeviceInfo.MesSubmitUrl, Mode=TwoWay}"
+                             Margin="6" />
+
+                    <TextBlock Grid.Row="17"
+                               Grid.Column="0"
+                               Text="MFG_ASSY_LINE:"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Center" />
+                    <TextBox Grid.Row="17"
+                             Grid.Column="1"
+                             Text="{Binding DeviceInfo.MesSubmitUrl, Mode=TwoWay}"
+                             Margin="6" />
+
+                    <TextBlock Grid.Row="18"
+                               Grid.Column="0"
+                               Text="PROCESS_MACHINE_ID:"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Center" />
+                    <TextBox Grid.Row="18"
+                             Grid.Column="1"
+                             Text="{Binding DeviceInfo.MesSubmitUrl, Mode=TwoWay}"
+                             Margin="6" />
+
+                    <TextBlock Grid.Row="19"
+                               Grid.Column="0"
+                               Text="CTQ_UNIT_OF_MEASURE:"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Center" />
+                    <TextBox Grid.Row="19"
+                             Grid.Column="1"
+                             Text="{Binding DeviceInfo.MesSubmitUrl, Mode=TwoWay}"
+                             Margin="6" />
+
+                    <StackPanel Orientation="Horizontal"
+                                HorizontalAlignment="Right"
+                                Grid.Row="20"
+                                Grid.ColumnSpan="2"
+                                Margin="6">
+                        <Button Style="{StaticResource MaterialDesignRaisedButton}"
+                                Command="{Binding SaveDeviceInfoCommand}">保存</Button>
+                    </StackPanel>
                 </Grid>
             </TabItem>