init

WCS_Client/App.config

@@ -6,8 +6,6 @@
     <!--<add name="Conn" connectionString="Zf9gXkmk6UQO/TVriL9BB2FkcijbnFyCgFdiYDp0AHI/+SHpVCfhnwpJxED8fXDftdHChe2Ej+bAXJI4Y9Cn6pqVSCeGMxU+IsInJ1y8kGzsMUfxr6jra+IWQrUYAgEwUDHPP/Z9ImJBBU4FBWN3oK9aMn+DF/uk626IYKwRNcDLCjPAQIGmlUT2oY/T/TRO+TF4LWKaOLRSGuuW175RhYnz8++aHw5fDjyV0BXfF8FODQ9rUAEOwKPIVhzwpeOM"/>-->
     <!--<add name="Conn" connectionString="Zf9gXkmk6UQO/TVriL9BB2FkcijbnFyCgFdiYDp0AHI/+SHpVCfhnwpJxED8fXDftdHChe2Ej+bAXJI4Y9Cn6s2li4Px8d/PBoEKtbTr4LiGK4Q2b+eRNUNxKEghJj4P+RkvfAiDN+Gj+jUrJOjmjM91RBKsNl4A+ODceR6JmROaqWIC5uyQeq0D+zYTSwIBJVuxVuDBPG4EoFHgpaNNq+BWrRoToi858tN9xQZ4L0MeferDiYPJGGYlH0T7DmFA"/>-->
     <!--<add name="Conn" connectionString="Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=Aries)));Persist Security Info=True;User Id=lxm; Password=abc.123;"/>-->
-
-
     <!--测试数据库连接字符串-->
     <!--<add name="OracleDatabase" connectionString="Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.12.189.162)(PORT=1522)))(CONNECT_DATA=(SERVICE_NAME=SBWMSQ)));Persist Security Info=True;User Id=BZWMS; Password=Aa123456;"
   providerName="System.DataAccess.Client" />-->
@@ -16,11 +14,11 @@
     providerName="System.DataAccess.Client" />-->
     <!--<add name="OracleDatabase" connectionString="Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=Aries)));Persist Security Info=True;User Id=lxm; Password=abc.123;"
 providerName="System.DataAccess.Client" />-->
-    <add name="OracleDatabase" connectionString="Data Source=192.168.249.120;Initial Catalog=WCS_MW;Persist Security Info=True;User ID=sa;Pwd=password@123$%^" providerName="System.Data.SqlClient" />
+    <add name="OracleDatabase" connectionString="Data Source=192.168.249.151;Initial Catalog=WCS_OPP;Persist Security Info=True;User ID=sa;Pwd=Password@123" providerName="System.Data.SqlClient" />
     <!--<add name="OracleDatabase" connectionString="Data Source=111.75.177.22,43997;Initial Catalog=WCS_MW;Persist Security Info=True;User ID=sa;Pwd=password@123$%^" providerName="System.Data.SqlClient" />-->
     <!--<add name="OracleDatabase" connectionString="Data Source=192.168.0.222;Initial Catalog=YONGGUAN_WCS;Persist Security Info=True;User ID=sa;Pwd=abc.123"
 providerName="System.Data.SqlClient" />-->
-	  <!--<add name="OracleDatabase" connectionString="Data Source=.;Initial Catalog=WCS_MW;Persist Security Info=True;User ID=sa;Pwd=sa123456"
+    <!--<add name="OracleDatabase" connectionString="Data Source=.;Initial Catalog=WCS_MW;Persist Security Info=True;User ID=sa;Pwd=sa123456"
 providerName="System.Data.SqlClient" />-->
     <!--正式数据库连接字符串-->
     <!--<add name="OracleDatabase" connectionString="Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.12.189.160)(PORT=1522)))(CONNECT_DATA=(SERVICE_NAME=SBWMSP)));Persist Security Info=True;User Id=BZWMS; Password=Aa123456;"
@@ -32,6 +30,7 @@ providerName="System.Data.SqlClient" />-->
     <!--CYQ.Data.Log 记录日志到Logs文件夹下-->
     <add key="IsWriteLog" value="true" />
     <add key="IsAutoCache" value="false" />
+    <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
@@ -52,4 +51,16 @@ providerName="System.Data.SqlClient" />-->
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+  <system.web>
+    <membership defaultProvider="ClientAuthenticationMembershipProvider">
+      <providers>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+      </providers>
+    </membership>
+    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+      <providers>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+      </providers>
+    </roleManager>
+  </system.web>
+</configuration>

WCS_Client/Frm/FrmMain.Designer.cs

@@ -64,12 +64,13 @@
             this.Btn_Calc});
             this.Bar_ToolBar.ItemSpacing = 2;
             this.Bar_ToolBar.Location = new System.Drawing.Point(0, 24);
+            this.Bar_ToolBar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Bar_ToolBar.Name = "Bar_ToolBar";
             this.Bar_ToolBar.PaddingBottom = 0;
             this.Bar_ToolBar.PaddingLeft = 0;
             this.Bar_ToolBar.PaddingRight = 0;
             this.Bar_ToolBar.PaddingTop = 0;
-            this.Bar_ToolBar.Size = new System.Drawing.Size(816, 41);
+            this.Bar_ToolBar.Size = new System.Drawing.Size(1088, 51);
             this.Bar_ToolBar.Stretch = true;
             this.Bar_ToolBar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.Bar_ToolBar.TabIndex = 32;
@@ -135,11 +136,12 @@
             this.Bar_Menu.IsMaximized = false;
             this.Bar_Menu.ItemSpacing = 2;
             this.Bar_Menu.Location = new System.Drawing.Point(0, 0);
+            this.Bar_Menu.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Bar_Menu.MenuBar = true;
             this.Bar_Menu.Name = "Bar_Menu";
             this.Bar_Menu.PaddingBottom = 0;
             this.Bar_Menu.PaddingTop = 0;
-            this.Bar_Menu.Size = new System.Drawing.Size(816, 24);
+            this.Bar_Menu.Size = new System.Drawing.Size(1088, 24);
             this.Bar_Menu.Stretch = true;
             this.Bar_Menu.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
             this.Bar_Menu.TabIndex = 31;
@@ -161,13 +163,14 @@
             this.Btn_LoginUserTime,
             this.Btn_Copyrignt});
             this.Bar_Status.ItemSpacing = 2;
-            this.Bar_Status.Location = new System.Drawing.Point(0, 319);
+            this.Bar_Status.Location = new System.Drawing.Point(0, 399);
+            this.Bar_Status.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Bar_Status.Name = "Bar_Status";
             this.Bar_Status.PaddingBottom = 0;
             this.Bar_Status.PaddingLeft = 0;
             this.Bar_Status.PaddingRight = 0;
             this.Bar_Status.PaddingTop = 0;
-            this.Bar_Status.Size = new System.Drawing.Size(816, 25);
+            this.Bar_Status.Size = new System.Drawing.Size(1088, 31);
             this.Bar_Status.Stretch = true;
             this.Bar_Status.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.Bar_Status.TabIndex = 33;
@@ -213,12 +216,13 @@
             this.STab_Main.ControlBox.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.STab_Main.ControlBox.MenuBox,
             this.STab_Main.ControlBox.CloseBox});
-            this.STab_Main.Location = new System.Drawing.Point(0, 65);
+            this.STab_Main.Location = new System.Drawing.Point(0, 81);
+            this.STab_Main.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.STab_Main.Name = "STab_Main";
             this.STab_Main.ReorderTabsEnabled = true;
             this.STab_Main.SelectedTabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
             this.STab_Main.SelectedTabIndex = -1;
-            this.STab_Main.Size = new System.Drawing.Size(816, 254);
+            this.STab_Main.Size = new System.Drawing.Size(1088, 318);
             this.STab_Main.TabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.STab_Main.TabIndex = 34;
             this.STab_Main.Text = "STab_Main";
@@ -230,17 +234,18 @@
             // 
             // FrmMain
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(816, 344);
+            this.ClientSize = new System.Drawing.Size(1088, 430);
             this.Controls.Add(this.Bar_ToolBar);
             this.Controls.Add(this.Bar_Menu);
             this.Controls.Add(this.Bar_Status);
             this.Controls.Add(this.STab_Main);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "FrmMain";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "美纹库WCS仓储物流调度系统";
+            this.Text = "OPP库WCS仓储物流调度系统";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             ((System.ComponentModel.ISupportInitialize)(this.Bar_ToolBar)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Bar_Menu)).EndInit();

WCS_Client/Frm/FrmMain.cs

@@ -73,7 +73,7 @@ namespace WCS_Client
 
             if (eqpData.Redis == null)
             {
-                RedisClient Redis = new RedisClient("81.69.99.176,database=11");
+                RedisClient Redis = new RedisClient("212.64.66.35,database=11");
                 MessagePackSerializer.DefaultOptions = StandardResolver.Options.WithCompression(MessagePackCompression.Lz4Block);
                 Redis.Serialize = obj =>
                 {
@@ -123,7 +123,7 @@ namespace WCS_Client
                 ////MBtn_Monitor
                 AddMenu("MBtn_Monitor", "MBtn_SCANN", "扫码信息查询", typeof(Frm.MBtn_SCANN), Btn_Click);
 
-                AddMenu("MBtn_Monitor", "MBtn_Mont", "设备监控查看", typeof(Frm.Frm_YongGuanMontior), Btn_Click);
+                //AddMenu("MBtn_Monitor", "MBtn_Mont", "设备监控查看", typeof(Frm.Frm_YongGuanMontior), Btn_Click);
 
                 //MBtn_Sys
                 AddMenu("MBtn_Sys", "MBtn_Interface_OPOrder", "日志管理", typeof(Frm.FrmLog), Btn_Click);
@@ -274,6 +274,7 @@ namespace WCS_Client
 
         private void Btn_SysExit_Click(object sender, EventArgs e)
         {
+            Environment.Exit(0);
             Application.Exit();
         }
 

WCS_Client/Frm/MBtn_Monitor/Frm_YongGuanMontior.cs

@@ -1,13 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Drawing;
 using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
 using WCS.Data;
-using WCS.Entity.Protocol;
-using WCS_Client.From.From_Montior;
+using WCS.Entity.Protocol.Station;
 
 namespace WCS_Client.Frm
 {
@@ -162,418 +160,424 @@ namespace WCS_Client.Frm
 
         public void pan11()
         {
-            try
-            {
-                var pack = eqpData.deviceDataPack;
-                // var frame = pack.Frame;//数据帧(数据产生的时间)
-                var convdata = pack.StationDatas;//输送机数据
-                var rgvdata = pack.RGVDatas;//穿梭车数据
-                var scdata = pack.SCDatas;//堆垛机数据
-                // var robotdata = pack.RobotData;//机器人数据
-                //var pldata = pack.ProdLineData;//产线数据
-
-                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)
-                    {
-                        //模式
-                        ddjstatus.DdjMode.Text = item.D521.Mode.ToString();
-
-                        if (item.D521.Mode.ToString() == "远程")
-                        {
-                            ddjstatus.G.Image = Properties.Resources.绿;
-                        }
-                        else if (item.D521.Mode.ToString() == "半自动")
-                        {
-                            ddjstatus.G.Image = Properties.Resources.黄;
-                        }
-                        else if (item.D521.Mode.ToString() == "手动")
-                        {
-                            ddjstatus.G.Image = Properties.Resources.黄;
-                        }
-                        else if (item.D521.Mode.ToString() == "维修")
-                        {
-                            ddjstatus.G.Image = Properties.Resources.红;
-                        }
-
-                        ////状态
-                        ddjstatus.DdjStatus.Text = item.D521.Status.ToString();
-                        ////任务Id
-                        ddjstatus.DdjOrdId.Text = item.D521.TaskID.ToString();
-                        var task = SugarBase.DB.Queryable<WCS_TASK>().First(v => v.ID == item.D521.TaskID);
-                        if (task != null)
-                        {
-                            //任务类型
-                            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.出库)
-                            {
-                                ddjstatus.LblInStatus.BackColor = Color.DarkGray;
-                                ddjstatus.LblOutStatus.BackColor = Color.Lime;
-                            }
-                            else
-                            {
-                                ddjstatus.LblInStatus.BackColor = Color.DarkGray;
-                                ddjstatus.LblOutStatus.BackColor = Color.DarkGray;
-                            }
-                        }
-                        else
-                        {
-                            ddjstatus.LblInStatus.BackColor = Color.DarkGray;
-                            ddjstatus.LblOutStatus.BackColor = Color.DarkGray;
-                        }
-                        //当前位置
-                        ddjstatus.DdjPosCurr.Text = item.D521.Tunnel.ToString();
-                        ////运行时长
-                        ddjstatus.DdjWorkTime.Text = item.D521.Runtime.ToString() + "h";
-                        ////里程数
-                        ddjstatus.DdjTotal_KM.Text = item.D521.TotalKM.ToString() + "KM";
-                        //起始位置
-                        ddjstatus.DdjPosFrom.Text = item.D521.SLine.ToString() + "-" + item.D521.SCol.ToString() + "-" + item.D521.SLayer.ToString();
-                        //目标位置
-                        ddjstatus.DdjPosTo.Text = item.D521.ELine.ToString() + "-" + item.D521.ECol.ToString() + "-" + item.D521.ELayer.ToString();
-                    }
-                }
-                //RGV
-                foreach (var item in rgvdata.Datas)
-                {
-                    //只更新有变更的数据
-                    //var oldItem = eqpData.oldDeviceDataPack.RGVDatas.Datas.FirstOrDefault(p => p.Code == item.Code);
-                    //if (oldItem.ToString() == item.ToString()) return;
-
-                    var rgvstatus = RGVSatatusSet.FirstOrDefault(v => v.RGVName == item.Code);
-                    if (rgvstatus != null)
-                    {
-                        string workmode = item.D521.WorkMode.ToString();
-                        //模式
-                        rgvstatus.RGVMode.Text = item.D521.WorkMode.ToString();
-
-                        if (item.D521.WorkMode.ToString() == "自动")
-                        {
-                            rgvstatus.G.Image = Properties.Resources.绿;
-                        }
-                        else if (item.D521.WorkMode.ToString() == "半自动")
-                        {
-                            rgvstatus.G.Image = Properties.Resources.黄;
-                        }
-                        else if (item.D521.WorkMode.ToString() == "手动")
-                        {
-                            rgvstatus.G.Image = Properties.Resources.黄;
-                        }
-                        else if (item.D521.WorkMode.ToString() == "维修")
-                        {
-                            rgvstatus.G.Image = Properties.Resources.红;
-                        }
-
-                        ////状态
-                        rgvstatus.RGVStatus.Text = item.D521.SystemStatus.ToString();
-                        ////任务Id
-                        rgvstatus.RGVOrdId.Text = item.D521.TaskID.ToString();
-                        //作业类型
-                        rgvstatus.RGVOptType.Text = item.D521.TaskType.ToString();
-                        //当前位置
-                        rgvstatus.RGVPosCurr.Text = item.D521.Position.ToString();
-                        //起始位置
-                        rgvstatus.RGVPosFrom.Text = item.D521.StartPosition.ToString();
-                        //目标位置
-                        rgvstatus.RGVPosTo.Text = item.D521.DestPosition.ToString();
-
-                        var control = FindControl("con" + item.Code);
-                        if (control != null)
-                        {
-                            if (control is Conveyor6)
-                            {
-                                var con = (Conveyor6)control;
-                                con.button1.Text = item.Code;
-                                if (item.D521.PH_Status == true)
-                                {
-                                    if (con.button1.Tag.ToString() != "pall")
-                                    {
-                                        con.button1.BackgroundImage = Image.FromFile("Resources/Rgv02.png");
-                                        con.button1.Tag = "pall";
-                                    }
-                                }
-                                else
-                                {
-                                    if (con.button1.Tag.ToString() != "empty")
-                                    {
-                                        con.button1.BackgroundImage = Image.FromFile("Resources/shelf16UD.png");
-                                        con.button1.Tag = "empty";
-                                    }
-                                }
-                            }
-                            else if (control is Conveyor5)
-                            {
-                                var con = (Conveyor5)control;
-                                con.button1.Text = item.Code;
-                                if (item.D521.PH_Status == true)
-                                {
-                                    if (con.button1.Tag.ToString() != "pall")
-                                    {
-                                        con.button1.BackgroundImage = Image.FromFile("Resources/rgv03.png");
-                                        con.button1.Tag = "pall";
-                                    }
-                                }
-                                else
-                                {
-                                    if (con.button1.Tag.ToString() != "empty")
-                                    {
-                                        con.button1.BackgroundImage = Image.FromFile("Resources/shelf16UD1.png");
-                                        con.button1.Tag = "empty";
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                //输送线
-                foreach (var item in convdata.Datas)
-                {
-                    //只更新有变更的数据
-
-                    var control = FindControl("con" + item.Code);
-
-                    if (control != null)
-                    {
-                        if (control is Conveyor)
-                        {
-                            var con = (Conveyor)control;
-                            if (item.D523.Fault != 0) con.BackColor = Color.Red;
-                            else if (item.D523.Status == 0) con.BackColor = Color.Yellow;
-                            else con.BackColor = Color.FromArgb(0, 144, 154);
-                            con.button1.Text = item.Code.ToString();
-                            if (item.D521.PH_STATUS == true)
-                            {
-                                if (con.button1.Tag.ToString() != "pall")
-                                {
-                                    con.button1.BackgroundImage = Image.FromFile("Resources/Rgv02.png");
-                                    con.button1.Tag = "pall";
-                                }
-                            }
-                            else
-                            {
-                                if (con.button1.Tag.ToString() != "empty")
-                                {
-                                    con.button1.BackgroundImage = Image.FromFile("Resources/shelf16UD.png");
-                                    con.button1.Tag = "empty";
-                                }
-                            }
-                        }
-                        else if (control is Conveyor_L)
-                        {
-                            var con = (Conveyor_L)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 con.BackColor = Color.FromArgb(0, 144, 154);
-                            if (item.D521.PH_STATUS == true)
-                            {
-                                if (con.button1.Tag.ToString() != "pall")
-                                {
-                                    con.button1.BackgroundImage = Image.FromFile("Resources/Conveyor_L.png");//1009L11.png
-                                    con.button1.Tag = "pall";
-                                }
-                            }
-                            else
-                            {
-                                if (con.button1.Tag.ToString() != "empty")
-                                {
-                                    con.button1.BackgroundImage = Image.FromFile("Resources/1009L11.png");//1009L11.png
-                                    con.button1.Tag = "empty";
-                                }
-                            }
-                        }
-                        else if (control is Conveyor_R)
-                        {
-                            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 con.BackColor = Color.FromArgb(0, 144, 154);
-                            if (item.D521.PH_STATUS == true)
-                            {
-                                if (con.button1.Tag.ToString() != "pall")
-                                {
-                                    con.button1.BackgroundImage = Image.FromFile("Resources/Conveyor_R.png");//1009L1.png
-                                    con.button1.Tag = "pall";
-                                }
-                            }
-                            else
-                            {
-                                if (con.button1.Tag.ToString() != "empty")
-                                {
-                                    con.button1.BackgroundImage = Image.FromFile("Resources/1009L1.png");//1009L1.png
-                                    con.button1.Tag = "empty";
-                                }
-                            }
-                        }
-                        else if (control is Conveyor4_L_R)
-                        {
-                            var con = (Conveyor4_L_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 con.BackColor = Color.FromArgb(0, 144, 154);
-                            if (item.D521.PH_STATUS == true)
-                            {
-                                if (con.button1.Tag.ToString() != "pall")
-                                {
-                                    con.button1.BackgroundImage = Image.FromFile("Resources/Conveyor4_L_R.png");
-                                    con.button1.Tag = "pall";
-                                }
-                            }
-                            else
-                            {
-                                if (con.button1.Tag.ToString() != "empty")
-                                {
-                                    con.button1.BackgroundImage = Image.FromFile("Resources/1001LR.gif");
-                                    con.button1.Tag = "empty";
-                                }
-                            }
-                        }
-                        else if (control is Conveyor3)
-                        {
-                            var con = (Conveyor3)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 con.BackColor = Color.FromArgb(0, 144, 154);
-                            if (item.D521.PH_STATUS == true)
-                            {
-                                if (con.button1.Tag.ToString() != "pall")
-                                {
-                                    con.button1.BackgroundImage = Image.FromFile("Resources/Conveyor3.png");//1009R1_A.png
-                                    con.button1.Tag = "pall";
-                                }
-                            }
-                            else
-                            {
-                                if (con.button1.Tag.ToString() != "empty")
-                                {
-                                    con.button1.BackgroundImage = Image.FromFile("Resources/1004LR.png");//1009R1.png
-                                    con.button1.Tag = "empty";
-                                }
-                            }
-                        }
-                        else if (control is Conveyor3_A)
-                        {
-                            var con = (Conveyor3_A)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 con.BackColor = Color.FromArgb(0, 144, 154);
-                            if (item.D521.PH_STATUS == true)
-                            {
-                                if (con.button1.Tag.ToString() != "pall")
-                                {
-                                    con.button1.BackgroundImage = Image.FromFile("Resources/Conveyor3_A_Box.png");//Conveyor3_A_Box.png
-                                    con.button1.Tag = "pall";
-                                }
-                            }
-                            else
-                            {
-                                if (con.button1.Tag.ToString() != "empty")
-                                {
-                                    con.button1.BackgroundImage = Image.FromFile("Resources/1009_A.png");//1009_A.png
-                                    con.button1.Tag = "empty";
-                                }
-                            }
-                        }
-                        else if (control is Conveyor3_B)
-                        {
-                            var con = (Conveyor3_B)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 con.BackColor = Color.FromArgb(0, 144, 154);
-                            if (item.D521.PH_STATUS == true)
-                            {
-                                if (con.button1.Tag.ToString() != "pall")
-                                {
-                                    con.button1.BackgroundImage = Image.FromFile("Resources/1009R1_B.png");//1009R1_A.png
-                                    con.button1.Tag = "pall";
-                                }
-                            }
-                            else
-                            {
-                                if (con.button1.Tag.ToString() != "empty")
-                                {
-                                    con.button1.BackgroundImage = Image.FromFile("Resources/1009R1.png");//1009R1.png
-                                    con.button1.Tag = "empty";
-                                }
-                            }
-                        }
-                        else if (control is Conveyor4_left)
-                        {
-                            var con = (Conveyor4_left)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 con.BackColor = Color.FromArgb(0, 144, 154);
-                            if (item.D521.PH_STATUS == true)
-                            {
-                                if (con.button1.Tag.ToString() != "pall")
-                                {
-                                    con.button1.BackgroundImage = Image.FromFile("Resources/Conveyor4_left.png");
-                                    con.button1.Tag = "pall";
-                                }
-                            }
-                            else
-                            {
-                                if (con.button1.Tag.ToString() != "empty")
-                                {
-                                    con.button1.BackgroundImage = Image.FromFile("Resources/1001L.gif");
-                                    con.button1.Tag = "empty";
-                                }
-                            }
-                        }
-                        else if (control is Conveyor4_right)
-                        {
-                            var con = (Conveyor4_right)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 con.BackColor = Color.FromArgb(0, 144, 154);
-                            if (item.D521.PH_STATUS == true)
-                            {
-                                if (con.button1.Tag.ToString() != "pall")
-                                {
-                                    con.button1.BackgroundImage = Image.FromFile("Resources/Conveyor4_right.png");
-                                    con.button1.Tag = "pall";
-                                }
-                            }
-                            else
-                            {
-                                if (con.button1.Tag.ToString() != "empty")
-                                {
-                                    con.button1.BackgroundImage = Image.FromFile("Resources/1001LR.gif");
-                                    con.button1.Tag = "empty";
-                                }
-                            }
-                        }
-                    }
-                }
-                //eqpData.deviceDataPack = pack;
-            }
-            catch (Exception ex)
-            {
-            }
-            finally
-            {
-                isinitfrm = true;
-            }
+            //try
+            //{
+            //    var pack = eqpData.deviceDataPack;
+            //    // var frame = pack.Frame;//数据帧(数据产生的时间)
+            //    var convdata = pack.StationDatas;//输送机数据
+            //    var rgvdata = pack.RGVDatas;//穿梭车数据
+            //    var scdata = pack.SCDatas;//堆垛机数据
+            //    // var robotdata = pack.RobotData;//机器人数据
+            //    //var pldata = pack.ProdLineData;//产线数据
+
+            //    //string startTime = DateTime.Now.ToString();
+
+            //    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)
+            //        {
+            //            //模式
+            //            ddjstatus.DdjMode.Text = item.D521.SRMMode.ToString();
+
+            //            if (item.D521.SRMMode.ToString() == "远程")
+            //            {
+            //                ddjstatus.G.Image = Properties.Resources.绿;
+            //            }
+            //            else if (item.D521.SRMMode.ToString() == "半自动")
+            //            {
+            //                ddjstatus.G.Image = Properties.Resources.黄;
+            //            }
+            //            else if (item.D521.SRMMode.ToString() == "手动")
+            //            {
+            //                ddjstatus.G.Image = Properties.Resources.黄;
+            //            }
+            //            else if (item.D521.SRMMode.ToString() == "维修")
+            //            {
+            //                ddjstatus.G.Image = Properties.Resources.红;
+            //            }
+
+            //            ////状态
+            //            ddjstatus.DdjStatus.Text = item.D521.SRMStatus.ToString();
+            //            ////任务Id
+            //            ddjstatus.DdjOrdId.Text = item.D521.TaskID_1.ToString();
+            //            var task = SugarBase.DB.Queryable<WCS_TASK>().First(v => v.ID == item.D521.TaskID_1);
+            //            if (task != null)
+            //            {
+            //                //任务类型
+            //                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.出库)
+            //                {
+            //                    ddjstatus.LblInStatus.BackColor = Color.DarkGray;
+            //                    ddjstatus.LblOutStatus.BackColor = Color.Lime;
+            //                }
+            //                else
+            //                {
+            //                    ddjstatus.LblInStatus.BackColor = Color.DarkGray;
+            //                    ddjstatus.LblOutStatus.BackColor = Color.DarkGray;
+            //                }
+            //            }
+            //            else
+            //            {
+            //                ddjstatus.LblInStatus.BackColor = Color.DarkGray;
+            //                ddjstatus.LblOutStatus.BackColor = Color.DarkGray;
+            //            }
+            //            //当前位置
+            //            ddjstatus.DdjPosCurr.Text = item.D521.TravelPos_1.ToString();
+            //            ////运行时长
+            //            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();
+            //        }
+            //    }
+            //    //RGV
+            //    foreach (var item in rgvdata.Datas)
+            //    {
+            //        //只更新有变更的数据
+            //        //var oldItem = eqpData.oldDeviceDataPack.RGVDatas.Datas.FirstOrDefault(p => p.Code == item.Code);
+            //        //if (oldItem.ToString() == item.ToString()) return;
+
+            //        var rgvstatus = RGVSatatusSet.FirstOrDefault(v => v.RGVName == item.Code);
+            //        if (rgvstatus != null)
+            //        {
+            //            string workmode = item.D521.WorkMode.ToString();
+            //            //模式
+            //            rgvstatus.RGVMode.Text = item.D521.WorkMode.ToString();
+
+            //            if (item.D521.WorkMode.ToString() == "自动")
+            //            {
+            //                rgvstatus.G.Image = Properties.Resources.绿;
+            //            }
+            //            else if (item.D521.WorkMode.ToString() == "半自动")
+            //            {
+            //                rgvstatus.G.Image = Properties.Resources.黄;
+            //            }
+            //            else if (item.D521.WorkMode.ToString() == "手动")
+            //            {
+            //                rgvstatus.G.Image = Properties.Resources.黄;
+            //            }
+            //            else if (item.D521.WorkMode.ToString() == "维修")
+            //            {
+            //                rgvstatus.G.Image = Properties.Resources.红;
+            //            }
+
+            //            ////状态
+            //            rgvstatus.RGVStatus.Text = item.D521.SystemStatus.ToString();
+            //            ////任务Id
+            //            rgvstatus.RGVOrdId.Text = item.D521.TaskID.ToString();
+            //            //作业类型
+            //            rgvstatus.RGVOptType.Text = item.D521.TaskType.ToString();
+            //            //当前位置
+            //            rgvstatus.RGVPosCurr.Text = item.D521.Position.ToString();
+            //            //起始位置
+            //            rgvstatus.RGVPosFrom.Text = item.D521.StartPosition.ToString();
+            //            //目标位置
+            //            rgvstatus.RGVPosTo.Text = item.D521.DestPosition.ToString();
+
+            //            var control = FindControl("con" + item.Code);
+            //            if (control != null)
+            //            {
+            //                if (control is Conveyor6)
+            //                {
+            //                    var con = (Conveyor6)control;
+            //                    con.button1.Text = item.Code;
+            //                    if (item.D521.PH_Status == true)
+            //                    {
+            //                        if (con.button1.Tag.ToString() != "pall")
+            //                        {
+            //                            con.button1.BackgroundImage = Image.FromFile("Resources/Rgv02.png");
+            //                            con.button1.Tag = "pall";
+            //                        }
+            //                    }
+            //                    else
+            //                    {
+            //                        if (con.button1.Tag.ToString() != "empty")
+            //                        {
+            //                            con.button1.BackgroundImage = Image.FromFile("Resources/shelf16UD.png");
+            //                            con.button1.Tag = "empty";
+            //                        }
+            //                    }
+            //                }
+            //                else if (control is Conveyor5)
+            //                {
+            //                    var con = (Conveyor5)control;
+            //                    con.button1.Text = item.Code;
+            //                    if (item.D521.PH_Status == true)
+            //                    {
+            //                        if (con.button1.Tag.ToString() != "pall")
+            //                        {
+            //                            con.button1.BackgroundImage = Image.FromFile("Resources/rgv03.png");
+            //                            con.button1.Tag = "pall";
+            //                        }
+            //                    }
+            //                    else
+            //                    {
+            //                        if (con.button1.Tag.ToString() != "empty")
+            //                        {
+            //                            con.button1.BackgroundImage = Image.FromFile("Resources/shelf16UD1.png");
+            //                            con.button1.Tag = "empty";
+            //                        }
+            //                    }
+            //                }
+            //            }
+            //        }
+            //    }
+            //    //输送线
+            //    foreach (var item in convdata.Datas)
+            //    {
+            //        //只更新有变更的数据
+
+            //        var control = FindControl("con" + item.Code);
+
+            //        if (control != null)
+            //        {
+            //            if (control is Conveyor)
+            //            {
+            //                var con = (Conveyor)control;
+            //                if (item.D523.Fault != 0) con.BackColor = Color.Red;
+            //                else if (item.D523.Status == 0) con.BackColor = Color.Yellow;
+            //                else con.BackColor = Color.FromArgb(0, 144, 154);
+            //                con.button1.Text = item.Code.ToString();
+            //                if (item.D521.PH_STATUS == true)
+            //                {
+            //                    if (con.button1.Tag.ToString() != "pall")
+            //                    {
+            //                        con.button1.BackgroundImage = Image.FromFile("Resources/Rgv02.png");
+            //                        con.button1.Tag = "pall";
+            //                    }
+            //                }
+            //                else
+            //                {
+            //                    if (con.button1.Tag.ToString() != "empty")
+            //                    {
+            //                        con.button1.BackgroundImage = Image.FromFile("Resources/shelf16UD.png");
+            //                        con.button1.Tag = "empty";
+            //                    }
+            //                }
+            //            }
+            //            else if (control is Conveyor_L)
+            //            {
+            //                var con = (Conveyor_L)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 con.BackColor = Color.FromArgb(0, 144, 154);
+            //                if (item.D521.PH_STATUS == true)
+            //                {
+            //                    if (con.button1.Tag.ToString() != "pall")
+            //                    {
+            //                        con.button1.BackgroundImage = Image.FromFile("Resources/Conveyor_L.png");//1009L11.png
+            //                        con.button1.Tag = "pall";
+            //                    }
+            //                }
+            //                else
+            //                {
+            //                    if (con.button1.Tag.ToString() != "empty")
+            //                    {
+            //                        con.button1.BackgroundImage = Image.FromFile("Resources/1009L11.png");//1009L11.png
+            //                        con.button1.Tag = "empty";
+            //                    }
+            //                }
+            //            }
+            //            else if (control is Conveyor_R)
+            //            {
+            //                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 con.BackColor = Color.FromArgb(0, 144, 154);
+            //                if (item.D521.PH_STATUS == true)
+            //                {
+            //                    if (con.button1.Tag.ToString() != "pall")
+            //                    {
+            //                        con.button1.BackgroundImage = Image.FromFile("Resources/Conveyor_R.png");//1009L1.png
+            //                        con.button1.Tag = "pall";
+            //                    }
+            //                }
+            //                else
+            //                {
+            //                    if (con.button1.Tag.ToString() != "empty")
+            //                    {
+            //                        con.button1.BackgroundImage = Image.FromFile("Resources/1009L1.png");//1009L1.png
+            //                        con.button1.Tag = "empty";
+            //                    }
+            //                }
+            //            }
+            //            else if (control is Conveyor4_L_R)
+            //            {
+            //                var con = (Conveyor4_L_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 con.BackColor = Color.FromArgb(0, 144, 154);
+            //                if (item.D521.PH_STATUS == true)
+            //                {
+            //                    if (con.button1.Tag.ToString() != "pall")
+            //                    {
+            //                        con.button1.BackgroundImage = Image.FromFile("Resources/Conveyor4_L_R.png");
+            //                        con.button1.Tag = "pall";
+            //                    }
+            //                }
+            //                else
+            //                {
+            //                    if (con.button1.Tag.ToString() != "empty")
+            //                    {
+            //                        con.button1.BackgroundImage = Image.FromFile("Resources/1001LR.gif");
+            //                        con.button1.Tag = "empty";
+            //                    }
+            //                }
+            //            }
+            //            else if (control is Conveyor3)
+            //            {
+            //                var con = (Conveyor3)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 con.BackColor = Color.FromArgb(0, 144, 154);
+            //                if (item.D521.PH_STATUS == true)
+            //                {
+            //                    if (con.button1.Tag.ToString() != "pall")
+            //                    {
+            //                        con.button1.BackgroundImage = Image.FromFile("Resources/Conveyor3.png");//1009R1_A.png
+            //                        con.button1.Tag = "pall";
+            //                    }
+            //                }
+            //                else
+            //                {
+            //                    if (con.button1.Tag.ToString() != "empty")
+            //                    {
+            //                        con.button1.BackgroundImage = Image.FromFile("Resources/1004LR.png");//1009R1.png
+            //                        con.button1.Tag = "empty";
+            //                    }
+            //                }
+            //            }
+            //            else if (control is Conveyor3_A)
+            //            {
+            //                var con = (Conveyor3_A)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 con.BackColor = Color.FromArgb(0, 144, 154);
+            //                if (item.D521.PH_STATUS == true)
+            //                {
+            //                    if (con.button1.Tag.ToString() != "pall")
+            //                    {
+            //                        con.button1.BackgroundImage = Image.FromFile("Resources/Conveyor3_A_Box.png");//Conveyor3_A_Box.png
+            //                        con.button1.Tag = "pall";
+            //                    }
+            //                }
+            //                else
+            //                {
+            //                    if (con.button1.Tag.ToString() != "empty")
+            //                    {
+            //                        con.button1.BackgroundImage = Image.FromFile("Resources/1009_A.png");//1009_A.png
+            //                        con.button1.Tag = "empty";
+            //                    }
+            //                }
+            //            }
+            //            else if (control is Conveyor3_B)
+            //            {
+            //                var con = (Conveyor3_B)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 con.BackColor = Color.FromArgb(0, 144, 154);
+            //                if (item.D521.PH_STATUS == true)
+            //                {
+            //                    if (con.button1.Tag.ToString() != "pall")
+            //                    {
+            //                        con.button1.BackgroundImage = Image.FromFile("Resources/1009R1_B.png");//1009R1_A.png
+            //                        con.button1.Tag = "pall";
+            //                    }
+            //                }
+            //                else
+            //                {
+            //                    if (con.button1.Tag.ToString() != "empty")
+            //                    {
+            //                        con.button1.BackgroundImage = Image.FromFile("Resources/1009R1.png");//1009R1.png
+            //                        con.button1.Tag = "empty";
+            //                    }
+            //                }
+            //            }
+            //            else if (control is Conveyor4_left)
+            //            {
+            //                var con = (Conveyor4_left)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 con.BackColor = Color.FromArgb(0, 144, 154);
+            //                if (item.D521.PH_STATUS == true)
+            //                {
+            //                    if (con.button1.Tag.ToString() != "pall")
+            //                    {
+            //                        con.button1.BackgroundImage = Image.FromFile("Resources/Conveyor4_left.png");
+            //                        con.button1.Tag = "pall";
+            //                    }
+            //                }
+            //                else
+            //                {
+            //                    if (con.button1.Tag.ToString() != "empty")
+            //                    {
+            //                        con.button1.BackgroundImage = Image.FromFile("Resources/1001L.gif");
+            //                        con.button1.Tag = "empty";
+            //                    }
+            //                }
+            //            }
+            //            else if (control is Conveyor4_right)
+            //            {
+            //                var con = (Conveyor4_right)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 con.BackColor = Color.FromArgb(0, 144, 154);
+            //                if (item.D521.PH_STATUS == true)
+            //                {
+            //                    if (con.button1.Tag.ToString() != "pall")
+            //                    {
+            //                        con.button1.BackgroundImage = Image.FromFile("Resources/Conveyor4_right.png");
+            //                        con.button1.Tag = "pall";
+            //                    }
+            //                }
+            //                else
+            //                {
+            //                    if (con.button1.Tag.ToString() != "empty")
+            //                    {
+            //                        con.button1.BackgroundImage = Image.FromFile("Resources/1001LR.gif");
+            //                        con.button1.Tag = "empty";
+            //                    }
+            //                }
+            //            }
+            //        }
+            //    }
+
+            //    //string endtTime = DateTime.Now.ToString();
+
+            //    //MessageBox.Show("开始时间--" + startTime + ",结束时间--" + endtTime);
+            //    //eqpData.deviceDataPack = pack;
+            //}
+            //catch (Exception ex)
+            //{
+            //}
+            //finally
+            //{
+            //    isinitfrm = true;
+            //}
         }
 
         private void lblsrm01_Click(object sender, EventArgs e)
@@ -601,8 +605,6 @@ namespace WCS_Client.Frm
         private void con2035_Load(object sender, EventArgs e)
         {
         }
-
-
     }
 
     public class DDJSatatus
@@ -721,7 +723,7 @@ namespace WCS_Client.Frm
         public Label RGVPosTo { get; set; }
     }
 
-    public class WCS_STATION5201 : WCS_STATION520
+    public class WCS_STATION5201 : WCS_Station520
     {
         public new DateTime UPDATETIME { get; set; }
     }

WCS_Client/Frm/MBtn_Task/FrmWCS_Task.cs

@@ -155,6 +155,10 @@ left join WCS_MAPPINGENTRY me on t.STATUS = me.MEP_MAPPINGNO and me.MEP_MAPPINGT
             PageData pd = BaseWorkflow.QueryPageData(_SQLText, _Orderby, uC_QueryPage1.GetQueryWhere(), PageIndex, PageSize);
             return pd;
         }
+        /// <summary>
+        /// 按钮触发事件
+        /// </summary>
+        /// <param name="LCName"></param>
         private void SubmitMethods(string LCName)
         {
             if (LCName == "btn_QDB")

WCS_Client/Frm/MBtn_User/FrmUser.cs

@@ -73,6 +73,10 @@ namespace WCS_Client.Frm
             return pd;
         }
 
+        /// <summary>
+        /// 按钮绑定事件
+        /// </summary>
+        /// <param name="LCName"></param>
         private void SubmitMethods(string LCName)
         {
 
@@ -293,6 +297,10 @@ namespace WCS_Client.Frm
             }
             return ErrQty == 0;
         }
+
+        /// <summary>
+        /// 添加用户
+        /// </summary>
         private void Init_frmLAddEdit()
         {
             frmLAddEdit = new FrmLAddEdit();

WCS_Client/UC/UCPanel/UC_QueryPage.cs

@@ -41,11 +41,11 @@ namespace WCS_Client.UC
             this.SCGrid.CellValueChanged += SuperGridControl1CellValueChanged;
             this.SCGrid.RowSetDefaultValues += SuperGridControl1RowSetDefaultValues;
         }
-        public delegate PageData  QueryPageDataHandler(int PageIndex, int PageSize);//分页查询
+        public delegate PageData QueryPageDataHandler(int PageIndex, int PageSize);//分页查询
         public delegate void RefreshRoleHandler(bool ChkValue);//刷新权限
         public delegate void GridDoubleClickHandler(DataRow dr);//表格双击方法
 
-        public delegate void GridMouseClickHandler (DataRow dr);//单击方法
+        public delegate void GridMouseClickHandler(DataRow dr);//单击方法
 
         public delegate void CellValueChangedHandler(GridCellValueChangedEventArgs e);
 
@@ -54,7 +54,7 @@ namespace WCS_Client.UC
 
         QueryPageDataHandler _QueryPageDataMethods = null;//查询数据集方法
         RefreshRoleHandler _RefreshRoleMethods = null;//刷新权限
-        
+
         GridDoubleClickHandler _GridDoubleClickMethods = null;//表格双击方法
         CellValueChangedHandler _CellValueChangedMethods = null;//表格值改变
 
@@ -62,7 +62,7 @@ namespace WCS_Client.UC
 
 
 
-         public  const string ChkTag = "F6FC5CEF7E5B48bbB04834B22DC248C3";
+        public const string ChkTag = "F6FC5CEF7E5B48bbB04834B22DC248C3";
         List<GridColumn> _GCList = new List<GridColumn>();//表格列表
         List<LayoutControlItem> _LCItemList = new List<LayoutControlItem>();// 查询控件
         bool _IsMultiSelect = true;//单/多选标记
@@ -130,7 +130,7 @@ namespace WCS_Client.UC
         /// <param name="ChkValueChangeMethods">单/多选改变方法</param>
         /// <param name="GridDoubleClickMethods">表格双击方法</param>
         /// <param name="RefreshRoleMethods">刷新权限方法</param>
-        public void Init_QueryPage(int LC_Height, bool IsMultiSelect, bool IsExport, string GroupName, List<GridColumn> GCList, List<LayoutControlItem> LCItemList, QueryPageDataHandler QueryPageDataMethods, RefreshRoleHandler RefreshRoleMethods, GridDoubleClickHandler GridDoubleClickMethods, CellValueChangedHandler CellValueChangedMethods, GridMouseClickHandler CellMouseDownMethods,int frozenColumnCount=0)
+        public void Init_QueryPage(int LC_Height, bool IsMultiSelect, bool IsExport, string GroupName, List<GridColumn> GCList, List<LayoutControlItem> LCItemList, QueryPageDataHandler QueryPageDataMethods, RefreshRoleHandler RefreshRoleMethods, GridDoubleClickHandler GridDoubleClickMethods, CellValueChangedHandler CellValueChangedMethods, GridMouseClickHandler CellMouseDownMethods, int frozenColumnCount = 0)
         {
             _GroupName = GroupName;
             //设定LayoutControl宽度
@@ -163,7 +163,7 @@ namespace WCS_Client.UC
                     this.layoutControl1.Controls.Add(LocItem.Control);
                     this.layoutControl1.RootGroup.Items.Add(LocItem);
                     this._LCItemList.Add(LocItem);
-                   
+
                 }
             }
             //初始化LayoutControl控件.
@@ -180,7 +180,7 @@ namespace WCS_Client.UC
                 }
                 //gc.ReadOnly = true;
                 gc.DisplayIndex = this.SCGrid.PrimaryGrid.Columns.Count;
-               
+
                 this.SCGrid.PrimaryGrid.Columns.Add(gc);
                 _GCList.Add(gc);
             }
@@ -211,7 +211,7 @@ namespace WCS_Client.UC
 
         public List<string> GetQueryWhere()
         {
-            return LCWhereUtil.GetWhereText(_LCItemList);        
+            return LCWhereUtil.GetWhereText(_LCItemList);
         }
 
         /// <summary>
@@ -258,7 +258,7 @@ namespace WCS_Client.UC
                 //SetLabelCallBack labDele = new SetLabelCallBack(Set_BarData); 
                 Set_BarData(PageDataItem);
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 Set_BarData(null);
             }
@@ -274,7 +274,7 @@ namespace WCS_Client.UC
                 }
             }
             this.SCGrid.PrimaryGrid.DataSource = dt;
-           
+
         }
 
 
@@ -303,13 +303,13 @@ namespace WCS_Client.UC
             if (LCItem.Control is ComboBoxEx)
             {
                 ComboBoxEx citem = LCItem.Control as ComboBoxEx;
-               // string s = citem.SelectedValue == null ? "" : citem.SelectedValue.ToString();
+                // string s = citem.SelectedValue == null ? "" : citem.SelectedValue.ToString();
                 citem.DataSource = dt;
                 citem.ValueMember = KeyField;
                 citem.DisplayMember = DisplayField;
 
-                
-               // citem.SelectedValue = s;
+
+                // citem.SelectedValue = s;
             }
             else if (LCItem.Control is LC_DropChkList)
             {
@@ -426,7 +426,7 @@ namespace WCS_Client.UC
 
         private void TMCopyCell_Click(object sender, EventArgs e)
         {
-            Clipboard.SetDataObject(CellStr==null?CellStr:CellStr.ToString());
+            Clipboard.SetDataObject(CellStr == null ? CellStr : CellStr.ToString());
         }
 
         private void TMChkbtn_Click(object sender, EventArgs e)
@@ -537,7 +537,7 @@ namespace WCS_Client.UC
                         return;
                     }
                     ShowOpaqueLayer();
-                    PageData PageDataItem=_QueryPageDataMethods(1, 0);
+                    PageData PageDataItem = _QueryPageDataMethods(1, 0);
                     if (PageDataItem == null)
                     {
                         ExportUtil.Execute(f, null, _GCList);
@@ -692,8 +692,8 @@ namespace WCS_Client.UC
                 {
                     return;
                 }
-                if (_CellMouseDownMethods!=null)
-                   _CellMouseDownMethods(drv.Row);
+                if (_CellMouseDownMethods != null)
+                    _CellMouseDownMethods(drv.Row);
             }
             #endregion
         }
@@ -720,7 +720,7 @@ namespace WCS_Client.UC
         /// 切换单/多选
         /// </summary>
         /// <param name="IsCheckBoxes">true,多选|false单选</param>
-        public  void SCGrid_SetCheckBox(bool IsCheckBoxes)
+        public void SCGrid_SetCheckBox(bool IsCheckBoxes)
         {
 
             if (IsCheckBoxes)
@@ -749,7 +749,7 @@ namespace WCS_Client.UC
                 }
                 foreach (GridColumn dc in _GCList)
                 {
-                   // dc.ReadOnly = true;
+                    // dc.ReadOnly = true;
                     dc.DisplayIndex = this.SCGrid.PrimaryGrid.Columns.Count;
                     this.SCGrid.PrimaryGrid.Columns.Add(dc);
                 }
@@ -783,7 +783,7 @@ namespace WCS_Client.UC
             {
                 _RefreshRoleMethods(IsCheckBoxes);
             }
-            
+
         }
 
         /// <summary>
@@ -923,7 +923,7 @@ namespace WCS_Client.UC
                 {
                     gc.CellStyles.Default.TextColor = Color.Red;
                 }
-                   
+
                 gc.ReadOnly = IsReadOnly;
             }
         }
@@ -974,7 +974,7 @@ namespace WCS_Client.UC
             //是否显示序列号
             SCGrid.PrimaryGrid.ShowRowHeaders = true;
             panel.RowHeaderWidth = 30;
-            SCGrid.PrimaryGrid.RowHeaderIndexOffset = 1; 
+            SCGrid.PrimaryGrid.RowHeaderIndexOffset = 1;
             this.SCGrid.PrimaryGrid.FrozenColumnCount = 1;
             //panel.Columns["IQC"].EditorType = typeof(MyButton);
             //GridRow iet = new GridRow();
@@ -1346,5 +1346,5 @@ namespace WCS_Client.UC
             //}
         }
     }
-    
+
 }

WCS_Client/WCS_Client.csproj

@@ -12,7 +12,7 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>publish\</PublishUrl>
+    <PublishUrl>D:\XM\Release\OPPClient\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
@@ -22,9 +22,11 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
+    <AutorunEnabled>true</AutorunEnabled>
+    <ApplicationRevision>1</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -51,6 +53,18 @@
   <PropertyGroup>
     <ApplicationIcon>Resources\wcs.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>FB53D5FEEE4B1C8D849D1BF42151BF5F148A831E</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>WCS_Client_TemporaryKey.pfx</ManifestKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>true</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>true</SignManifests>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="CSkin, Version=16.1.14.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -161,6 +175,7 @@
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -169,13 +184,11 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="WCS.Entity, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\新建文件夹 (2)\美纹库客户端\WCS_V1.4\WCS_Client\bin\Debug\WCS.Entity.dll</HintPath>
+    <Reference Include="WCS.Entity">
+      <HintPath>dll\WCS.Entity.dll</HintPath>
     </Reference>
-    <Reference Include="WCS.Entity.Protocol, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\新建文件夹 (2)\美纹库客户端\WCS_V1.4\WCS_Client\bin\Debug\WCS.Entity.Protocol.dll</HintPath>
+    <Reference Include="WCS.Entity.Protocol">
+      <HintPath>dll\WCS.Entity.Protocol.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -1022,6 +1035,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <None Include="WCS_Client_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="dll\CSkin.dll" />

WCS_Client/Workflow/TaskWorkflow.cs

@@ -37,16 +37,16 @@ namespace WCS_Client.Workflow
             for (int i = 0; i < dataTable.Rows.Count; i++)
             {
                 //写入输送线
-                dataTable.Rows[i][ADDRCURRENT] = eqpData.deviceDataPack.StationDatas.Datas.Where(p => p.D521.TASKNUM == (int)dataTable.Rows[i][1]).FirstOrDefault()?.Code;
+                dataTable.Rows[i][ADDRCURRENT] = eqpData.deviceDataPack.StationDatas.Datas.Where(p => p.D521.Tasknum == (int)dataTable.Rows[i][1]).FirstOrDefault()?.Code;
                 //不在输送线，尝试写入RGV
                 if (string.IsNullOrEmpty(dataTable.Rows[i][ADDRCURRENT].ToString()))
                 {
-                    dataTable.Rows[i][ADDRCURRENT] = eqpData.deviceDataPack.RGVDatas.Datas.Where(p => p.D521.TaskID == (int)dataTable.Rows[i][1] && p.D521.PH_Status).FirstOrDefault()?.Code;
+                    dataTable.Rows[i][ADDRCURRENT] = eqpData.deviceDataPack.RGVDatas.Datas.Where(p => p.D521.TaskID_1 == (int)dataTable.Rows[i][1] && p.D521.PH_Status_1).FirstOrDefault()?.Code;
                 }
                 //不在输送线/RGV，尝试写入堆垛机
                 if (string.IsNullOrEmpty(dataTable.Rows[i][ADDRCURRENT].ToString()))
                 {
-                    dataTable.Rows[i][ADDRCURRENT] = eqpData.deviceDataPack.SCDatas.Datas.Where(p => p.D521.TaskID == (int)dataTable.Rows[i][1]).FirstOrDefault()?.Code;
+                    dataTable.Rows[i][ADDRCURRENT] = eqpData.deviceDataPack.SCDatas.Datas.Where(p => p.D521.TaskID_1 == (int)dataTable.Rows[i][1]).FirstOrDefault()?.Code;
                 }
 
                 //开始写入产线