Commit 99485715 LN

1

1 个父辈 577c5b6f
......@@ -340,7 +340,7 @@ namespace DeviceLibrary
private static string SaveImageToFile(string deviceName, string cameraName, Bitmap bitmap)
{
string date = DateTime.Now.ToString("HH-mm-ss-") + DateTime.Now.Millisecond;
string dire = @"\image\" + deviceName.Trim().Replace('_', '-') + @"\" + cameraName.Trim().Replace('_', '-').Replace(':', '-') + @"\";
string dire = @"D:\image\" + deviceName.Trim().Replace('_', '-') + @"\" + cameraName.Trim().Replace('_', '-').Replace(':', '-') + @"\";
string iamgeName = date + ".bmp";
try
{
......@@ -474,7 +474,7 @@ namespace DeviceLibrary
/// </summary>
/// <param name="dir"></param>
/// <param name="days"></param>
static void DeleteOldFiles(string path = "", int days = 7)
static void DeleteOldFiles(string path = "", int days = 5)
{
if (path == "")
{
......
......@@ -145,15 +145,18 @@ namespace DeviceLibrary
private Task ScanCodeTask = null;
private Task GetPosTask = null;
private int scanCount = 0;
private int getPosCount = 0;
private void IN02_ScanCode()
{
try
{
MoveInfo.NextMoveStep(MoveStep.IN02_ScanCode);
MoveInfo.log("开始扫码");
MoveInfo.log("开始扫码,scanCount=0");
scanCount = 0;
ScanCodeTask = Task.Factory.StartNew(delegate
{
string[] cameraName=Setting_Init.CameraScan_IN_2;
string[] cameraName = Setting_Init.CameraScan_IN_2;
if (Name.Contains("1"))
{
cameraName = Setting_Init.CameraScan_IN_1;
......@@ -161,17 +164,27 @@ namespace DeviceLibrary
//循环扫码,扫到条码才进入下一步
while (MoveInfo.MoveStep.Equals(MoveStep.IN02_ScanCode))
{
scanCount++;
LastCode = CodeManager.CameraScan(cameraName.ToList());
if (LastCode.Count > 0)
{
MoveInfo.log("扫码完成:"+CodeManager.ProcessCode(LastCode)+"");
{
MoveInfo.log("扫码完成:" + CodeManager.ProcessCode(LastCode) + "");
break;
}
else
{
SetWarnMsg($"{Name}: 扫码失败");
MoveInfo.errlog("扫码失败 , 等待2秒后重新扫码");
Thread.Sleep(2000);
if (IOManager.IOValue(Reel_Check).Equals(IO_VALUE.HIGH))
{
MoveInfo.errlog($"扫码{scanCount}次失败 , 等待2秒后重新扫码");
Thread.Sleep(2000);
}
else
{
MoveInfo.errlog($"扫码{scanCount}次失败 , 未检测到料盘信号 ,结束扫码");
MoveInfo.EndMove();
}
break;
}
}
});
......@@ -194,11 +207,13 @@ namespace DeviceLibrary
}
else
{
MoveInfo.log("获取库位号: " + codestr);
MoveInfo.log("获取库位号: " + codestr + ",getPosCount=0");
getPosCount = 0;
GetPosTask = Task.Factory.StartNew(delegate
{
while (MoveInfo.MoveStep.Equals(MoveStep.IN03_GetPos))
{
getPosCount++;
string shelfRfid = RobotManage.mainMachine.getReadyShelf();
if (String.IsNullOrEmpty(shelfRfid))
{
......@@ -223,8 +238,16 @@ namespace DeviceLibrary
else
{
SetWarnMsg( " getLocation " + outMsg);
MoveInfo.errlog("获取位置失败: " + outMsg + ", 等待3秒后重新获取");
Thread.Sleep(3000);
if (IOManager.IOValue(Reel_Check).Equals(IO_VALUE.HIGH))
{
MoveInfo.errlog($"获取位置{getPosCount}次失败: " + outMsg + ", 等待3秒后重新获取");
Thread.Sleep(3000);
}
else
{
MoveInfo.errlog($"获取位置{getPosCount}次失败: " + outMsg + ", 未检测到料盘信号,重置");
Reset("获取位置失败且未检测到料盘");
}
}
}
}
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!