lhiven
/
Rs.SkyLine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加周转盘扫码后检测二维码是否有重码功能

Browse Source
develop
lhiven 10 months ago
parent 7bb09d71b2
commit 58df3e224f
5 changed files with 254 additions and 166 deletions
Show Stats Download Patch File Download Diff File

6
Rs.SkyLine/Flow/AlarmConstID.cs
Unescape Escape View File

@ -422,6 +422,11 @@ namespace Rs.MotionPlat.Flow
public const int 料盘未放下报警 = 1096; public const int 料盘未放下报警 = 1096;
/// <summary>
/// 二维码重码报警
/// </summary>
public const int 二维码重码报警 = 1097;
@ -654,5 +659,6 @@ namespace Rs.MotionPlat.Flow
/// 扫码失败报警 /// 扫码失败报警
/// </summary> /// </summary>
public const int ScanBarCodeFailAlarm = 58; public const int ScanBarCodeFailAlarm = 58;
} }
} }

9
Rs.SkyLine/Flow/LoadAndUnloadTask.cs
Unescape Escape View File

@ -181,6 +181,15 @@ namespace Rs.MotionPlat.Flow
turnoverResult.Add(turnoverInfo); turnoverResult.Add(turnoverInfo);
} }
/// <summary>
/// 移除掉重码的任务
/// </summary>
/// <param name="slotIndex"></param>
public void RemoveRepeatSnTask(int slotIndex)
{
turnoverResult = turnoverResult.Where(t => t.ToIndex != slotIndex).ToList();
}
public void CopyBarcodeToTask(int slotIndex,string sn) public void CopyBarcodeToTask(int slotIndex,string sn)
{ {
TurnoverInfo ti = turnoverResult.Where(r => r.ToIndex == slotIndex && r.ToType == TurnoverType.Turnover).First(); TurnoverInfo ti = turnoverResult.Where(r => r.ToIndex == slotIndex && r.ToType == TurnoverType.Turnover).First();

70
Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs
Unescape Escape View File

@ -2361,6 +2361,10 @@ namespace Rs.MotionPlat.Flow
public void ScanBarCode() public void ScanBarCode()
{ {
//需要检测的穴位
List<TurnoverTraySlot> checkSlots = new List<TurnoverTraySlot>();
int reScanNum = 0;
bool exitScan = false;
SchedulingMessageBox box = new SchedulingMessageBox(); SchedulingMessageBox box = new SchedulingMessageBox();
if (GlobalVar.RunSpace) if (GlobalVar.RunSpace)
{ {
@ -2390,6 +2394,10 @@ namespace Rs.MotionPlat.Flow
} }
else else
{ {
while(!exitScan)
{
checkSlots.Clear();
reScanNum++;
//没有需要给周转盘上料的任务后，就开始上相机扫码 //没有需要给周转盘上料的任务后，就开始上相机扫码
//判断周转盘第一行有没有产品,如果有产品则拍第一行 //判断周转盘第一行有没有产品,如果有产品则拍第一行
if (TurnoverTrayManager.Instance.HasProduct(ETrayRow.One)) if (TurnoverTrayManager.Instance.HasProduct(ETrayRow.One))
@ -2419,6 +2427,7 @@ namespace Rs.MotionPlat.Flow
//复制二维码 //复制二维码
LoadAndUnloadTask.Instance.CopyBarcodeToTask(vr.SlotIndex - 1, vr.SN); LoadAndUnloadTask.Instance.CopyBarcodeToTask(vr.SlotIndex - 1, vr.SN);
TurnoverTrayManager.Instance.Slot(vr.SlotIndex).SN = vr.SN; TurnoverTrayManager.Instance.Slot(vr.SlotIndex).SN = vr.SN;
checkSlots.Add(TurnoverTrayManager.Instance.Slot(vr.SlotIndex));
} }
else else
{ {
@ -2435,6 +2444,7 @@ namespace Rs.MotionPlat.Flow
OnShowGrabResult?.Invoke(vrsigle, true); OnShowGrabResult?.Invoke(vrsigle, true);
LoadAndUnloadTask.Instance.CopyBarcodeToTask(vr.SlotIndex - 1, vrsigle.SN); LoadAndUnloadTask.Instance.CopyBarcodeToTask(vr.SlotIndex - 1, vrsigle.SN);
TurnoverTrayManager.Instance.Slot(vr.SlotIndex).SN = vrsigle.SN; TurnoverTrayManager.Instance.Slot(vr.SlotIndex).SN = vrsigle.SN;
checkSlots.Add(TurnoverTrayManager.Instance.Slot(vr.SlotIndex));
break; break;
} }
else else
@ -2533,6 +2543,7 @@ namespace Rs.MotionPlat.Flow
//复制二维码 //复制二维码
LoadAndUnloadTask.Instance.CopyBarcodeToTask(vr.SlotIndex - 1, vr.SN); LoadAndUnloadTask.Instance.CopyBarcodeToTask(vr.SlotIndex - 1, vr.SN);
TurnoverTrayManager.Instance.Slot(vr.SlotIndex).SN = vr.SN; TurnoverTrayManager.Instance.Slot(vr.SlotIndex).SN = vr.SN;
checkSlots.Add(TurnoverTrayManager.Instance.Slot(vr.SlotIndex));
} }
else else
{ {
@ -2550,6 +2561,7 @@ namespace Rs.MotionPlat.Flow
OnShowGrabResult?.Invoke(vrsigle, true); OnShowGrabResult?.Invoke(vrsigle, true);
LoadAndUnloadTask.Instance.CopyBarcodeToTask(vr.SlotIndex - 1, vrsigle.SN); LoadAndUnloadTask.Instance.CopyBarcodeToTask(vr.SlotIndex - 1, vrsigle.SN);
TurnoverTrayManager.Instance.Slot(vr.SlotIndex).SN = vrsigle.SN; TurnoverTrayManager.Instance.Slot(vr.SlotIndex).SN = vrsigle.SN;
checkSlots.Add(TurnoverTrayManager.Instance.Slot(vr.SlotIndex));
break; break;
} }
else else
@ -2622,11 +2634,67 @@ namespace Rs.MotionPlat.Flow
//OnUpCameraGrabResult?.Invoke(result); //OnUpCameraGrabResult?.Invoke(result);
} }
if(checkSlots!=null && checkSlots.Count>0)
{
var repeatList = checkSlots.GroupBy(s => s.SN).Where(k => k.Count() >= 2).ToList();
if (repeatList != null && repeatList.Count > 0)
{
if (reScanNum >= 3)
{
List<int> slots = new List<int>();
List<string> repeatMsg = new List<string>();
//here need alarm and after take products out from tray point
foreach (var item in repeatList)
{
string repeatSnSlot = string.Join(" eq ", item.Select(s => s.Index));
repeatMsg.Add(repeatSnSlot);
foreach (var rslot in item)
{
slots.Add(rslot.Index);
}
}
string msg = string.Join(",", repeatMsg);
alarmInfo = GetClassName() + msg;
MessageQueue.Instance.Warn(alarmInfo);
alarmEntity = AlarmCollection.Get(AlarmConstID.二维码重码报警).Transform(msg);
AlarmMessageBox.ShowDialog(alarmEntity, ETipButton.Retry, null, true);
//judge product taked away use upcamea
foreach (var item in slots)
{
while (true)
{
SlotProductHasOrNotResult haveProduct = UpCameraCheckFlow.Instance.CheckTurnoverTrayHasProduct(null, item);
if (haveProduct.HasProduct)
{
alarmEntity = AlarmCollection.Get(AlarmConstID.周转盘产品未取出).Transform(item);
AlarmMessageBox.ShowDialog(alarmEntity, ETipButton.Retry, null);
}
else
{
LoadAndUnloadTask.Instance.RemoveRepeatSnTask(item-1);
TurnoverTrayManager.Instance.Slot(item).ClearProduct();
GlobalTray.TurnoverTray.ChangeStatus(item, ESlotStatus.NotHave);
break;
}
}
}
reScanNum = 0;
}
}
else
{
exitScan = true;
}
}
else
{
exitScan = true;
}
}
} }
} }
} }
} }
} }
/// <summary> /// <summary>

2
Rs.SkyLine/Properties/AssemblyInfo.cs
Unescape Escape View File

@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
// //
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
[assembly: AssemblyVersion("3.20.24.44")] [assembly: AssemblyVersion("3.20.24.45")]
//[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]

11
Rs.SkyLine/TestFrm.cs
Unescape Escape View File

@ -471,7 +471,7 @@ namespace Rs.MotionPlat
TurnoverTrayManager.Instance.Slot(4).SN = "3"; TurnoverTrayManager.Instance.Slot(4).SN = "3";
TurnoverTrayManager.Instance.Slot(5).SN = "4"; TurnoverTrayManager.Instance.Slot(5).SN = "4";
TurnoverTrayManager.Instance.Slot(6).SN = "5"; TurnoverTrayManager.Instance.Slot(6).SN = "5";
TurnoverTrayManager.Instance.Slot(7).SN = "6"; TurnoverTrayManager.Instance.Slot(7).SN = "2";
TurnoverTrayManager.Instance.Slot(8).SN = "7"; TurnoverTrayManager.Instance.Slot(8).SN = "7";
List<TurnoverTraySlot> slotList= new List<TurnoverTraySlot>(); List<TurnoverTraySlot> slotList= new List<TurnoverTraySlot>();
@ -487,8 +487,13 @@ namespace Rs.MotionPlat
var gb = slotList.GroupBy(s => s.SN).Where(aa=>aa.Count()>=2).ToList(); var gb = slotList.GroupBy(s => s.SN).Where(aa=>aa.Count()>=2).ToList();
List<string> repeatMsg = new List<string>();
foreach (var item in gb)
{
string repeatSnSlot = string.Join(" eq ", item.Select(s => s.Index));
repeatMsg.Add(repeatSnSlot);
}
string msg = string.Join(",", repeatMsg);
} }
} }
} }

Write Preview
Loading…
Cancel
Save