启动或者复位时清空出库缓存

source/DeviceLibrary/storeBean/EquipBase.cs

@@ -74,7 +74,7 @@ namespace OnlineStore.DeviceLibrary
                 alarmType.Equals(AlarmType.AxisAlarm) || alarmType.Equals(AlarmType.AxisMoveError))
             {
                 AxisAlarmFlag = true;
-                StopMove();
+                StopRun();
             }
         }
 

source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs

@@ -350,6 +350,8 @@ namespace OnlineStore.DeviceLibrary
             alarmType = AlarmType.None;
             isInSuddenDown = false;
             isNoAirpressure_Check = false;
+            waitAOutStoreList = new ConcurrentQueue<InOutParam>();
+            waitBOutStoreList = new ConcurrentQueue<InOutParam>();
             MoveInfo.NextMoveStep(StepEnum.BOX_H001_Wait);
             AutoInout.StopAuto();
             LogInfo($"复位 {MoveInfo.SLog} ：存储机构轴开始复位");

source/DeviceLibrary/storeBean/boxBean/BoxEquip_ConnectServerTimer.cs

@@ -29,7 +29,7 @@ namespace OnlineStore.DeviceLibrary
             Operation operation = getLineBoxStatus();
             if (!string.IsNullOrEmpty(posid))
             {
-                operation.boxStatus[1].data[ParamDefine.posId]= posid;
+                operation.boxStatus[1].data[ParamDefine.posId] = posid;
             }
             LogUtil.info($"SendStoreState,posid:{posid}, storeStatus:{storeStatus}");
             operation.boxStatus[1].status = (int)storeStatus;
@@ -69,7 +69,7 @@ namespace OnlineStore.DeviceLibrary
                 //}
                 //else
                 {
-                    if (StoreManager.IsConnectServer)
+                    if (StoreManager.IsConnectServer && (runStatus.Equals(RunStatus.Runing)|| runStatus.Equals(RunStatus.Busy)))
                     {
                         SendLineStatus();
                     }
@@ -125,26 +125,26 @@ namespace OnlineStore.DeviceLibrary
             else if (runStatus.Equals(DeviceStatus.OutStoreBoxEnd) || runStatus.Equals(DeviceStatus.InStoreEnd))
             {
                 boxStatus.data.Add(ParamDefine.posId, lastPosId);
-                boxStatus.data.Add(ParamDefine.barcode,lastBarcode);
+                boxStatus.data.Add(ParamDefine.barcode, lastBarcode);
                 boxStatus.data.Add(ParamDefine.executeTime, executeTime);
             }
             else if (!lastPosId.Equals(""))
             {
                 boxStatus.data.Add(ParamDefine.posId, lastPosId);
                 boxStatus.data.Add(ParamDefine.barcode, lastBarcode);
-                boxStatus.data.Add(ParamDefine.executeTime,executeTime);
+                boxStatus.data.Add(ParamDefine.executeTime, executeTime);
                 boxStatus.status = (int)deviceStatus;
                 if (lastPosId != "")
                 {
-                    LogUtil.info("给服务器发送出入库消息：" + Name + ",status【" + deviceStatus + "】posId【" + lastPosId + "】barcode【"+lastBarcode+"】");
+                    LogUtil.info("给服务器发送出入库消息：" + Name + ",status【" + deviceStatus + "】posId【" + lastPosId + "】barcode【" + lastBarcode + "】");
                 }
                 lastPosId = "";
                 lastBarcode = "";
             }
 
-            if (MoveInfo.MoveType.Equals(MoveType.InStore)||MoveInfo.MoveType.Equals(MoveType.OutStore))
+            if (MoveInfo.MoveType.Equals(MoveType.InStore) || MoveInfo.MoveType.Equals(MoveType.OutStore))
             {
-                if ((MoveInfo.MoveParam != null)&&( MoveInfo.MoveParam.PosInfo!=null))
+                if ((MoveInfo.MoveParam != null) && (MoveInfo.MoveParam.PosInfo != null))
                 {
                     if (!boxStatus.data.ContainsKey(ParamDefine.posId))
                     {
@@ -249,9 +249,9 @@ namespace OnlineStore.DeviceLibrary
                         LogUtil.info(logName + "服务器反馈 ：" + resultOperation.msg);
                         continue;
                     }
-                    else if (resultOperation.op.Equals(1)&& operation.seq.Equals(resultOperation.seq))
+                    else if (resultOperation.op.Equals(1) && operation.seq.Equals(resultOperation.seq))
                     {
-                        LogUtil.info(logName + " 成功"+$"【{JsonHelper.SerializeObject(resultOperation)}】");
+                        LogUtil.info(logName + " 成功" + $"【{JsonHelper.SerializeObject(resultOperation)}】");
                         return true;
                     }
                     else
@@ -334,8 +334,8 @@ namespace OnlineStore.DeviceLibrary
                     try
                     {
                         //判断是否接收过此库位的出库信息
-                        if (MoveInfo.MoveType.Equals(MoveType.OutStore) && (MoveInfo.MoveParam.PosInfo.PosId.Equals(posId)|| 
-                            (MoveInfo.MoveParam.PosInfoBack !=null && MoveInfo.MoveParam.PosInfoBack.PosId.Equals(posId))))
+                        if (MoveInfo.MoveType.Equals(MoveType.OutStore) && (MoveInfo.MoveParam.PosInfo.PosId.Equals(posId) ||
+                            (MoveInfo.MoveParam.PosInfoBack != null && MoveInfo.MoveParam.PosInfoBack.PosId.Equals(posId))))
                         {
                             LogUtil.error(Name + " 出库命令【" + inoutParam.PosInfo.ToStr() + "】重复，正在【" + posId + "】出库中");
                             continue;