Parcourir la source

监控优化(堆垛机图标,出入库显示,起始目标地址显示优化)

xu.lu il y a 2 ans
Parent
commit
41e70e6377

+ 1 - 0
WCS.Data/SugarBase.cs

@@ -46,6 +46,7 @@ namespace WCS.Data
             var db = new SqlSugarClient(new ConnectionConfig()
             {
                 ConnectionString = "Data Source=192.168.249.120;Initial Catalog=WCS_MW;Persist Security Info=True;User ID=sa;Pwd=password@123$%^",
+                //ConnectionString = "Data Source=192.168.249.151;Initial Catalog=WCS_OPP;Persist Security Info=True;User ID=sa;Pwd=Password@123",
                 DbType = dbType,
                 InitKeyType = InitKeyType.Attribute,
                 IsAutoCloseConnection = isAutoCloseConnection

+ 31 - 15
WCS_Client/Frm/Equipment/ConvSignal.cs

@@ -10,22 +10,38 @@ namespace WCS_Client.Frm
     [Flags]
     public enum ConvFaultEnum : ushort
     {
+        //总故障 = 1 << 0,
+        //急停故障 = 1 << 1,
+        //超时故障 = 1 << 2,
+        //驱动故障 = 1 << 3,
+        //空气开关故障 = 1 << 4,
+        //传感器异常故障 = 1 << 5,
+        //其它故障汇入 = 1 << 6,
+        //无Ready信号请检查柜内空开 = 1 << 7,
+        //超时故障2 = 1 << 8,
+        //驱动故障2 = 1 << 9,
+        //空气开关故障2 = 1 << 10,
+        //左极限故障 = 1 << 11,
+        //右极限故障 = 1 << 12,
+        //无Ready信号请检查柜内空开2 = 1 << 13,
+        //前极限故障 = 1 << 14,
+        //后极限故障 = 1 << 15
         总故障 = 1 << 0,
-        急停故障 = 1 << 1,
-        超时故障 = 1 << 2,
-        驱动故障 = 1 << 3,
-        空气开关故障 = 1 << 4,
-        传感器异常故障 = 1 << 5,
-        其它故障汇入 = 1 << 6,
-        无Ready信号请检查柜内空开 = 1 << 7,
-        超时故障2 = 1 << 8,
-        驱动故障2 = 1 << 9,
-        空气开关故障2 = 1 << 10,
-        左极限故障 = 1 << 11,
-        右极限故障 = 1 << 12,
-        无Ready信号请检查柜内空开2 = 1 << 13,
-        前极限故障 = 1 << 14,
-        后极限故障 = 1 << 15
+        超时故障 = 1 << 1,
+        驱动故障 = 1 << 2,
+        空气开关故障 = 1 << 3,
+        前极限故障 = 1 << 4,
+        后极限故障 = 1 << 5,
+        无Ready信号请检查柜内空开 = 1 << 6,
+        上极限故障 = 1 << 7,
+        下极限故障 = 1 << 8,
+        急停故障 = 1 << 9,
+        超时故障1 = 1 << 10,
+        驱动故障1 = 1 << 11,
+        空气开关故障1 = 1 << 12,
+        传感器异常故障 = 1 << 13,
+        超边故障 = 1 << 14,
+        无Ready信号请检查柜内空开1 = 1 << 15,
     }
     public class ConvSignal : EquipmentSignal
     {

+ 33 - 16
WCS_Client/Frm/Equipment/WCS_STATION523.cs

@@ -20,23 +20,40 @@ namespace WCS_Client.Frm
 
         public enum StationFault : uint
         {
-            无=0,
+            //无=0,
+            //总故障 = 1 << 0,
+            //急停故障 = 1 << 1,
+            //超时故障 = 1 << 2,
+            //驱动故障 = 1 << 3,
+            //空气开关故障 = 1 << 4,
+            //传感器异常故障 = 1 << 5,
+            //其它故障汇入 = 1 << 6,
+            //无Ready信号请检查柜内空开 = 1 << 7,
+            //超时故障2 = 1 << 8,
+            //驱动故障2 = 1 << 9,
+            //空气开关故障2 = 1 << 10,
+            //左极限故障 = 1 << 11,
+            //右极限故障 = 1 << 12,
+            //无Ready信号请检查柜内空开2 = 1 << 13,
+            //前极限故障 = 1 << 14,
+            //后极限故障 = 1 << 15
             总故障 = 1 << 0,
-            急停故障 = 1 << 1,
-            超时故障 = 1 << 2,
-            驱动故障 = 1 << 3,
-            空气开关故障 = 1 << 4,
-            传感器异常故障 = 1 << 5,
-            其它故障汇入 = 1 << 6,
-            无Ready信号请检查柜内空开 = 1 << 7,
-            超时故障2 = 1 << 8,
-            驱动故障2 = 1 << 9,
-            空气开关故障2 = 1 << 10,
-            左极限故障 = 1 << 11,
-            右极限故障 = 1 << 12,
-            无Ready信号请检查柜内空开2 = 1 << 13,
-            前极限故障 = 1 << 14,
-            后极限故障 = 1 << 15
+            超时故障 = 1 << 1,
+            驱动故障 = 1 << 2,
+            空气开关故障 = 1 << 3,
+            前极限故障 = 1 << 4,
+            后极限故障 = 1 << 5,
+            无Ready信号请检查柜内空开 = 1 << 6,
+            上极限故障 = 1 << 7,
+            下极限故障 = 1 << 8,
+            急停故障 = 1 << 9,
+            超时故障1 = 1 << 10,
+            驱动故障1 = 1 << 11,
+            空气开关故障1 = 1 << 12,
+            传感器异常故障 = 1 << 13,
+            超边故障 = 1 << 14,
+            无Ready信号请检查柜内空开1 = 1 << 15
+
         }
         public enum StationStatus : short
         {

+ 11 - 8
WCS_Client/Frm/Equipment/WCS_TASK.cs

@@ -9,6 +9,7 @@ namespace WCS_Client.Frm
 {
     public class WCS_TASK
     {
+        #region PAST
         [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
         public int ID { get; set; }
         public string BARCODE { get; set; }
@@ -18,22 +19,22 @@ namespace WCS_Client.Frm
 
         //public TaskStatus STATUSCh
         //{
-        //    get 
+        //    get
         //    {
         //        return (TaskStatus)STATUS;
         //    }
         //}
         public string ADDRFROM { get; set; }
 
-     
+
         public string ADDRTO { get; set; }
 
         //[StringLength(20)]
         //public string ADDRCURRENT { get; set; }
 
-        public string ADDRNEXT{ get; set; } 
+        public string ADDRNEXT { get; set; }
+
 
-     
         public string TUNNEL { get; set; }
 
         public int FLOOR { get; set; }
@@ -52,20 +53,22 @@ namespace WCS_Client.Frm
         /// <summary>
         /// 产线1-9
         /// </summary>
-        public short PRODLINE { get; set; }  
+        public short PRODLINE { get; set; }
 
         /// <summary>
         /// 满盘数量
         /// </summary>
-        public short FULLQTY { get; set; }  
+        public short FULLQTY { get; set; }
         public short HEIGHT { get; set; }
-        public int WMSTASK { get; set; }  
-     
+        public int WMSTASK { get; set; }
+
         public TaskStatus UPLOADED { get; set; }
         public string UPDATEUSER { get; set; }
         public DateTime UPDATETIME { get; set; }
 
         public int AgvTask { get; set; }
+        #endregion
+
     }
 
     public enum TaskType

Fichier diff supprimé car celui-ci est trop grand
+ 343 - 217
WCS_Client/Frm/MBtn_Monitor/Frm_YongGuanMontior.Designer.cs


+ 88 - 60
WCS_Client/Frm/MBtn_Monitor/Frm_YongGuanMontior.cs

@@ -184,6 +184,7 @@ namespace WCS_Client.Frm
             }
         }
 
+        readonly string[] srmArray = new string[] { "srm" , "srm0"};
         public void pan11()
         {
             try
@@ -195,61 +196,77 @@ namespace WCS_Client.Frm
                 var scdata = pack.SCDatas;//堆垛机数据
                 //SRM
                 foreach (var item in scdata.Datas)
-                {
-                    //只更新有变更的数据
-                    //if (eqpData.oldDeviceDataPack != null)
-                    //{
-                    //    var oldItem = eqpData.oldDeviceDataPack.SCDatas.Datas.FirstOrDefault(p => p.Code == item.Code);
-                    //    if (oldItem.ToString() == item.ToString()) return;
-                    //}                  
+                {                      
                     var ddjstatus = DDJSatatusSet.FirstOrDefault(v => v.SrmName == item.Code);
                     if (ddjstatus != null)
                     {
                         //报警信息
                         if (item.D537.SCAlarm.ToString() == "无")
+                        {
                             ddjstatus.DdjWarning.Text = "";
-                        else {
+                        }                           
+                        else 
+                        {
                             ddjstatus.DdjWarning.Text += item.D537.SCAlarm.ToString();//item.Info.Contains("接口调用") ? "" : item.Info;
-                        }
-                        
+                        }  
+                        //当前巷道
                         if (item.Code != null)
                         {
                             ddjstatus.DdjPosCurr.Text = item.Code.ToString().Substring(3);
-                        }
+                        }                                           
+                        //模式
+                        ddjstatus.DdjMode.Text = item.D521.SRMMode.ToString();
+                        int srmColor = 0; //1 red 2 Yellow 3 green
                         if (ddjstatus.DdjWarning.Text != "")
                         {
                             ddjstatus.G.Image = Properties.Resources.红;
+                            srmColor = 1;
                         }
-                        else //(ddjstatus != null)
+                        else
                         {
-                            //模式
-                            ddjstatus.DdjMode.Text = item.D521.SRMMode.ToString();
-
                             if (!string.IsNullOrEmpty(ddjstatus.DdjMode.Text))
                             {
                                 if (item.D521.SRMMode.ToString() == "远程")
                                 {
                                     ddjstatus.G.Image = Properties.Resources.绿;
+                                    srmColor = 3;
                                 }
                                 else if (item.D521.SRMMode.ToString() == "半自动" || item.D521.SRMMode.ToString() == "手动")
                                 {
                                     ddjstatus.G.Image = Properties.Resources.黄;
+                                    srmColor = 2;
                                 }
                                 else if (item.D521.SRMMode.ToString() == "维修")
                                 {
                                     ddjstatus.G.Image = Properties.Resources.红;
+                                    srmColor = 1;
                                 }
                             }
                             else
                             {
                                 ddjstatus.DdjMode.Text = "无";
                                 ddjstatus.G.Image = Properties.Resources.黄;
-                            }                       
+                                srmColor = 2;
+                            }
+                        }
+                        try
+                        {
+                            var srmIndex = ddjstatus.SrmName.Substring(3);
+                            for (int i = 0; i < srmArray.Length; i++)
+                            {
+                                var control = FindControl(srmArray[i] + srmIndex);
+                                if (control != null)
+                                {
+                                    Thread.Sleep(10);
+                                    ((srm)control).SetColor(srmColor);
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
                         }
-
                         ////状态
                         ddjstatus.DdjStatus.Text = item.D521.SRMStatus.ToString();
-
                         int taskid = 100;
                         if (item.D521.TaskID_1 > 10000 && item.D521.TaskID_2 > 10000)
                         {
@@ -267,50 +284,51 @@ namespace WCS_Client.Frm
                         {
                             taskid = item.D521.TaskID_1;
                         }
-
                         //任务号
                         ddjstatus.DdjOrdId.Text = taskid.ToString();
-                        var task = SugarBase.DB.Queryable<WCS_TASK>().First(v => v.ID == taskid);
-                        if (task != null)
+                        TryCachHelper.TryExecute((db) =>
                         {
-                            //任务类型
-                            ddjstatus.DdjOptType.Text = task.TYPE.ToString();
-                            if (task.TYPE == TaskType.入库)
-                            {
-
-                                ddjstatus.LblInStatus.BackColor = Color.Lime;
-                                ddjstatus.LblOutStatus.BackColor = Color.DarkGray;
-
-
-                            }
-                            else if (task.TYPE == TaskType.出库)
+                            var task_Temp = db.Queryable<WCS_TASK>().First(v => v.ID == taskid);
+                            if (task_Temp == null)
                             {
-
                                 ddjstatus.LblInStatus.BackColor = Color.DarkGray;
-                                ddjstatus.LblOutStatus.BackColor = Color.Lime;
+                                ddjstatus.LblOutStatus.BackColor = Color.DarkGray;                              
                             }
                             else
                             {
-                                ddjstatus.LblInStatus.BackColor = Color.DarkGray;
-                                ddjstatus.LblOutStatus.BackColor = Color.DarkGray;
-                            }
-                        }
-                        else
-                        {
-                            ddjstatus.LblInStatus.BackColor = Color.DarkGray;
-                            ddjstatus.LblOutStatus.BackColor = Color.DarkGray;
-                        }
+                                //任务类型
+                                ddjstatus.DdjOptType.Text = task_Temp.TYPE.ToString();
+                                if (task_Temp.TYPE == TaskType.入库)
+                                {
 
+                                    ddjstatus.LblInStatus.BackColor = Color.Lime;
+                                    ddjstatus.LblOutStatus.BackColor = Color.DarkGray;
+
+                                    //起始位置
+                                    ddjstatus.DdjPosFrom.Text = item.D521.SLine_1.ToString();                                    
+                                    //目标位置
+                                    ddjstatus.DdjPosTo.Text = item.D521.ELine_1.ToString() + "-" + item.D521.ECol_1.ToString() + "-" + item.D521.ELayer_1.ToString();
+                                }
+                                else if (task_Temp.TYPE == TaskType.出库)
+                                {
+                                    ddjstatus.LblInStatus.BackColor = Color.DarkGray;
+                                    ddjstatus.LblOutStatus.BackColor = Color.Lime;
+                                    ddjstatus.DdjPosFrom.Text = item.D521.SLine_1.ToString() + "-" + item.D521.SCol_1.ToString() + "-" + item.D521.SLayer_1.ToString();
+                                    //目标位置
+                                    ddjstatus.DdjPosTo.Text = item.D521.ELine_1.ToString();
+                                }
+                                else
+                                {
+                                    ddjstatus.LblInStatus.BackColor = Color.DarkGray;
+                                    ddjstatus.LblOutStatus.BackColor = Color.DarkGray;
+                                }
+                            }
+                        });                      
                         ////运行时长
                         ddjstatus.DdjWorkTime.Text = item.D521.Runtime.ToString() + "h";
                         ////里程数
-                        ddjstatus.DdjTotal_KM.Text = item.D521.TotalKM.ToString() + "KM";
-                        //起始位置
-                        ddjstatus.DdjPosFrom.Text = item.D521.SLine_1.ToString() + "-" + item.D521.SCol_1.ToString() + "-" + item.D521.SLayer_1.ToString();
-                        //目标位置
-                        ddjstatus.DdjPosTo.Text = item.D521.SLine_1.ToString() + "-" + item.D521.SCol_1.ToString() + "-" + item.D521.SLayer_1.ToString();
-                    }
-                    
+                        ddjstatus.DdjTotal_KM.Text = item.D521.TotalKM.ToString() + "KM";                     
+                    }                   
                     }
                 //RGV
                 foreach (var item in rgvdata.Datas)
@@ -511,6 +529,8 @@ namespace WCS_Client.Frm
                             var con = (Conveyor3_A)control;
                             con.button1.Text = item.Code.ToString();
                             if (item.D523.Alarm != 0) con.BackColor = Color.Red;
+                            else if (item.D521.Status.HasFlag(WCS.Entity.Protocol.IstationStatus.条码未读出)) con.BackColor = Color.Red;
+                            else if (item.D521.Status.HasFlag(WCS.Entity.Protocol.IstationStatus.外检扫码故障)) con.BackColor = Color.Red;
                             else if (item.D523.Status == 0) con.BackColor = Color.Yellow;
                             else con.BackColor = Color.FromArgb(0, 144, 154);
                             if (item.D521.Status.HasFlag(WCS.Entity.Protocol.IstationStatus.光电状态))
@@ -535,6 +555,7 @@ namespace WCS_Client.Frm
                             var con = (Conveyor3_B)control;
                             con.button1.Text = item.Code.ToString();
                             if (item.D523.Alarm != 0) con.BackColor = Color.Red;
+                            else if (item.D521.Status.HasFlag(WCS.Entity.Protocol.IstationStatus.条码未读出)) con.BackColor = Color.Red;
                             else if (item.D521.Status.HasFlag(WCS.Entity.Protocol.IstationStatus.外检扫码故障)) con.BackColor = Color.Red;
                             else if (item.D523.Status == 0) con.BackColor = Color.Yellow;
                             else con.BackColor = Color.FromArgb(0, 144, 154);
@@ -672,7 +693,7 @@ namespace WCS_Client.Frm
         }
 
         private void lblsrm01_Click(object sender, EventArgs e)
-        {
+        {           
             Label srm = (Label)sender;
             string equName = srm.Name.Substring(3);
             FrmEquMsg_dtl Frm = new FrmEquMsg_dtl(equName);
@@ -697,20 +718,27 @@ namespace WCS_Client.Frm
         {
         }
 
-        private void p_Load(object sender, EventArgs e)
-        {
 
-        }
 
-        private void RGV10_Load(object sender, EventArgs e)
+        #endregion
+       
+
+        private void srm1_Load_1(object sender, EventArgs e)
         {
+            srm srm = (srm)sender;
+            string equName = "srm";
+            if (srm.Name.ToString().Length > 4)
+            {
+                equName = srm.Name.Substring(4);
+            }
+            else
+            {
+                equName = srm.Name.Substring(3);
+            }
 
+            FrmEquMsg_dtl Frm = new FrmEquMsg_dtl(equName);
+            Frm.Show();
         }
-
-
-        #endregion
-
-        
     }
 
     public class DDJSatatus

+ 40 - 40
WCS_Client/Frm/MBtn_Monitor/Frm_YongGuanMontior.resx

@@ -234,9 +234,9 @@
         AAAASUVORK5CYII=
 </value>
   </data>
-  <data name="堆垛机2.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel2.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABIAAATGCAYAAAArLvR9AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
+        iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
         bGUAAEjHnZZ3VFTXFofPvXd6oc0w0hl6ky4wgPQuIB0EURhmBhjKAMMMTWyIqEBEEREBRZCggAGjoUis
         iGIhKKhgD0gQUGIwiqioZEbWSnx5ee/l5ffHvd/aZ+9z99l7n7UuACRPHy4vBZYCIJkn4Ad6ONNXhUfQ
@@ -281,24 +281,18 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAwlJREFUeF7t1DGqHgQQ
-        hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
-        +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
-        DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
-        vQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+
-        UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDsh
-        m70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2g
-        PlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7
-        IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJN
-        oD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6U
-        OyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70C
-        TaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAO
-        lDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9
-        Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlDunaDXx7/8Rgs+1wgFSwAAAABJRU5E
-        rkJggg==
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAahJREFUeF7t3bFpA1EU
+        RUF3p1hlOBHGkXInLkPyYqkNdWbDhstZ2PxNMOG5BTz4/LfH4/kHAAAAAMO8HMYAAAAAmMhhDAAAAICR
+        HMYAAAAAGMlhDAAAAICR9g9jp/PlkNt9yX6r2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
+        W+y1aou9Vm2x16ot9lq1xV6rtthb7R/G3j++DvlZfrPfqrbYa9UWe63aYq9VW+y1aou9Vm2x16ot9lq1
+        xV6rtthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vp5SAgAAADCSwxgAAAAAIzmMAQAAADCSwxgAAAAAIzmM
+        AQAAADDS/mHs8/p9yHLwl4Bqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVe
+        q7bYa9UWe63aYm+1fxg7nS+H3O5L9lvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
+        W+y1aou9Vm2x16ot9lq1xd7KU0oAAAAARnIYAwAAAGAkhzEAAAAARnIYAwAAAGCi5+sf9Z0LPvxaiMMA
+        AAAASUVORK5CYII=
 </value>
   </data>
-  <data name="堆垛机4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="srm01.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABIAAATGCAYAAAArLvR9AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -362,7 +356,7 @@
         rkJggg==
 </value>
   </data>
-  <data name="堆垛机6.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="srm02.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABIAAATGCAYAAAArLvR9AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -426,9 +420,9 @@
         rkJggg==
 </value>
   </data>
-  <data name="tableCellLabel2.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="srm04.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
+        iVBORw0KGgoAAAANSUhEUgAAABIAAATGCAYAAAArLvR9AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
         bGUAAEjHnZZ3VFTXFofPvXd6oc0w0hl6ky4wgPQuIB0EURhmBhjKAMMMTWyIqEBEEREBRZCggAGjoUis
         iGIhKKhgD0gQUGIwiqioZEbWSnx5ee/l5ffHvd/aZ+9z99l7n7UuACRPHy4vBZYCIJkn4Ad6ONNXhUfQ
@@ -473,18 +467,24 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAahJREFUeF7t3bFpA1EU
-        RUF3p1hlOBHGkXInLkPyYqkNdWbDhstZ2PxNMOG5BTz4/LfH4/kHAAAAAMO8HMYAAAAAmMhhDAAAAICR
-        HMYAAAAAGMlhDAAAAICR9g9jp/PlkNt9yX6r2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
-        W+y1aou9Vm2x16ot9lq1xV6rtthb7R/G3j++DvlZfrPfqrbYa9UWe63aYq9VW+y1aou9Vm2x16ot9lq1
-        xV6rtthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vp5SAgAAADCSwxgAAAAAIzmMAQAAADCSwxgAAAAAIzmM
-        AQAAADDS/mHs8/p9yHLwl4Bqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVe
-        q7bYa9UWe63aYm+1fxg7nS+H3O5L9lvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
-        W+y1aou9Vm2x16ot9lq1xd7KU0oAAAAARnIYAwAAAGAkhzEAAAAARnIYAwAAAGCi5+sf9Z0LPvxaiMMA
-        AAAASUVORK5CYII=
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAAAwlJREFUeF7t1DGqHgQQ
+        hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
+        +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
+        DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
+        vQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+
+        UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDsh
+        m70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2g
+        PlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7
+        IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJN
+        oD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6U
+        OyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70C
+        TaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAO
+        lDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9
+        Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlDunaDXx7/8Rgs+1wgFSwAAAABJRU5E
+        rkJggg==
 </value>
   </data>
-  <data name="堆垛机7.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="srm03.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABIAAATGCAYAAAArLvR9AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -531,7 +531,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -548,7 +548,7 @@
         rkJggg==
 </value>
   </data>
-  <data name="堆垛机8.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="srm05.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABIAAATGCAYAAAArLvR9AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -595,7 +595,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -612,7 +612,7 @@
         rkJggg==
 </value>
   </data>
-  <data name="堆垛机1.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="srm06.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABIAAATGCAYAAAArLvR9AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -659,7 +659,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -676,7 +676,7 @@
         rkJggg==
 </value>
   </data>
-  <data name="堆垛机3.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="srm07.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABIAAATGCAYAAAArLvR9AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -723,7 +723,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -740,7 +740,7 @@
         rkJggg==
 </value>
   </data>
-  <data name="堆垛机5.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="srm08.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABIAAATGCAYAAAArLvR9AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -787,7 +787,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb

+ 1 - 0
WCS_Client/From/From_Montior/srm.Designer.cs

@@ -73,6 +73,7 @@
             this.button1.TabIndex = 0;
             this.button1.UseVisualStyleBackColor = true;
             this.button1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.button1_MouseMove);
+            this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
             // srm
             // 

+ 46 - 0
WCS_Client/From/From_Montior/srm.cs

@@ -18,6 +18,31 @@ namespace WCS_Client.From.From_Montior
             InitializeComponent();
         }
 
+        System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(srm));
+        public void SetColor(int color)
+        {
+            if (color == 1)
+            {
+                //button1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("Red")));
+                button1.BackgroundImage = Image.FromFile("Resources/堆垛机1Red.png");
+            }
+            else if (color == 2)
+            {
+                //this.button1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("Yellow")));
+                button1.BackgroundImage = Image.FromFile("Resources/堆垛机1Yellow.png");
+            }
+            else if (color == 3)
+            {
+                //this.button1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("Green")));
+                button1.BackgroundImage = Image.FromFile("Resources/堆垛机1Green.png");
+            }
+            else
+            {
+                this.button1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("button1.BackgroundImage")));
+            }
+
+        }
+
         readonly Dictionary<Button, string> dic = new Dictionary<Button, string>();
         private void button1_MouseMove(object sender, MouseEventArgs e)
         {
@@ -30,5 +55,26 @@ namespace WCS_Client.From.From_Montior
                 MoveOverInfoTip.SettingMutiTipInfo(dic);
             }
         }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            if (Name.Contains("_"))
+            {
+                MessageBox.Show("该设备无数据。");
+                return;
+            }
+            if (Name.Length > 4)
+            {
+                string equname = "SRM" + Name.Substring(4);
+                FrmEquMsg_dtl Frm = new FrmEquMsg_dtl(equname);
+                Frm.Show();
+            }
+            else
+            {
+                string equname = "SRM" + Name.Substring(3);
+                FrmEquMsg_dtl Frm = new FrmEquMsg_dtl(equname);
+                Frm.Show();
+            }
+        }
     }
 }

BIN
WCS_Client/dll/WCS.Entity.Protocol.dll


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff