增加报警显示

source/AssemblyLineClient/FrmFeedingEquip.cs

@@ -143,7 +143,7 @@ namespace OnlineStore.AssemblyLine
                 {
                     lblInstoreList.Text = text;
                 }
-                lblMoveInfo.Text = equipBean.GetMoveStr();
+                lblMoveInfo.Text = "料架：" + equipBean.CurrShelfId + "\r\n" + equipBean.GetMoveStr();
                 lblwidth.Text = " ";
             }
             catch (Exception ex)

source/DeviceLibrary/assemblyLine/DischargeLine.cs

@@ -383,7 +383,8 @@ namespace OnlineStore.DeviceLibrary
             string msg = "";
             int tLength = 10;
             msg += "runS：" + runStatus + "\n";
-            msg += "runS："+ lineStatus + "\n";
+            msg += "lineS："+ lineStatus + "\n";
+            msg += "alarm：  " + alarmType + "\n";
             msg += "MoveT："+ MoveInfo.MoveType + "\n";
             msg += "MoveS："+ MoveInfo.SLog + "\n";
 

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -576,6 +576,7 @@ namespace OnlineStore.DeviceLibrary
 
             msg += "runS：  " + runStatus + "\n";
             msg += "lineS：  " + lineStatus + "\n";
+            msg += "alarm：  " + alarmType + "\n";
             msg += "MoveT："+ MoveInfo.MoveType+"\n";
             msg += "MoveS ：" + MoveInfo.SLog + "\n";
             msg += "SMoveT：" + SecondMoveInfo.MoveType + "\n";

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -442,9 +442,19 @@ namespace OnlineStore.DeviceLibrary
             }
             else
             {
-                WarnMsg = Name + "TrayLCylinderAfter：提升轴当前不在下降位置P2，不后退定位气缸";
-                Alarm(LineAlarmType.IoSingleTimeOut);
-                LogUtil.error(Name + "TrayLCylinderAfter：提升轴当前不在下降位置P2，不后退定位气缸");
+                if (IOValue(IO_Type.SL_TrayLocation1_After).Equals(IO_VALUE.HIGH) &&
+                    IOValue(IO_Type.SL_TrayLocation1_Before).Equals(IO_VALUE.LOW) &&
+                    IOValue(IO_Type.SL_TrayLocation2_After).Equals(IO_VALUE.HIGH) &&
+                    IOValue(IO_Type.SL_TrayLocation2_Before).Equals(IO_VALUE.LOW))
+                {
+
+                }
+                else
+                {
+                    WarnMsg = Name + "TrayLCylinderAfter：提升轴当前不在下降位置P2，不后退定位气缸";
+                    Alarm(LineAlarmType.IoSingleTimeOut);
+                    LogUtil.error(Name + "TrayLCylinderAfter：提升轴当前不在下降位置P2，不后退定位气缸");
+                }
             }
             if (moveinfo != null)
             {
@@ -700,7 +710,7 @@ namespace OnlineStore.DeviceLibrary
                 //}
                 //发送料架信息给调度系统
                 AgvClient.SendRFID(Config.AgvInName, data);
-                LogUtil.info(Name + "定位工位料架编号：" + CurrShelfId);
+                LogUtil.info(Name + "读取到料架编号：" + CurrShelfId);
             }
             catch (Exception ex)
             {

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -363,7 +363,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 else if (MoveInfo.IsTimeOut(180))
                 {
-                    WarnMsg = SecondMoveInfo.Name + "[" + SecondMoveInfo.MoveType + "][" + SecondMoveInfo.MoveStep + "]等待横移机构空闲可出库超时[" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒";
+                    WarnMsg = SecondMoveInfo.Name + "[" + SecondMoveInfo.MoveType + "][" + SecondMoveInfo.MoveStep + "] 等待开始紧急出料移栽超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒";
                     LogUtil.error(WarnMsg, DeviceID + 11);
                     Alarm(LineAlarmType.IoSingleTimeOut);
                 } 
@@ -1007,7 +1007,7 @@ namespace OnlineStore.DeviceLibrary
                         {
                             if (NeedSaveParam)
                             {
-                                LogInfo(" 【" + info.ToStr() + "】需要出库，参数信息：" + param.ToStr());
+                                LogInfo(" 【" + info.ToStr() + "】需要出库 ，拦截托盘 "  );
                                 CheckParam = param;
                             }
                             return true;

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -982,10 +982,10 @@ namespace OnlineStore.DeviceLibrary
             string msg = "";
             // int tLength = 20;
             msg += "横移41托盘： " + Sw41TrayNum + "\n";
-            msg += "横移23托盘：" + Sw23TrayNum + "\n";
-
+            msg += "横移23托盘：" + Sw23TrayNum + "\n"; 
             msg += "runS： "+ runStatus + "\n";
             msg += "lineS： "+ lineStatus + "\n";
+            msg += "alarm：  " + alarmType + "\n";
             msg += "MoveT：" + MoveInfo.MoveType + "\n";
             msg += "MoveS： " + MoveInfo.SLog + "\n";
             msg += "SW41： "+ SW41_MoveInfo.MoveType + "  "+ SW41_MoveInfo.MoveStep + "\n";