Skip to content

李娜 / SO664-HCSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 96f28d98 由 LN
选项

空出时环形线不出库。日志修改。

1 个父辈 d92a4a4a
内嵌 并排
正在显示 7 个修改的文件 包含 109 行增加 和 95 行删除
source/DeviceLibrary/acSingleStore/BoxAutoPoint.cs
......@@ -215,11 +215,11 @@ namespace OnlineStore.DeviceLibrary
}
else
{
LogUtil.error("BoxAutoPoint ToolTimer_Elapsed 出错：未找到" + MoveInfo.MoveStep + "的处理");
LogUtil.error(LogName + "BoxAutoPoint ToolTimer_Elapsed 出错：未找到" + MoveInfo.MoveStep + "的处理");
}
}catch(Exception ex)
{
LogUtil.error("BoxAutoPoint ToolTimer_Elapsed 出错：" + ex.ToString());
LogUtil.error(LogName + "BoxAutoPoint ToolTimer_Elapsed 出错：" + ex.ToString());
}
isInProcesss = false;
}
......
source/DeviceLibrary/acSingleStore/BoxBean.cs
......@@ -120,7 +120,7 @@ namespace OnlineStore.DeviceLibrary
return false;
}
LogUtil.info(Name + "开始启动，启动时间：" + StartTime.ToString());
LogInfo( "开始启动，启动时间：" + StartTime.ToString());
//TODO 启动时先所有轴远点返回，测试暂时关闭
storeRunStatus = StoreRunStatus.HomeMoving;
storeStatus = StoreStatus.ResetMove;
......@@ -142,12 +142,12 @@ namespace OnlineStore.DeviceLibrary
if (suddenBtn.Equals(IO_VALUE.LOW))
{
SetWarnMsg("启动失败：急停未开");
LogUtil.error(" (" + Name + ")启动出现错误：急停没开 ！启动失败！");
LogUtil.error(Name+ " (" + Name + ")启动出现错误：急停没开 ！启动失败！");
}
else
{
SetWarnMsg("启动失败：没有气压信号");
LogUtil.error(" (" + Name + ")启动出现错误：没有气压信号 ！启动失败！");
LogUtil.error(Name+ " (" + Name + ")启动出现错误：没有气压信号 ！启动失败！");
}
return false;
}
......@@ -167,7 +167,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NewMove(StoreMoveType.ReturnHome);
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_InOutBack);
ACAxisHomeMove(Config.InOut_Axis);
LogUtil.info(Name + "开始原点返回，先把进出轴回原点");
LogInfo( "开始原点返回，先把进出轴回原点");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
}
public void MoveToP1()
......@@ -175,7 +175,7 @@ namespace OnlineStore.DeviceLibrary
//压紧轴回原点，叉子回到P1,关闭门旋转轴和升降轴回到P1
MoveInfo.NewMove(StoreMoveType.StoreReset);
MoveInfo.NextMoveStep(StoreMoveStep.BOX_M_H_TOP1_InOutToP1);
LogUtil.info(Name + "到待机状态，进出轴到P1，判断叉子没有料盘");
LogInfo( "到待机状态，进出轴到P1，判断叉子没有料盘");
ACAxisMove(Config.InOut_Axis, Config.InOutAxis_P1_Position, Config.InOutAxis_P1_Speed);
}
......@@ -205,11 +205,11 @@ namespace OnlineStore.DeviceLibrary
if (!OpenAllAxis(true))
{
LogUtil.info(Name + "复位时打开轴失败，需要再次复位，直接报警停止复位");
LogInfo( "复位时打开轴失败，需要再次复位，直接报警停止复位");
return;
}
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_InOutBack);
LogUtil.info(Name + "复位中，进出轴开始原点返回");
LogInfo( "复位中，进出轴开始原点返回");
ACAxisHomeMove(Config.InOut_Axis);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
......@@ -233,13 +233,13 @@ namespace OnlineStore.DeviceLibrary
case StoreMoveStep.BOX_H_InOutMove:
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_InOutBack);
ACAxisHomeMove(Config.InOut_Axis);
LogUtil.info(Name + "" + MoveInfo.MoveType + "：进出轴开始原点返回");
LogInfo( "" + MoveInfo.MoveType + "：进出轴开始原点返回");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
break;
case StoreMoveStep.BOX_H_InOutBack:
Thread.Sleep(200);
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_InOutToP1);
LogUtil.info(Name + "" + MoveInfo.MoveType + "：进出轴到待机点P1["+ Config.InOutAxis_P1_Position + "]，关闭舱门");
LogInfo( "" + MoveInfo.MoveType + "：进出轴到待机点P1["+ Config.InOutAxis_P1_Position + "]，关闭舱门");
ACAxisMove(Config.InOut_Axis, Config.InOutAxis_P1_Position, Config.InOutAxis_P1_Speed);
CloseDoor();
break;
......@@ -254,7 +254,7 @@ namespace OnlineStore.DeviceLibrary
}
}
//复位和回原点要等轴3进出轴ORG亮了以后才能返回其他轴
LogUtil.info(Name + "" + MoveInfo.MoveType + "： 压紧轴，旋转轴，上下轴开始 原点返回");
LogInfo( "" + MoveInfo.MoveType + "： 压紧轴，旋转轴，上下轴开始 原点返回");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_OtherAxisBack);
MoveInfo.TimeOutSeconds = 100;
......@@ -267,12 +267,12 @@ namespace OnlineStore.DeviceLibrary
break;
case StoreMoveStep.BOX_H_OtherAxisBack:
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_WaitTime);
LogUtil.info(Name + "" + MoveInfo.MoveType + "：等待200ms后开始走到待机点");
LogInfo( "" + MoveInfo.MoveType + "：等待200ms后开始走到待机点");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200));
break;
case StoreMoveStep.BOX_H_WaitTime:
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_MiddleAxisToP1);
LogUtil.info(Name + "" + MoveInfo.MoveType + "：上下轴走到P1[" + Config.UpDownAxis_DoorOPosition_P1 + "]，压紧轴到P1[" + Config.CompressAxis_P1_Position + "]，旋转轴运动到P1[" + Config.MiddleAxis_P1_Position + "]");
LogInfo( "" + MoveInfo.MoveType + "：上下轴走到P1[" + Config.UpDownAxis_DoorOPosition_P1 + "]，压紧轴到P1[" + Config.CompressAxis_P1_Position + "]，旋转轴运动到P1[" + Config.MiddleAxis_P1_Position + "]");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_DoorOPosition_P1, Config.UpDownAxis_P1_Speed);
ComMoveToPosition(Config.CompressAxis_P1_Position, Config.CompAxis_P1_Speed);
......@@ -281,7 +281,7 @@ namespace OnlineStore.DeviceLibrary
ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1_Position, Config.MiddleAxis_P1_Speed);
break;
case StoreMoveStep.BOX_H_MiddleAxisToP1:
LogUtil.info(Name + "" + MoveInfo.MoveType + "完成");
LogInfo( "" + MoveInfo.MoveType + "完成");
storeRunStatus = StoreRunStatus.Runing;
MoveInfo.EndMove();
storeStatus = StoreStatus.StoreOnline;
......@@ -293,7 +293,7 @@ namespace OnlineStore.DeviceLibrary
case StoreMoveStep.BOX_M_H_TOP1_InOutToP1:
MoveInfo.NextMoveStep(StoreMoveStep.BOX_M_H_TOP1_CompressHome);
LogUtil.info(Name + "到待机状态，压紧轴回原点，关闭舱门");
LogInfo( "到待机状态，压紧轴回原点，关闭舱门");
if (UseCompress_Axis)
{
ACAxisHomeMove(Config.Comp_Axis);
......@@ -303,14 +303,14 @@ namespace OnlineStore.DeviceLibrary
break;
case StoreMoveStep.BOX_M_H_TOP1_CompressHome:
MoveInfo.NextMoveStep(StoreMoveStep.BOX_M_H_TOP1_OtherAxisToP1);
LogUtil.info(Name + "" + MoveInfo.MoveType + "：旋转轴运动到P1[" + Config.MiddleAxis_P1_Position + "]，上下轴走到P1[" + Config.UpDownAxis_DoorOPosition_P1 + "]，压紧轴到P1[" + Config.CompressAxis_P1_Position + "]");
LogInfo( "" + MoveInfo.MoveType + "：旋转轴运动到P1[" + Config.MiddleAxis_P1_Position + "]，上下轴走到P1[" + Config.UpDownAxis_DoorOPosition_P1 + "]，压紧轴到P1[" + Config.CompressAxis_P1_Position + "]");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1_Position, Config.MiddleAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_DoorOPosition_P1, Config.UpDownAxis_P1_Speed);
ComMoveToPosition(Config.CompressAxis_P1_Position, Config.CompAxis_P1_Speed);
break;
case StoreMoveStep.BOX_M_H_TOP1_OtherAxisToP1:
LogUtil.info(Name + "到待机状态完成");
LogInfo( "到待机状态完成");
MoveInfo.EndMove();
storeStatus = StoreStatus.StoreOnline;
storeRunStatus = StoreRunStatus.Runing;
......@@ -395,26 +395,26 @@ namespace OnlineStore.DeviceLibrary
{
if (AxisManager.instance.IsServeoOn(axis.DeviceName, axis.GetAxisValue()))
{
LogUtil.info(Name + "成功打开轴：" + axis.Explain);
LogInfo( "成功打开轴：" + axis.Explain);
}
else
{
//清理报警，再重新打开一次
LogUtil.info(Name + "第一次打开轴" + axis.Explain + "失败，先清理一下报警，再重新打开一次");
LogInfo( "第一次打开轴" + axis.Explain + "失败，先清理一下报警，再重新打开一次");
AxisManager.instance.AlarmClear(axis.DeviceName, axis.GetAxisValue());
System.Threading.Thread.Sleep(1200);
AxisManager.instance.ServoOn(axis.DeviceName, axis.GetAxisValue());
System.Threading.Thread.Sleep(100);
if (AxisManager.instance.IsServeoOn(axis.DeviceName, axis.GetAxisValue()))
{
LogUtil.info(Name + "清理报警后重新打卡轴成功：" + axis.Explain);
LogInfo( "清理报警后重新打卡轴成功：" + axis.Explain);
}
else
{
AxisManager.instance.ServoOff(axis.DeviceName, axis.GetAxisValue());
int alarmCode = GetAlarmCodeByAxis(axis);
WarnMsg = Name + "打开轴" + axis.Explain + "失败 ";
LogUtil.info(Name + WarnMsg);
LogInfo( WarnMsg);
Alarm(StoreAlarmType.AxisAlarm, GetAlarmCodeByAxis(axis).ToString(), WarnMsg, MoveInfo.MoveType);
return false;
}
......@@ -425,7 +425,7 @@ namespace OnlineStore.DeviceLibrary
public void CloseAllAxis()
{
LogUtil.info(Name + "关闭所有轴");
LogInfo( "关闭所有轴");
foreach (ConfigMoveAxis axis in moveAxisList)
{
AxisManager.instance.ServoOff(axis.DeviceName, axis.GetAxisValue());
......@@ -473,7 +473,7 @@ namespace OnlineStore.DeviceLibrary
lineConnect.StopConnect();
IOManager.instance.CloseAllDO();
LogUtil.info(Name + ",停止运行，总运行时间：" + span.ToString());
LogInfo( ",停止运行，总运行时间：" + span.ToString());
}
public override void Alarm(StoreAlarmType alarmType, string alarmDetial, string alarmMsg, StoreMoveType storeMoveType)
......@@ -548,18 +548,18 @@ namespace OnlineStore.DeviceLibrary
{
if (MoveInfo.MoveType.Equals(StoreMoveType.None))
{
LogUtil.info("收到复位信号，当前无报警，且空闲中，只回到待机点");
LogInfo( "收到复位信号，当前无报警，且空闲中，只回到待机点");
MoveToP1();
}
else
{
LogUtil.info("收到复位信号，当前无报警， 在" + MoveInfo.MoveType + "处理中，不处理复位");
LogInfo( "收到复位信号，当前无报警， 在" + MoveInfo.MoveType + "处理中，不处理复位");
}
}
else
{
//收到复位信号
LogUtil.info("收到复位信号，自动复位");
LogInfo( "收到复位信号，自动复位");
WarnMsg = "收到复位信号，自动复位";
Reset();
}
......@@ -592,7 +592,7 @@ namespace OnlineStore.DeviceLibrary
{
SetWarnMsg( "未检测到气压信号");
preAirValue = IO_VALUE.LOW;
LogUtil.info("已持续【" + FormUtil.GetSpanStr(span) + "】未检测到气压信号，报警");
LogInfo( "已持续【" + FormUtil.GetSpanStr(span) + "】未检测到气压信号，报警");
Alarm(StoreAlarmType.NoAirCheck, "2", WarnMsg, StoreMoveType.None);
return;
}
......@@ -626,7 +626,7 @@ namespace OnlineStore.DeviceLibrary
}
else
{
LogUtil.error("主定时器：InProcess已等待" + stopwatch.Elapsed.ToString() + "重新处理");
LogUtil.error(Name+ "主定时器：InProcess已等待" + stopwatch.Elapsed.ToString() + "重新处理");
IsChongfu = true;
}
}
......@@ -648,7 +648,7 @@ namespace OnlineStore.DeviceLibrary
{
if (IsChongfu)
{
LogUtil.info("【" + info + "】 处理完成，耗时：" + stopwatch.Elapsed.ToString());
LogInfo( "【" + info + "】 处理完成，耗时：" + stopwatch.Elapsed.ToString());
}
}
private void ReadDITimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
......@@ -735,7 +735,7 @@ namespace OnlineStore.DeviceLibrary
//若BOX和移栽都没有在等待Io的过程中则此Io超时异常可能已经处理过
if (MoveInfo.IsInWait == false)
{
LogUtil.info(Name + "之前有IO超时异常【" + alarmInfo.alarmDetail + "】,但是当前已经没有在等待中，清理信号超时异常！");
LogInfo( "之前有IO超时异常【" + alarmInfo.alarmDetail + "】,但是当前已经没有在等待中，清理信号超时异常！");
alarmType = StoreAlarmType.None;
WarnMsg = "";
}
......@@ -743,7 +743,7 @@ namespace OnlineStore.DeviceLibrary
}
catch (Exception ex)
{
LogUtil.error("IOTimeOutProcess出错：" + ex.ToString());
LogUtil.error(Name+ "IOTimeOutProcess出错：" + ex.ToString());
}
}
......@@ -759,11 +759,11 @@ namespace OnlineStore.DeviceLibrary
{
if (storeRunStatus < StoreRunStatus.Runing || MoveInfo.MoveType == StoreMoveType.InStore || MoveInfo.MoveType == StoreMoveType.OutStore)
{
LogUtil.info(Name + "已经累计出入库" + CurrInOutACount + "次，当时当前正在忙碌中暂不复位");
LogInfo( "已经累计出入库" + CurrInOutACount + "次，当时当前正在忙碌中暂不复位");
}
else
{
LogUtil.info(Name + "已经累计出入库" + CurrInOutACount + "次，需要复位一下");
LogInfo( "已经累计出入库" + CurrInOutACount + "次，需要复位一下");
Reset();
}
}
......@@ -771,11 +771,11 @@ namespace OnlineStore.DeviceLibrary
{
if (storeRunStatus < StoreRunStatus.Runing || MoveInfo.MoveType == StoreMoveType.InStore || MoveInfo.MoveType == StoreMoveType.OutStore)
{
LogUtil.info(Name + "已经累计出入库" + CurrInOutCount + "次，当时当前正在忙碌中暂不复位旋转轴");
LogInfo( "已经累计出入库" + CurrInOutCount + "次，当时当前正在忙碌中暂不复位旋转轴");
}
else
{
LogUtil.info(Name + "已经累计出入库" + CurrInOutCount + "次，需要复位一下旋转轴");
LogInfo( "已经累计出入库" + CurrInOutCount + "次，需要复位一下旋转轴");
}
}
else if (lineConnect.CanStartOut() || IsDebug || autoNext)
......@@ -792,12 +792,12 @@ namespace OnlineStore.DeviceLibrary
if (currInOutFixture != null)
{ //出库
LogUtil.info(Name + "开始执行排队中的出库【" + currInOutFixture.ToStr() + "】");
LogInfo( "开始执行排队中的出库【" + currInOutFixture.ToStr() + "】");
bool result = StartOutStoreMove(new InOutParam(currInOutFixture));
//bool result = StartOutStoreMove(new InOutParam("", currInOutFixture.PosId, currInOutFixture.plateH, currInOutFixture.plateW));
if (!result)
{
LogUtil.info(Name + " 执行排队中的出库【" + currInOutFixture.ToStr() + "】失败，重新加入等待队列");
LogInfo( " 执行排队中的出库【" + currInOutFixture.ToStr() + "】失败，重新加入等待队列");
AddWaitOutInfo(currInOutFixture);
}
}
......@@ -805,7 +805,7 @@ namespace OnlineStore.DeviceLibrary
}
catch (Exception ex)
{
LogUtil.error("处理出入库排队列表出错：" + ex.ToString());
LogUtil.error(Name+ "处理出入库排队列表出错：" + ex.ToString());
}
}
......@@ -870,7 +870,7 @@ namespace OnlineStore.DeviceLibrary
Thread.Sleep(300);
CloseAllAxis();
LogUtil.info(Name + "StopMove");
LogInfo( "StopMove");
IOMove(IO_Type.Door_Down, IO_VALUE.LOW);
IOMove(IO_Type.Door_Up, IO_VALUE.LOW);
isInPro = false;
......@@ -920,8 +920,8 @@ namespace OnlineStore.DeviceLibrary
if (position == null)
{ //出入库没有找到服务器发送的库位，需要打印日志方便查询原因
WarnMsg = "入库未找到库位：【" + inoutInfo.ToStr() + "】 ";
LogUtil.error("收到服务器入库命令：入库未找到库位：【" + inoutInfo.ToStr() + "】");
LogUtil.info("收到服务器入库命令：入库未找到库位：【" + inoutInfo.ToStr() + "】");
LogUtil.error(Name+ "收到服务器入库命令：入库未找到库位：【" + inoutInfo.ToStr() + "】");
LogInfo( "收到服务器入库命令：入库未找到库位：【" + inoutInfo.ToStr() + "】");
return;
}
//TODO:判断BOX是否处于可以入库状态，如果调试或急停中，需要返回给服务器；
......@@ -930,11 +930,11 @@ namespace OnlineStore.DeviceLibrary
InOutParam param = new InOutParam(inoutInfo);
StartInStoreMove(param);
//如果当前正在出入库中，需要记录下来，等待空闲时执行
LogUtil.info(Name + " 收到服务器入库命令：【" + inoutInfo.ToStr() + "】开始入库！");
LogInfo( " 收到服务器入库命令：【" + inoutInfo.ToStr() + "】开始入库！");
}
else
{
LogUtil.info(Name + " 收到服务器入库命令：【" + inoutInfo.ToStr() + "】 正在忙碌中，无法入库！");
LogInfo( " 收到服务器入库命令：【" + inoutInfo.ToStr() + "】 正在忙碌中，无法入库！");
}
}
......@@ -943,7 +943,7 @@ namespace OnlineStore.DeviceLibrary
public bool ReviceLineCheckInStoreCMD(string posId, int plateH, int plateW, string message, string rfid)
{
string logName = "入库库位验证【 " + message + "】【" + posId + "】：";
string logName =Name+ "入库库位验证【 " + message + "】【" + posId + "】：";
try
{
......@@ -1076,14 +1076,14 @@ namespace OnlineStore.DeviceLibrary
}
catch (Exception ex)
{
LogUtil.error("定时给服务器发送消息出错：" + ex.ToString());
LogUtil.error(Name+ "定时给服务器发送消息出错：" + ex.ToString());
}
}
humBean.HumidityProcess(this);
}
catch (Exception ex)
{
LogUtil.error("server_connect_timer_Tick出错：" + ex.ToString());
LogUtil.error(Name+ "server_connect_timer_Tick出错：" + ex.ToString());
}
finally
{
......@@ -1148,7 +1148,7 @@ namespace OnlineStore.DeviceLibrary
boxStatus.status = (int)lastPosIdStatus;
if (lastPosId != "")
{
LogUtil.info("给服务器发送出入库完成消息：" + Name + ",status【" + lastPosIdStatus + "】posId【" + lastPosId + "】");
LogInfo( "给服务器发送出入库完成消息：" + Name + ",status【" + lastPosIdStatus + "】posId【" + lastPosId + "】");
}
lastPosId = "";
}
......@@ -1216,12 +1216,12 @@ namespace OnlineStore.DeviceLibrary
}
else
{
LogUtil.error("收到服务器命令：op=" + resultOperation.op + "，未找到对应处理");
LogUtil.error(Name+ "收到服务器命令：op=" + resultOperation.op + "，未找到对应处理");
}
TimeSpan span = DateTime.Now - time;
if (span.TotalMilliseconds > 10)
{
LogUtil.info(Name + "执行TimerProcess 共处理了【" + span.TotalMilliseconds + "】毫秒");
LogInfo( "执行TimerProcess 共处理了【" + span.TotalMilliseconds + "】毫秒");
}
}
......@@ -1253,7 +1253,7 @@ namespace OnlineStore.DeviceLibrary
//rfidLoc: 料架的架位,值为 - 1时,可以自由分配皮带线, 小料时,架位为1 - 46优先走1 / 2号皮带线,47 - 92优先走3 / 4号皮带线, 70,71,72时只能分配到3 / 4号皮带线; 大料时,架位1 - 6优先走1 / 2号皮带线, 7 - 12优先走3 / 4号皮带线
string dataStr = JsonHelper.SerializeObject(data);
LogUtil.info("收到服务器出库消息：【" + dataStr + "】");
LogInfo( "收到服务器出库消息：【" + dataStr + "】");
int index = -1;
foreach (string posId in posIdArray)
......@@ -1281,7 +1281,7 @@ namespace OnlineStore.DeviceLibrary
//判断是否接收过此库位的出库信息
if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore) && MoveInfo.MoveParam.PosInfo.PosId.Equals(posId))
{
LogUtil.info(Name + " 出库命令【" + intouInfo.ToStr() + "】重复，正在【" + posId + "】出库中");
LogInfo( " 出库命令【" + intouInfo.ToStr() + "】重复，正在【" + posId + "】出库中");
continue;
}
else
......@@ -1298,7 +1298,7 @@ namespace OnlineStore.DeviceLibrary
}
catch (Exception ex)
{
LogUtil.error("验证出库【" + intouInfo.ToStr() + "】是否重复出错：" + ex.ToString());
LogUtil.error(Name+ "验证出库【" + intouInfo.ToStr() + "】是否重复出错：" + ex.ToString());
}
if (CanStarInOut() && (lineConnect.CanStartOut() || IsDebug))
......@@ -1306,13 +1306,13 @@ namespace OnlineStore.DeviceLibrary
bool result = StartOutStoreMove(new InOutParam(intouInfo));
if (!result)
{
LogUtil.info(Name + " 执行出库【" + intouInfo.ToStr() + "】失败，加入等待队列");
LogInfo( " 执行出库【" + intouInfo.ToStr() + "】失败，加入等待队列");
AddWaitOutInfo(intouInfo);
}
}
else
{
LogUtil.error("执行出库【" + intouInfo.ToStr() + "】失败，当前在忙碌中，加入等待队列");
LogUtil.error(Name+ "执行出库【" + intouInfo.ToStr() + "】失败，当前在忙碌中，加入等待队列");
AddWaitOutInfo(intouInfo);
}
......@@ -1320,7 +1320,7 @@ namespace OnlineStore.DeviceLibrary
TimeSpan span = DateTime.Now - time;
if (span.TotalMilliseconds > 10)
{
LogUtil.info(Name + "执行TimerProcess 共处理了【" + span.TotalMilliseconds + "】毫秒");
LogInfo( "执行TimerProcess 共处理了【" + span.TotalMilliseconds + "】毫秒");
}
}
}
......
source/DeviceLibrary/acSingleStore/BoxBean_Inventory.cs
......@@ -107,14 +107,14 @@ namespace OnlineStore.DeviceLibrary
if (AutoStartIndex >= 0 && AutoStartIndex < PositionNumList.Count)
{
newIndex = AutoStartIndex;
LogUtil.info( Name + "下一个索引不存在，重新开始自动盘点，索引【" + AutoStartIndex + "】");
LogInfo( "下一个索引不存在，重新开始自动盘点，索引【" + AutoStartIndex + "】");
}
else
{
autoNext = false;
readDITimer.Enabled = false;
autoMsg = "自动盘点结束！";
LogUtil.info( Name + "下一个索引不存在，自动盘点结束！");
LogInfo( "下一个索引不存在，自动盘点结束！");
//回待机位
MoveToP1();
}
......@@ -124,7 +124,7 @@ namespace OnlineStore.DeviceLibrary
autoPositionIndex = newIndex;
string posid = PositionNumList[autoPositionIndex];
InOutPosInfo inoutinfo = new InOutPosInfo(autoInoutCode, posid);
LogUtil.info( Name + "自动进入下一个仓位：posid=" + posid);
LogInfo( "自动进入下一个仓位：posid=" + posid);
autoMsg = "自动盘点：" + posid;
StartInventoryMove(new InOutParam(inoutinfo));
......@@ -153,7 +153,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error( Name + " 启动盘点库位【" + posId + "】出错，找不到库位信息");
return;
}
LogUtil.info( Name + " 启动盘点库位【" + posId + "】");
LogInfo( " 启动盘点库位【" + posId + "】");
storeRunStatus = StoreRunStatus.Busy;
storeStatus = StoreStatus.CheckPosMove;
MoveInfo.NewMove(StoreMoveType.CheckPosition, param);
......@@ -175,7 +175,7 @@ namespace OnlineStore.DeviceLibrary
private void CheckPositionLog(string msg)
{
string posId = MoveInfo.MoveParam != null ? "【" + MoveInfo.MoveParam.PosInfo.PosId + "】" : " ";
LogUtil.info( posId + MoveInfo.MoveStep + " " + msg);
LogInfo( posId + MoveInfo.MoveStep + " " + msg);
}
}
}
source/DeviceLibrary/acSingleStore/BoxBean_Partial.cs
......@@ -117,7 +117,7 @@ namespace OnlineStore.DeviceLibrary
int errorCount = Math.Abs(outCount - InOut_P1);
if (errorCount <= Config.InOut_Axis.CanErrorCountMin)
{
LogUtil.info("进出轴当前位置：" + outCount + "，已经在P1["+ InOut_P1 + "]，不需要再回P1");
LogUtil.error(Name+ "进出轴当前位置：" + outCount + "，已经在P1["+ InOut_P1 + "]，不需要再回P1");
}
else
{
......@@ -303,7 +303,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(Name + " 启动入库【" + posId + "】出错，叉子料盘检测有料");
return;
}
LogUtil.info(Name + " 启动入库【" + posId + "】");
LogInfo( " 启动入库【" + posId + "】");
storeRunStatus = StoreRunStatus.Busy;
storeStatus = StoreStatus.InStoreExecute;
MoveInfo.NewMove(StoreMoveType.InStore, param);
......@@ -538,7 +538,7 @@ namespace OnlineStore.DeviceLibrary
{
TimeSpan span = DateTime.Now - startInStoreTime;
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.PosId : "";
LogUtil.info(Name + " 【" + posId + "】 整个入库流程结束，耗时【" + FormUtil.GetSpanStr(span) + "】！");
LogInfo( " 【" + posId + "】 整个入库流程结束，耗时【" + FormUtil.GetSpanStr(span) + "】！");
MoveInfo.EndMove();
storeRunStatus = StoreRunStatus.Runing;
//设备连接，入库后，BOX恢复原始状态
......@@ -547,7 +547,7 @@ namespace OnlineStore.DeviceLibrary
}
else
{
LogUtil.info(Name + " 入库，moveStatus=" + MoveInfo.MoveStep + "，没有对应的处理！");
LogInfo( " 入库，moveStatus=" + MoveInfo.MoveStep + "，没有对应的处理！");
}
}
......@@ -577,7 +577,7 @@ namespace OnlineStore.DeviceLibrary
return false;
}
storeStatus = StoreStatus.OutStoreExecute;
LogUtil.info( Name + "启动出库【" + posId + "】 " );
LogInfo( "启动出库【" + posId + "】 " );
storeRunStatus = StoreRunStatus.Busy;
MoveInfo.NewMove(StoreMoveType.OutStore, param);
......@@ -797,16 +797,27 @@ namespace OnlineStore.DeviceLibrary
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.SO_27_CheckTray))
{
bool isCancel = false;
if (IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.LOW))
{
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.PosId : "";
string barcode = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.barcode : "";
CodeMsg = "" + posId + "_" + barcode + "_空出";
LogUtil.error(CodeMsg + "，取消出库任务");
LogUtil.error(CodeMsg + "，取消出库任务");
StoreManager.cancelOutTask(barcode);
isCancel = true;
}
else
{
//发送消息给流水线
SendOutStoreEnd(MoveInfo);
}
SO_28_GoBack();
MoveInfo.NextMoveStep(StoreMoveStep.SO_28_GoBack);
OutStoreLog("出库：轴2至P1(待机点)[" + MoveInfo.MoveParam.MoveP.UpDown_P1 + "] ,关闭舱门");
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
CloseDoor();
}
else if (MoveInfo.MoveStep == StoreMoveStep.SO_28_GoBack)
{
......@@ -829,7 +840,7 @@ namespace OnlineStore.DeviceLibrary
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.PosId : "";
storeStatus = StoreStatus.StoreOnline;
LogUtil.info(Name + " 【" + posId + "】 整个出库流程结束，耗时【" + FormUtil.GetSpanStr(span) + "】！");
LogInfo( " 【" + posId + "】 整个出库流程结束，耗时【" + FormUtil.GetSpanStr(span) + "】！");
MoveInfo.EndMove();
storeRunStatus = StoreRunStatus.Runing;
InOutEndProcess(StoreMoveType.OutStore);
......@@ -853,19 +864,11 @@ namespace OnlineStore.DeviceLibrary
{
if (OutCheckAlarm())
{
LogUtil.info(Name + "执行用户操作：忽略检测信号，继续出库");
LogInfo( "执行用户操作：忽略检测信号，继续出库");
MoveInfo.EndStepWait();
}
}
private void SO_28_GoBack()
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_28_GoBack);
OutStoreLog("出库：轴2至P1(待机点)["+ MoveInfo.MoveParam.MoveP.UpDown_P1 + "] ,关闭舱门");
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
CloseDoor();
//发送消息给流水线
SendOutStoreEnd(MoveInfo);
}
private void SO_21_ToDoorP()
{
LineMoveP moveP = MoveInfo.MoveParam.MoveP;
......@@ -958,13 +961,13 @@ namespace OnlineStore.DeviceLibrary
if (AutoStartIndex >= 0 && AutoStartIndex < PositionNumList.Count)
{
newIndex = AutoStartIndex;
LogUtil.info(Name + "下一个索引不存在，重新开始自动出入库，索引【" + AutoStartIndex + "】");
LogInfo( "下一个索引不存在，重新开始自动出入库，索引【" + AutoStartIndex + "】");
}
else
{
autoNext = false;
autoMsg = "自动出入库结束！";
LogUtil.info(Name + "下一个索引不存在，自动 出入库结束！");
LogInfo( "下一个索引不存在，自动 出入库结束！");
return;
}
}
......@@ -974,21 +977,21 @@ namespace OnlineStore.DeviceLibrary
//判断是否需要重置
if (CurrInOutACount >= Config.Box_ResetACount)
{
LogUtil.info(Name + "自动进入下一个出库：posid=" + posid + ",当时已经出入库" + CurrInOutACount + "次，需要重置BOX，先把出库信息存入排队列表中");
LogInfo( "自动进入下一个出库：posid=" + posid + ",当时已经出入库" + CurrInOutACount + "次，需要重置BOX，先把出库信息存入排队列表中");
Reset(false);
autoMsg = "自动出库：" + posid;
AddWaitOutInfo(inoutinfo);
}
//else if (CurrInOutCount >= Config.Box_ResetMCount)
//{
// LogUtil.info(Name + "自动进入下一个出库：posid=" + posid + ",当时已经出入库" + CurrInOutCount + "次，需要重置BOX旋转轴，先把出库信息存入排队列表中");
// LogInfo( "自动进入下一个出库：posid=" + posid + ",当时已经出入库" + CurrInOutCount + "次，需要重置BOX旋转轴，先把出库信息存入排队列表中");
// //ResetMiddleAxis(false);
// autoMsg = "自动出库：" + posid;
// AddWaitOutInfo(inoutinfo);
//}
else
{
LogUtil.info(Name + "自动进入下一个出库：posid=" + posid);
LogInfo( "自动进入下一个出库：posid=" + posid);
autoMsg = "自动出库：" + posid;
StartOutStoreMove(new InOutParam(inoutinfo));
}
......@@ -1001,13 +1004,13 @@ namespace OnlineStore.DeviceLibrary
if (AutoStartIndex >= 0 && AutoStartIndex < PositionNumList.Count)
{
newIndex = AutoStartIndex;
LogUtil.info(Name + "下一个索引不存在，重新开始自动出入库，索引【" + AutoStartIndex + "】");
LogInfo( "下一个索引不存在，重新开始自动出入库，索引【" + AutoStartIndex + "】");
}
else
{
autoNext = false;
autoMsg = "自动出入库结束！";
LogUtil.info(Name + "下一个索引不存在，自动 出入库结束！");
LogInfo( "下一个索引不存在，自动 出入库结束！");
return;
}
}
......@@ -1015,7 +1018,7 @@ namespace OnlineStore.DeviceLibrary
string posid = PositionNumList[newIndex];
InOutPosInfo inoutinfo = new InOutPosInfo(autoInoutCode, posid);
LogUtil.info(Name + "自动进入下一个入库：posid=" + posid);
LogInfo( "自动进入下一个入库：posid=" + posid);
autoMsg = "自动入库：" + posid;
StartInStoreMove(new InOutParam(inoutinfo));
}
......@@ -1029,12 +1032,12 @@ namespace OnlineStore.DeviceLibrary
private void InStoreLog(string msg)
{
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.PosId : "";
LogUtil.info( "【" + posId + "】" + msg );
LogUtil.info( Name+ "【" + posId + "】" + msg );
}
private void OutStoreLog(string msg)
{
string posId = MoveInfo.MoveParam != null ? "【" + MoveInfo.MoveParam.PosInfo.PosId + "】" : " ";
LogUtil.info( posId + MoveInfo.MoveStep + " " + msg );
LogUtil.info( Name+ posId + MoveInfo.MoveStep + " " + msg );
}
}
}
source/DeviceLibrary/bean/KTK_Store.cs
......@@ -214,7 +214,7 @@ namespace OnlineStore.DeviceLibrary
protected void ACAxisHomeMove(ConfigMoveAxis moveAxis)
{
moveAxis.TargetPosition = 0;
LogUtil.info(moveAxis.DisplayStr + "speed[" + moveAxis.HomeHighSpeed + "]开始原点返回");
LogUtil.debug (moveAxis.DisplayStr + "speed[" + moveAxis.HomeHighSpeed + "]开始原点返回");
MoveInfo.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, true));
AxisManager.instance.HomeMove(moveAxis.DeviceName, (short)moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed, moveAxis.HomeLowSpeed, moveAxis.HomeAddSpeed);
}
......@@ -243,7 +243,7 @@ namespace OnlineStore.DeviceLibrary
//判断是否需要重新运动
if (MoveInfo.CanWhileCount > 0)
{
LogUtil.error(moveAxis.DisplayStr + "目标位置[" + targetPosition + "]当前位置[" + outCount +
LogUtil.error(Name + moveAxis.DisplayStr + "目标位置[" + targetPosition + "]当前位置[" + outCount +
"]，误差过大，重新开始运动，剩余[" + MoveInfo.CanWhileCount + "]次");
AxisManager.instance.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed,moveAxis.AddSpeed,moveAxis.DelSpeed);
MoveInfo.CanWhileCount--;
......@@ -272,7 +272,7 @@ namespace OnlineStore.DeviceLibrary
//判断是否需要重新运动
if (MoveInfo.CanWhileCount > 0)
{
LogUtil.error( moveAxis.DisplayStr + "收到原点完成信号，当前位置[" + outCount + "]，重新回原点，剩余[" + MoveInfo.CanWhileCount + "]次");
LogUtil.error(Name+ moveAxis.DisplayStr + "收到原点完成信号，当前位置[" + outCount + "]，重新回原点，剩余[" + MoveInfo.CanWhileCount + "]次");
//LogUtil.error( StoreName + moveAxis.DisplayStr + "重新回原点");
AxisManager.instance.HomeMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed, moveAxis.HomeLowSpeed, moveAxis.HomeAddSpeed);
MoveInfo.CanWhileCount--;
......
source/HCSingleStore/记录.txt
 // 机器状态 顶灯显示
 空出时不发送给环形线出库。
日志修改，增加box名称。
// 机器状态 顶灯显示
// 绿 黄 红
//机器复位中 闪 灭 灭
//机器待机中 亮 灭 灭
......
source/HuichuanLibrary/HCBoardManager_Axis.cs
......@@ -274,7 +274,7 @@ namespace HuichuanLibrary
}
else
{
ShowLog(" Axis[" + axisNo + "] SetSingleAxMvPara ptpVel [" + ptpVel + "] ptpAcc [" + ptpAcc + "] ptpDec [" + ptpDec + "] OK");
DebugLog(" Axis[" + axisNo + "] SetSingleAxMvPara ptpVel [" + ptpVel + "] ptpAcc [" + ptpAcc + "] ptpDec [" + ptpDec + "] OK");
return true;
}
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!