KWD 3 месяцев назад
Родитель
Сommit
b8a590e4e0
1 измененных файлов с 494 добавлено и 522 удалено
  1. 494 522
      TeamAAS-VM/Views/SettingView.xaml

+ 494 - 522
TeamAAS-VM/Views/SettingView.xaml

@@ -546,12 +546,12 @@
                                     Grid.Column="1"
                                     Orientation="Horizontal">
                                     <CheckBox
-    Grid.Row="11"
-    Grid.Column="1"
-    Margin="6,2"
-    Command="{Binding CheckStatusCommand}"
-    Content="启用 MES"
-    IsChecked="{Binding SelectDeviceInfo.EnableMES, Mode=TwoWay}" />
+                                        Grid.Row="11"
+                                        Grid.Column="1"
+                                        Margin="6,2"
+                                        Command="{Binding CheckStatusCommand}"
+                                        Content="启用 MES"
+                                        IsChecked="{Binding SelectDeviceInfo.EnableMES, Mode=TwoWay}" />
                                     <!--<CheckBox Grid.Row="10"
           Grid.Column="1"
           Content="是否启用两次产品编号"
@@ -562,11 +562,11 @@
                                         Grid.Column="1"
                                         Margin="6,2"
                                         Command="{Binding CheckStatusCommand}"
-Content="是否启用锁螺丝XY超限"
-IsChecked="{Binding SelectDeviceInfo.EnableXY, Mode=TwoWay}" />
+                                        Content="是否启用锁螺丝XY超限"
+                                        IsChecked="{Binding SelectDeviceInfo.EnableXY, Mode=TwoWay}" />
                                 </StackPanel>
 
-                                
+
                                 <StackPanel
                                     Grid.Row="13"
                                     Grid.Column="1"
@@ -713,38 +713,38 @@ IsChecked="{Binding SelectDeviceInfo.EnableXY, Mode=TwoWay}" />
                                     Margin="6,2"
                                     Text="{Binding SelectDeviceInfo.DataInfo.PROCESS_MACHINE_ID, Mode=TwoWay}" />
                                 <TextBlock
-    Grid.Row="24"
-    Grid.Column="0"
-    HorizontalAlignment="Right"
-    VerticalAlignment="Center"
-    Text="螺丝型号1:" />
+                                    Grid.Row="24"
+                                    Grid.Column="0"
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Center"
+                                    Text="螺丝型号1:" />
                                 <TextBox
-    Grid.Row="24"
-    Grid.Column="1"
-    Margin="6,2"
-    Text="{Binding SelectDeviceInfo.DataInfo.Screwsize1, Mode=TwoWay}" />
+                                    Grid.Row="24"
+                                    Grid.Column="1"
+                                    Margin="6,2"
+                                    Text="{Binding SelectDeviceInfo.DataInfo.Screwsize1, Mode=TwoWay}" />
                                 <TextBlock
-Grid.Row="25"
-Grid.Column="0"
-HorizontalAlignment="Right"
-VerticalAlignment="Center"
-Text="螺丝型号2:" />
+                                    Grid.Row="25"
+                                    Grid.Column="0"
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Center"
+                                    Text="螺丝型号2:" />
                                 <TextBox
-Grid.Row="25"
-Grid.Column="1"
-Margin="6,2"
-Text="{Binding SelectDeviceInfo.DataInfo.Screwsize2, Mode=TwoWay}" />
+                                    Grid.Row="25"
+                                    Grid.Column="1"
+                                    Margin="6,2"
+                                    Text="{Binding SelectDeviceInfo.DataInfo.Screwsize2, Mode=TwoWay}" />
                                 <TextBlock
-Grid.Row="26"
-Grid.Column="0"
-HorizontalAlignment="Right"
-VerticalAlignment="Center"
-Text="螺丝型号3:" />
+                                    Grid.Row="26"
+                                    Grid.Column="0"
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Center"
+                                    Text="螺丝型号3:" />
                                 <TextBox
-Grid.Row="26"
-Grid.Column="1"
-Margin="6,2"
-Text="{Binding SelectDeviceInfo.DataInfo.Screwsize3, Mode=TwoWay}" />
+                                    Grid.Row="26"
+                                    Grid.Column="1"
+                                    Margin="6,2"
+                                    Text="{Binding SelectDeviceInfo.DataInfo.Screwsize3, Mode=TwoWay}" />
                             </Grid>
                         </Grid>
                     </ScrollViewer>
@@ -2831,528 +2831,500 @@ Text="{Binding SelectDeviceInfo.DataInfo.Screwsize3, Mode=TwoWay}" />
                             Text="{lex:Loc 系统参数}" />
                     </StackPanel>
                 </TabItem.Header>
-                <StackPanel Margin="20" Orientation="Vertical">
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="16" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="20" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-
-                        <Grid Margin="16">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="220" />
-                                <ColumnDefinition Width="260" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-
+                <Grid Margin="20">
+                    <ScrollViewer
+                        HorizontalScrollBarVisibility="Auto"
+                        VerticalScrollBarVisibility="Auto">
+                        <Grid IsEnabled="{Binding IsAllowEdit}">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
+                                <RowDefinition Height="16" />
                                 <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="20" />
                                 <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
 
-                            <!--  下相机拍照次数  -->
-                            <TextBlock
-                                Grid.Row="0"
-                                Grid.Column="0"
-                                Margin="0,8,12,8"
-                                VerticalAlignment="Center"
-                                Text="{lex:Loc 下相机拍照次数}" />
-                            <mah:NumericUpDown
-                                Grid.Row="0"
-                                Grid.Column="1"
-                                Margin="0,6"
-                                FontSize="{DynamicResource Font.Size.Body3}"
-                                Maximum="100"
-                                Minimum="0"
-                                Value="{Binding DowmCameraNum, Mode=TwoWay}" />
-
-                            <!--  上相机取料拍照次数  -->
-                            <TextBlock
-                                Grid.Row="1"
-                                Grid.Column="0"
-                                Margin="0,8,12,8"
-                                VerticalAlignment="Center"
-                                Text="{lex:Loc 上相机取料拍照次数}" />
-                            <mah:NumericUpDown
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                Margin="0,6"
-                                FontSize="{DynamicResource Font.Size.Body3}"
-                                Maximum="100"
-                                Minimum="0"
-                                Value="{Binding UpCameraPickNum, Mode=TwoWay}" />
-
-                            <!--  上相机放料拍照次数  -->
-                            <TextBlock
-                                Grid.Row="2"
-                                Grid.Column="0"
-                                Margin="0,8,12,8"
-                                VerticalAlignment="Center"
-                                Text="{lex:Loc 上相机放料拍照次数}" />
-                            <mah:NumericUpDown
-                                Grid.Row="2"
-                                Grid.Column="1"
-                                Margin="0,6"
-                                FontSize="{DynamicResource Font.Size.Body3}"
-                                Maximum="100"
-                                Minimum="0"
-                                Value="{Binding UpCameraPutNum, Mode=TwoWay}" />
-
-                            <!--  上相机锁附/组装次数(复检)  -->
-                            <TextBlock
-                                Grid.Row="3"
-                                Grid.Column="0"
-                                Margin="0,8,12,8"
-                                VerticalAlignment="Center"
-                                Text="上相机锁附/组装次数(复检)" />
-                            <mah:NumericUpDown
-                                Grid.Row="3"
-                                Grid.Column="1"
-                                Margin="0,6"
-                                FontSize="{DynamicResource Font.Size.Body3}"
-                                Maximum="100"
-                                Minimum="0"
-                                Value="{Binding UPCameracheckNum, Mode=TwoWay}" />
-
-                            <!--  取料固定位置拍产品相机数量  -->
-                            <TextBlock
-                                Grid.Row="4"
-                                Grid.Column="0"
-                                Margin="0,8,12,8"
-                                VerticalAlignment="Center"
-                                Text="{lex:Loc 取料固定位置拍产品相机数量}" />
-                            <mah:NumericUpDown
-                                Grid.Row="4"
-                                Grid.Column="1"
-                                Margin="0,6"
-                                FontSize="{DynamicResource Font.Size.Body3}"
-                                Maximum="10"
-                                Minimum="0"
-                                Value="{Binding FixedCameraPickNum, Mode=TwoWay}" />
-
-                            <!--  锁附/组装固定位置拍产品相机数量  -->
-                            <TextBlock
-                                Grid.Row="5"
-                                Grid.Column="0"
-                                Margin="0,8,12,8"
-                                VerticalAlignment="Center"
-                                Text="{lex:Loc 锁附组装固定位置拍产品相机数量}" />
-                            <mah:NumericUpDown
-                                Grid.Row="5"
-                                Grid.Column="1"
-                                Margin="0,6"
-                                FontSize="{DynamicResource Font.Size.Body3}"
-                                Maximum="10"
-                                Minimum="0"
-                                Value="{Binding FixedCameraPutNum, Mode=TwoWay}" />
-
-                            <!--  固定相机检测锁附/组装次数  -->
-                            <TextBlock
-                                Grid.Row="6"
-                                Grid.Column="0"
-                                Margin="0,8,12,8"
-                                VerticalAlignment="Center"
-                                Text="{lex:Loc 固定相机检测锁附组装次数}" />
-                            <mah:NumericUpDown
-                                Grid.Row="6"
-                                Grid.Column="1"
-                                Margin="0,6"
-                                FontSize="{DynamicResource Font.Size.Body3}"
-                                Maximum="100"
-                                Minimum="0"
-                                Value="{Binding FixedCameracheckNum, Mode=TwoWay}" />
-
-                            <!--  工作模式  -->
-                            <TextBlock
-                                Grid.Row="7"
-                                Grid.Column="0"
-                                Margin="0,8,12,8"
-                                VerticalAlignment="Center"
-                                Text="{lex:Loc 工作模式}" />
-                            <mah:NumericUpDown
-                                Grid.Row="7"
-                                Grid.Column="1"
-                                Margin="0,6"
-                                materialDesign:HintAssist.HelperText="1:拍1打1   2:拍1打所有"
-                                materialDesign:HintAssist.HelperTextFontSize="10"
-                                FontSize="{DynamicResource Font.Size.Body3}"
-                                Maximum="100"
-                                Minimum="0"
-                                Value="{Binding WorkMode, Mode=TwoWay}" />
-                        <!-- 固定相机检测锁附/组装次数 -->
-                        <TextBlock Grid.Row="6"
-                                   Grid.Column="0"
-                                   Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
-                                   VerticalAlignment="Center"
-                                   HorizontalAlignment="Right"
-                                   Margin="0,6,10,6"
-                                   Text="{lex:Loc 固定相机检测锁附组装次数}" />
-                        <mah:NumericUpDown Grid.Row="6"
-                                           Grid.Column="1"
-                                           Margin="0,6"
-                                           Value="{Binding FixedCameracheckNum,Mode=TwoWay}"
-                                           Minimum="0"
-                                           Maximum="100"
-                                           FontSize="{DynamicResource Font.Size.Body3}" />
-                        <!-- 工作模式  -->
-                        <TextBlock Grid.Row="7"
-                                   Grid.Column="0"
-                                   Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
-                                   VerticalAlignment="Center"
-                                   HorizontalAlignment="Right"
-                                   Margin="0,6,10,6"
-                                   Text="{lex:Loc 工作模式}" />
-                        <mah:NumericUpDown Grid.Row="7"
-                                           Grid.Column="1"
-                                           Margin="0,10"
-                                           Value="{Binding WorkMode,Mode=TwoWay}"
-                                           Minimum="0"
-                                           Maximum="100"
-                                           FontSize="{DynamicResource Font.Size.Body3}"
-                                           materialDesign:HintAssist.HelperTextFontSize="10"
-                                           materialDesign:HintAssist.HelperText="1:拍1打1 - 2:拍2打所有 - 3:先拍1打1打3颗再拍2打所有" />
-
-                            <!--  取料位置  -->
-                            <TextBlock
-                                Grid.Row="8"
-                                Grid.Column="0"
-                                Margin="0,8,12,8"
-                                VerticalAlignment="Center"
-                                Text="{lex:Loc 取料位置}" />
-                            <mah:NumericUpDown
-                                Grid.Row="8"
-                                Grid.Column="1"
-                                Margin="0,6"
-                                materialDesign:HintAssist.HelperText="0:不需要取料   1:需要取料"
-                                materialDesign:HintAssist.HelperTextFontSize="10"
-                                FontSize="{DynamicResource Font.Size.Body3}"
-                                Maximum="100"
-                                Minimum="0"
-                                Value="{Binding PickPointNum, Mode=TwoWay}" />
-
-                            <!--  批头矫正模式  -->
-                            <TextBlock
-                                Grid.Row="9"
-                                Grid.Column="0"
-                                Margin="0,8,12,8"
-                                VerticalAlignment="Center"
-                                Text="批头矫正模式" />
-                            <mah:NumericUpDown
-                                Grid.Row="9"
-                                Grid.Column="1"
-                                Margin="0,6"
-                                materialDesign:HintAssist.HelperText="1:初始化时矫正  2:每个产品矫正一次  3:每颗螺丝矫正一次"
-                                materialDesign:HintAssist.HelperTextFontSize="10"
-                                FontSize="{DynamicResource Font.Size.Body3}"
-                                Maximum="100"
-                                Minimum="0"
-                                ToolTip="1:初始化时矫正,2:每个产品矫正一次,3:每颗螺丝矫正一次"
-                                Value="{Binding ScrewTeachNum, Mode=TwoWay}" />
-
-                            <!--  保存锁付曲线  -->
-                            <TextBlock
-                                Grid.Row="10"
-                                Grid.Column="0"
-                                Margin="0,8,12,8"
-                                VerticalAlignment="Center"
-                                Text="锁付曲线图保存" />
-                            <Grid
-                                Grid.Row="10"
-                                Grid.Column="1"
-                                Grid.ColumnSpan="2"
-                                Margin="0,6,0,6">
+                            <Grid Margin="16">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="12" />
+                                    <ColumnDefinition Width="220" />
+                                    <ColumnDefinition Width="260" />
                                     <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
 
-                                <CheckBox
+                                <Grid.RowDefinitions>
+                                    <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>
+
+                                <!--  下相机拍照次数  -->
+                                <TextBlock
+                                    Grid.Row="0"
                                     Grid.Column="0"
+                                    Margin="0,8,12,8"
                                     VerticalAlignment="Center"
-                                    Content="启用保存锁付曲线图"
+                                    Text="{lex:Loc 下相机拍照次数}" />
+                                <mah:NumericUpDown
+                                    Grid.Row="0"
+                                    Grid.Column="1"
+                                    Margin="0,6"
                                     FontSize="{DynamicResource Font.Size.Body3}"
-                                    IsChecked="{Binding IsSaveScrewCurve, Mode=TwoWay}" />
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Value="{Binding DowmCameraNum, Mode=TwoWay}" />
 
-                                <TextBox
-                                    Grid.Column="2"
-                                    MinWidth="260"
+                                <!--  上相机取料拍照次数  -->
+                                <TextBlock
+                                    Grid.Row="1"
+                                    Grid.Column="0"
+                                    Margin="0,8,12,8"
                                     VerticalAlignment="Center"
-                                    IsEnabled="{Binding IsSaveScrewCurve}"
-                                    Text="{Binding ScrewCurvePath, Mode=TwoWay}" />
+                                    Text="{lex:Loc 上相机取料拍照次数}" />
+                                <mah:NumericUpDown
+                                    Grid.Row="1"
+                                    Grid.Column="1"
+                                    Margin="0,6"
+                                    FontSize="{DynamicResource Font.Size.Body3}"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Value="{Binding UpCameraPickNum, Mode=TwoWay}" />
 
-                                <Button
-                                    Grid.Column="3"
-                                    Margin="8,0,0,0"
+                                <!--  上相机放料拍照次数  -->
+                                <TextBlock
+                                    Grid.Row="2"
+                                    Grid.Column="0"
+                                    Margin="0,8,12,8"
                                     VerticalAlignment="Center"
-                                    Command="{Binding BrowseScrewCurvePathCommand}"
-                                    IsEnabled="{Binding IsSaveScrewCurve}"
-                                    Style="{StaticResource MaterialDesignFloatingActionMiniDarkButton}">
-                                    <materialDesign:PackIcon Kind="FolderOpen" />
-                                </Button>
-                            </Grid>
+                                    Text="{lex:Loc 上相机放料拍照次数}" />
+                                <mah:NumericUpDown
+                                    Grid.Row="2"
+                                    Grid.Column="1"
+                                    Margin="0,6"
+                                    FontSize="{DynamicResource Font.Size.Body3}"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Value="{Binding UpCameraPutNum, Mode=TwoWay}" />
 
-                            <!--  扫码流程设置  -->
-                            <TextBlock
-                                Grid.Row="11"
-                                Grid.Column="0"
-                                Margin="0,8,12,8"
-                                VerticalAlignment="Top"
-                                Text="扫码流程设置" />
-                            <StackPanel
-                                Grid.Row="11"
-                                Grid.Column="1"
-                                Grid.ColumnSpan="2"
-                                Margin="0,6,0,0"
-                                Orientation="Vertical">
-                                <WrapPanel Margin="0,0,0,8">
-                                    <CheckBox
-                                        Margin="0,0,20,8"
-                                        Content="是否启用最后一次拍照关闭光源"
-                                        FontSize="{DynamicResource Font.Size.Body3}"
-                                        IsChecked="{Binding IsBasePartOpenLight, Mode=TwoWay}" />
-                                    <CheckBox
-                                        Margin="0,0,20,8"
-                                        Content="是否启用KB复检"
-                                        FontSize="{DynamicResource Font.Size.Body3}"
-                                        IsChecked="{Binding IsBasePartOpenLightKB, Mode=TwoWay}" />
-                                    <CheckBox
-                                        Margin="0,0,20,8"
-                                        Content="是否MES结果为1"
-                                        FontSize="{DynamicResource Font.Size.Body3}"
-                                        IsChecked="{Binding IsMesResult, Mode=TwoWay}" />
-                                </WrapPanel>
-                                <WrapPanel Margin="0,0,0,8">
-                                    <CheckBox
-                                        Margin="0,0,20,8"
-                                        Content="是否基于零件码获取流程码"
-                                        FontSize="{DynamicResource Font.Size.Body3}"
-                                        IsChecked="{Binding IsBasePartCodeGetSN, Mode=TwoWay}" />
-                                    <CheckBox
-                                        Margin="0,0,20,8"
-                                        Content="是否通过零件码判断螺丝型号"
-                                        FontSize="{DynamicResource Font.Size.Body3}"
-                                        IsChecked="{Binding IsBasePartCodeChooseScrew, Mode=TwoWay}" />
-                                </WrapPanel>
+                                <!--  上相机锁附/组装次数(复检)  -->
+                                <TextBlock
+                                    Grid.Row="3"
+                                    Grid.Column="0"
+                                    Margin="0,8,12,8"
+                                    VerticalAlignment="Center"
+                                    Text="上相机锁附/组装次数(复检)" />
+                                <mah:NumericUpDown
+                                    Grid.Row="3"
+                                    Grid.Column="1"
+                                    Margin="0,6"
+                                    FontSize="{DynamicResource Font.Size.Body3}"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Value="{Binding UPCameracheckNum, Mode=TwoWay}" />
 
+                                <!--  取料固定位置拍产品相机数量  -->
+                                <TextBlock
+                                    Grid.Row="4"
+                                    Grid.Column="0"
+                                    Margin="0,8,12,8"
+                                    VerticalAlignment="Center"
+                                    Text="{lex:Loc 取料固定位置拍产品相机数量}" />
+                                <mah:NumericUpDown
+                                    Grid.Row="4"
+                                    Grid.Column="1"
+                                    Margin="0,6"
+                                    FontSize="{DynamicResource Font.Size.Body3}"
+                                    Maximum="10"
+                                    Minimum="0"
+                                    Value="{Binding FixedCameraPickNum, Mode=TwoWay}" />
 
+                                <!--  锁附/组装固定位置拍产品相机数量  -->
+                                <TextBlock
+                                    Grid.Row="5"
+                                    Grid.Column="0"
+                                    Margin="0,8,12,8"
+                                    VerticalAlignment="Center"
+                                    Text="{lex:Loc 锁附组装固定位置拍产品相机数量}" />
+                                <mah:NumericUpDown
+                                    Grid.Row="5"
+                                    Grid.Column="1"
+                                    Margin="0,6"
+                                    FontSize="{DynamicResource Font.Size.Body3}"
+                                    Maximum="10"
+                                    Minimum="0"
+                                    Value="{Binding FixedCameraPutNum, Mode=TwoWay}" />
 
-                                <TextBox
-                                    Width="320"
-                                    HorizontalAlignment="Left"
-                                    materialDesign:HintAssist.Hint="螺丝型号匹配规则"
-                                    BorderThickness="1"
-                                    Text="{Binding ChooseScrewModel, Mode=TwoWay}"
-                                    ToolTip="螺丝型号判断,如******123**,*为忽略字符" />
-                            </StackPanel>
-                        </Grid>
+                                <!--  固定相机检测锁附/组装次数  -->
+                                <TextBlock
+                                    Grid.Row="6"
+                                    Grid.Column="0"
+                                    Margin="0,8,12,8"
+                                    VerticalAlignment="Center"
+                                    Text="{lex:Loc 固定相机检测锁附组装次数}" />
+                                <mah:NumericUpDown
+                                    Grid.Row="6"
+                                    Grid.Column="1"
+                                    Margin="0,6"
+                                    FontSize="{DynamicResource Font.Size.Body3}"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Value="{Binding FixedCameracheckNum, Mode=TwoWay}" />
 
-                        <!--  保存系统参数  -->
-                        <DockPanel Grid.Row="2" LastChildFill="False">
-                            <Button
-                                Height="40"
-                                MinWidth="150"
-                                HorizontalAlignment="Right"
-                                materialDesign:ButtonAssist.CornerRadius="10"
-                                Command="{Binding SaveSystemParametersCommand}"
-                                DockPanel.Dock="Right"
-                                IsEnabled="{Binding IsAllowEdit}"
-                                Style="{StaticResource MaterialDesignRaisedButton}">
-                                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
-                                    <materialDesign:PackIcon Margin="0,0,6,0" Kind="ContentSaveCheck" />
-                                    <TextBlock VerticalAlignment="Center" Text="{lex:Loc 保存系统参数}" />
-                                </StackPanel>
-                            </Button>
-                        </DockPanel>
+                                <!--  工作模式  -->
+                                <TextBlock
+                                    Grid.Row="7"
+                                    Grid.Column="0"
+                                    Margin="0,8,12,8"
+                                    VerticalAlignment="Center"
+                                    Text="{lex:Loc 工作模式}" />
+                                <mah:NumericUpDown
+                                    Grid.Row="7"
+                                    Grid.Column="1"
+                                    Margin="0,6"
+                                    materialDesign:HintAssist.HelperText="1:拍1打1 - 2:拍2打所有 - 3:先拍1打1打3颗再拍2打所有"
+                                    materialDesign:HintAssist.HelperTextFontSize="10"
+                                    FontSize="{DynamicResource Font.Size.Body3}"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Value="{Binding WorkMode, Mode=TwoWay}" />
+                                <!--  取料位置  -->
+                                <TextBlock
+                                    Grid.Row="8"
+                                    Grid.Column="0"
+                                    Margin="0,8,12,8"
+                                    VerticalAlignment="Center"
+                                    Text="{lex:Loc 取料位置}" />
+                                <mah:NumericUpDown
+                                    Grid.Row="8"
+                                    Grid.Column="1"
+                                    Margin="0,6"
+                                    materialDesign:HintAssist.HelperText="0:不需要取料   1:需要取料"
+                                    materialDesign:HintAssist.HelperTextFontSize="10"
+                                    FontSize="{DynamicResource Font.Size.Body3}"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Value="{Binding PickPointNum, Mode=TwoWay}" />
 
-                        <StackPanel
-                            Grid.Row="5"
-                            Margin="0,12,0,0"
-                            Orientation="Horizontal">
-                            <!--  刷卡参数配置  -->
-                            <GroupBox
-                                Width="280"
-                                Margin="0,0,50,0"
-                                HorizontalAlignment="Left"
-                                Header="刷卡器配置">
-                                <Grid Margin="10">
+                                <!--  批头矫正模式  -->
+                                <TextBlock
+                                    Grid.Row="9"
+                                    Grid.Column="0"
+                                    Margin="0,8,12,8"
+                                    VerticalAlignment="Center"
+                                    Text="批头矫正模式" />
+                                <mah:NumericUpDown
+                                    Grid.Row="9"
+                                    Grid.Column="1"
+                                    Margin="0,6"
+                                    materialDesign:HintAssist.HelperText="1:初始化时矫正  2:每个产品矫正一次  3:每颗螺丝矫正一次"
+                                    materialDesign:HintAssist.HelperTextFontSize="10"
+                                    FontSize="{DynamicResource Font.Size.Body3}"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    ToolTip="1:初始化时矫正,2:每个产品矫正一次,3:每颗螺丝矫正一次"
+                                    Value="{Binding ScrewTeachNum, Mode=TwoWay}" />
+
+                                <!--  保存锁付曲线  -->
+                                <TextBlock
+                                    Grid.Row="10"
+                                    Grid.Column="0"
+                                    Margin="0,8,12,8"
+                                    VerticalAlignment="Center"
+                                    Text="锁付曲线图保存" />
+                                <Grid
+                                    Grid.Row="10"
+                                    Grid.Column="1"
+                                    Grid.ColumnSpan="2"
+                                    Margin="0,6,0,6">
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="12" />
                                         <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto" />
                                     </Grid.ColumnDefinitions>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                    </Grid.RowDefinitions>
-                                    <TextBlock
-                                        Grid.Row="0"
-                                        Grid.Column="0"
-                                        HorizontalAlignment="Right"
-                                        Text="PortName:" />
-                                    <TextBox
-                                        Grid.Row="0"
-                                        Grid.Column="1"
-                                        Margin="6,0"
-                                        Text="{Binding CardReaderConfig.PortName, Mode=TwoWay}" />
-                                    <TextBlock
-                                        Grid.Row="1"
-                                        Grid.Column="0"
-                                        HorizontalAlignment="Right"
-                                        Text="BaudRate:" />
-                                    <TextBox
-                                        Grid.Row="1"
-                                        Grid.Column="1"
-                                        Margin="6,0"
-                                        Text="{Binding CardReaderConfig.BaudRate, Mode=TwoWay}" />
-                                    <TextBlock
-                                        Grid.Row="2"
-                                        Grid.Column="0"
-                                        HorizontalAlignment="Right"
-                                        Text="Parity:" />
-                                    <ComboBox
-                                        Grid.Row="2"
-                                        Grid.Column="1"
-                                        ItemsSource="{Binding Source={StaticResource Parity}}"
-                                        SelectedItem="{Binding CardReaderConfig.Parity, Mode=TwoWay}" />
-                                    <TextBlock
-                                        Grid.Row="3"
-                                        Grid.Column="0"
-                                        HorizontalAlignment="Right"
-                                        Text="StopBits:" />
-                                    <ComboBox
-                                        Grid.Row="3"
-                                        Grid.Column="1"
-                                        ItemsSource="{Binding Source={StaticResource StopBits}}"
-                                        SelectedItem="{Binding CardReaderConfig.StopBits, Mode=TwoWay}" />
-                                    <TextBlock
-                                        Grid.Row="4"
+
+                                    <CheckBox
                                         Grid.Column="0"
-                                        HorizontalAlignment="Right"
-                                        Text="DataBits:" />
+                                        VerticalAlignment="Center"
+                                        Content="启用保存锁付曲线图"
+                                        FontSize="{DynamicResource Font.Size.Body3}"
+                                        IsChecked="{Binding IsSaveScrewCurve, Mode=TwoWay}" />
+
                                     <TextBox
-                                        Grid.Row="4"
-                                        Grid.Column="1"
-                                        Margin="6,0"
-                                        Text="{Binding CardReaderConfig.DataBits, Mode=TwoWay}" />
+                                        Grid.Column="2"
+                                        MinWidth="260"
+                                        VerticalAlignment="Center"
+                                        IsEnabled="{Binding IsSaveScrewCurve}"
+                                        Text="{Binding ScrewCurvePath, Mode=TwoWay}" />
 
                                     <Button
-                                        Grid.Row="5"
-                                        Grid.Column="1"
-                                        MinWidth="120"
-                                        Margin="0,6"
-                                        materialDesign:ButtonAssist.CornerRadius="10"
-                                        Command="{Binding SaveCardReaderConfigCommand}"
-                                        Style="{StaticResource MaterialDesignRaisedButton}">
-                                        <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
-                                            <materialDesign:PackIcon Margin="0,0,6,0" Kind="ContentSaveCheck" />
-                                            <TextBlock VerticalAlignment="Center" Text="保存刷卡器配置" />
-                                        </StackPanel>
+                                        Grid.Column="3"
+                                        Margin="8,0,0,0"
+                                        VerticalAlignment="Center"
+                                        Command="{Binding BrowseScrewCurvePathCommand}"
+                                        IsEnabled="{Binding IsSaveScrewCurve}"
+                                        Style="{StaticResource MaterialDesignFloatingActionMiniDarkButton}">
+                                        <materialDesign:PackIcon Kind="FolderOpen" />
                                     </Button>
                                 </Grid>
-                            </GroupBox>
 
-                            <GroupBox Width="280" Header="扭力测量仪配置">
-                                <Grid Margin="10">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="auto" />
-                                        <ColumnDefinition Width="*" />
-                                    </Grid.ColumnDefinitions>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                    </Grid.RowDefinitions>
-                                    <TextBlock
-                                        Grid.Row="0"
-                                        Grid.Column="0"
-                                        HorizontalAlignment="Right"
-                                        Text="PortName:" />
-                                    <TextBox
-                                        Grid.Row="0"
-                                        Grid.Column="1"
-                                        Margin="6,0"
-                                        Text="{Binding TorqueReadConfig.PortName, Mode=TwoWay}" />
-                                    <TextBlock
-                                        Grid.Row="1"
-                                        Grid.Column="0"
-                                        HorizontalAlignment="Right"
-                                        Text="BaudRate:" />
-                                    <TextBox
-                                        Grid.Row="1"
-                                        Grid.Column="1"
-                                        Margin="6,0"
-                                        Text="{Binding TorqueReadConfig.BaudRate, Mode=TwoWay}" />
-                                    <TextBlock
-                                        Grid.Row="2"
-                                        Grid.Column="0"
-                                        HorizontalAlignment="Right"
-                                        Text="Parity:" />
-                                    <ComboBox
-                                        Grid.Row="2"
-                                        Grid.Column="1"
-                                        ItemsSource="{Binding Source={StaticResource Parity}}"
-                                        SelectedItem="{Binding TorqueReadConfig.Parity, Mode=TwoWay}" />
-                                    <TextBlock
-                                        Grid.Row="3"
-                                        Grid.Column="0"
-                                        HorizontalAlignment="Right"
-                                        Text="StopBits:" />
-                                    <ComboBox
-                                        Grid.Row="3"
-                                        Grid.Column="1"
-                                        ItemsSource="{Binding Source={StaticResource StopBits}}"
-                                        SelectedItem="{Binding TorqueReadConfig.StopBits, Mode=TwoWay}" />
-                                    <TextBlock
-                                        Grid.Row="4"
-                                        Grid.Column="0"
-                                        HorizontalAlignment="Right"
-                                        Text="DataBits:" />
+                                <!--  扫码流程设置  -->
+                                <TextBlock
+                                    Grid.Row="11"
+                                    Grid.Column="0"
+                                    Margin="0,8,12,8"
+                                    VerticalAlignment="Top"
+                                    Text="扫码流程设置" />
+                                <StackPanel
+                                    Grid.Row="11"
+                                    Grid.Column="1"
+                                    Grid.ColumnSpan="2"
+                                    Margin="0,6,0,0"
+                                    Orientation="Vertical">
+                                    <WrapPanel Margin="0,0,0,8">
+                                        <CheckBox
+                                            Margin="0,0,20,8"
+                                            Content="是否启用最后一次拍照关闭光源"
+                                            FontSize="{DynamicResource Font.Size.Body3}"
+                                            IsChecked="{Binding IsBasePartOpenLight, Mode=TwoWay}" />
+                                        <CheckBox
+                                            Margin="0,0,20,8"
+                                            Content="是否启用KB复检"
+                                            FontSize="{DynamicResource Font.Size.Body3}"
+                                            IsChecked="{Binding IsBasePartOpenLightKB, Mode=TwoWay}" />
+                                        <CheckBox
+                                            Margin="0,0,20,8"
+                                            Content="是否MES结果为1"
+                                            FontSize="{DynamicResource Font.Size.Body3}"
+                                            IsChecked="{Binding IsMesResult, Mode=TwoWay}" />
+                                    </WrapPanel>
+                                    <WrapPanel Margin="0,0,0,8">
+                                        <CheckBox
+                                            Margin="0,0,20,8"
+                                            Content="是否基于零件码获取流程码"
+                                            FontSize="{DynamicResource Font.Size.Body3}"
+                                            IsChecked="{Binding IsBasePartCodeGetSN, Mode=TwoWay}" />
+                                        <CheckBox
+                                            Margin="0,0,20,8"
+                                            Content="是否通过零件码判断螺丝型号"
+                                            FontSize="{DynamicResource Font.Size.Body3}"
+                                            IsChecked="{Binding IsBasePartCodeChooseScrew, Mode=TwoWay}" />
+                                    </WrapPanel>
+
+
+
                                     <TextBox
-                                        Grid.Row="4"
-                                        Grid.Column="1"
-                                        Margin="6,0"
-                                        Text="{Binding TorqueReadConfig.DataBits, Mode=TwoWay}" />
+                                        Width="320"
+                                        HorizontalAlignment="Left"
+                                        materialDesign:HintAssist.Hint="螺丝型号匹配规则"
+                                        BorderThickness="1"
+                                        Text="{Binding ChooseScrewModel, Mode=TwoWay}"
+                                        ToolTip="螺丝型号判断,如******123**,*为忽略字符" />
+                                </StackPanel>
+                            </Grid>
 
-                                    <Button
-                                        Grid.Row="5"
-                                        Grid.Column="1"
-                                        MinWidth="120"
-                                        Margin="0,6"
-                                        materialDesign:ButtonAssist.CornerRadius="10"
-                                        Command="{Binding SaveTorqueReaderConfigCommand}"
-                                        Style="{StaticResource MaterialDesignRaisedButton}">
-                                        <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
-                                            <materialDesign:PackIcon Margin="0,0,6,0" Kind="ContentSaveCheck" />
-                                            <TextBlock VerticalAlignment="Center" Text="保存扭力测量仪配置" />
-                                        </StackPanel>
-                                    </Button>
-                                </Grid>
-                            </GroupBox>
-                        </StackPanel>
+                            <!--  保存系统参数  -->
+                            <DockPanel Grid.Row="2" LastChildFill="False">
+                                <Button
+                                    Height="40"
+                                    MinWidth="150"
+                                    HorizontalAlignment="Right"
+                                    materialDesign:ButtonAssist.CornerRadius="10"
+                                    Command="{Binding SaveSystemParametersCommand}"
+                                    DockPanel.Dock="Right"
+                                    IsEnabled="{Binding IsAllowEdit}"
+                                    Style="{StaticResource MaterialDesignRaisedButton}">
+                                    <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                                        <materialDesign:PackIcon Margin="0,0,6,0" Kind="ContentSaveCheck" />
+                                        <TextBlock VerticalAlignment="Center" Text="{lex:Loc 保存系统参数}" />
+                                    </StackPanel>
+                                </Button>
+                            </DockPanel>
 
-                    </Grid>
-                </StackPanel>
+                            <StackPanel
+                                Grid.Row="4"
+                                Margin="0,12,0,0"
+                                Orientation="Horizontal">
+                                <!--  刷卡参数配置  -->
+                                <GroupBox
+                                    Width="280"
+                                    Margin="0,0,50,0"
+                                    HorizontalAlignment="Left"
+                                    Header="刷卡器配置">
+                                    <Grid Margin="10">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="auto" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                        </Grid.RowDefinitions>
+                                        <TextBlock
+                                            Grid.Row="0"
+                                            Grid.Column="0"
+                                            HorizontalAlignment="Right"
+                                            Text="PortName:" />
+                                        <TextBox
+                                            Grid.Row="0"
+                                            Grid.Column="1"
+                                            Margin="6,0"
+                                            Text="{Binding CardReaderConfig.PortName, Mode=TwoWay}" />
+                                        <TextBlock
+                                            Grid.Row="1"
+                                            Grid.Column="0"
+                                            HorizontalAlignment="Right"
+                                            Text="BaudRate:" />
+                                        <TextBox
+                                            Grid.Row="1"
+                                            Grid.Column="1"
+                                            Margin="6,0"
+                                            Text="{Binding CardReaderConfig.BaudRate, Mode=TwoWay}" />
+                                        <TextBlock
+                                            Grid.Row="2"
+                                            Grid.Column="0"
+                                            HorizontalAlignment="Right"
+                                            Text="Parity:" />
+                                        <ComboBox
+                                            Grid.Row="2"
+                                            Grid.Column="1"
+                                            ItemsSource="{Binding Source={StaticResource Parity}}"
+                                            SelectedItem="{Binding CardReaderConfig.Parity, Mode=TwoWay}" />
+                                        <TextBlock
+                                            Grid.Row="3"
+                                            Grid.Column="0"
+                                            HorizontalAlignment="Right"
+                                            Text="StopBits:" />
+                                        <ComboBox
+                                            Grid.Row="3"
+                                            Grid.Column="1"
+                                            ItemsSource="{Binding Source={StaticResource StopBits}}"
+                                            SelectedItem="{Binding CardReaderConfig.StopBits, Mode=TwoWay}" />
+                                        <TextBlock
+                                            Grid.Row="4"
+                                            Grid.Column="0"
+                                            HorizontalAlignment="Right"
+                                            Text="DataBits:" />
+                                        <TextBox
+                                            Grid.Row="4"
+                                            Grid.Column="1"
+                                            Margin="6,0"
+                                            Text="{Binding CardReaderConfig.DataBits, Mode=TwoWay}" />
+
+                                        <Button
+                                            Grid.Row="5"
+                                            Grid.Column="1"
+                                            MinWidth="120"
+                                            Margin="0,6"
+                                            materialDesign:ButtonAssist.CornerRadius="10"
+                                            Command="{Binding SaveCardReaderConfigCommand}"
+                                            Style="{StaticResource MaterialDesignRaisedButton}">
+                                            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                                                <materialDesign:PackIcon Margin="0,0,6,0" Kind="ContentSaveCheck" />
+                                                <TextBlock VerticalAlignment="Center" Text="保存刷卡器配置" />
+                                            </StackPanel>
+                                        </Button>
+                                    </Grid>
+                                </GroupBox>
+
+                                <GroupBox Width="280" Header="扭力测量仪配置">
+                                    <Grid Margin="10">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="auto" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                        </Grid.RowDefinitions>
+                                        <TextBlock
+                                            Grid.Row="0"
+                                            Grid.Column="0"
+                                            HorizontalAlignment="Right"
+                                            Text="PortName:" />
+                                        <TextBox
+                                            Grid.Row="0"
+                                            Grid.Column="1"
+                                            Margin="6,0"
+                                            Text="{Binding TorqueReadConfig.PortName, Mode=TwoWay}" />
+                                        <TextBlock
+                                            Grid.Row="1"
+                                            Grid.Column="0"
+                                            HorizontalAlignment="Right"
+                                            Text="BaudRate:" />
+                                        <TextBox
+                                            Grid.Row="1"
+                                            Grid.Column="1"
+                                            Margin="6,0"
+                                            Text="{Binding TorqueReadConfig.BaudRate, Mode=TwoWay}" />
+                                        <TextBlock
+                                            Grid.Row="2"
+                                            Grid.Column="0"
+                                            HorizontalAlignment="Right"
+                                            Text="Parity:" />
+                                        <ComboBox
+                                            Grid.Row="2"
+                                            Grid.Column="1"
+                                            ItemsSource="{Binding Source={StaticResource Parity}}"
+                                            SelectedItem="{Binding TorqueReadConfig.Parity, Mode=TwoWay}" />
+                                        <TextBlock
+                                            Grid.Row="3"
+                                            Grid.Column="0"
+                                            HorizontalAlignment="Right"
+                                            Text="StopBits:" />
+                                        <ComboBox
+                                            Grid.Row="3"
+                                            Grid.Column="1"
+                                            ItemsSource="{Binding Source={StaticResource StopBits}}"
+                                            SelectedItem="{Binding TorqueReadConfig.StopBits, Mode=TwoWay}" />
+                                        <TextBlock
+                                            Grid.Row="4"
+                                            Grid.Column="0"
+                                            HorizontalAlignment="Right"
+                                            Text="DataBits:" />
+                                        <TextBox
+                                            Grid.Row="4"
+                                            Grid.Column="1"
+                                            Margin="6,0"
+                                            Text="{Binding TorqueReadConfig.DataBits, Mode=TwoWay}" />
+
+                                        <Button
+                                            Grid.Row="5"
+                                            Grid.Column="1"
+                                            MinWidth="120"
+                                            Margin="0,6"
+                                            materialDesign:ButtonAssist.CornerRadius="10"
+                                            Command="{Binding SaveTorqueReaderConfigCommand}"
+                                            Style="{StaticResource MaterialDesignRaisedButton}">
+                                            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                                                <materialDesign:PackIcon Margin="0,0,6,0" Kind="ContentSaveCheck" />
+                                                <TextBlock VerticalAlignment="Center" Text="保存扭力测量仪配置" />
+                                            </StackPanel>
+                                        </Button>
+                                    </Grid>
+                                </GroupBox>
+                            </StackPanel>
+
+                        </Grid>
+                    </ScrollViewer>
+
+                </Grid>
             </TabItem>
 
             <!--  产品信息  -->