Skip to content

孙克 / RC1250-ACPackingStore

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

出库mark参数修改

1 个父辈 5621c002
内嵌 并排
正在显示 2 个修改的文件 包含 16 行增加 和 33 行删除
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Partial.cs
...@@ -840,12 +840,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -840,12 +840,13 @@ namespace OnlineStore.DeviceLibrary
} }
else if (IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.LOW) && (!MoveInfo.MoveParam.rfid.Equals(""))) else if (IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.LOW) && (!MoveInfo.MoveParam.rfid.Equals("")))
{ {
string rfid = MoveInfo.MoveParam.rfid; string mark = GetMarkInfo();
// string rfid = MoveInfo.MoveParam.rfid;
MoveInfo.NextMoveStep(StoreMoveStep.BI_00_ReadyShelf); MoveInfo.NextMoveStep(StoreMoveStep.BI_00_ReadyShelf);
InOutStoreLog("出库 " + MoveInfo.SLog + "： 通知agv调度准备带料架的agv[" + rfid + "]，等待agv到达或检测到料架信号，进出轴到P1"); InOutStoreLog("出库 " + MoveInfo.SLog + "： 通知agv调度准备带料架的agv[" + mark + "]，等待agv到达或检测到料架信号，进出轴到P1");
InOutBackToP1(MoveInfo.MoveParam.MoveP.InOut_P1); InOutBackToP1(MoveInfo.MoveParam.MoveP.InOut_P1);
//需要先叫agv到达 //需要先叫agv到达
AgvClient.SetStatus(Config.AgvNodeName, rfid, rfid, ClientAction.NeedEnter, ClientLevel.High, true); AgvClient.SetStatus(Config.AgvNodeName, mark,MoveInfo.MoveParam.rfid , ClientAction.NeedEnter, ClientLevel.High, true);
MoveInfo.WaitList.Add(WaitResultInfo.WaitAgvAction((int)ClientAction.Arrive)); MoveInfo.WaitList.Add(WaitResultInfo.WaitAgvAction((int)ClientAction.Arrive));
} }
else else
......
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Shelf.cs
...@@ -26,12 +26,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -26,12 +26,13 @@ namespace OnlineStore.DeviceLibrary
} }
private void ShelfEnterProcess() private void ShelfEnterProcess()
{ {
string moveName = "料架入库"; string mark = GetMarkInfo();
string moveName = "料架入库[" + mark + "]";
bool instoreShelf = true; bool instoreShelf = true;
if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore)) if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore))
{ {
instoreShelf = false; instoreShelf = false;
moveName = "空料架进入"; moveName = "空料架进入["+ mark + "]";
} }
if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_00_ReadyShelf)) if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_00_ReadyShelf))
{ {
...@@ -55,7 +56,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -55,7 +56,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BI_03_LineRun); MoveInfo.NextMoveStep(StoreMoveStep.BI_03_LineRun);
InOutStoreLog(moveName + MoveInfo.SLog + "调用AgvClient.MayEnter，线体正转，等待LineIn_Check信号"); InOutStoreLog(moveName + MoveInfo.SLog + "调用AgvClient.MayEnter，线体正转，等待LineIn_Check信号");
AgvClient.SetStatus(Config.AgvNodeName, "", "", ClientAction.MayEnter, ClientLevel.High, true); AgvClient.SetStatus(Config.AgvNodeName, mark, "", ClientAction.MayEnter, ClientLevel.High, true);
LineRun(); LineRun();
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineIn_Check, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineIn_Check, IO_VALUE.HIGH));
} }
...@@ -68,7 +69,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -68,7 +69,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StoreMoveStep.BI_05_LineStop); MoveInfo.NextMoveStep(StoreMoveStep.BI_05_LineStop);
InOutStoreLog(moveName + MoveInfo.SLog + "调用AgvClient.FinishEnter，取料位检测到信号，停止线体正转"); InOutStoreLog(moveName + MoveInfo.SLog + "调用AgvClient.FinishEnter，取料位检测到信号，停止线体正转");
LineStop(); LineStop();
AgvClient.SetStatus(Config.AgvNodeName, "", "", ClientAction.FinishEnter, ClientLevel.High, true); AgvClient.SetStatus(Config.AgvNodeName, mark, "", ClientAction.FinishEnter, ClientLevel.High, true);
if (!instoreShelf) if (!instoreShelf)
{ {
...@@ -77,25 +78,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -77,25 +78,6 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.MoveParam.UpdateShelfPosId(ShelfPosList[0]); MoveInfo.MoveParam.UpdateShelfPosId(ShelfPosList[0]);
InOutStoreLog("出库 " + MoveInfo.SLog + "： ShelfPosID未设置，默认ShelfPosID=" + MoveInfo.MoveParam.ShelfPosID); InOutStoreLog("出库 " + MoveInfo.SLog + "： ShelfPosID未设置，默认ShelfPosID=" + MoveInfo.MoveParam.ShelfPosID);
} }
// EmprtShelfList = new System.Collections.Concurrent.ConcurrentQueue<string>(ShelfPosList);
//if (MoveInfo.MoveParam.ShelfPosID.Equals(""))
//{
// string shelfPosId = "";
// bool result = EmprtShelfList.TryDequeue(out shelfPosId);
// if (result)
// {
// MoveInfo.MoveParam.UpdateShelfPosId(shelfPosId);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：重置EmprtShelfList列表，设置料架位置：" + MoveInfo.MoveParam.ShelfPosID);
// }
// else
// {
// waitOutStoreList.Enqueue(MoveInfo.MoveParam);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：重置EmprtShelfList列表，获取料架位置失败！结束出库，并将" + MoveInfo.MoveParam.ToStr() + "放入等待列表");
// MoveEndToRuningStatus();
// }
//}
} }
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_05_LineStop)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_05_LineStop))
...@@ -184,9 +166,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -184,9 +166,9 @@ namespace OnlineStore.DeviceLibrary
} }
CylinderMove(MoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down); CylinderMove(MoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down);
} }
private string GetMarkInfo() private string GetMarkInfo(string defualtMark = "")
{ {
string mark = "0"; string mark = defualtMark;
if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore)) if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore))
{ {
...@@ -198,16 +180,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -198,16 +180,16 @@ namespace OnlineStore.DeviceLibrary
if (MoveInfo.MoveParam.urgentReel) if (MoveInfo.MoveParam.urgentReel)
{ {
//紧急料，需要到紧急料区 //紧急料，需要到紧急料区
mark = CurrShelfID + ",urgent"; mark = MoveInfo.MoveParam.rfid + ",urgent";
} }
else if (MoveInfo.MoveParam.cutReel) else if (MoveInfo.MoveParam.cutReel)
{ {
//cutReel 为true是分盘料,AGV会拉到到分盘区 //cutReel 为true是分盘料,AGV会拉到到分盘区
mark = CurrShelfID + ",cut"; mark = MoveInfo.MoveParam.rfid + ",cut";
} }
else else
{ {
mark = CurrShelfID + ",pack"; mark = MoveInfo.MoveParam.rfid + ",pack";
} }
} }
return mark; return mark;
...@@ -243,12 +225,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -243,12 +225,12 @@ namespace OnlineStore.DeviceLibrary
} }
private void ShelfOutProcess() private void ShelfOutProcess()
{ {
string moveName = "送出空料架";
string mark = GetMarkInfo(); string mark = GetMarkInfo();
string moveName = "送出空料架["+mark+"]";
if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore)) if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore))
{ {
moveName = "送出出库料架"; moveName = "送出出库料架[" + mark + "]";
} }
// LogCPU(); // LogCPU();
if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_01_TopDown)) if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_01_TopDown))
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!