Commit 60bee337 LN

调试时不连接服务器

1 个父辈 f298ae7c
...@@ -759,11 +759,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -759,11 +759,11 @@ namespace OnlineStore.DeviceLibrary
{ {
if (storeRunStatus < StoreRunStatus.Runing || MoveInfo.MoveType == StoreMoveType.InStore || MoveInfo.MoveType == StoreMoveType.OutStore) if (storeRunStatus < StoreRunStatus.Runing || MoveInfo.MoveType == StoreMoveType.InStore || MoveInfo.MoveType == StoreMoveType.OutStore)
{ {
LogInfo( "已经累计出入库" + CurrInOutACount + "次,当时当前正在忙碌中暂不复位"); LogInfo("已经累计出入库" + CurrInOutACount + "次,当时当前正在忙碌中暂不复位");
} }
else else
{ {
LogInfo( "已经累计出入库" + CurrInOutACount + "次,需要复位一下"); LogInfo("已经累计出入库" + CurrInOutACount + "次,需要复位一下");
Reset(); Reset();
} }
} }
...@@ -771,14 +771,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -771,14 +771,14 @@ namespace OnlineStore.DeviceLibrary
{ {
if (storeRunStatus < StoreRunStatus.Runing || MoveInfo.MoveType == StoreMoveType.InStore || MoveInfo.MoveType == StoreMoveType.OutStore) if (storeRunStatus < StoreRunStatus.Runing || MoveInfo.MoveType == StoreMoveType.InStore || MoveInfo.MoveType == StoreMoveType.OutStore)
{ {
LogInfo( "已经累计出入库" + CurrInOutCount + "次,当时当前正在忙碌中暂不复位旋转轴"); LogInfo("已经累计出入库" + CurrInOutCount + "次,当时当前正在忙碌中暂不复位旋转轴");
} }
else else
{ {
LogInfo( "已经累计出入库" + CurrInOutCount + "次,需要复位一下旋转轴"); LogInfo("已经累计出入库" + CurrInOutCount + "次,需要复位一下旋转轴");
} }
} }
else if (lineConnect.CanStartOut() || IsDebug || autoNext) else if (lineConnect.CanStartOut() || autoNext)
{ {
InOutPosInfo currInOutFixture = null; InOutPosInfo currInOutFixture = null;
lock (waitOutListLock) lock (waitOutListLock)
...@@ -792,12 +792,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -792,12 +792,12 @@ namespace OnlineStore.DeviceLibrary
if (currInOutFixture != null) if (currInOutFixture != null)
{ //出库 { //出库
LogInfo( "开始执行排队中的出库【" + currInOutFixture.ToStr() + "】"); LogInfo("开始执行排队中的出库【" + currInOutFixture.ToStr() + "】");
bool result = StartOutStoreMove(new InOutParam(currInOutFixture)); bool result = StartOutStoreMove(new InOutParam(currInOutFixture));
//bool result = StartOutStoreMove(new InOutParam("", currInOutFixture.PosId, currInOutFixture.plateH, currInOutFixture.plateW)); //bool result = StartOutStoreMove(new InOutParam("", currInOutFixture.PosId, currInOutFixture.plateH, currInOutFixture.plateW));
if (!result) if (!result)
{ {
LogInfo( " 执行排队中的出库【" + currInOutFixture.ToStr() + "】失败,重新加入等待队列"); LogInfo(" 执行排队中的出库【" + currInOutFixture.ToStr() + "】失败,重新加入等待队列");
AddWaitOutInfo(currInOutFixture); AddWaitOutInfo(currInOutFixture);
} }
} }
...@@ -1057,26 +1057,29 @@ namespace OnlineStore.DeviceLibrary ...@@ -1057,26 +1057,29 @@ namespace OnlineStore.DeviceLibrary
lastConTime = DateTime.Now; lastConTime = DateTime.Now;
try try
{ {
if (lineConnect.IsConnect()) if (!IsDebug)
{ {
int hasTray = (int)IOValue(IO_Type.TrayCheck_Door); if (lineConnect.IsConnect())
int ss = (int)storeStatus;
if (IsDebug)
{ {
ss = (int)StoreStatus.Debugging; int hasTray = (int)IOValue(IO_Type.TrayCheck_Door);
} int ss = (int)storeStatus;
StoreSendBean store = lineConnect.GetBean( (int)ss, (int)storeRunStatus, hasTray, (int)alarmType ); if (IsDebug)
lineConnect.SendHeart(store); {
} ss = (int)StoreStatus.Debugging;
if (StoreManager.IsConnectServer) }
{ StoreSendBean store = lineConnect.GetBean((int)ss, (int)storeRunStatus, hasTray, (int)alarmType);
try lineConnect.SendHeart(store);
{
SendLineStatus();
} }
catch (Exception ex) if (StoreManager.IsConnectServer)
{ {
LogUtil.error(Name+ "定时给服务器发送消息出错:" + ex.ToString()); try
{
SendLineStatus();
}
catch (Exception ex)
{
LogUtil.error(Name + "定时给服务器发送消息出错:" + ex.ToString());
}
} }
} }
humBean.HumidityProcess(this); humBean.HumidityProcess(this);
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!