增加报警上传

source/DeviceLibrary/bean/EquipBean.cs

@@ -1073,6 +1073,27 @@ namespace OnlineStore.DeviceLibrary
                         StoreSendBean store = lineConn.GetBean((int)ss, (int)storeRunStatus, hasTray, (int)alarmType);
                         lineConn.SendHeart(store);
                     }
+
+                    //上报异常
+                    bool isAlarm = false;
+                    List<AlarmMsg> msglist = new List<AlarmMsg>(); 
+                    if (!String.IsNullOrEmpty(WarnMsg))//10秒刷新一次任务显示
+                    {
+                        isAlarm = true; 
+                        msglist.Add(new AlarmMsg(Name, "doubleLine.WarnMsg", WarnMsg));
+                    }
+                    foreach(WorkStation s in StationMap.Values)
+                    {
+                        if (!String.IsNullOrEmpty(s.WarnMsg))
+                        {
+                            isAlarm = true;
+                            msglist.Add(new AlarmMsg(Name+s.Name, "doubleLine."+s.Name, s.WarnMsg));
+                        }
+                    }
+                    if (isAlarm)
+                    { 
+                        HttpServer.updateDeviceAlarmMsg(msglist);
+                    }
                 }
             }
             catch (Exception ex)

source/DeviceLibrary/bean/EquipManager.cs

@@ -255,7 +255,7 @@ namespace OnlineStore.DeviceLibrary
             }
             return msg;
         }
-
+               
     }
     public class ResultData
     {

source/HCSingleStore/FrmEquip.Designer.cs

@@ -215,7 +215,7 @@
             this.chbMoveStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.chbMoveStop.AutoSize = true;
             this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chbMoveStop.Location = new System.Drawing.Point(886, 204);
+            this.chbMoveStop.Location = new System.Drawing.Point(886, 190);
             this.chbMoveStop.Name = "chbMoveStop";
             this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
             this.chbMoveStop.TabIndex = 288;
@@ -338,7 +338,7 @@
             this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.logBox.Location = new System.Drawing.Point(4, 236);
             this.logBox.Name = "logBox";
-            this.logBox.Size = new System.Drawing.Size(978, 343);
+            this.logBox.Size = new System.Drawing.Size(978, 340);
             this.logBox.TabIndex = 278;
             this.logBox.Text = "";
             this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
@@ -364,7 +364,7 @@
             this.groupBox2.Controls.Add(this.button6);
             this.groupBox2.Controls.Add(this.button3);
             this.groupBox2.Controls.Add(this.button5);
-            this.groupBox2.Location = new System.Drawing.Point(6, 439);
+            this.groupBox2.Location = new System.Drawing.Point(6, 436);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Size = new System.Drawing.Size(972, 78);
             this.groupBox2.TabIndex = 276;