Commit 1ea47368 张东亮

放完料就上报完成

1 个父辈 71a400ab
using OnlineStore; using AGVLib;
using OnlineStore;
using OnlineStore.Common; using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary; using OnlineStore.LoadCSVLibrary;
using System; using System;
...@@ -427,6 +428,14 @@ namespace DeviceLibrary ...@@ -427,6 +428,14 @@ namespace DeviceLibrary
break; break;
case MoveStep.StoreTS14: case MoveStep.StoreTS14:
MoveInfo.NextMoveStep(MoveStep.StoreTS15); MoveInfo.NextMoveStep(MoveStep.StoreTS15);
if (Common.IsInstore(storeMoveType))
{
if (!mainMachine.ServerCM.SendStoreState(mainMachine?.StoreMoveInfo?.MoveParam?.PosID, StoreStatus.InStoreEnd))
{
Msg.add(crc.GetString("Res0008", "服务器连接异常"), MsgLevel.warning);
return false;
}
}
InOut_Axis.AbsMove(MoveInfo, Config.InOut_P1, Config.InOut_P1_speed); InOut_Axis.AbsMove(MoveInfo, Config.InOut_P1, Config.InOut_P1_speed);
MoveInfo.log($"{storeMoveType}:进出轴去待机点P1[{Config.InOut_P1}]"); MoveInfo.log($"{storeMoveType}:进出轴去待机点P1[{Config.InOut_P1}]");
break; break;
......
...@@ -64,7 +64,7 @@ namespace DeviceLibrary ...@@ -64,7 +64,7 @@ namespace DeviceLibrary
public bool boxTransportIsFree { get => boxTransport.IsComplateOrFree; } public bool boxTransportIsFree { get => boxTransport.IsComplateOrFree; }
public event Action<string, StoreMoveType, bool> InOutEndProcessEvent; public event Action<string, StoreMoveType, bool> InOutEndProcessEvent;
ServerCommunication ServerCM = new ServerCommunication(); public ServerCommunication ServerCM = new ServerCommunication();
/// <summary> /// <summary>
/// 开始运行的时间 /// 开始运行的时间
/// </summary> /// </summary>
...@@ -714,7 +714,7 @@ namespace DeviceLibrary ...@@ -714,7 +714,7 @@ namespace DeviceLibrary
} }
} }
} }
bool lastStringDoorSafetyStatus=true; bool lastStringDoorSafetyStatus = true;
void StringDoorSuddenStop() void StringDoorSuddenStop()
{ {
if (lastStringDoorSafetyStatus) if (lastStringDoorSafetyStatus)
...@@ -727,7 +727,7 @@ namespace DeviceLibrary ...@@ -727,7 +727,7 @@ namespace DeviceLibrary
{ {
ResetMoveInfo.NewMove(MoveStep.H01_HomeReset); ResetMoveInfo.NewMove(MoveStep.H01_HomeReset);
} }
lastStringDoorSafetyStatus=false; lastStringDoorSafetyStatus = false;
} }
} }
/// <summary> /// <summary>
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!