update

TeamAAS-VM/Core/Management.cs

@@ -1764,29 +1764,17 @@ namespace TeamAAS_VP.Core
                             //吸嘴数量+1
                             NumStatistics.NozzleNum = await _systemDatabaseService.IncrementLatestNozzleLockCountAsync(currentUserName);
 
-                            //电批吸嘴报警
-                            NumStatistics.HeaderNum++;//批头数量
-                            NumStatistics.NozzleNum++;//吸嘴数量
-                            FileHelper.WriteJsonFile(NumStatistics, FilePath.NumberStatisticsPath);
-                            if (NumStatistics.HeaderNum < NumStatistics.HeaderAlarmValue)
-                            {
-                                System.Windows.MessageBox.Show("Electric Screwdriver Alarm!", "Alarm", MessageBoxButton.OK, MessageBoxImage.Warning);
-                            }
-                            if (NumStatistics.NozzleNum < NumStatistics.NozzleAlarmValue)
-                            {
-                                System.Windows.MessageBox.Show("Nozzle Alarm!", "Alarm", MessageBoxButton.OK, MessageBoxImage.Warning);
-                            }
-                        }
-                            await plc.WriteNodeAsync(addressConfig.In_WorkDone.Address, (Int16)0);
-                            // 停止采集压力并保存
-                            await StopAndSavePressureCollectionAsync(currentProduct.Name, _productService.CurrentProductCode, positionIndex);
-                        }
-                        else
-                        {
-                            SendTaskMessage(Lang.停止锁付信号已关闭, MessageLevel.Alarm);
-                        }
+                        
+                        await plc.WriteNodeAsync(addressConfig.In_WorkDone.Address, (Int16)0);
+                        // 停止采集压力并保存
+                        await StopAndSavePressureCollectionAsync(currentProduct.Name, _productService.CurrentProductCode, positionIndex);
+                    }
+                    else
+                    {
+                        SendTaskMessage(Lang.停止锁付信号已关闭, MessageLevel.Alarm);
                     }
                 }
+            }
                 // 多相机坐标合并
                 else if (addressConfig.In_RequestPosition.Address.Contains(tuple.nodeId))
                 {
@@ -1875,12 +1863,6 @@ namespace TeamAAS_VP.Core
                             {
                                 NumStatistics.Feeder2Num = _configService.DecrementScrewCountByFeederNumber(feeders);
                             }
-                            FileHelper.WriteJsonFile(NumStatistics, FilePath.NumberStatisticsPath);
-                            var res = _configService.CheckAlarm(state);
-                            if (res)
-                            {
-                                System.Windows.MessageBox.Show("Screw feeder alarm!", "Alarm", MessageBoxButton.OK, MessageBoxImage.Warning);
-                            }
                         }
                     }
                 }

TeamAAS-VM/TeamAAS-VP.csproj

@@ -555,7 +555,6 @@
     <Compile Include="ViewModels\Home\ChangeHeaderViewModel.cs" />
     <Compile Include="ViewModels\Home\AddScrewViewModel.cs" />
     <Compile Include="Services\TorqueService.cs" />
-    <Compile Include="ViewModels\Home\SetAlarmValueViewModel.cs" />
     <Compile Include="ViewModels\Home\TorqueCheckViewModel.cs" />
     <Compile Include="ViewModels\Product\ImageDisplayViewModel.cs" />
     <Compile Include="ViewModels\Setting\AddScrewFeederViewModel.cs" />