监控更新

WCS_Client/Frm/Current.cs

@@ -18,36 +18,6 @@ namespace WCS_Client.Frm
         /// </summary>
         public static List<WCS_PLC> PlcSet = new List<WCS_PLC>();
 
-        public static void InitData(string wcssystem)
-        {
-            //string result = TryCachHelper.TryExecute((db) =>
-            // {
-            //     PlcSet = db.Queryable<WCS_PLC>().Where(v => v.PLC_WCSSYSTEM == wcssystem).ToList();
-            //     foreach (var plc in PlcSet)
-            //     {
-            //         plc.WCS_DBSet = db.Queryable<WCS_DBDEFINITION>().Where(v => v.DB_PLCNAME == plc.PLC_NAME).ToList();
-            //         plc.WCS_ScannSet = db.Queryable<WCS_SCANN>().Where(v => v.SCANN_PLCNAME == plc.PLC_NAME).OrderBy(v => v.SCANN_SEQUENCE).ToList();
-            //         plc.WCS_EquipmentInfoSet = db.Queryable<WCS_EQUIPMENTINFO>().Where(v => v.Equ_PlcName == plc.PLC_NAME).OrderBy(v => v.Equ_Sequence).ToList();
-            //         foreach (var item in plc.WCS_EquipmentInfoSet)
-            //         {
-            //             var equDBInfoSet = GetConvDBInfo(plc, item);
-            //             if (item.Equ_Type.ToLower().Trim() == EquipmentType.conveyor.ToString())
-            //             {
-            //                 item.EquSignal = new ConvSignal(item.Equ_PlcName, equDBInfoSet);
-            //             }
-            //             else if (item.Equ_Type.ToLower().Trim() == EquipmentType.srm.ToString())
-            //             {
-            //                 item.EquSignal = new SrmSignal(item.Equ_PlcName, equDBInfoSet);
-            //             }
-            //             else if (item.Equ_Type.ToLower().Trim() == EquipmentType.rgv.ToString())
-            //             {
-            //                 item.EquSignal = new RGVSignal(item.Equ_PlcName, equDBInfoSet);
-            //             }
-            //         }
-            //         plc.Init();
-            //     }
-            // });
-        }
         public static void RefreshData(bool isRefreshTask = false)
         {
             TryCachHelper.TryExecute((db) =>
@@ -65,135 +35,7 @@ namespace WCS_Client.Frm
         }
         private static List<ConvDbInfo> GetConvDBInfo(WCS_PLC plc, WCS_EQUIPMENTINFO item)
         {
-            List<ConvDbInfo> equDBInfoSet = new List<ConvDbInfo>();
-            //var dbSet = plc.WCS_DBSet.Where(v => v.DB_PLCNAME == item.Equ_PlcName).ToList();
-            //foreach (var DB in dbSet)
-            //{
-            //    if (DB.DB_TYPE == (int)DB_TypeEnum.WCS可读可写DB)
-            //    {
-            //        if (string.IsNullOrWhiteSpace(item.Equ_ReadWriteDB_Sequence)) continue;
-
-            //        var convdb = new ConvDbInfo();
-            //        convdb.DBName = DB.DB_NAME;
-            //        convdb.DBType = DB_TypeEnum.WCS可读可写DB;
-            //        convdb.DBReadLength = item.Equ_ReadWriteDB_Length;
-            //        //convdb.DBReadIndox = item.Equ_ReadWriteDB_Sequence * item.Equ_ReadWriteDB_Length;
-            //        int temp_sequence = Convert.ToInt32(item.Equ_ReadWriteDB_Sequence);
-            //        if (temp_sequence != 0)
-            //        {
-            //            int Totallength = temp_sequence * item.Equ_ReadWriteDB_Length; //plc.WCS_EquipmentInfoSet.Where(v => string.IsNullOrWhiteSpace(v.Equ_ReadWriteDB_Sequence) == false && Convert.ToInt32(v.Equ_ReadWriteDB_Sequence) < temp_sequence).Sum(v => v.Equ_ReadWriteDB_Length);
-            //            convdb.DBReadIndox = Totallength;
-            //        }
-            //        equDBInfoSet.Add(convdb);
-            //    }
-            //    else if (DB.DB_TYPE == (int)DB_TypeEnum.WCS只读DB)
-            //    {
-            //        if (string.IsNullOrWhiteSpace(item.Equ_ReadDB_Sequence)) continue;
-
-            //        var convdb = new ConvDbInfo();
-            //        convdb.DBName = DB.DB_NAME;
-            //        convdb.DBType = DB_TypeEnum.WCS只读DB;
-            //        convdb.DBReadLength = item.Equ_ReadDB_Length;
-            //        //convdb.DBReadIndox = item.Equ_ReadWriteDB_Sequence * item.Equ_ReadWriteDB_Length;
-            //        int temp_sequence = Convert.ToInt32(item.Equ_ReadDB_Sequence);
-            //        if (temp_sequence != 0)
-            //        {
-            //            int Totallength = temp_sequence * item.Equ_ReadDB_Length; //plc.WCS_EquipmentInfoSet.Where(v => string.IsNullOrWhiteSpace(v.Equ_ReadDB_Sequence) == false && Convert.ToInt32(v.Equ_ReadDB_Sequence) < temp_sequence).Sum(v => v.Equ_ReadDB_Length);
-            //            convdb.DBReadIndox = Totallength;
-            //        }
-            //        equDBInfoSet.Add(convdb);
-            //    }
-            //    else if (DB.DB_TYPE == (int)DB_TypeEnum.WCS状态和故障DB)
-            //    {
-            //        if (string.IsNullOrWhiteSpace(item.Equ_StatusDB_Sequence)) continue;
-
-            //        var convdb = new ConvDbInfo();
-            //        convdb.DBName = DB.DB_NAME;
-            //        convdb.DBType = DB_TypeEnum.WCS状态和故障DB;
-            //        convdb.DBReadLength = item.Equ_StatusDB_Length;
-            //        //convdb.DBReadIndox = item.Equ_ReadWriteDB_Sequence * item.Equ_ReadWriteDB_Length;
-            //        int temp_sequence = Convert.ToInt32(item.Equ_StatusDB_Sequence);
-            //        if (temp_sequence != 0)
-            //        {
-            //            int Totallength = temp_sequence * item.Equ_StatusDB_Length; //plc.WCS_EquipmentInfoSet.Where(v => string.IsNullOrWhiteSpace(v.Equ_StatusDB_Sequence) == false && Convert.ToInt32(v.Equ_StatusDB_Sequence) < temp_sequence).Sum(v => v.Equ_StatusDB_Length);
-            //            convdb.DBReadIndox = Totallength;
-            //        }
-            //        equDBInfoSet.Add(convdb);
-            //    }
-            //    else if (DB.DB_TYPE == (int)DB_TypeEnum.WCS读取扫码DB)
-            //    {
-            //        if (string.IsNullOrWhiteSpace(item.Equ_BarCodeDB_Sequence)) continue;
-
-            //        var convdb = new ConvDbInfo();
-            //        convdb.DBName = DB.DB_NAME;
-            //        convdb.DBType = DB_TypeEnum.WCS读取扫码DB;
-            //        convdb.DBReadLength = item.Equ_BarCodeDB_Length;
-            //        //convdb.DBReadIndox = item.Equ_ReadWriteDB_Sequence * item.Equ_ReadWriteDB_Length;
-            //        int temp_sequence = Convert.ToInt32(item.Equ_BarCodeDB_Sequence);
-            //        if (temp_sequence != 0)
-            //        {
-            //            int Totallength = plc.WCS_EquipmentInfoSet.Where(v => string.IsNullOrWhiteSpace(v.Equ_BarCodeDB_Sequence) == false && Convert.ToInt32(v.Equ_BarCodeDB_Sequence) < temp_sequence).Sum(v => v.Equ_BarCodeDB_Length);
-            //            convdb.DBReadIndox = Totallength;
-            //        }
-            //        convdb.ScannSet = plc.WCS_ScannSet.Where(v => v.SCANN_STATIONNO == item.Equ_No).OrderBy(v => v.SCANN_SEQUENCE).ToList();
-            //        equDBInfoSet.Add(convdb);
-            //    }
-            //    else if (DB.DB_TYPE == (int)DB_TypeEnum.WCS读写扩展DB1)
-            //    {
-            //        if (string.IsNullOrWhiteSpace(item.Equ_ExtendOne_Sequence)) continue;
-
-            //        var convdb = new ConvDbInfo();
-            //        convdb.DBName = DB.DB_NAME;
-            //        convdb.DBType = DB_TypeEnum.WCS读写扩展DB1;
-            //        convdb.DBReadLength = item.Equ_ExtendOne_Length;
-            //        //convdb.DBReadIndox = item.Equ_ReadWriteDB_Sequence * item.Equ_ReadWriteDB_Length;
-            //        int temp_sequence = Convert.ToInt32(item.Equ_ExtendOne_Sequence);
-            //        if (temp_sequence != 0)
-            //        {
-            //            int Totallength = plc.WCS_EquipmentInfoSet.Where(v => string.IsNullOrWhiteSpace(v.Equ_ExtendOne_Sequence) == false && Convert.ToInt32(v.Equ_ExtendOne_Sequence) < temp_sequence).Sum(v => v.Equ_ExtendOne_Length);
-            //            convdb.DBReadIndox = Totallength;
-            //        }
-            //        convdb.ScannSet = plc.WCS_ScannSet.Where(v => v.SCANN_STATIONNO == item.Equ_No).OrderBy(v => v.SCANN_SEQUENCE).ToList();
-            //        equDBInfoSet.Add(convdb);
-            //    }
-            //    else if (DB.DB_TYPE == (int)DB_TypeEnum.WCS读写扩展DB2)
-            //    {
-            //        if (string.IsNullOrWhiteSpace(item.Equ_ExtendTwo_Sequence)) continue;
-
-            //        var convdb = new ConvDbInfo();
-            //        convdb.DBName = DB.DB_NAME;
-            //        convdb.DBType = DB_TypeEnum.WCS读写扩展DB2;
-            //        convdb.DBReadLength = item.Equ_ExtendTwo_Length;
-            //        //convdb.DBReadIndox = item.Equ_ReadWriteDB_Sequence * item.Equ_ReadWriteDB_Length;
-            //        int temp_sequence = Convert.ToInt32(item.Equ_ExtendTwo_Sequence);
-            //        if (temp_sequence != 0)
-            //        {
-            //            int Totallength = plc.WCS_EquipmentInfoSet.Where(v => string.IsNullOrWhiteSpace(v.Equ_ExtendTwo_Sequence) == false && Convert.ToInt32(v.Equ_ExtendTwo_Sequence) < temp_sequence).Sum(v => v.Equ_ExtendTwo_Length);
-            //            convdb.DBReadIndox = Totallength;
-            //        }
-            //        convdb.ScannSet = plc.WCS_ScannSet.Where(v => v.SCANN_STATIONNO == item.Equ_No).OrderBy(v => v.SCANN_SEQUENCE).ToList();
-            //        equDBInfoSet.Add(convdb);
-            //    }
-            //    else if (DB.DB_TYPE == (int)DB_TypeEnum.WCS读写扩展DB3)
-            //    {
-            //        if (string.IsNullOrWhiteSpace(item.Equ_ExtendThree_Sequence)) continue;
-
-            //        var convdb = new ConvDbInfo();
-            //        convdb.DBName = DB.DB_NAME;
-            //        convdb.DBType = DB_TypeEnum.WCS读写扩展DB3;
-            //        convdb.DBReadLength = item.Equ_ExtendThree_Length;
-            //        //convdb.DBReadIndox = item.Equ_ReadWriteDB_Sequence * item.Equ_ReadWriteDB_Length;
-            //        int temp_sequence = Convert.ToInt32(item.Equ_ExtendThree_Sequence);
-            //        if (temp_sequence != 0)
-            //        {
-            //            int Totallength = plc.WCS_EquipmentInfoSet.Where(v => string.IsNullOrWhiteSpace(v.Equ_ExtendThree_Sequence) == false && Convert.ToInt32(v.Equ_ExtendThree_Sequence) < temp_sequence).Sum(v => v.Equ_ExtendThree_Length);
-            //            convdb.DBReadIndox = Totallength;
-            //        }
-            //        convdb.ScannSet = plc.WCS_ScannSet.Where(v => v.SCANN_STATIONNO == item.Equ_No).OrderBy(v => v.SCANN_SEQUENCE).ToList();
-            //        equDBInfoSet.Add(convdb);
-            //    }
-            //}
-
+            List<ConvDbInfo> equDBInfoSet = new List<ConvDbInfo>();          
             return equDBInfoSet;
         }
     }

WCS_Client/Frm/FrmMain.cs

@@ -17,8 +17,7 @@ namespace WCS_Client
         public FrmMain()
         {
             InitializeComponent();
-            InitFrm();
-            WCS_Client.Frm.Current.InitData("wcs_pvc");
+            InitFrm();            
         }
 
         private void InitFrm()

WCS_Client/Frm/MBtn_Monitor/Frm_YongGuanMontior.Designer.cs

@@ -312,8 +312,8 @@
             this.con1282 = new WCS_Client.From.From_Montior.Conveyor_R();
             this.con1213 = new WCS_Client.From.From_Montior.Conveyor_R();
             this.con1209 = new WCS_Client.From.From_Montior.Conveyor_R();
-            this.con1199 = new WCS_Client.From.From_Montior.Conveyor_R();
             this.con1202 = new WCS_Client.From.From_Montior.Conveyor_R();
+            this.con1199 = new WCS_Client.From.From_Montior.Conveyor_R();
             this.con1204 = new WCS_Client.From.From_Montior.Conveyor_R();
             this.con1193 = new WCS_Client.From.From_Montior.Conveyor_R();
             this.con1190 = new WCS_Client.From.From_Montior.Conveyor_R();
@@ -922,6 +922,20 @@
             this.GV2 = new System.Windows.Forms.PictureBox();
             this.pictureBox5 = new System.Windows.Forms.PictureBox();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.tabPage3 = new System.Windows.Forms.TabPage();
+            this.myTableLayoutPanel3 = new WCS_Client.From.MyTableLayoutPanel();
+            this.con3056 = new WCS_Client.From.From_Montior.Conveyor3_B();
+            this.con3055 = new WCS_Client.From.From_Montior.Conveyor3_B();
+            this.con3058 = new WCS_Client.From.From_Montior.Conveyor3_B();
+            this.con3059 = new WCS_Client.From.From_Montior.Conveyor3_B();
+            this.con3061 = new WCS_Client.From.From_Montior.Conveyor3_B();
+            this.con3060 = new WCS_Client.From.From_Montior.Conveyor3_B();
+            this.con3064 = new WCS_Client.From.From_Montior.Conveyor3_B();
+            this.con3063 = new WCS_Client.From.From_Montior.Conveyor3_B();
+            this.con3053 = new WCS_Client.From.From_Montior.Conveyor3_B();
+            this.con3052 = new WCS_Client.From.From_Montior.Conveyor3_B();
+            this.conveyor3_B1 = new WCS_Client.From.From_Montior.Conveyor3_B();
+            this.conveyor3_B2 = new WCS_Client.From.From_Montior.Conveyor3_B();
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
             this.myTableLayoutPanel1.SuspendLayout();
@@ -998,12 +1012,15 @@
             ((System.ComponentModel.ISupportInitialize)(this.GV2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();
             this.tableLayoutPanel1.SuspendLayout();
+            this.tabPage3.SuspendLayout();
+            this.myTableLayoutPanel3.SuspendLayout();
             this.SuspendLayout();
             // 
             // tabControl1
             // 
             this.tabControl1.Controls.Add(this.tabPage1);
             this.tabControl1.Controls.Add(this.tabPage2);
+            this.tabControl1.Controls.Add(this.tabPage3);
             this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabControl1.ItemSize = new System.Drawing.Size(120, 21);
             this.tabControl1.Location = new System.Drawing.Point(0, 0);
@@ -4339,8 +4356,8 @@
             this.myTableLayoutPanel2.Controls.Add(this.con1282, 12, 44);
             this.myTableLayoutPanel2.Controls.Add(this.con1213, 42, 24);
             this.myTableLayoutPanel2.Controls.Add(this.con1209, 38, 22);
-            this.myTableLayoutPanel2.Controls.Add(this.con1199, 60, 24);
             this.myTableLayoutPanel2.Controls.Add(this.con1202, 60, 24);
+            this.myTableLayoutPanel2.Controls.Add(this.con1199, 60, 24);
             this.myTableLayoutPanel2.Controls.Add(this.con1204, 68, 24);
             this.myTableLayoutPanel2.Controls.Add(this.con1193, 86, 24);
             this.myTableLayoutPanel2.Controls.Add(this.con1190, 90, 24);
@@ -5311,29 +5328,29 @@
             this.con1209.Size = new System.Drawing.Size(44, 18);
             this.con1209.TabIndex = 1028;
             // 
-            // con1199
-            // 
-            this.con1199.BackColor = System.Drawing.Color.Transparent;
-            this.myTableLayoutPanel2.SetColumnSpan(this.con1199, 4);
-            this.con1199.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.con1199.Location = new System.Drawing.Point(660, 216);
-            this.con1199.Margin = new System.Windows.Forms.Padding(0);
-            this.con1199.Name = "con1199";
-            this.myTableLayoutPanel2.SetRowSpan(this.con1199, 2);
-            this.con1199.Size = new System.Drawing.Size(44, 18);
-            this.con1199.TabIndex = 1034;
-            // 
             // con1202
             // 
             this.con1202.BackColor = System.Drawing.Color.Transparent;
             this.myTableLayoutPanel2.SetColumnSpan(this.con1202, 4);
             this.con1202.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.con1202.Location = new System.Drawing.Point(704, 216);
+            this.con1202.Location = new System.Drawing.Point(660, 216);
             this.con1202.Margin = new System.Windows.Forms.Padding(0);
             this.con1202.Name = "con1202";
             this.myTableLayoutPanel2.SetRowSpan(this.con1202, 2);
             this.con1202.Size = new System.Drawing.Size(44, 18);
-            this.con1202.TabIndex = 1035;
+            this.con1202.TabIndex = 1034;
+            // 
+            // con1199
+            // 
+            this.con1199.BackColor = System.Drawing.Color.Transparent;
+            this.myTableLayoutPanel2.SetColumnSpan(this.con1199, 4);
+            this.con1199.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.con1199.Location = new System.Drawing.Point(704, 216);
+            this.con1199.Margin = new System.Windows.Forms.Padding(0);
+            this.con1199.Name = "con1199";
+            this.myTableLayoutPanel2.SetRowSpan(this.con1199, 2);
+            this.con1199.Size = new System.Drawing.Size(44, 18);
+            this.con1199.TabIndex = 1035;
             // 
             // con1204
             // 
@@ -13293,6 +13310,384 @@
             this.tableLayoutPanel1.Size = new System.Drawing.Size(1710, 879);
             this.tableLayoutPanel1.TabIndex = 127;
             // 
+            // tabPage3
+            // 
+            this.tabPage3.Controls.Add(this.myTableLayoutPanel3);
+            this.tabPage3.Location = new System.Drawing.Point(4, 25);
+            this.tabPage3.Name = "tabPage3";
+            this.tabPage3.Size = new System.Drawing.Size(1702, 586);
+            this.tabPage3.TabIndex = 2;
+            this.tabPage3.Text = "连廊";
+            this.tabPage3.UseVisualStyleBackColor = true;
+            // 
+            // myTableLayoutPanel3
+            // 
+            this.myTableLayoutPanel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(144)))), ((int)(((byte)(154)))));
+            this.myTableLayoutPanel3.ColumnCount = 147;
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.7160404F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6265352F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6800777F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.681731F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.681731F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.681731F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.681731F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.681731F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.681731F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.681731F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.681731F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.681731F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.681731F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.681731F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.681731F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.681731F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.681731F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.681731F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6797763F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6797763F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6797763F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6797763F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.681731F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6823825F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6823825F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6823825F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6823825F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6823825F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6823825F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6823825F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6823825F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6795904F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6795904F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6795904F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6795904F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6795904F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6795904F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6809903F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6809903F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6809903F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6809903F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6809903F));
+            this.myTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0.6809903F));
+            this.myTableLayoutPanel3.Controls.Add(this.con3056, 32, 8);
+            this.myTableLayoutPanel3.Controls.Add(this.con3055, 34, 8);
+            this.myTableLayoutPanel3.Controls.Add(this.con3058, 32, 12);
+            this.myTableLayoutPanel3.Controls.Add(this.con3059, 34, 12);
+            this.myTableLayoutPanel3.Controls.Add(this.con3061, 32, 16);
+            this.myTableLayoutPanel3.Controls.Add(this.con3060, 34, 16);
+            this.myTableLayoutPanel3.Controls.Add(this.con3064, 32, 20);
+            this.myTableLayoutPanel3.Controls.Add(this.con3063, 34, 20);
+            this.myTableLayoutPanel3.Controls.Add(this.con3053, 32, 4);
+            this.myTableLayoutPanel3.Controls.Add(this.con3052, 34, 4);
+            this.myTableLayoutPanel3.Controls.Add(this.conveyor3_B1, 34, 24);
+            this.myTableLayoutPanel3.Controls.Add(this.conveyor3_B2, 34, 28);
+            this.myTableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.myTableLayoutPanel3.Location = new System.Drawing.Point(0, 0);
+            this.myTableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.myTableLayoutPanel3.Name = "myTableLayoutPanel3";
+            this.myTableLayoutPanel3.RowCount = 59;
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.614359F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.614356F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.698966F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.698966F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.698966F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.698966F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.701804F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.701804F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.839253F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.654523F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.701804F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.701804F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.705216F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.698966F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.694767F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.694767F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.694767F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.694767F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.694767F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.694767F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.694767F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.69617F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.69617F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.614356F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.614356F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.614356F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.614356F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.614356F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.701032F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.701032F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.701032F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.701032F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.701032F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.701032F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.698966F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.698966F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.698966F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.698966F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.698966F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.71991F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.71991F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.71991F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.71991F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.71991F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.71991F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.71991F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.71991F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.71991F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.706988F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.706988F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.71991F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.71991F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.71991F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.71991F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.71991F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.722672F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.722672F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.654523F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 1.649178F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.myTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.myTableLayoutPanel3.Size = new System.Drawing.Size(1702, 586);
+            this.myTableLayoutPanel3.TabIndex = 3;
+            this.myTableLayoutPanel3.Tag = "";
+            // 
+            // con3056
+            // 
+            this.myTableLayoutPanel3.SetColumnSpan(this.con3056, 2);
+            this.con3056.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.con3056.Location = new System.Drawing.Point(352, 72);
+            this.con3056.Margin = new System.Windows.Forms.Padding(0);
+            this.con3056.Name = "con3056";
+            this.myTableLayoutPanel3.SetRowSpan(this.con3056, 4);
+            this.con3056.Size = new System.Drawing.Size(22, 37);
+            this.con3056.TabIndex = 0;
+            // 
+            // con3055
+            // 
+            this.myTableLayoutPanel3.SetColumnSpan(this.con3055, 2);
+            this.con3055.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.con3055.Location = new System.Drawing.Point(374, 72);
+            this.con3055.Margin = new System.Windows.Forms.Padding(0);
+            this.con3055.Name = "con3055";
+            this.myTableLayoutPanel3.SetRowSpan(this.con3055, 4);
+            this.con3055.Size = new System.Drawing.Size(22, 37);
+            this.con3055.TabIndex = 1;
+            // 
+            // con3058
+            // 
+            this.myTableLayoutPanel3.SetColumnSpan(this.con3058, 2);
+            this.con3058.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.con3058.Location = new System.Drawing.Point(352, 109);
+            this.con3058.Margin = new System.Windows.Forms.Padding(0);
+            this.con3058.Name = "con3058";
+            this.myTableLayoutPanel3.SetRowSpan(this.con3058, 4);
+            this.con3058.Size = new System.Drawing.Size(22, 36);
+            this.con3058.TabIndex = 2;
+            // 
+            // con3059
+            // 
+            this.myTableLayoutPanel3.SetColumnSpan(this.con3059, 2);
+            this.con3059.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.con3059.Location = new System.Drawing.Point(374, 109);
+            this.con3059.Margin = new System.Windows.Forms.Padding(0);
+            this.con3059.Name = "con3059";
+            this.myTableLayoutPanel3.SetRowSpan(this.con3059, 4);
+            this.con3059.Size = new System.Drawing.Size(22, 36);
+            this.con3059.TabIndex = 3;
+            // 
+            // con3061
+            // 
+            this.myTableLayoutPanel3.SetColumnSpan(this.con3061, 2);
+            this.con3061.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.con3061.Location = new System.Drawing.Point(352, 145);
+            this.con3061.Margin = new System.Windows.Forms.Padding(0);
+            this.con3061.Name = "con3061";
+            this.myTableLayoutPanel3.SetRowSpan(this.con3061, 4);
+            this.con3061.Size = new System.Drawing.Size(22, 36);
+            this.con3061.TabIndex = 4;
+            // 
+            // con3060
+            // 
+            this.myTableLayoutPanel3.SetColumnSpan(this.con3060, 2);
+            this.con3060.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.con3060.Location = new System.Drawing.Point(374, 145);
+            this.con3060.Margin = new System.Windows.Forms.Padding(0);
+            this.con3060.Name = "con3060";
+            this.myTableLayoutPanel3.SetRowSpan(this.con3060, 4);
+            this.con3060.Size = new System.Drawing.Size(22, 36);
+            this.con3060.TabIndex = 5;
+            // 
+            // con3064
+            // 
+            this.myTableLayoutPanel3.SetColumnSpan(this.con3064, 2);
+            this.con3064.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.con3064.Location = new System.Drawing.Point(352, 181);
+            this.con3064.Margin = new System.Windows.Forms.Padding(0);
+            this.con3064.Name = "con3064";
+            this.myTableLayoutPanel3.SetRowSpan(this.con3064, 4);
+            this.con3064.Size = new System.Drawing.Size(22, 36);
+            this.con3064.TabIndex = 6;
+            // 
+            // con3063
+            // 
+            this.myTableLayoutPanel3.SetColumnSpan(this.con3063, 2);
+            this.con3063.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.con3063.Location = new System.Drawing.Point(374, 181);
+            this.con3063.Margin = new System.Windows.Forms.Padding(0);
+            this.con3063.Name = "con3063";
+            this.myTableLayoutPanel3.SetRowSpan(this.con3063, 4);
+            this.con3063.Size = new System.Drawing.Size(22, 36);
+            this.con3063.TabIndex = 7;
+            // 
+            // con3053
+            // 
+            this.myTableLayoutPanel3.SetColumnSpan(this.con3053, 2);
+            this.con3053.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.con3053.Location = new System.Drawing.Point(352, 36);
+            this.con3053.Margin = new System.Windows.Forms.Padding(0);
+            this.con3053.Name = "con3053";
+            this.myTableLayoutPanel3.SetRowSpan(this.con3053, 4);
+            this.con3053.Size = new System.Drawing.Size(22, 36);
+            this.con3053.TabIndex = 8;
+            // 
+            // con3052
+            // 
+            this.myTableLayoutPanel3.SetColumnSpan(this.con3052, 2);
+            this.con3052.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.con3052.Location = new System.Drawing.Point(374, 36);
+            this.con3052.Margin = new System.Windows.Forms.Padding(0);
+            this.con3052.Name = "con3052";
+            this.myTableLayoutPanel3.SetRowSpan(this.con3052, 4);
+            this.con3052.Size = new System.Drawing.Size(22, 36);
+            this.con3052.TabIndex = 9;
+            // 
+            // conveyor3_B1
+            // 
+            this.myTableLayoutPanel3.SetColumnSpan(this.conveyor3_B1, 2);
+            this.conveyor3_B1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.conveyor3_B1.Location = new System.Drawing.Point(374, 217);
+            this.conveyor3_B1.Margin = new System.Windows.Forms.Padding(0);
+            this.conveyor3_B1.Name = "conveyor3_B1";
+            this.myTableLayoutPanel3.SetRowSpan(this.conveyor3_B1, 4);
+            this.conveyor3_B1.Size = new System.Drawing.Size(22, 36);
+            this.conveyor3_B1.TabIndex = 10;
+            // 
+            // conveyor3_B2
+            // 
+            this.myTableLayoutPanel3.SetColumnSpan(this.conveyor3_B2, 2);
+            this.conveyor3_B2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.conveyor3_B2.Location = new System.Drawing.Point(374, 253);
+            this.conveyor3_B2.Margin = new System.Windows.Forms.Padding(0);
+            this.conveyor3_B2.Name = "conveyor3_B2";
+            this.myTableLayoutPanel3.SetRowSpan(this.conveyor3_B2, 4);
+            this.conveyor3_B2.Size = new System.Drawing.Size(22, 36);
+            this.conveyor3_B2.TabIndex = 11;
+            // 
             // Frm_YongGuanMontior
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
@@ -13404,6 +13799,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.GV2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit();
             this.tableLayoutPanel1.ResumeLayout(false);
+            this.tabPage3.ResumeLayout(false);
+            this.myTableLayoutPanel3.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -14166,8 +14563,8 @@
         private From.From_Montior.Conveyor_R con1282;
         private From.From_Montior.Conveyor_R con1213;
         private From.From_Montior.Conveyor_R con1209;
-        private From.From_Montior.Conveyor_R con1199;
         private From.From_Montior.Conveyor_R con1202;
+        private From.From_Montior.Conveyor_R con1199;
         private From.From_Montior.Conveyor_R con1204;
         private From.From_Montior.Conveyor_R con1193;
         private From.From_Montior.Conveyor_R con1190;
@@ -14302,5 +14699,19 @@
         private From.TableCellLabel 堆垛机1;
         private From.TableCellLabel 堆垛机3;
         private From.TableCellLabel 堆垛机5;
+        private System.Windows.Forms.TabPage tabPage3;
+        private From.MyTableLayoutPanel myTableLayoutPanel3;
+        private From.From_Montior.Conveyor3_B con3056;
+        private From.From_Montior.Conveyor3_B con3055;
+        private From.From_Montior.Conveyor3_B con3058;
+        private From.From_Montior.Conveyor3_B con3059;
+        private From.From_Montior.Conveyor3_B con3061;
+        private From.From_Montior.Conveyor3_B con3060;
+        private From.From_Montior.Conveyor3_B con3064;
+        private From.From_Montior.Conveyor3_B con3063;
+        private From.From_Montior.Conveyor3_B con3053;
+        private From.From_Montior.Conveyor3_B con3052;
+        private From.From_Montior.Conveyor3_B conveyor3_B1;
+        private From.From_Montior.Conveyor3_B conveyor3_B2;
     }
 }

WCS_Client/Frm/MBtn_Monitor/Frm_YongGuanMontior.cs

@@ -705,9 +705,10 @@ namespace WCS_Client.Frm
 
         }
 
+
         #endregion
 
-       
+        
     }
 
     public class DDJSatatus

WCS_Client/Frm/MBtn_Monitor/Frm_YongGuanMontior.resx

@@ -281,7 +281,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDQAACw0B7QfALAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -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
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDQAACw0B7QfALAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -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
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -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
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -22559,7 +22559,7 @@
         Z2f/Z2f/Z2f/Z2f/Z2f/Z2f/Z2f/Z2f/Z2f/Z2f/Z2cAAA==
 </value>
   </data>
-  <data name="GV2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="pictureBox11.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
         DAAACwwBP0AiyAAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
@@ -22572,7 +22572,7 @@
         gg==
 </value>
   </data>
-  <data name="pictureBox11.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="GV2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
         DAAACwwBP0AiyAAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj

WCS_Client/Workflow/BaseWorkflow.cs

@@ -62,52 +62,7 @@ namespace WCS_Client
                             errorMsg = LangConst.PasswordError;
                         }
                     }
-                });
-
-                //using (MAction action = new MAction(TableEnum.WCS_Users))
-                //{
-                //    MDataTable mdt = action.Select();
-                //    var users = mdt.ToList<WCS_Users>();
-
-                //    var user = users.FirstOrDefault(v => v.USER_NO == use_No);
-
-                //    if (user == null)
-                //    {
-                //        errMsg = LangConst.UserNotExists;
-                //    }
-                //    else
-                //    {
-                //        if (user.USER_PWD == Md5Helper.Md5Hash(use_Pwd))
-                //        {
-                //            string user_textStr = BinaryHelper.ByteArray2BinaryStr(user.USER_TEXT);
-
-                //            string jiemastr = BinaryHelper.jiema(user_textStr);
-                //            WCS_Users userinfo = jiemastr.ToObject<WCS_Users>();
-                //            userinfo.Use_LoginTime = DateTime.Now;
-                //            string userjson = userinfo.ToJson();
-
-                //            user.USER_TEXT = BinaryHelper.BinaryStr2ByteArray(BinaryHelper.bianma(userjson));
-
-                //            action.Set("USER_TEXT", user.USER_TEXT);
-                //            string where = string.Format("USER_NO = '{0}'", user.USER_NO);
-                //            if (action.Update(where, false))
-                //            {
-                //                user.GetUserInfo(userinfo);
-                //                CurrentHelper.User = user;
-                //                //CurrentHelper.User.UserInfoItem = BinaryHelper.jiema(CurrentHelper.User.User_Text).ToObject<UserInfo>();
-                //                result = true;
-                //            }
-                //            else
-                //            {
-                //                errMsg = LangConst.UpdateError;
-                //            }
-                //        }
-                //        else
-                //        {
-                //            errMsg = LangConst.PasswordError;
-                //        }
-                //    }
-                //}
+                });              
             }
             catch (Exception ex)
             {