diff --git a/GenerateAlarmConst/App.config b/GenerateAlarmConst/App.config new file mode 100644 index 0000000..193aecc --- /dev/null +++ b/GenerateAlarmConst/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/GenerateAlarmConst/Form1.Designer.cs b/GenerateAlarmConst/Form1.Designer.cs new file mode 100644 index 0000000..0cce92b --- /dev/null +++ b/GenerateAlarmConst/Form1.Designer.cs @@ -0,0 +1,47 @@ +namespace GenerateAlarmConst +{ + partial class Form1 + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows 窗体设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + this.SuspendLayout(); + // + // Form1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1148, 739); + this.Name = "Form1"; + this.Text = "Form1"; + this.ResumeLayout(false); + + } + + #endregion + } +} + diff --git a/GenerateAlarmConst/Form1.cs b/GenerateAlarmConst/Form1.cs new file mode 100644 index 0000000..0f4d49f --- /dev/null +++ b/GenerateAlarmConst/Form1.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace GenerateAlarmConst +{ + public partial class Form1 : Form + { + public Form1() + { + InitializeComponent(); + } + } +} diff --git a/GenerateAlarmConst/Form1.resx b/GenerateAlarmConst/Form1.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/GenerateAlarmConst/Form1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/GenerateAlarmConst/GenerateAlarmConst.csproj b/GenerateAlarmConst/GenerateAlarmConst.csproj new file mode 100644 index 0000000..234b210 --- /dev/null +++ b/GenerateAlarmConst/GenerateAlarmConst.csproj @@ -0,0 +1,83 @@ + + + + + Debug + AnyCPU + {6FC7AA8C-FF1E-4F40-9644-23C4AF215880} + WinExe + GenerateAlarmConst + GenerateAlarmConst + v4.8 + 512 + true + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + Form + + + Form1.cs + + + + + Form1.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + Settings.settings + True + + + + + + + \ No newline at end of file diff --git a/GenerateAlarmConst/Program.cs b/GenerateAlarmConst/Program.cs new file mode 100644 index 0000000..be482b1 --- /dev/null +++ b/GenerateAlarmConst/Program.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace GenerateAlarmConst +{ + internal static class Program + { + /// + /// 应用程序的主入口点。 + /// + [STAThread] + static void Main() + { + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + Application.Run(new Form1()); + } + } +} diff --git a/GenerateAlarmConst/Properties/AssemblyInfo.cs b/GenerateAlarmConst/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..c83c084 --- /dev/null +++ b/GenerateAlarmConst/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 有关程序集的一般信息由以下 +// 控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("GenerateAlarmConst")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("GenerateAlarmConst")] +[assembly: AssemblyCopyright("Copyright © 2025")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 将 ComVisible 设置为 false 会使此程序集中的类型 +//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 +//请将此类型的 ComVisible 特性设置为 true。 +[assembly: ComVisible(false)] + +// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID +[assembly: Guid("6fc7aa8c-ff1e-4f40-9644-23c4af215880")] + +// 程序集的版本信息由下列四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 +//通过使用 "*"，如下所示: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/GenerateAlarmConst/Properties/Resources.Designer.cs b/GenerateAlarmConst/Properties/Resources.Designer.cs new file mode 100644 index 0000000..c55b28d --- /dev/null +++ b/GenerateAlarmConst/Properties/Resources.Designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本: 4.0.30319.42000 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace GenerateAlarmConst.Properties +{ + + + /// + /// 强类型资源类，用于查找本地化字符串等。 + /// + // 此类是由 StronglyTypedResourceBuilder + // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 + // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen + // (以 /str 作为命令选项)，或重新生成 VS 项目。 + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources + { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() + { + } + + /// + /// 返回此类使用的缓存 ResourceManager 实例。 + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager + { + get + { + if ((resourceMan == null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GenerateAlarmConst.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture + { + get + { + return resourceCulture; + } + set + { + resourceCulture = value; + } + } + } +} diff --git a/GenerateAlarmConst/Properties/Resources.resx b/GenerateAlarmConst/Properties/Resources.resx new file mode 100644 index 0000000..af7dbeb --- /dev/null +++ b/GenerateAlarmConst/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/GenerateAlarmConst/Properties/Settings.Designer.cs b/GenerateAlarmConst/Properties/Settings.Designer.cs new file mode 100644 index 0000000..831abcc --- /dev/null +++ b/GenerateAlarmConst/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GenerateAlarmConst.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} diff --git a/GenerateAlarmConst/Properties/Settings.settings b/GenerateAlarmConst/Properties/Settings.settings new file mode 100644 index 0000000..3964565 --- /dev/null +++ b/GenerateAlarmConst/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + diff --git a/Rs.DeweyTester.sln b/Rs.DeweyTester.sln index c28acdd..b75d496 100644 --- a/Rs.DeweyTester.sln +++ b/Rs.DeweyTester.sln @@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rs.DeweyTester", "Rs.DeweyT EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gugao.FunTest", "Gugao.FunTest\Gugao.FunTest.csproj", "{E8D7862F-FEA8-4923-987E-7BAF217DB5B9}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenerateAlarmConst", "GenerateAlarmConst\GenerateAlarmConst.csproj", "{6FC7AA8C-FF1E-4F40-9644-23C4AF215880}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ Global {E8D7862F-FEA8-4923-987E-7BAF217DB5B9}.Debug|Any CPU.Build.0 = Debug|Any CPU {E8D7862F-FEA8-4923-987E-7BAF217DB5B9}.Release|Any CPU.ActiveCfg = Release|Any CPU {E8D7862F-FEA8-4923-987E-7BAF217DB5B9}.Release|Any CPU.Build.0 = Release|Any CPU + {6FC7AA8C-FF1E-4F40-9644-23C4AF215880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6FC7AA8C-FF1E-4F40-9644-23C4AF215880}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6FC7AA8C-FF1E-4F40-9644-23C4AF215880}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6FC7AA8C-FF1E-4F40-9644-23C4AF215880}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Rs.DeweyTester/Commom/DevLog.cs b/Rs.DeweyTester/Commom/DevLog.cs index bb8457b..8bf199a 100644 --- a/Rs.DeweyTester/Commom/DevLog.cs +++ b/Rs.DeweyTester/Commom/DevLog.cs @@ -1,5 +1,7 @@ using NPOI.OpenXmlFormats.Dml.Chart; +using NPOI.SS.Formula.Functions; using Rs.Framework; +using Rs.MotionPlat.Entitys; using System; using System.Collections.Generic; using System.IO; @@ -7,6 +9,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.ListView; namespace Rs.MotionPlat.Commom { @@ -37,7 +40,7 @@ namespace Rs.MotionPlat.Commom catch (Exception ex) { - LogHelper.Error($"Summary:{ex.Message + ex.StackTrace}"); + LogHelper.Error($"EventTracker:{ex.Message + ex.StackTrace}"); } } @@ -66,26 +69,51 @@ namespace Rs.MotionPlat.Commom } catch (Exception ex) { - LogHelper.Error($"Summary:{ex.Message + ex.StackTrace}"); + LogHelper.Error($"Breakdown:{ex.Message + ex.StackTrace}"); } } } - public static void UnitTracker() + public static void UnitTracker(TestFixture fixture) { lock (lockobj) { - string filename = ""; - string csvTitle = "SiteID,ProjectID,MachineID,Date,Time,LotName,LoginMode,Serial Number,Socker ID,Test Result,Trial,Socket Usage"; - if (!File.Exists(filename)) + try { - File.AppendAllText(filename, csvTitle); + int usage = 0; + string RetryMode = "T1"; + if (fixture.Product.TestNum > 0) + { + RetryMode = $"R{fixture.Product.TestNum}"; + } + string filename = $"{fileDir}\\{DateTime.Now.ToString("yyyyMMdd")}\\UnitTracker_{DateTime.Now.ToString("yyyyMMdd")}.csv"; + for (int i = 1; i <= 6; i++) + { + TestFixture tf = TestFixtureManager.Instance.GetTestFixture(i); + if (tf.Enable) + { + usage |= 1 << (i - 1); + } + } + string trial = string.Join("", Convert.ToString(usage, 2).Reverse()); + string csvTitle = "SiteID,ProjectID,MachineID,Date,Time,LotName,LoginMode,Serial Number,Socker ID,Test Result,Trial,Socket Usage"; + if (!Directory.Exists(Path.GetDirectoryName(filename))) + { + Directory.CreateDirectory(Path.GetDirectoryName(filename)); + } + if (!File.Exists(filename)) + { + File.AppendAllText(filename, csvTitle); + } + string content = $"{GlobalVar.SiteID},{GlobalVar.ProjectID},{GlobalVar.MachineID},{DateTime.Now.ToString("HH:mm:ss")},{DateTime.Now.ToString("HH:mm:ss")},{GlobalVar.LotName},OP,{fixture.Product.SN},{fixture.Index},{fixture.Result},{RetryMode},{trial}\r\n"; + File.AppendAllText(filename, content); } - else + catch (Exception ex) { - + LogHelper.Error($"UnitTracker:{ex.Message + ex.StackTrace}"); } + } } diff --git a/Rs.DeweyTester/Entitys/TestFixtureManager.cs b/Rs.DeweyTester/Entitys/TestFixtureManager.cs index 6f7f1b4..38cb4f6 100644 --- a/Rs.DeweyTester/Entitys/TestFixtureManager.cs +++ b/Rs.DeweyTester/Entitys/TestFixtureManager.cs @@ -642,6 +642,7 @@ namespace Rs.MotionPlat.Entitys TotalCount++; Yield = (double)((double)PassCount / TotalCount); AddTestRecordToProduct(); + DevLog.UnitTracker(this); //this.Product.AddResult(this.Index, Result, items[6]); } Status = ETestFixtureStatus.IDLE; diff --git a/Rs.DeweyTester/Flow/HomeFlow.cs b/Rs.DeweyTester/Flow/HomeFlow.cs index cf26d37..c5d7d49 100644 --- a/Rs.DeweyTester/Flow/HomeFlow.cs +++ b/Rs.DeweyTester/Flow/HomeFlow.cs @@ -210,7 +210,7 @@ namespace Rs.MotionPlat.Flow } else if(stopwatch.ElapsedMilliseconds>5000) { - Msgbox.ShowDialog(AlarmCollection.Get(AlarmConstID.料仓抽屉锁动位异常报警), EButtonType.Retry); + Msgbox.ShowDialog(AlarmCollection.Get(AlarmConstID.料仓抽屉锁动位异常报警).Transform(i), EButtonType.Retry); stopwatch.Restart(); } } diff --git a/Rs.DeweyTester/Flow/NormalFlow/StockFlowBase.cs b/Rs.DeweyTester/Flow/NormalFlow/StockFlowBase.cs index 8fe627d..7f68860 100644 --- a/Rs.DeweyTester/Flow/NormalFlow/StockFlowBase.cs +++ b/Rs.DeweyTester/Flow/NormalFlow/StockFlowBase.cs @@ -154,7 +154,7 @@ namespace Rs.MotionPlat.Flow.NormalFlow } else if (stopwatch.ElapsedMilliseconds > 5000) { - Msg.ShowError(AlarmCollection.Get(AlarmConstID.抽屉锁原位异常报警).Transform("1").CN); + Msg.ShowError(AlarmCollection.Get(AlarmConstID.抽屉锁原位异常报警).Transform(StockIndex).CN); outStockStep = EOutStockFlowStep.打开抽屉锁; } break; @@ -171,7 +171,7 @@ namespace Rs.MotionPlat.Flow.NormalFlow } else if (stopwatch.ElapsedMilliseconds > 5000) { - Msg.ShowError(AlarmCollection.Get(AlarmConstID.抽屉拉伸气缸动位异常).CN); + Msg.ShowError(AlarmCollection.Get(AlarmConstID.抽屉拉伸气缸动位异常).Transform(StockIndex).CN); outStockStep = EOutStockFlowStep.出仓; } break; @@ -233,7 +233,7 @@ namespace Rs.MotionPlat.Flow.NormalFlow } else if (stopwatch.ElapsedMilliseconds > 10000) { - AlarmEntity alarmEntity = AlarmCollection.Get(AlarmConstID.抽屉拉伸气缸原位异常); + AlarmEntity alarmEntity = AlarmCollection.Get(AlarmConstID.抽屉拉伸气缸原位异常).Transform(StockIndex); Msgbox.ShowDialog(alarmEntity, EButtonType.Recheck); inStockStep = EInStockFlowStep.进仓; } @@ -260,7 +260,7 @@ namespace Rs.MotionPlat.Flow.NormalFlow } else if (stopwatch.ElapsedMilliseconds > 5000) { - Msg.ShowError(AlarmCollection.Get(AlarmConstID.抽屉锁动位异常报警).CN); + Msg.ShowError(AlarmCollection.Get(AlarmConstID.抽屉锁动位异常报警).Transform(StockIndex).CN); inStockStep = EInStockFlowStep.关闭开抽屉锁; } break; diff --git a/Rs.DeweyTester/Program.cs b/Rs.DeweyTester/Program.cs index 0cd39ee..22168f5 100644 --- a/Rs.DeweyTester/Program.cs +++ b/Rs.DeweyTester/Program.cs @@ -29,6 +29,20 @@ namespace Rs.MotionPlat [STAThread] static void Main() { + + int usage = 0; + + for (int i = 1; i <= 6; i++) + { + if (i==2 || i==3 ||i==5 || i==6) + { + usage |= 1 << (i - 1); + } + } + + string ss = string.Join ("", Convert.ToString(usage, 2).Reverse()); + + Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); //Application.Run(new FormIO2()); diff --git a/Rs.DeweyTester/Properties/AssemblyInfo.cs b/Rs.DeweyTester/Properties/AssemblyInfo.cs index 29e92b6..902b954 100644 --- a/Rs.DeweyTester/Properties/AssemblyInfo.cs +++ b/Rs.DeweyTester/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: - [assembly: AssemblyVersion("1.20.25.03")] + [assembly: AssemblyVersion("1.20.25.04")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]