日志修改

source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs

@@ -368,7 +368,7 @@ namespace OnlineStore.DeviceLibrary
                 else
                 {
                     //未检测到信号或阻挡下降失败，结束处理
-                    LogInfo(MoveInfo.SLog + "未等到信号 HY_FrontStopCheck=LOW 或 HY_TrayCheck=LOW 结束处理 ");
+                    LogInfo(MoveInfo.SLog + "未等到信号 HY_FrontStopCheck=LOW 或 HY_TrayCheck=HIGH 结束处理 ");
                     MoveEndS();
                 }
             }
@@ -385,7 +385,7 @@ namespace OnlineStore.DeviceLibrary
                 else
                 {
                     //未检测到信号或阻挡下降失败，结束处理
-                    LogInfo(MoveInfo.SLog + "未等到信号 HY_TrayCheck=LOW 结束处理 ");
+                    LogInfo(MoveInfo.SLog + "未等到信号 HY_TrayCheck=HIGH 结束处理 ");
                     MoveEndS();
                 }
             }

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -475,7 +475,8 @@ namespace OnlineStore.DeviceLibrary
             }
             else if (MoveInfo.IsStep(LineMoveStep.MI_15_SendPosToStore))
             {
-                if (!LineServer.IsInStorePro(DeviceID, MoveInfo.MoveParam.PosId))
+                String notOkMsg = "";
+                if (!LineServer.IsInStorePro(DeviceID, MoveInfo.MoveParam.PosId,out notOkMsg))
                 {
                     //InLog("入库 " + MoveInfo.SLog + " ， 送料流程完成，料仓还未开始入库，再次发送starIn命令");
                     //LineServer.StartInStore(DeviceID, MoveInfo.MoveParam);
@@ -488,7 +489,7 @@ namespace OnlineStore.DeviceLibrary
 
                     if (sendCount >= 3)
                     {
-                        SetWarnMsg(MoveInfo.Name + "[" + MoveInfo.MoveStep + "] " + " 等待BOX开始入库超时  已发送" + sendCount + "次", "等待BOX开始入库超时");
+                        SetWarnMsg(MoveInfo.Name + "[" + MoveInfo.MoveStep + "] " + " 等待BOX开始入库超时 "+ notOkMsg + "  已发送" + sendCount + "次", "等待BOX开始入库超时");
                         //WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveStep + "] " + " 等待BOX开始入库超时  已发送" + sendCount + "次";
                         //LogUtil.error(WarnMsg);
                         Alarm(LineAlarmType.IoSingleTimeOut);

source/DeviceLibrary/server/LineServer.cs

@@ -89,11 +89,11 @@ namespace OnlineStore.DeviceLibrary
             }
             return false;
         }
-        public static bool IsInStorePro(int id, string posId)
+        public static bool IsInStorePro(int id, string posId, out string NotOkMsg)
         {
             BoxInfo box = GetBoxInfo(id);
             TimeSpan span = DateTime.Now - box.LastMsgTime;
-
+            NotOkMsg = " [料仓" + id + "：离线] ";
             if (box != null && span.TotalSeconds < ClientKeepSecond)
             {
 
@@ -106,11 +106,21 @@ namespace OnlineStore.DeviceLibrary
                     {
                         if (box.WaitInStoreList != null && box.WaitInStoreList.Contains(posId))
                         {
+                            NotOkMsg = " [料仓" + id + "：库位[" + posId + "]还在入库等待列表中] ";
                             LogUtil.error("IsInStorePro[" + id + "][" + posId + "]，库位还在入库等待列表中，返回false");
                             return false;
                         }
+                        NotOkMsg = "";
                         return true;
                     }
+                    else
+                    {
+                        NotOkMsg = " [料仓" + id + "：status=" + status + "]";
+                    }
+                }
+                else
+                {
+                    NotOkMsg = " [料仓" + id + "：runs=" + runs +"]";
                 }
             }
             return false;