From d22ab75ed0f5c3b4488cf791e72ee955fcb4179d Mon Sep 17 00:00:00 2001 From: lhiven Date: Wed, 14 May 2025 13:34:18 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=BD=93=E6=8A=A5?= =?UTF-8?q?=E8=AD=A6=E6=97=B6=E6=9A=82=E5=81=9C=E8=AE=BE=E5=A4=87=E7=9A=84?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E8=9C=82=E9=B8=A3=E5=99=A8=E4=B9=9F=E5=93=8D?= =?UTF-8?q?=E3=80=82=202=E3=80=8111=E4=BD=8D=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E8=A1=A5=E9=BD=90=E5=8A=9F=E8=83=BD=E5=8F=96=E6=B6=88=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.DeweyTester/Commom/BuzzerManager.cs | 2 +- Rs.DeweyTester/Commom/PadBarCode.cs | 7 ++++--- Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs | 3 ++- Rs.DeweyTester/FormMain.cs | 1 + Rs.DeweyTester/Properties/AssemblyInfo.cs | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Rs.DeweyTester/Commom/BuzzerManager.cs b/Rs.DeweyTester/Commom/BuzzerManager.cs index c195349..47f08e5 100644 --- a/Rs.DeweyTester/Commom/BuzzerManager.cs +++ b/Rs.DeweyTester/Commom/BuzzerManager.cs @@ -54,7 +54,7 @@ namespace Rs.MotionPlat.Commom } if (bRun) { - if(MachineManage.Instance.MachineStatus!= EMachineStatus.Stop) + //if(MachineManage.Instance.MachineStatus!= EMachineStatus.Stop) { if(!GlobalVar.DisableBuzzer) { diff --git a/Rs.DeweyTester/Commom/PadBarCode.cs b/Rs.DeweyTester/Commom/PadBarCode.cs index 1c74c3b..0bd77a0 100644 --- a/Rs.DeweyTester/Commom/PadBarCode.cs +++ b/Rs.DeweyTester/Commom/PadBarCode.cs @@ -10,9 +10,10 @@ namespace Rs.MotionPlat.Commom { public static string Pad(string sn) { - string firstStr = sn.Substring(0, sn.Length - 3); - string secondStr = sn.Substring(sn.Length - 3); - return $"FGX{firstStr}0000RY9+{secondStr}"; + return sn; + //string firstStr = sn.Substring(0, sn.Length - 3); + //string secondStr = sn.Substring(sn.Length - 3); + //return $"FGX{firstStr}0000RY9+{secondStr}"; } } } diff --git a/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs b/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs index 1ddf160..68274bf 100644 --- a/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs +++ b/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs @@ -474,7 +474,8 @@ namespace Rs.MotionPlat.Flow StockTakeFlow.Instance.Take(ETrayType.Input, ret.SlotIndex, idleNozzle.NozzleIndex); if (NozzleManager.GetNozzle(idleNozzle.NozzleIndex).Product != null) { - NozzleManager.GetNozzle(idleNozzle.NozzleIndex).Product.SN = ScanFailNGHelper.GetSn();// "SLK11111111PNK60X"; + //NozzleManager.GetNozzle(idleNozzle.NozzleIndex).Product.SN = "SLK11111111PNK60X"; + NozzleManager.GetNozzle(idleNozzle.NozzleIndex).Product.SN = ScanFailNGHelper.GetSn(); } takeSlotIndex++; exit = true; diff --git a/Rs.DeweyTester/FormMain.cs b/Rs.DeweyTester/FormMain.cs index 09445ef..d82bffa 100644 --- a/Rs.DeweyTester/FormMain.cs +++ b/Rs.DeweyTester/FormMain.cs @@ -801,6 +801,7 @@ namespace Rs.MotionPlat private void btnBuzzer_Click(object sender, EventArgs e) { Ops.Off("蜂鸣器"); + BuzzerManager.Instance.Off(); } private void txtGrrProductNum_KeyUp(object sender, KeyEventArgs e) diff --git a/Rs.DeweyTester/Properties/AssemblyInfo.cs b/Rs.DeweyTester/Properties/AssemblyInfo.cs index f1d5bf1..97808c4 100644 --- a/Rs.DeweyTester/Properties/AssemblyInfo.cs +++ b/Rs.DeweyTester/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: - [assembly: AssemblyVersion("20.25.33.2")] + [assembly: AssemblyVersion("20.25.34.2")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]