Commit 313117d0 张东亮

出库完成必须上报完成再动作

1 个父辈 1c8a38a6
...@@ -73,12 +73,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -73,12 +73,13 @@ namespace OnlineStore.DeviceLibrary
isInProcess = false; isInProcess = false;
} }
} }
public bool SendStoreState(string posid, DeviceStatus storeStatus) public bool SendStoreState(string posid,DeviceStatus storeStatus)
{ {
if (Monitor.TryEnter(serverLoc)) if (Monitor.TryEnter(serverLoc))
{ {
try try
{ {
{
Operation operation = getLineBoxStatus(); Operation operation = getLineBoxStatus();
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {
...@@ -91,9 +92,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -91,9 +92,11 @@ namespace OnlineStore.DeviceLibrary
operation.boxStatus[1].status = (int)storeStatus; operation.boxStatus[1].status = (int)storeStatus;
LogUtil.info(JsonHelper.SerializeObject(operation)); LogUtil.info(JsonHelper.SerializeObject(operation));
Operation resultOperation = HttpHelper.Post(SServerManager.GetPostApi(server), operation, false); Operation resultOperation = HttpHelper.Post(SServerManager.GetPostApi(server), operation, false);
if(resultOperation != null)
{
if (operation.seq == resultOperation.seq) if (operation.seq == resultOperation.seq)
{ {
LogUtil.info($"SendStoreState,posid:{posid}, storeStatus:{storeStatus}"); LogUtil.info($"SendStoreState success,posid:{posid}, storeStatus:{storeStatus}");
return true; return true;
} }
else else
...@@ -102,6 +105,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -102,6 +105,10 @@ namespace OnlineStore.DeviceLibrary
Thread.Sleep(2000); Thread.Sleep(2000);
} }
} }
}
}
} }
finally finally
{ {
......
...@@ -275,6 +275,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -275,6 +275,8 @@ namespace OnlineStore.DeviceLibrary
UpdownAxisTo_P5_P11(); UpdownAxisTo_P5_P11();
break; break;
case StepEnum.SO_18_PutReel: case StepEnum.SO_18_PutReel:
if (!StoreManager.XLRStore.boxEquip.SendStoreState(MoveInfo.MoveParam.PosInfo.PosId, DeviceStatus.OutStoreBoxEnd))
return;
MoveInfo.NextMoveStep(StepEnum.SO_19_InOutBackFromBuff); MoveInfo.NextMoveStep(StepEnum.SO_19_InOutBackFromBuff);
LogInfo($"出库 {MoveInfo.SLog}:[{MoveInfo.MoveParam.PosInfo.ToStr()}]出库完成[耗时:{(DateTime.Now - startTime).TotalSeconds.ToString("f2")}秒],移栽X轴到待机点P1,行走机构到待机点P1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"出库 {MoveInfo.SLog}:[{MoveInfo.MoveParam.PosInfo.ToStr()}]出库完成[耗时:{(DateTime.Now - startTime).TotalSeconds.ToString("f2")}秒],移栽X轴到待机点P1,行走机构到待机点P1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
XAxis_To_P1(); XAxis_To_P1();
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!