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

TeamAAS-VM/Core/Management.cs

@@ -1778,8 +1778,8 @@ namespace TeamAAS_VP.Core
                             lockResult.Pressure = pressure;
                             lockResult.TargetTorqueUpperLimit = ScrewDriver.TargetTorqueUpperLimit;
                             lockResult.TargetTorqueLowerLimit = ScrewDriver.TargetTorqueLowerLimit;
-                            lockResult.TargetTurnsUpperLimit = ScrewDriver.TargetTurnsUpperLimit;
-                            lockResult.TargetTurnsLowerLimit = ScrewDriver.TargetTurnsLowerLimit;
+                            lockResult.TargetTurnsUpperLimit = ScrewDriver.TargetTurnsUpperLimit / 360;
+                            lockResult.TargetTurnsLowerLimit = ScrewDriver.TargetTurnsLowerLimit / 360;
                             lockResult.TargetLockSpeed = ScrewDriver.TargetLockSpeed;
                             lockResult.PositionX = currentPosition.X;
                             lockResult.PositionY = currentPosition.Y;
@@ -2025,6 +2025,7 @@ namespace TeamAAS_VP.Core
                         else
                         {
                             SendTaskMessage("二维码拍照点位发送信号已关闭", MessageLevel.Alarm);
+                            await plc.WriteNodeAsync(addressConfig.Out_QrCodePhotoResault.Address, (Int16)0);
                         }
                     }
 

TeamAAS-VM/ViewModels/HomeViewModel.cs

@@ -492,7 +492,7 @@ namespace TeamAAS_VP.ViewModels
                     series.Points.Clear();
                     foreach (var waveData in result.WaveDatas)
                     {
-                        series.Points.Add(new OxyPlot.DataPoint(waveData.LockAngle, waveData.Torque));
+                        series.Points.Add(new OxyPlot.DataPoint(waveData.Turns, waveData.Torque));
                     }
                     LockCurvePlotModel.InvalidatePlot(true);
                     if (!string.IsNullOrEmpty(result.LockCurveImagePath))

TeamAAS-VM/ViewModels/Product/PlcPointParamsViewModel.cs

@@ -682,6 +682,9 @@ namespace TeamAAS_VP.ViewModels.Product
                             break;
                     }
                     //Robot.Timeout = 5000;
+
+                    point.Z = SelectedPoint.Z_Position_Stop;
+                    await Robot.GoAsync(point);
                 }
                 _eventAggregator.GetEvent<SnackbarMessageNotification>().Publish(new MessageParameter() { Msg = $"{Lang.完成}!", Duration = 0.4 });
             }

TeamAAS-VM/Views/SettingView.xaml

@@ -2329,7 +2329,7 @@
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="auto" />
-                            <ColumnDefinition Width="200" />
+                            <ColumnDefinition Width="300" />
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
@@ -2395,14 +2395,14 @@
                                            Maximum="100"
                                            FontSize="{DynamicResource Font.Size.Body3}" />
 
-                        <!-- 上相机锁附/组装次数 -->
+                        <!-- 上相机锁附/组装次数(复检) -->
                         <TextBlock Grid.Row="3"
                                    Grid.Column="0"
                                    Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
                                    VerticalAlignment="Center"
                                    HorizontalAlignment="Right"
                                    Margin="0,6,10,6"
-                                   Text="{lex:Loc 上相机锁附组装次数}" />
+                                   Text="上相机锁附/组装次数(复检)" />
                         <mah:NumericUpDown Grid.Row="3"
                                            Grid.Column="1"
                                            Margin="0,6"
@@ -2526,7 +2526,7 @@
                                     Orientation="Horizontal"
                                     VerticalAlignment="Center"
                                     IsEnabled="{Binding IsSaveScrewCurve}">
-                            <TextBox MinWidth="200"
+                            <TextBox MinWidth="300"
                                      Text="{Binding ScrewCurvePath,Mode=TwoWay}" />
                             <Button Style="{StaticResource MaterialDesignFloatingActionMiniDarkButton}"
                                     Command="{Binding BrowseScrewCurvePathCommand}"

TeamAAS-VM/Views/User/CardLoginWindow.xaml

@@ -250,7 +250,7 @@
                                        FontWeight="SemiBold" />
                         </Grid>
                         <Button x:Name="NameLoginButton"
-                                Height="50"
+                                Height="45"
                                 Width="50"
                                 materialDesign:ButtonAssist.CornerRadius="5"
                                 HorizontalAlignment="Center"
@@ -350,7 +350,7 @@
                     <Button Grid.Row="3"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
-                            Height="50"
+                            Height="45"
                             Width="50"
                             materialDesign:ButtonAssist.CornerRadius="5"
                             HorizontalAlignment="Center"