修改显示

TeamAAS-VM/Core/Management.cs

@@ -2201,6 +2201,7 @@ namespace TeamAAS_VP.Core
                                         SendTaskMessage($"mes开始QUERY", MessageLevel.Info);
                                         if (systemConfig.IsBasePartCodeGetSN)//是否基于零件码,判断是否过站
                                         {
+                                            SendTaskMessage($"基于零件码,判断是否过站", MessageLevel.Debug);
                                             (bool isSuccess, string response) = await _mesService.StationGetExAsync(code, "", 2);//基于电池的SN获取产品SN，询问mes
                                             if (isSuccess)
                                             {
@@ -2266,6 +2267,7 @@ namespace TeamAAS_VP.Core
                                         }
                                         else //直接基于RFID询问是否过站
                                         {
+                                            SendTaskMessage($"基于RFID询问是否过站", MessageLevel.Debug);
                                             (bool isSuccess, string response) = await _mesService.StationGetAsync(code, "", 2);//询问mes
                                             if (isSuccess)
                                             {
@@ -2321,6 +2323,8 @@ namespace TeamAAS_VP.Core
                                         var stationConfig = _configService.GetDeviceInfo(0);
                                         SendTaskMessage($"收到{i}:{stationConfig.DeviceName}上传本站数据请求...", MessageLevel.Debug);
                                         //从服务器中获取当前时间
+                                        LogHelper.WriteLogMes($"【从服务器中获取当前时间】");
+                                        SendTaskMessage($"从服务器中获取当前时间", MessageLevel.Info);
                                         var serverTimeResult = await _mesService.GetServerTimeAsync(i, code, 2);
 
                                         //这里缺少上传MES的本站数据结果及开始和结束时间，需要补充
@@ -2692,7 +2696,7 @@ namespace TeamAAS_VP.Core
                 //
                 ThrowNumber = await _systemDatabaseService.GetThrowNumberAsync();
                 NgNumber = await _systemDatabaseService.GetNGProductionAsync(currentproduct.Name);
-                Yield = (TotalQuantityToday - NgNumber) / TotalQuantityToday * 100;
+                Yield = ((double)TotalQuantityToday - (double)NgNumber) / (double)TotalQuantityToday * 100;
             }
             catch (Exception)
             {

TeamAAS-VM/Core/ScrewDriver/XYD_ScrewDriver.cs

@@ -467,12 +467,12 @@ namespace TeamAAS_VP.Core.ScrewDriver
                 int finalResult = ToInt16(data, 32);
                 switch (finalResult)
                 {
-                    case 1: ErrorInfo = "圈数异常"; break;
+                    case 1: ErrorInfo = "圈数超限"; break;
                     case 2: ErrorInfo = "区段行程NG"; break;
                     case 3: ErrorInfo = "超时"; break;
                     case 4: ErrorInfo = string.Empty; break;
                     case 5: ErrorInfo = "中断"; break;
-                    case 6: ErrorInfo = "转矩过大"; break;
+                    case 6: ErrorInfo = "扭矩超限"; break;
                     case 7: ErrorInfo = "反转"; break;
                     case 8: ErrorInfo = "锁止角不合格"; break;
                     case 9: ErrorInfo = "过锁异常"; break;

TeamAAS-VM/Models/DeviceInfo.cs

@@ -84,11 +84,11 @@ namespace TeamAAS_VP.Models
         /// </summary>
         public string SaveCsvPath { get => _saveCsvPath; set => SetProperty(ref _saveCsvPath, value); }
 
-        private bool _enableDoubleMes;
-        /// <summary>
-        /// 是否启用两次产品编号MES获取，默认不启用
-        /// </summary>
-        public bool EnableDoubleMes { get => _enableDoubleMes; set => SetProperty(ref _enableDoubleMes, value); }
+        //private bool _enableDoubleMes;
+        ///// <summary>
+        ///// 是否启用两次产品编号MES获取，默认不启用
+        ///// </summary>
+        //public bool EnableDoubleMes { get => _enableDoubleMes; set => SetProperty(ref _enableDoubleMes, value); }
 
         private CTQ_Data _dataInfo = new CTQ_Data();
         public CTQ_Data DataInfo
@@ -125,7 +125,7 @@ namespace TeamAAS_VP.Models
                 EnableMES = this.EnableMES,
                 SaveCsv = this.SaveCsv,
                 SaveCsvPath = this.SaveCsvPath,
-                EnableDoubleMes = this.EnableDoubleMes,
+                //EnableDoubleMes = this.EnableDoubleMes,
                 DataInfo = this.DataInfo.Copy()
             };
         }

TeamAAS-VM/Services/RemoteCommandService.cs

@@ -1189,7 +1189,7 @@ namespace TeamAAS_VP.Services
                 SendTaskMessage(Lang.开始执行视觉流程.Replace("{0}", $"{i + 1}").Replace("{1}", procedure.Name), MessageLevel.Info);
 
                 // 1. 执行相机拍照并运行视觉工具
-                bool visionSucceed = ExecutePhoto(i + 1,procedure, InputTerminal, out CogToolBlockTerminalCollection outputCollection, imgPara);
+                bool visionSucceed = ExecutePhoto(i + 1, procedure, InputTerminal, out CogToolBlockTerminalCollection outputCollection, imgPara);
                 if (!visionSucceed)
                 {
                     SendTaskMessage(Lang.视觉任务执行失败, MessageLevel.Error);
@@ -1456,7 +1456,7 @@ namespace TeamAAS_VP.Services
         /// 执行相机拍照并运行 ToolBlock，返回是否成功并通过 out 参数返回 Outputs。
         /// 该方法会发布 RenderUpdateNotification 以更新 UI。
         /// </summary>
-        public bool ExecutePhoto(int index,ProcedureModel procedure, Dictionary<string, string> InputTerminal, out CogToolBlockTerminalCollection outputCollection, ImageParameters imgPara)
+        public bool ExecutePhoto(int index, ProcedureModel procedure, Dictionary<string, string> InputTerminal, out CogToolBlockTerminalCollection outputCollection, ImageParameters imgPara)
         {
             try
             {
@@ -1531,7 +1531,7 @@ namespace TeamAAS_VP.Services
                         template.RegisterVariable("ProductSN", () => _productService.CurrentProductCode);
                         template.RegisterVariable("CameraName", () => procedure.CameraName);
                         template.RegisterVariable("ShotCount", () => index);
-                        template.RegisterVariable("Result", () => Found ? "OK":"NG");
+                        template.RegisterVariable("Result", () => Found ? "OK" : "NG");
                         template.RegisterVariable("DateTime", () => DateTime.Now);
 
                         // 生成文件名
@@ -1552,7 +1552,8 @@ namespace TeamAAS_VP.Services
                         SavePath = procedure.SavePath,
                         IsCompress = procedure.IsCompress,
                         ImgPara = imgPara,
-                        ImageFileName = imgName
+                        ImageFileName = imgName,
+                        ProceductName = procedure.Name,
                     });
                     SendTaskMessage($"{procedure.CameraName},{procedure.CameraId}", MessageLevel.Info);
                     return true;
@@ -1689,7 +1690,7 @@ namespace TeamAAS_VP.Services
                         SavePath = procedure.SavePath,
                         IsCompress = procedure.IsCompress,
                         ProceductName = procedure.Name,
-                        ImageFileName = imgName
+                        ImageFileName = imgName,
                     });
                     SendTaskMessage($"{procedure.CameraName},{procedure.CameraId}", MessageLevel.Info);
                     return true;

TeamAAS-VM/Views/SettingView.xaml

@@ -450,20 +450,21 @@
                                          Text="{Binding SelectDeviceInfo.comp, Mode=TwoWay}"
                                          Margin="6,2" />
 
-                                <TextBlock Grid.Row="9"
+                                <!--<TextBlock Grid.Row="9"
                                            Grid.Column="0"
                                            Text="启用 MES:"
                                            HorizontalAlignment="Right"
-                                           VerticalAlignment="Center" />
+                                           VerticalAlignment="Center" />-->
                                 <CheckBox Grid.Row="9"
                                           Grid.Column="1"
+                                          Content="启用 MES"
                                           IsChecked="{Binding SelectDeviceInfo.EnableMES, Mode=TwoWay}"
                                           Margin="6,2" />
-                                <CheckBox Grid.Row="10"
+                                <!--<CheckBox Grid.Row="10"
                                           Grid.Column="1"
                                           Content="是否启用两次产品编号"
                                           IsChecked="{Binding SelectDeviceInfo.EnableDoubleMes, Mode=TwoWay}"
-                                          Margin="6,2" />
+                                          Margin="6,2" />-->
                                 <CheckBox Grid.Row="11"
                                           Grid.Column="1"
                                           Content="是否保存CSV文件"