mon_version1

WCS_Client/Frm/Equipment/WCS_TASK.cs

@@ -72,10 +72,10 @@ namespace WCS_Client.Frm
 
     public enum TaskType
     {
-        //组盘 = 0,
+        组盘 = 0,
         入库 = 1,
         出库 = 2,
-        //输送 = 5, 
+        输送 = 5, 
     }
 
     public enum TaskStatus

WCS_Client/Frm/MBtn_Monitor/Frm_YongGuanMontior.cs

@@ -232,14 +232,15 @@ namespace WCS_Client.Frm
                         }
 
                         ////状态
-                        ddjstatus.DdjStatus.Text = item.D521.SRMStatus.ToString();
-                        ////任务Id
-                        ddjstatus.DdjOrdId.Text = item.D521.TaskID_1.ToString();
+                        ddjstatus.DdjStatus.Text = item.D521.SRMStatus.ToString();                      
+                        
                         var task = SugarBase.DB.Queryable<WCS_TASK>().First(v => v.ID == item.D521.TaskID_1);
                         if (task != null)
                         {
+                            //任务号
+                            ddjstatus.DdjOrdId.Text = item.D521.TaskID_1.ToString();
                             //任务类型
-                            ddjstatus.DdjOptType.Text = task.TYPE.ToString();
+                            ddjstatus.DdjOptType.Text = task.TYPE.ToString();                                                      
                             if (task.TYPE == TaskType.入库)
                             {
                                 ddjstatus.LblInStatus.BackColor = Color.Lime;
@@ -258,11 +259,13 @@ namespace WCS_Client.Frm
                         }
                         else
                         {
+                            ddjstatus.DdjOrdId.Text = "0";
+                            ddjstatus.DdjOptType.Text = "无";
+
                             ddjstatus.LblInStatus.BackColor = Color.DarkGray;
-                            ddjstatus.LblOutStatus.BackColor = Color.DarkGray;
+                            ddjstatus.LblOutStatus.BackColor = Color.DarkGray;                         
                         }
-                        //当前位置
-                        //ddjstatus.DdjPosCurr.Text = item.D521.TravelPos_1.ToString();
+                        
                         ////运行时长
                         ddjstatus.DdjWorkTime.Text = item.D521.Runtime.ToString() + "h";
                         ////里程数
@@ -303,50 +306,48 @@ namespace WCS_Client.Frm
                         {
                             rgvstatus.G.Image = Properties.Resources.红;
                         }
+                        else if(item.D521.WorkMode.ToString() == "99")
+                        {
+                            rgvstatus.RGVMode.Text = "手动";
+                            rgvstatus.G.Image = Properties.Resources.黄;
+                        }
 
                         ////状态
                         rgvstatus.RGVStatus.Text = item.D521.SystemStatus.ToString();
+                        //rgvstatus.RGVOrdId.Text = item.D521.TaskID_1.ToString();
+
                         //任务Id
                         if (item.D521.TaskID_1.ToString().Length > 3)
                         {
-                            //rgvstatus.RGVOrdId.Text = item.D521.TaskID_1.ToString();
-
-                            //作业类型
-                            rgvstatus.RGVOptType.Text = item.D521.TaskType_1.ToString();
-                            //当前位置
-                            //rgvstatus.RGVPosCurr.Text = item.D521.Position.ToString();
-                            //起始位置
-                            rgvstatus.RGVPosFrom.Text = item.D521.StartPosition_1.ToString();
-                            //目标位置
-                            rgvstatus.RGVPosTo.Text = item.D521.DestPosition_1.ToString();
+                            rgvstatus.RGVOrdId.Text = item.D521.TaskID_1.ToString();
                         }
                         else if (item.D521.TaskID_2.ToString().Length > 3)
                         {
-                            //rgvstatus.RGVOrdId.Text = item.D521.TaskID_2.ToString();
+                            rgvstatus.RGVOrdId.Text = item.D521.TaskID_2.ToString();
+                        }
+                        else
+                        {
+                            rgvstatus.RGVOrdId.Text = item.D521.TaskID_1.ToString();
+                        }
 
-                            //作业类型
-                            rgvstatus.RGVOptType.Text = item.D521.TaskType_2.ToString();
-                            //当前位置
-                            //rgvstatus.RGVPosCurr.Text = item.D521.Position.ToString();
-                            //起始位置
-                            rgvstatus.RGVPosFrom.Text = item.D521.StartPosition_2.ToString();
-                            //目标位置
-                            rgvstatus.RGVPosTo.Text = item.D521.DestPosition_2.ToString();
+                        if (item.D521.Status_1.HasFlag(WCS.Entity.Protocol.RGVStatus.光电) || item.D521.Status_2.HasFlag(WCS.Entity.Protocol.RGVStatus.光电))
+                        {
+                            rgvstatus.RGVPosCurr.Text = "true";
                         }
                         else
                         {
-                            rgvstatus.RGVOrdId.Text = "";//item.D521.TaskID_1.ToString();
-
-                            //作业类型
-                            rgvstatus.RGVOptType.Text = item.D521.TaskType_1.ToString();
-                                                            //当前位置
-                                                            //rgvstatus.RGVPosCurr.Text = item.D521.Position.ToString();
-                                                            //起始位置
-                            rgvstatus.RGVPosFrom.Text = ""; //item.D521.StartPosition_1.ToString();
-                                                            //目标位置
-                            rgvstatus.RGVPosTo.Text = item.D521.DestPosition_1.ToString();
+                            rgvstatus.RGVPosCurr.Text = "false";
                         }
                         
+                        //作业类型
+                        rgvstatus.RGVOptType.Text = item.D521.TaskType_1.ToString();
+                            //当前位置
+                            //rgvstatus.RGVPosCurr.Text = item.D521.Position.ToString();
+                            //起始位置
+                        rgvstatus.RGVPosFrom.Text = "0"; //item.D521.StartPosition_1.ToString();
+                                                             //目标位置
+                        rgvstatus.RGVPosTo.Text = item.D521.DestPosition_1.ToString();
+
 
                         var control = FindControl(item.Code);
                         if (control != null)
@@ -356,7 +357,7 @@ namespace WCS_Client.Frm
                                 var con = (Conveyor_R)control;
                                 con.button1.Text = item.Code.ToString();
                                 if (item.D523.Fault != 0) con.BackColor = Color.Red;
-                                else if (item.D523.Status == 0) con.BackColor = Color.Yellow;
+                                else if (item.D523.Status == 0 && item.Code.ToString()!="RGV8") con.BackColor = Color.Yellow;
                                 else con.BackColor = Color.FromArgb(0, 144, 154);
                                 if (item.D521.Status_1.HasFlag(WCS.Entity.Protocol.RGVStatus.光电))
                                 {
@@ -555,6 +556,7 @@ namespace WCS_Client.Frm
                                 }
                             }
                         }
+                        #region ---
                         //else if (control is Conveyor4_L_R)
                         //{
                         //    var con = (Conveyor4_L_R)control;
@@ -652,6 +654,7 @@ namespace WCS_Client.Frm
                         //    }
                         //}
                         #endregion
+                        #endregion
                     }
                 }
 
@@ -682,7 +685,7 @@ namespace WCS_Client.Frm
             _timer.Stop();
             _timer.Elapsed -= new System.Timers.ElapsedEventHandler(theout);//到达时间的时候执行事件；
         }
-
+        #region load
         private void con2114_Load(object sender, EventArgs e)
         {
         }
@@ -699,6 +702,12 @@ namespace WCS_Client.Frm
         {
 
         }
+
+        private void RGV10_Load(object sender, EventArgs e)
+        {
+
+        }
+        #endregion
     }
 
     public class DDJSatatus

WCS_Client/From/From_Montior/Conveyor_R.cs

@@ -37,7 +37,17 @@ namespace WCS_Client.From.From_Montior
             }
             if (Name.Length > 3)
             {
-                string equname = Name.Substring(3);
+                string equname = "";
+                if (Name.StartsWith("R"))
+                {
+                     equname = Name.Substring(0);
+                }
+                else
+                {
+                     equname = Name.Substring(3);
+                }
+
+                
                 FrmEquMsg_dtl Frm = new FrmEquMsg_dtl(equname);
                 Frm.Show();
             }