1、优化当报警时暂停设备的同时蜂鸣器也响。

2、11位二维码补齐功能取消。
develop
lhiven 3 weeks ago
parent a8a7ee8215
commit d22ab75ed0

@ -54,7 +54,7 @@ namespace Rs.MotionPlat.Commom
} }
if (bRun) if (bRun)
{ {
if(MachineManage.Instance.MachineStatus!= EMachineStatus.Stop) //if(MachineManage.Instance.MachineStatus!= EMachineStatus.Stop)
{ {
if(!GlobalVar.DisableBuzzer) if(!GlobalVar.DisableBuzzer)
{ {

@ -10,9 +10,10 @@ namespace Rs.MotionPlat.Commom
{ {
public static string Pad(string sn) public static string Pad(string sn)
{ {
string firstStr = sn.Substring(0, sn.Length - 3); return sn;
string secondStr = sn.Substring(sn.Length - 3); //string firstStr = sn.Substring(0, sn.Length - 3);
return $"FGX{firstStr}0000RY9+{secondStr}"; //string secondStr = sn.Substring(sn.Length - 3);
//return $"FGX{firstStr}0000RY9+{secondStr}";
} }
} }
} }

@ -474,7 +474,8 @@ namespace Rs.MotionPlat.Flow
StockTakeFlow.Instance.Take(ETrayType.Input, ret.SlotIndex, idleNozzle.NozzleIndex); StockTakeFlow.Instance.Take(ETrayType.Input, ret.SlotIndex, idleNozzle.NozzleIndex);
if (NozzleManager.GetNozzle(idleNozzle.NozzleIndex).Product != null) 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++; takeSlotIndex++;
exit = true; exit = true;

@ -801,6 +801,7 @@ namespace Rs.MotionPlat
private void btnBuzzer_Click(object sender, EventArgs e) private void btnBuzzer_Click(object sender, EventArgs e)
{ {
Ops.Off("蜂鸣器"); Ops.Off("蜂鸣器");
BuzzerManager.Instance.Off();
} }
private void txtGrrProductNum_KeyUp(object sender, KeyEventArgs e) private void txtGrrProductNum_KeyUp(object sender, KeyEventArgs e)

@ -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: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]

Loading…
Cancel
Save