修改

TeamAAS-VM/Core/Management.cs

@@ -1765,17 +1765,17 @@ namespace TeamAAS_VP.Core
                             //吸嘴数量+1
                             NumStatistics.NozzleNum = await _systemDatabaseService.IncrementLatestNozzleLockCountAsync(currentUserName);
 
-                        
-                        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))
                 {
@@ -1867,7 +1867,7 @@ namespace TeamAAS_VP.Core
                         }
                     }
                 }
-                
+
                 // 过站检查
                 else
                 {
@@ -1932,7 +1932,6 @@ namespace TeamAAS_VP.Core
                                     swCT.Stop();
                                     CTtime = Math.Round(swCT.Elapsed.TotalSeconds, 3);
                                     WriteProductLog(lockResultsAll, code, CTtime);
-                                    lockResultsAll.Clear();
                                 }
                                 else
                                 {
@@ -1970,7 +1969,7 @@ namespace TeamAAS_VP.Core
         /// <param name="productName">配方名称</param>
         /// <param name="productCode">产品编号</param>
         /// <param name="positionIndex">锁付点编号</param>
-        private void StartPressureCollection(string productName,string productCode, int positionIndex)
+        private void StartPressureCollection(string productName, string productCode, int positionIndex)
         {
             try
             {
@@ -2016,7 +2015,7 @@ namespace TeamAAS_VP.Core
                     if (_pressureTimeoutCts.IsCancellationRequested && !_pressureCts.IsCancellationRequested)
                     {
                         SendTaskMessage("Pressure collection timed out, saving collected data.", MessageLevel.Alarm);
-                        await StopAndSavePressureCollectionAsync(productName, productCode,positionIndex);
+                        await StopAndSavePressureCollectionAsync(productName, productCode, positionIndex);
                     }
                 }, token);
             }
@@ -2164,7 +2163,7 @@ namespace TeamAAS_VP.Core
         /// 产品锁付记录进行存储
         /// </summary>
         /// <param name="result">结果</param>
-        public void WriteProductLog(List<LockResult> lockResults,string rfid,double ct)
+        public void WriteProductLog(List<LockResult> lockResults, string rfid, double ct)
         {
             try
             {
@@ -2183,7 +2182,7 @@ namespace TeamAAS_VP.Core
                 string path = $"E:\\Data\\生产数据\\{dt.ToString("yyyy-MM")}\\{dt.ToString("yyyy-MM-dd")}.csv";
                 StringBuilder sb = new StringBuilder();
                 //具体的ct需要优化
-                sb.Append($"{dt.ToString("yyyy-MM-dd HH:mm:ss")},{lockResults[0].ProductName},{Math.Round(ct, 3)},{rfid},{result},{lockResults[number-1].NozzleNumber},{lockResults[number - 1].HeadNumber},");
+                sb.Append($"{dt.ToString("yyyy-MM-dd HH:mm:ss")},{lockResults[0].ProductName},{Math.Round(ct, 3)},{rfid},{result},{lockResults[number - 1].NozzleNumber},{lockResults[number - 1].HeadNumber},");
                 foreach (var item in lockResults)
                 {
                     try
@@ -2230,6 +2229,8 @@ namespace TeamAAS_VP.Core
             {
                 LogHelper.WriteLogError("写入产品记录时出错!", ex);
             }
+
+            lockResultsAll.Clear();
         }
         #endregion
 

TeamAAS-VM/ViewModels/Product/AutoCorrectLockPointViewModel.cs

@@ -215,12 +215,17 @@ namespace TeamAAS_VP.ViewModels.Product
                     }
                 }
                 //获取拍照流程
-                if (product.MoveDownCameraLockPhotoProcedureId == Guid.Empty)
+                if (screwCameraPoint[0].VisionProcessID == Guid.Empty)
                 {
                     _eventAggregator.GetEvent<SnackbarMessageNotification>().Publish(new MessageParameter() { Msg = Lang.未获取到锁付相机拍照流程无法执行取料拍照点位矫正, Duration = 1 });
                     return;
                 }
-                var procedure = ProcedureModels.FirstOrDefault(p => p.Id == product.MoveDownCameraLockPhotoProcedureId);
+                if (screwCameraPoint[1].VisionProcessID == Guid.Empty)
+                {
+                    _eventAggregator.GetEvent<SnackbarMessageNotification>().Publish(new MessageParameter() { Msg = Lang.未获取到锁付相机拍照流程无法执行取料拍照点位矫正, Duration = 1 });
+                    return;
+                }
+                var procedure = ProcedureModels.FirstOrDefault(p => p.Id == screwCameraPoint[0].VisionProcessID);
                 if (procedure == null)
                 {
                     _eventAggregator.GetEvent<SnackbarMessageNotification>().Publish(new MessageParameter() { Msg = Lang.未获取到锁付相机拍照流程无法执行取料拍照点位矫正, Duration = 1 });
@@ -260,6 +265,13 @@ namespace TeamAAS_VP.ViewModels.Product
                     U = screwCameraPoint[1].U_Position,
                     V = screwCameraPoint[1].R_Position,
                 };
+
+                procedure = ProcedureModels.FirstOrDefault(p => p.Id == screwCameraPoint[1].VisionProcessID);
+                if (procedure == null)
+                {
+                    _eventAggregator.GetEvent<SnackbarMessageNotification>().Publish(new MessageParameter() { Msg = Lang.未获取到锁付相机拍照流程无法执行取料拍照点位矫正, Duration = 1 });
+                    return;
+                }
                 await Robot.CalibMotionAsync(rpoint, 0);
                 if (_cts.IsCancellationRequested)
                     return;

TeamAAS-VM/Views/SettingView.xaml

@@ -2324,7 +2324,7 @@
                                            Minimum="0"
                                            Maximum="100"
                                            FontSize="{DynamicResource Font.Size.Body3}"
-                                           materialDesign:HintAssist.HelperTextFontSize="6"
+                                           materialDesign:HintAssist.HelperTextFontSize="10"
                                            materialDesign:HintAssist.HelperText="1:拍1打1 - 2:拍1打所有" />
 
                         <!-- 取料位置 -->
@@ -2343,7 +2343,7 @@
                                            Minimum="0"
                                            Maximum="100"
                                            FontSize="{DynamicResource Font.Size.Body3}"
-                                           materialDesign:HintAssist.HelperTextFontSize="6"
+                                           materialDesign:HintAssist.HelperTextFontSize="10"
                                            materialDesign:HintAssist.HelperText="0:不需要取料 - 1:需要取料" />
                         <!-- 披头矫正的模式 -->
                         <TextBlock Grid.Row="9"
@@ -2361,7 +2361,7 @@
                                            Maximum="100"
                                            FontSize="{DynamicResource Font.Size.Body3}"
                                            ToolTip="1：初始化时矫正，2：每个产品矫正一次，3：每颗螺丝矫正一次"
-                                           materialDesign:HintAssist.HelperTextFontSize="6"
+                                           materialDesign:HintAssist.HelperTextFontSize="10"
                                            materialDesign:HintAssist.HelperText="1：初始化时矫正，2：每个产品矫正一次，3：每颗螺丝矫正一次" />
 
                         <CheckBox Grid.Row="10"