Skip to content

刘韬 / 1069_MIMO_PlUS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 48f5ced2 由 张东亮
选项

入库ng不上报完成状态

1 个父辈 e6014066
内嵌 并排
正在显示 3 个修改的文件 包含 18 行增加 和 6 行删除
DeviceLibrary/theMachine/BoxTransport.cs
...@@ -452,7 +452,7 @@ namespace DeviceLibrary ...@@ -452,7 +452,7 @@ namespace DeviceLibrary
break; break;
case MoveStep.StoreTS14: case MoveStep.StoreTS14:
MoveInfo.NextMoveStep(MoveStep.StoreTS15); MoveInfo.NextMoveStep(MoveStep.StoreTS15);
if (Common.IsInstore(storeMoveType)) if (Common.IsInstore(storeMoveType) && !(mainMachine?.StoreMoveInfo?.MoveParam.IsNg ?? false))
{ {
if (!mainMachine.ServerCM.SendStoreState(mainMachine?.StoreMoveInfo?.MoveParam?.PosID, StoreStatus.InStoreEnd)) if (!mainMachine.ServerCM.SendStoreState(mainMachine?.StoreMoveInfo?.MoveParam?.PosID, StoreStatus.InStoreEnd))
{ {
......
DeviceLibrary/theMachine/MainMachine_Store.cs
...@@ -180,10 +180,9 @@ namespace DeviceLibrary ...@@ -180,10 +180,9 @@ namespace DeviceLibrary
} }
else if (h1.Value) else if (h1.Value)
{ {
StoreMoveInfo.NextMoveStep(MoveStep.StoreInNG_03); StoreMoveInfo.NextMoveStep(MoveStep.StoreInNG_02_1);
StoreMoveInfo.log($"单料口有料盘，系统暂停"); StoreMoveInfo.log($"单料口有料盘，打开门");
Msg.add(crc.GetString(L.please_take_ngdoor_reel, "等待取走单料口料盘"), MsgLevel.alarm); SingleDoor.ToHigh(StoreMoveInfo);
RobotManage.UserPause(crc.GetString("please_take_ngdoor_reel", "等待取走单口料盘"));
} }
else else
{ {
...@@ -192,9 +191,20 @@ namespace DeviceLibrary ...@@ -192,9 +191,20 @@ namespace DeviceLibrary
} }
break; break;
case MoveStep.StoreInNG_02_1:
StoreMoveInfo.NextMoveStep(MoveStep.StoreInNG_02_2);
Msg.add(crc.GetString(L.please_take_ngdoor_reel, "等待取走单料口料盘"), MsgLevel.alarm);
RobotManage.UserPause(crc.GetString("please_take_ngdoor_reel", "等待取走单口料盘"));
break;
case MoveStep.StoreInNG_02_2:
StoreMoveInfo.NextMoveStep(MoveStep.StoreInNG_03);
SingleDoor.ToLow(StoreMoveInfo);
StoreMoveInfo.log($"确认完毕，关门");
break;
case MoveStep.StoreInNG_03: case MoveStep.StoreInNG_03:
StoreMoveInfo.NextMoveStep(MoveStep.StoreInNG_04); StoreMoveInfo.NextMoveStep(MoveStep.StoreInNG_04);
BoxStorePosition tar = new BoxStorePosition(Config, StoreSide.NGDoor, StoreMoveInfo.MoveParam); StoreMoveInfo.MoveParam.IsNg = true;
BoxStorePosition tar = new BoxStorePosition(Config, StoreSide.NGDoor, StoreMoveInfo.MoveParam);
boxTransport.Start(null, tar, StoreMoveType.InStore); boxTransport.Start(null, tar, StoreMoveType.InStore);
StoreMoveInfo.log($"开始转运料盘到单料口"); StoreMoveInfo.log($"开始转运料盘到单料口");
break; break;
......
DeviceLibrary/theMachine/MoveStep.cs
...@@ -118,6 +118,8 @@ namespace DeviceLibrary ...@@ -118,6 +118,8 @@ namespace DeviceLibrary
StoreInNG_01, StoreInNG_01,
StoreInNG_02, StoreInNG_02,
StoreInNG_02_1,
StoreInNG_02_2,
StoreInNG_03, StoreInNG_03,
StoreInNG_04, StoreInNG_04,
StoreInNG_05, StoreInNG_05,
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!