diff --git a/ControlMonitorClient/DBFactory.dll.config b/ControlMonitorClient/DBFactory.dll.config index bc4e272..9745ec3 100644 --- a/ControlMonitorClient/DBFactory.dll.config +++ b/ControlMonitorClient/DBFactory.dll.config @@ -3,13 +3,15 @@ - + + - + + diff --git a/ControlMonitorClient/FrmBrowseInterFace.cs b/ControlMonitorClient/FrmBrowseInterFace.cs index 2e7cf18..f05eeb7 100644 --- a/ControlMonitorClient/FrmBrowseInterFace.cs +++ b/ControlMonitorClient/FrmBrowseInterFace.cs @@ -180,7 +180,7 @@ namespace wcfControlMonitorClient var taskId = this.interfaceGridView.CurrentRow.Cells["任务编号"].Value.ToString(); if (MessageBox.Show($"您确认要任务{taskId}吗？", "操作提示：", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK) { - if (this.interfaceGridView.CurrentRow.Cells["任务编号"].Value.ToString() == "999") + if (this.interfaceGridView.CurrentRow.Cells["任务状态"].Value.ToString() == "999") { string sql1 = $"delete from IO_CONTROL where CONTROL_ID={taskId}";//删除LCS不存在的任务流程 dboM.ExceSQL(sql.ToString()); @@ -192,9 +192,7 @@ namespace wcfControlMonitorClient MessageBox.Show("任务未完成，不允许删除"); } } - //申请状态 - - + //申请状态 } private void contextMenuStrip1_Opening(object sender, CancelEventArgs e) diff --git a/ControlMonitorClient/FrmControlMonitor.designer.cs b/ControlMonitorClient/FrmControlMonitor.designer.cs index c6a6d8f..ec210af 100644 --- a/ControlMonitorClient/FrmControlMonitor.designer.cs +++ b/ControlMonitorClient/FrmControlMonitor.designer.cs @@ -1335,11 +1335,12 @@ this.tsStatus.BorderStyle = System.Windows.Forms.BorderStyle.None; this.tsStatus.Font = new System.Drawing.Font("黑体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.tsStatus.ForeColor = System.Drawing.Color.Red; - this.tsStatus.Location = new System.Drawing.Point(1, 1545); + this.tsStatus.Location = new System.Drawing.Point(1, 1931); + this.tsStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tsStatus.Multiline = true; this.tsStatus.Name = "tsStatus"; this.tsStatus.ReadOnly = true; - this.tsStatus.Size = new System.Drawing.Size(3108, 38); + this.tsStatus.Size = new System.Drawing.Size(4144, 48); this.tsStatus.TabIndex = 174; this.tsStatus.TabStop = false; this.tsStatus.Text = "..."; @@ -1351,20 +1352,21 @@ this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.tabControl1.Location = new System.Drawing.Point(0, 0); + this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(1490, 844); + this.tabControl1.Size = new System.Drawing.Size(1924, 1055); this.tabControl1.TabIndex = 241; // // tabPage1 // this.tabPage1.BackColor = System.Drawing.Color.WhiteSmoke; this.tabPage1.Controls.Add(this.plAccessorial1); - this.tabPage1.Location = new System.Drawing.Point(4, 22); - this.tabPage1.Margin = new System.Windows.Forms.Padding(2); + this.tabPage1.Location = new System.Drawing.Point(4, 25); + this.tabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(2); - this.tabPage1.Size = new System.Drawing.Size(1482, 818); + this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tabPage1.Size = new System.Drawing.Size(1916, 1026); this.tabPage1.TabIndex = 1; this.tabPage1.Text = "输送线监控画面"; // @@ -1597,8 +1599,6 @@ this.plAccessorial1.Controls.Add(this.label67); this.plAccessorial1.Controls.Add(this.label88); this.plAccessorial1.Controls.Add(this.label87); - this.plAccessorial1.Controls.Add(this.label106); - this.plAccessorial1.Controls.Add(this.label115); this.plAccessorial1.Controls.Add(this.label24); this.plAccessorial1.Controls.Add(this.label94); this.plAccessorial1.Controls.Add(this.label64); @@ -1651,28 +1651,30 @@ this.plAccessorial1.Controls.Add(this.Converyor12051tips); this.plAccessorial1.Controls.Add(this.Converyor11001tips); this.plAccessorial1.Dock = System.Windows.Forms.DockStyle.Fill; - this.plAccessorial1.Location = new System.Drawing.Point(2, 2); - this.plAccessorial1.Margin = new System.Windows.Forms.Padding(2); + this.plAccessorial1.Location = new System.Drawing.Point(3, 2); + this.plAccessorial1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.plAccessorial1.Name = "plAccessorial1"; - this.plAccessorial1.Size = new System.Drawing.Size(1478, 814); + this.plAccessorial1.Size = new System.Drawing.Size(1910, 1022); this.plAccessorial1.TabIndex = 5825; this.plAccessorial1.Tag = "17008"; // // back3 // this.back3.AutoSize = true; - this.back3.Location = new System.Drawing.Point(1015, 755); + this.back3.Location = new System.Drawing.Point(1353, 944); + this.back3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.back3.Name = "back3"; - this.back3.Size = new System.Drawing.Size(53, 12); + this.back3.Size = new System.Drawing.Size(67, 15); this.back3.TabIndex = 8363; this.back3.Text = "回退信息"; // // back2 // this.back2.AutoSize = true; - this.back2.Location = new System.Drawing.Point(1015, 717); + this.back2.Location = new System.Drawing.Point(1353, 896); + this.back2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.back2.Name = "back2"; - this.back2.Size = new System.Drawing.Size(53, 12); + this.back2.Size = new System.Drawing.Size(67, 15); this.back2.TabIndex = 8363; this.back2.Text = "回退信息"; // @@ -1680,9 +1682,10 @@ // this.Converyor11002tips.AutoSize = true; this.Converyor11002tips.ForeColor = System.Drawing.Color.IndianRed; - this.Converyor11002tips.Location = new System.Drawing.Point(958, 316); + this.Converyor11002tips.Location = new System.Drawing.Point(1277, 395); + this.Converyor11002tips.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.Converyor11002tips.Name = "Converyor11002tips"; - this.Converyor11002tips.Size = new System.Drawing.Size(65, 12); + this.Converyor11002tips.Size = new System.Drawing.Size(82, 15); this.Converyor11002tips.TabIndex = 8361; this.Converyor11002tips.Tag = "11001"; this.Converyor11002tips.Text = "条码不匹配"; @@ -1691,54 +1694,60 @@ // back1 // this.back1.AutoSize = true; - this.back1.Location = new System.Drawing.Point(1014, 683); + this.back1.Location = new System.Drawing.Point(1352, 854); + this.back1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.back1.Name = "back1"; - this.back1.Size = new System.Drawing.Size(53, 12); + this.back1.Size = new System.Drawing.Size(67, 15); this.back1.TabIndex = 8363; this.back1.Text = "回退信息"; // // back4 // this.back4.AutoSize = true; - this.back4.Location = new System.Drawing.Point(139, 717); + this.back4.Location = new System.Drawing.Point(185, 896); + this.back4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.back4.Name = "back4"; - this.back4.Size = new System.Drawing.Size(53, 12); + this.back4.Size = new System.Drawing.Size(67, 15); this.back4.TabIndex = 8363; this.back4.Text = "回退信息"; // // label144 // this.label144.AutoSize = true; - this.label144.Location = new System.Drawing.Point(968, 755); + this.label144.Location = new System.Drawing.Point(1291, 944); + this.label144.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label144.Name = "label144"; - this.label144.Size = new System.Drawing.Size(35, 12); + this.label144.Size = new System.Drawing.Size(47, 15); this.label144.TabIndex = 8362; this.label144.Text = "12004"; // // label142 // this.label142.AutoSize = true; - this.label142.Location = new System.Drawing.Point(968, 717); + this.label142.Location = new System.Drawing.Point(1291, 896); + this.label142.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label142.Name = "label142"; - this.label142.Size = new System.Drawing.Size(35, 12); + this.label142.Size = new System.Drawing.Size(47, 15); this.label142.TabIndex = 8362; this.label142.Text = "12003"; // // label141 // this.label141.AutoSize = true; - this.label141.Location = new System.Drawing.Point(967, 683); + this.label141.Location = new System.Drawing.Point(1289, 854); + this.label141.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label141.Name = "label141"; - this.label141.Size = new System.Drawing.Size(35, 12); + this.label141.Size = new System.Drawing.Size(47, 15); this.label141.TabIndex = 8362; this.label141.Text = "12001"; // // label140 // this.label140.AutoSize = true; - this.label140.Location = new System.Drawing.Point(92, 715); + this.label140.Location = new System.Drawing.Point(123, 894); + this.label140.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label140.Name = "label140"; - this.label140.Size = new System.Drawing.Size(41, 12); + this.label140.Size = new System.Drawing.Size(55, 15); this.label140.TabIndex = 8362; this.label140.Text = "12029:"; // @@ -1746,9 +1755,10 @@ // this.label138.AutoSize = true; this.label138.ForeColor = System.Drawing.Color.Red; - this.label138.Location = new System.Drawing.Point(967, 186); + this.label138.Location = new System.Drawing.Point(1289, 232); + this.label138.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label138.Name = "label138"; - this.label138.Size = new System.Drawing.Size(17, 12); + this.label138.Size = new System.Drawing.Size(22, 15); this.label138.TabIndex = 8360; this.label138.Tag = "17011"; this.label138.Text = "▲"; @@ -1757,9 +1767,10 @@ // this.label137.AutoSize = true; this.label137.ForeColor = System.Drawing.Color.Red; - this.label137.Location = new System.Drawing.Point(967, 343); + this.label137.Location = new System.Drawing.Point(1289, 429); + this.label137.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label137.Name = "label137"; - this.label137.Size = new System.Drawing.Size(17, 12); + this.label137.Size = new System.Drawing.Size(22, 15); this.label137.TabIndex = 8360; this.label137.Tag = "17010"; this.label137.Text = "▲"; @@ -1768,9 +1779,10 @@ // this.label136.AutoSize = true; this.label136.ForeColor = System.Drawing.Color.Red; - this.label136.Location = new System.Drawing.Point(968, 622); + this.label136.Location = new System.Drawing.Point(1291, 778); + this.label136.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label136.Name = "label136"; - this.label136.Size = new System.Drawing.Size(17, 12); + this.label136.Size = new System.Drawing.Size(22, 15); this.label136.TabIndex = 8360; this.label136.Tag = "17009"; this.label136.Text = "▲"; @@ -1779,9 +1791,10 @@ // this.label139.AutoSize = true; this.label139.ForeColor = System.Drawing.Color.Red; - this.label139.Location = new System.Drawing.Point(1157, 392); + this.label139.Location = new System.Drawing.Point(1543, 490); + this.label139.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label139.Name = "label139"; - this.label139.Size = new System.Drawing.Size(17, 12); + this.label139.Size = new System.Drawing.Size(22, 15); this.label139.TabIndex = 8360; this.label139.Tag = "17003"; this.label139.Text = "▲"; @@ -1790,9 +1803,10 @@ // this.label135.AutoSize = true; this.label135.ForeColor = System.Drawing.Color.Red; - this.label135.Location = new System.Drawing.Point(1157, 544); + this.label135.Location = new System.Drawing.Point(1543, 680); + this.label135.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label135.Name = "label135"; - this.label135.Size = new System.Drawing.Size(17, 12); + this.label135.Size = new System.Drawing.Size(22, 15); this.label135.TabIndex = 8360; this.label135.Tag = "17004"; this.label135.Text = "▲"; @@ -1801,9 +1815,10 @@ // this.label134.AutoSize = true; this.label134.ForeColor = System.Drawing.Color.Red; - this.label134.Location = new System.Drawing.Point(1325, 269); + this.label134.Location = new System.Drawing.Point(1767, 336); + this.label134.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label134.Name = "label134"; - this.label134.Size = new System.Drawing.Size(17, 12); + this.label134.Size = new System.Drawing.Size(22, 15); this.label134.TabIndex = 8360; this.label134.Tag = "17002"; this.label134.Text = "▲"; @@ -1812,9 +1827,10 @@ // this.label133.AutoSize = true; this.label133.ForeColor = System.Drawing.Color.Red; - this.label133.Location = new System.Drawing.Point(1128, 185); + this.label133.Location = new System.Drawing.Point(1504, 231); + this.label133.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label133.Name = "label133"; - this.label133.Size = new System.Drawing.Size(17, 12); + this.label133.Size = new System.Drawing.Size(22, 15); this.label133.TabIndex = 8360; this.label133.Tag = "17001"; this.label133.Text = "▲"; @@ -1823,9 +1839,10 @@ // this.label132.AutoSize = true; this.label132.ForeColor = System.Drawing.Color.Red; - this.label132.Location = new System.Drawing.Point(256, 100); + this.label132.Location = new System.Drawing.Point(341, 125); + this.label132.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label132.Name = "label132"; - this.label132.Size = new System.Drawing.Size(17, 12); + this.label132.Size = new System.Drawing.Size(22, 15); this.label132.TabIndex = 8360; this.label132.Tag = "17005"; this.label132.Text = "▲"; @@ -1834,9 +1851,10 @@ // this.label131.AutoSize = true; this.label131.ForeColor = System.Drawing.Color.Red; - this.label131.Location = new System.Drawing.Point(186, 187); + this.label131.Location = new System.Drawing.Point(248, 234); + this.label131.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label131.Name = "label131"; - this.label131.Size = new System.Drawing.Size(17, 12); + this.label131.Size = new System.Drawing.Size(22, 15); this.label131.TabIndex = 8360; this.label131.Tag = "17006"; this.label131.Text = "▲"; @@ -1845,9 +1863,10 @@ // this.label130.AutoSize = true; this.label130.ForeColor = System.Drawing.Color.Red; - this.label130.Location = new System.Drawing.Point(186, 271); + this.label130.Location = new System.Drawing.Point(248, 339); + this.label130.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label130.Name = "label130"; - this.label130.Size = new System.Drawing.Size(17, 12); + this.label130.Size = new System.Drawing.Size(22, 15); this.label130.TabIndex = 8360; this.label130.Tag = "17007"; this.label130.Text = "▲"; @@ -1856,9 +1875,10 @@ // this.label129.AutoSize = true; this.label129.ForeColor = System.Drawing.Color.Red; - this.label129.Location = new System.Drawing.Point(199, 541); + this.label129.Location = new System.Drawing.Point(265, 676); + this.label129.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label129.Name = "label129"; - this.label129.Size = new System.Drawing.Size(17, 12); + this.label129.Size = new System.Drawing.Size(22, 15); this.label129.TabIndex = 8360; this.label129.Tag = "17008"; this.label129.Text = "▲"; @@ -1868,10 +1888,11 @@ this.tb_11003.BackColor = System.Drawing.Color.Blue; this.tb_11003.BorderStyle = System.Windows.Forms.BorderStyle.None; this.tb_11003.Enabled = false; - this.tb_11003.Location = new System.Drawing.Point(917, 173); + this.tb_11003.Location = new System.Drawing.Point(1223, 216); + this.tb_11003.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tb_11003.Multiline = true; this.tb_11003.Name = "tb_11003"; - this.tb_11003.Size = new System.Drawing.Size(13, 13); + this.tb_11003.Size = new System.Drawing.Size(17, 16); this.tb_11003.TabIndex = 5743; this.tb_11003.Tag = "11003.0"; this.tb_11003.Visible = false; @@ -1881,10 +1902,11 @@ this.tb_11002.BackColor = System.Drawing.Color.Blue; this.tb_11002.BorderStyle = System.Windows.Forms.BorderStyle.None; this.tb_11002.Enabled = false; - this.tb_11002.Location = new System.Drawing.Point(916, 329); + this.tb_11002.Location = new System.Drawing.Point(1221, 411); + this.tb_11002.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tb_11002.Multiline = true; this.tb_11002.Name = "tb_11002"; - this.tb_11002.Size = new System.Drawing.Size(13, 13); + this.tb_11002.Size = new System.Drawing.Size(17, 16); this.tb_11002.TabIndex = 5743; this.tb_11002.Tag = "11002.0"; this.tb_11002.Visible = false; @@ -1893,9 +1915,10 @@ // this.bt_11003.BackColor = System.Drawing.Color.DarkOrange; this.bt_11003.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.bt_11003.Location = new System.Drawing.Point(905, 165); + this.bt_11003.Location = new System.Drawing.Point(1207, 206); + this.bt_11003.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bt_11003.Name = "bt_11003"; - this.bt_11003.Size = new System.Drawing.Size(47, 28); + this.bt_11003.Size = new System.Drawing.Size(63, 35); this.bt_11003.TabIndex = 5742; this.bt_11003.Tag = "11003"; this.bt_11003.Text = "11003"; @@ -1906,10 +1929,11 @@ this.tb_11001.BackColor = System.Drawing.Color.Blue; this.tb_11001.BorderStyle = System.Windows.Forms.BorderStyle.None; this.tb_11001.Enabled = false; - this.tb_11001.Location = new System.Drawing.Point(922, 604); + this.tb_11001.Location = new System.Drawing.Point(1229, 755); + this.tb_11001.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tb_11001.Multiline = true; this.tb_11001.Name = "tb_11001"; - this.tb_11001.Size = new System.Drawing.Size(13, 13); + this.tb_11001.Size = new System.Drawing.Size(17, 16); this.tb_11001.TabIndex = 5743; this.tb_11001.Tag = "11001.0"; this.tb_11001.Visible = false; @@ -1918,9 +1942,10 @@ // this.bt_11002.BackColor = System.Drawing.Color.DarkOrange; this.bt_11002.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.bt_11002.Location = new System.Drawing.Point(905, 321); + this.bt_11002.Location = new System.Drawing.Point(1207, 401); + this.bt_11002.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bt_11002.Name = "bt_11002"; - this.bt_11002.Size = new System.Drawing.Size(47, 28); + this.bt_11002.Size = new System.Drawing.Size(63, 35); this.bt_11002.TabIndex = 5742; this.bt_11002.Tag = "11002"; this.bt_11002.Text = "11002"; @@ -1930,9 +1955,10 @@ // this.button95.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button95.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button95.Location = new System.Drawing.Point(1022, 311); + this.button95.Location = new System.Drawing.Point(1363, 389); + this.button95.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button95.Name = "button95"; - this.button95.Size = new System.Drawing.Size(63, 17); + this.button95.Size = new System.Drawing.Size(84, 21); this.button95.TabIndex = 8358; this.button95.Tag = "15001"; this.button95.Text = "15001"; @@ -1942,9 +1968,10 @@ // this.bt_11001.BackColor = System.Drawing.Color.DarkOrange; this.bt_11001.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.bt_11001.Location = new System.Drawing.Point(908, 596); + this.bt_11001.Location = new System.Drawing.Point(1211, 745); + this.bt_11001.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bt_11001.Name = "bt_11001"; - this.bt_11001.Size = new System.Drawing.Size(47, 28); + this.bt_11001.Size = new System.Drawing.Size(63, 35); this.bt_11001.TabIndex = 5742; this.bt_11001.Tag = "11001"; this.bt_11001.Text = "11001"; @@ -1956,9 +1983,10 @@ this.label105.BackColor = System.Drawing.Color.Transparent; this.label105.Enabled = false; this.label105.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label105.Location = new System.Drawing.Point(22, 556); + this.label105.Location = new System.Drawing.Point(29, 695); + this.label105.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label105.Name = "label105"; - this.label105.Size = new System.Drawing.Size(83, 12); + this.label105.Size = new System.Drawing.Size(107, 15); this.label105.TabIndex = 8357; this.label105.Text = "11001联机停车"; // @@ -1968,9 +1996,10 @@ this.label104.BackColor = System.Drawing.Color.Transparent; this.label104.Enabled = false; this.label104.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label104.Location = new System.Drawing.Point(21, 233); + this.label104.Location = new System.Drawing.Point(28, 291); + this.label104.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label104.Name = "label104"; - this.label104.Size = new System.Drawing.Size(83, 12); + this.label104.Size = new System.Drawing.Size(107, 15); this.label104.TabIndex = 8357; this.label104.Text = "11002联机停车"; // @@ -1980,18 +2009,20 @@ this.label114.BackColor = System.Drawing.Color.Transparent; this.label114.Enabled = false; this.label114.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label114.Location = new System.Drawing.Point(10, 112); + this.label114.Location = new System.Drawing.Point(13, 140); + this.label114.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label114.Name = "label114"; - this.label114.Size = new System.Drawing.Size(83, 12); + this.label114.Size = new System.Drawing.Size(107, 15); this.label114.TabIndex = 8357; this.label114.Text = "11003联机停车"; // // pictureBox3 // this.pictureBox3.Image = global::wcfControlMonitorClient.Properties.Resources.stop_0; - this.pictureBox3.Location = new System.Drawing.Point(53, 586); + this.pictureBox3.Location = new System.Drawing.Point(71, 732); + this.pictureBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.Size = new System.Drawing.Size(40, 38); + this.pictureBox3.Size = new System.Drawing.Size(53, 48); this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox3.TabIndex = 8355; this.pictureBox3.TabStop = false; @@ -2000,9 +2031,10 @@ // pictureBox2 // this.pictureBox2.Image = global::wcfControlMonitorClient.Properties.Resources.stop_0; - this.pictureBox2.Location = new System.Drawing.Point(53, 258); + this.pictureBox2.Location = new System.Drawing.Point(71, 322); + this.pictureBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(40, 38); + this.pictureBox2.Size = new System.Drawing.Size(53, 48); this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox2.TabIndex = 8355; this.pictureBox2.TabStop = false; @@ -2011,9 +2043,10 @@ // pictureBox21 // this.pictureBox21.Image = global::wcfControlMonitorClient.Properties.Resources.NoEntry; - this.pictureBox21.Location = new System.Drawing.Point(1363, 531); + this.pictureBox21.Location = new System.Drawing.Point(1817, 664); + this.pictureBox21.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox21.Name = "pictureBox21"; - this.pictureBox21.Size = new System.Drawing.Size(34, 37); + this.pictureBox21.Size = new System.Drawing.Size(45, 46); this.pictureBox21.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox21.TabIndex = 8355; this.pictureBox21.TabStop = false; @@ -2022,9 +2055,10 @@ // pictureBox23 // this.pictureBox23.Image = global::wcfControlMonitorClient.Properties.Resources.NoEntry; - this.pictureBox23.Location = new System.Drawing.Point(1363, 292); + this.pictureBox23.Location = new System.Drawing.Point(1817, 365); + this.pictureBox23.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox23.Name = "pictureBox23"; - this.pictureBox23.Size = new System.Drawing.Size(34, 37); + this.pictureBox23.Size = new System.Drawing.Size(45, 46); this.pictureBox23.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox23.TabIndex = 8355; this.pictureBox23.TabStop = false; @@ -2033,9 +2067,10 @@ // pictureBox25 // this.pictureBox25.Image = global::wcfControlMonitorClient.Properties.Resources.NoEntry; - this.pictureBox25.Location = new System.Drawing.Point(1111, 76); + this.pictureBox25.Location = new System.Drawing.Point(1481, 95); + this.pictureBox25.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox25.Name = "pictureBox25"; - this.pictureBox25.Size = new System.Drawing.Size(34, 37); + this.pictureBox25.Size = new System.Drawing.Size(45, 46); this.pictureBox25.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox25.TabIndex = 8355; this.pictureBox25.TabStop = false; @@ -2044,9 +2079,10 @@ // pictureBox22 // this.pictureBox22.Image = global::wcfControlMonitorClient.Properties.Resources.NoEntry; - this.pictureBox22.Location = new System.Drawing.Point(1363, 141); + this.pictureBox22.Location = new System.Drawing.Point(1817, 176); + this.pictureBox22.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox22.Name = "pictureBox22"; - this.pictureBox22.Size = new System.Drawing.Size(34, 37); + this.pictureBox22.Size = new System.Drawing.Size(45, 46); this.pictureBox22.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox22.TabIndex = 8355; this.pictureBox22.TabStop = false; @@ -2055,9 +2091,10 @@ // pictureBox19 // this.pictureBox19.Image = global::wcfControlMonitorClient.Properties.Resources.NoEntry; - this.pictureBox19.Location = new System.Drawing.Point(1363, 409); + this.pictureBox19.Location = new System.Drawing.Point(1817, 511); + this.pictureBox19.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox19.Name = "pictureBox19"; - this.pictureBox19.Size = new System.Drawing.Size(34, 37); + this.pictureBox19.Size = new System.Drawing.Size(45, 46); this.pictureBox19.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox19.TabIndex = 8355; this.pictureBox19.TabStop = false; @@ -2066,9 +2103,10 @@ // pictureBox18 // this.pictureBox18.Image = global::wcfControlMonitorClient.Properties.Resources.NoEntry; - this.pictureBox18.Location = new System.Drawing.Point(1093, 633); + this.pictureBox18.Location = new System.Drawing.Point(1457, 791); + this.pictureBox18.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox18.Name = "pictureBox18"; - this.pictureBox18.Size = new System.Drawing.Size(34, 37); + this.pictureBox18.Size = new System.Drawing.Size(45, 46); this.pictureBox18.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox18.TabIndex = 8355; this.pictureBox18.TabStop = false; @@ -2077,9 +2115,10 @@ // pictureBox30 // this.pictureBox30.Image = global::wcfControlMonitorClient.Properties.Resources.NoEntry; - this.pictureBox30.Location = new System.Drawing.Point(150, 314); + this.pictureBox30.Location = new System.Drawing.Point(200, 392); + this.pictureBox30.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox30.Name = "pictureBox30"; - this.pictureBox30.Size = new System.Drawing.Size(27, 28); + this.pictureBox30.Size = new System.Drawing.Size(36, 35); this.pictureBox30.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox30.TabIndex = 8355; this.pictureBox30.TabStop = false; @@ -2088,9 +2127,10 @@ // pictureBox29 // this.pictureBox29.Image = global::wcfControlMonitorClient.Properties.Resources.NoEntry; - this.pictureBox29.Location = new System.Drawing.Point(338, 399); + this.pictureBox29.Location = new System.Drawing.Point(451, 499); + this.pictureBox29.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox29.Name = "pictureBox29"; - this.pictureBox29.Size = new System.Drawing.Size(27, 28); + this.pictureBox29.Size = new System.Drawing.Size(36, 35); this.pictureBox29.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox29.TabIndex = 8355; this.pictureBox29.TabStop = false; @@ -2099,9 +2139,10 @@ // pictureBox28 // this.pictureBox28.Image = global::wcfControlMonitorClient.Properties.Resources.NoEntry; - this.pictureBox28.Location = new System.Drawing.Point(150, 500); + this.pictureBox28.Location = new System.Drawing.Point(200, 625); + this.pictureBox28.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox28.Name = "pictureBox28"; - this.pictureBox28.Size = new System.Drawing.Size(27, 28); + this.pictureBox28.Size = new System.Drawing.Size(36, 35); this.pictureBox28.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox28.TabIndex = 8355; this.pictureBox28.TabStop = false; @@ -2110,9 +2151,10 @@ // pictureBox27 // this.pictureBox27.Image = global::wcfControlMonitorClient.Properties.Resources.NoEntry; - this.pictureBox27.Location = new System.Drawing.Point(347, 625); + this.pictureBox27.Location = new System.Drawing.Point(463, 781); + this.pictureBox27.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox27.Name = "pictureBox27"; - this.pictureBox27.Size = new System.Drawing.Size(27, 28); + this.pictureBox27.Size = new System.Drawing.Size(36, 35); this.pictureBox27.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox27.TabIndex = 8355; this.pictureBox27.TabStop = false; @@ -2121,9 +2163,10 @@ // pictureBox10 // this.pictureBox10.Image = global::wcfControlMonitorClient.Properties.Resources.NoEntry; - this.pictureBox10.Location = new System.Drawing.Point(706, 701); + this.pictureBox10.Location = new System.Drawing.Point(941, 876); + this.pictureBox10.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox10.Name = "pictureBox10"; - this.pictureBox10.Size = new System.Drawing.Size(27, 28); + this.pictureBox10.Size = new System.Drawing.Size(36, 35); this.pictureBox10.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox10.TabIndex = 8355; this.pictureBox10.TabStop = false; @@ -2132,9 +2175,10 @@ // pictureBox17 // this.pictureBox17.Image = global::wcfControlMonitorClient.Properties.Resources.NoEntry; - this.pictureBox17.Location = new System.Drawing.Point(706, 500); + this.pictureBox17.Location = new System.Drawing.Point(941, 625); + this.pictureBox17.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox17.Name = "pictureBox17"; - this.pictureBox17.Size = new System.Drawing.Size(27, 28); + this.pictureBox17.Size = new System.Drawing.Size(36, 35); this.pictureBox17.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox17.TabIndex = 8355; this.pictureBox17.TabStop = false; @@ -2143,9 +2187,10 @@ // pictureBox9 // this.pictureBox9.Image = global::wcfControlMonitorClient.Properties.Resources.NoEntry; - this.pictureBox9.Location = new System.Drawing.Point(706, 417); + this.pictureBox9.Location = new System.Drawing.Point(941, 521); + this.pictureBox9.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox9.Name = "pictureBox9"; - this.pictureBox9.Size = new System.Drawing.Size(27, 28); + this.pictureBox9.Size = new System.Drawing.Size(36, 35); this.pictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox9.TabIndex = 8355; this.pictureBox9.TabStop = false; @@ -2154,9 +2199,10 @@ // pictureBox8 // this.pictureBox8.Image = global::wcfControlMonitorClient.Properties.Resources.NoEntry; - this.pictureBox8.Location = new System.Drawing.Point(706, 256); + this.pictureBox8.Location = new System.Drawing.Point(941, 320); + this.pictureBox8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox8.Name = "pictureBox8"; - this.pictureBox8.Size = new System.Drawing.Size(27, 28); + this.pictureBox8.Size = new System.Drawing.Size(36, 35); this.pictureBox8.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox8.TabIndex = 8355; this.pictureBox8.TabStop = false; @@ -2165,9 +2211,10 @@ // pictureBox7 // this.pictureBox7.Image = global::wcfControlMonitorClient.Properties.Resources.NoEntry; - this.pictureBox7.Location = new System.Drawing.Point(700, 64); + this.pictureBox7.Location = new System.Drawing.Point(933, 80); + this.pictureBox7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox7.Name = "pictureBox7"; - this.pictureBox7.Size = new System.Drawing.Size(33, 31); + this.pictureBox7.Size = new System.Drawing.Size(44, 39); this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox7.TabIndex = 8355; this.pictureBox7.TabStop = false; @@ -2176,9 +2223,10 @@ // pictureBox5 // this.pictureBox5.Image = global::wcfControlMonitorClient.Properties.Resources.NoEntry; - this.pictureBox5.Location = new System.Drawing.Point(389, 64); + this.pictureBox5.Location = new System.Drawing.Point(519, 80); + this.pictureBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox5.Name = "pictureBox5"; - this.pictureBox5.Size = new System.Drawing.Size(31, 30); + this.pictureBox5.Size = new System.Drawing.Size(41, 38); this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox5.TabIndex = 8355; this.pictureBox5.TabStop = false; @@ -2187,9 +2235,10 @@ // pictureBox4 // this.pictureBox4.Image = global::wcfControlMonitorClient.Properties.Resources.NoEntry; - this.pictureBox4.Location = new System.Drawing.Point(175, 68); + this.pictureBox4.Location = new System.Drawing.Point(233, 85); + this.pictureBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox4.Name = "pictureBox4"; - this.pictureBox4.Size = new System.Drawing.Size(28, 27); + this.pictureBox4.Size = new System.Drawing.Size(37, 34); this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox4.TabIndex = 8355; this.pictureBox4.TabStop = false; @@ -2198,9 +2247,10 @@ // pictureBox26 // this.pictureBox26.Image = global::wcfControlMonitorClient.Properties.Resources.stop_0; - this.pictureBox26.Location = new System.Drawing.Point(53, 137); + this.pictureBox26.Location = new System.Drawing.Point(71, 171); + this.pictureBox26.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox26.Name = "pictureBox26"; - this.pictureBox26.Size = new System.Drawing.Size(40, 38); + this.pictureBox26.Size = new System.Drawing.Size(53, 48); this.pictureBox26.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox26.TabIndex = 8355; this.pictureBox26.TabStop = false; @@ -2211,10 +2261,11 @@ this.textBox98.BackColor = System.Drawing.Color.Blue; this.textBox98.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox98.Enabled = false; - this.textBox98.Location = new System.Drawing.Point(1063, 525); + this.textBox98.Location = new System.Drawing.Point(1417, 656); + this.textBox98.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox98.Multiline = true; this.textBox98.Name = "textBox98"; - this.textBox98.Size = new System.Drawing.Size(13, 13); + this.textBox98.Size = new System.Drawing.Size(17, 16); this.textBox98.TabIndex = 5999; this.textBox98.Tag = "12022.0"; this.textBox98.Visible = false; @@ -2224,10 +2275,11 @@ this.textBox97.BackColor = System.Drawing.Color.Blue; this.textBox97.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox97.Enabled = false; - this.textBox97.Location = new System.Drawing.Point(1063, 466); + this.textBox97.Location = new System.Drawing.Point(1417, 582); + this.textBox97.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox97.Multiline = true; this.textBox97.Name = "textBox97"; - this.textBox97.Size = new System.Drawing.Size(13, 13); + this.textBox97.Size = new System.Drawing.Size(17, 16); this.textBox97.TabIndex = 5970; this.textBox97.Tag = "12021.0"; this.textBox97.Visible = false; @@ -2237,10 +2289,11 @@ this.textBox96.BackColor = System.Drawing.Color.Blue; this.textBox96.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox96.Enabled = false; - this.textBox96.Location = new System.Drawing.Point(1063, 409); + this.textBox96.Location = new System.Drawing.Point(1417, 511); + this.textBox96.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox96.Multiline = true; this.textBox96.Name = "textBox96"; - this.textBox96.Size = new System.Drawing.Size(13, 13); + this.textBox96.Size = new System.Drawing.Size(17, 16); this.textBox96.TabIndex = 5969; this.textBox96.Tag = "12020.0"; this.textBox96.Visible = false; @@ -2249,9 +2302,10 @@ // this.button79.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button79.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button79.Location = new System.Drawing.Point(1055, 384); + this.button79.Location = new System.Drawing.Point(1407, 480); + this.button79.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button79.Name = "button79"; - this.button79.Size = new System.Drawing.Size(31, 61); + this.button79.Size = new System.Drawing.Size(41, 76); this.button79.TabIndex = 5930; this.button79.Tag = "12020"; this.button79.Text = "12020"; @@ -2263,9 +2317,10 @@ this.label89.BackColor = System.Drawing.Color.Transparent; this.label89.Enabled = false; this.label89.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label89.Location = new System.Drawing.Point(1039, 408); + this.label89.Location = new System.Drawing.Point(1385, 510); + this.label89.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label89.Name = "label89"; - this.label89.Size = new System.Drawing.Size(17, 12); + this.label89.Size = new System.Drawing.Size(22, 15); this.label89.TabIndex = 5875; this.label89.Text = "↓"; // @@ -2274,10 +2329,11 @@ this.textBox90.BackColor = System.Drawing.Color.Blue; this.textBox90.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox90.Enabled = false; - this.textBox90.Location = new System.Drawing.Point(1062, 252); + this.textBox90.Location = new System.Drawing.Point(1416, 315); + this.textBox90.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox90.Multiline = true; this.textBox90.Name = "textBox90"; - this.textBox90.Size = new System.Drawing.Size(13, 13); + this.textBox90.Size = new System.Drawing.Size(17, 16); this.textBox90.TabIndex = 6023; this.textBox90.Tag = "12012.0"; this.textBox90.Visible = false; @@ -2288,9 +2344,10 @@ this.label90.BackColor = System.Drawing.Color.Transparent; this.label90.Enabled = false; this.label90.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label90.Location = new System.Drawing.Point(1039, 467); + this.label90.Location = new System.Drawing.Point(1385, 584); + this.label90.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label90.Name = "label90"; - this.label90.Size = new System.Drawing.Size(17, 12); + this.label90.Size = new System.Drawing.Size(22, 15); this.label90.TabIndex = 5877; this.label90.Text = "↓"; // @@ -2298,9 +2355,10 @@ // this.button73.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button73.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button73.Location = new System.Drawing.Point(1055, 227); + this.button73.Location = new System.Drawing.Point(1407, 284); + this.button73.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button73.Name = "button73"; - this.button73.Size = new System.Drawing.Size(31, 61); + this.button73.Size = new System.Drawing.Size(41, 76); this.button73.TabIndex = 6022; this.button73.Tag = "12012"; this.button73.Text = "12012"; @@ -2312,9 +2370,10 @@ this.label92.BackColor = System.Drawing.Color.Transparent; this.label92.Enabled = false; this.label92.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label92.Location = new System.Drawing.Point(1039, 524); + this.label92.Location = new System.Drawing.Point(1385, 655); + this.label92.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label92.Name = "label92"; - this.label92.Size = new System.Drawing.Size(17, 12); + this.label92.Size = new System.Drawing.Size(22, 15); this.label92.TabIndex = 5880; this.label92.Text = "↓"; // @@ -2324,9 +2383,10 @@ this.label79.BackColor = System.Drawing.Color.Transparent; this.label79.Enabled = false; this.label79.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label79.Location = new System.Drawing.Point(1039, 250); + this.label79.Location = new System.Drawing.Point(1385, 312); + this.label79.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label79.Name = "label79"; - this.label79.Size = new System.Drawing.Size(17, 12); + this.label79.Size = new System.Drawing.Size(22, 15); this.label79.TabIndex = 6021; this.label79.Text = "↓"; // @@ -2334,9 +2394,10 @@ // this.button80.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button80.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button80.Location = new System.Drawing.Point(1055, 443); + this.button80.Location = new System.Drawing.Point(1407, 554); + this.button80.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button80.Name = "button80"; - this.button80.Size = new System.Drawing.Size(31, 61); + this.button80.Size = new System.Drawing.Size(41, 76); this.button80.TabIndex = 5929; this.button80.Tag = "12021"; this.button80.Text = "12021"; @@ -2346,9 +2407,10 @@ // this.button81.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button81.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button81.Location = new System.Drawing.Point(1055, 500); + this.button81.Location = new System.Drawing.Point(1407, 625); + this.button81.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button81.Name = "button81"; - this.button81.Size = new System.Drawing.Size(31, 61); + this.button81.Size = new System.Drawing.Size(41, 76); this.button81.TabIndex = 5928; this.button81.Tag = "12022"; this.button81.Text = "12022"; @@ -2360,37 +2422,39 @@ this.panel9.Controls.Add(this.label119); this.panel9.Controls.Add(this.label111); this.panel9.Controls.Add(this.panel8); - this.panel9.Location = new System.Drawing.Point(509, 357); - this.panel9.Margin = new System.Windows.Forms.Padding(2); + this.panel9.Location = new System.Drawing.Point(679, 446); + this.panel9.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel9.Name = "panel9"; - this.panel9.Size = new System.Drawing.Size(412, 29); + this.panel9.Size = new System.Drawing.Size(549, 36); this.panel9.TabIndex = 6008; // // label119 // this.label119.AutoSize = true; - this.label119.Location = new System.Drawing.Point(115, 11); + this.label119.Location = new System.Drawing.Point(153, 14); + this.label119.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label119.Name = "label119"; - this.label119.Size = new System.Drawing.Size(71, 12); + this.label119.Size = new System.Drawing.Size(90, 15); this.label119.TabIndex = 8359; this.label119.Text = "2巷道常温库"; // // label111 // this.label111.AutoSize = true; - this.label111.Location = new System.Drawing.Point(213, 7); + this.label111.Location = new System.Drawing.Point(284, 9); + this.label111.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label111.Name = "label111"; - this.label111.Size = new System.Drawing.Size(23, 12); + this.label111.Size = new System.Drawing.Size(30, 15); this.label111.TabIndex = 0; this.label111.Text = "6排"; // // panel8 // this.panel8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.panel8.Location = new System.Drawing.Point(0, 26); - this.panel8.Margin = new System.Windows.Forms.Padding(2); + this.panel8.Location = new System.Drawing.Point(0, 32); + this.panel8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(412, 29); + this.panel8.Size = new System.Drawing.Size(549, 36); this.panel8.TabIndex = 5820; // // panel14 @@ -2398,27 +2462,29 @@ this.panel14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.panel14.Controls.Add(this.label120); this.panel14.Controls.Add(this.label115); - this.panel14.Location = new System.Drawing.Point(509, 200); - this.panel14.Margin = new System.Windows.Forms.Padding(2); + this.panel14.Location = new System.Drawing.Point(679, 250); + this.panel14.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel14.Name = "panel14"; - this.panel14.Size = new System.Drawing.Size(412, 29); + this.panel14.Size = new System.Drawing.Size(549, 36); this.panel14.TabIndex = 6017; // // label120 // this.label120.AutoSize = true; - this.label120.Location = new System.Drawing.Point(115, 8); + this.label120.Location = new System.Drawing.Point(153, 10); + this.label120.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label120.Name = "label120"; - this.label120.Size = new System.Drawing.Size(71, 12); + this.label120.Size = new System.Drawing.Size(90, 15); this.label120.TabIndex = 8359; this.label120.Text = "3巷道常温库"; // // label115 // this.label115.AutoSize = true; - this.label115.Location = new System.Drawing.Point(213, 11); + this.label115.Location = new System.Drawing.Point(276, 10); + this.label115.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label115.Name = "label115"; - this.label115.Size = new System.Drawing.Size(29, 12); + this.label115.Size = new System.Drawing.Size(38, 15); this.label115.TabIndex = 0; this.label115.Text = "10排"; // @@ -2426,39 +2492,41 @@ // this.panel16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.panel16.Controls.Add(this.label127); - this.panel16.Controls.Add(this.label106); this.panel16.Controls.Add(this.panel17); - this.panel16.Location = new System.Drawing.Point(516, 664); - this.panel16.Margin = new System.Windows.Forms.Padding(2); + this.panel16.Controls.Add(this.label106); + this.panel16.Location = new System.Drawing.Point(688, 830); + this.panel16.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel16.Name = "panel16"; - this.panel16.Size = new System.Drawing.Size(412, 29); + this.panel16.Size = new System.Drawing.Size(549, 36); this.panel16.TabIndex = 6010; // // label127 // this.label127.AutoSize = true; - this.label127.Location = new System.Drawing.Point(108, 7); + this.label127.Location = new System.Drawing.Point(144, 9); + this.label127.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label127.Name = "label127"; - this.label127.Size = new System.Drawing.Size(71, 12); + this.label127.Size = new System.Drawing.Size(90, 15); this.label127.TabIndex = 8359; this.label127.Text = "1巷道低温库"; // // label106 // this.label106.AutoSize = true; - this.label106.Location = new System.Drawing.Point(206, 7); + this.label106.Location = new System.Drawing.Point(275, 9); + this.label106.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label106.Name = "label106"; - this.label106.Size = new System.Drawing.Size(23, 12); + this.label106.Size = new System.Drawing.Size(30, 15); this.label106.TabIndex = 0; this.label106.Text = "1排"; // // panel17 // this.panel17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.panel17.Location = new System.Drawing.Point(0, 34); - this.panel17.Margin = new System.Windows.Forms.Padding(2); + this.panel17.Location = new System.Drawing.Point(0, 42); + this.panel17.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel17.Name = "panel17"; - this.panel17.Size = new System.Drawing.Size(412, 29); + this.panel17.Size = new System.Drawing.Size(549, 36); this.panel17.TabIndex = 5820; // // panel4 @@ -2467,37 +2535,39 @@ this.panel4.Controls.Add(this.label126); this.panel4.Controls.Add(this.label107); this.panel4.Controls.Add(this.panel3); - this.panel4.Location = new System.Drawing.Point(516, 632); - this.panel4.Margin = new System.Windows.Forms.Padding(2); + this.panel4.Location = new System.Drawing.Point(688, 790); + this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(412, 29); + this.panel4.Size = new System.Drawing.Size(549, 36); this.panel4.TabIndex = 6009; // // label126 // this.label126.AutoSize = true; - this.label126.Location = new System.Drawing.Point(107, 9); + this.label126.Location = new System.Drawing.Point(143, 11); + this.label126.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label126.Name = "label126"; - this.label126.Size = new System.Drawing.Size(71, 12); + this.label126.Size = new System.Drawing.Size(90, 15); this.label126.TabIndex = 8359; this.label126.Text = "1巷道低温库"; // // label107 // this.label107.AutoSize = true; - this.label107.Location = new System.Drawing.Point(206, 9); + this.label107.Location = new System.Drawing.Point(275, 11); + this.label107.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label107.Name = "label107"; - this.label107.Size = new System.Drawing.Size(23, 12); + this.label107.Size = new System.Drawing.Size(30, 15); this.label107.TabIndex = 0; this.label107.Text = "2排"; // // panel3 // this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.panel3.Location = new System.Drawing.Point(0, 34); - this.panel3.Margin = new System.Windows.Forms.Padding(2); + this.panel3.Location = new System.Drawing.Point(0, 42); + this.panel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(412, 29); + this.panel3.Size = new System.Drawing.Size(549, 36); this.panel3.TabIndex = 5820; // // panel7 @@ -2505,27 +2575,29 @@ this.panel7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.panel7.Controls.Add(this.label128); this.panel7.Controls.Add(this.label110); - this.panel7.Location = new System.Drawing.Point(509, 386); - this.panel7.Margin = new System.Windows.Forms.Padding(2); + this.panel7.Location = new System.Drawing.Point(679, 482); + this.panel7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(412, 29); + this.panel7.Size = new System.Drawing.Size(549, 36); this.panel7.TabIndex = 6011; // // label128 // this.label128.AutoSize = true; - this.label128.Location = new System.Drawing.Point(114, 13); + this.label128.Location = new System.Drawing.Point(152, 16); + this.label128.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label128.Name = "label128"; - this.label128.Size = new System.Drawing.Size(71, 12); + this.label128.Size = new System.Drawing.Size(90, 15); this.label128.TabIndex = 8359; this.label128.Text = "2巷道常温库"; // // label110 // this.label110.AutoSize = true; - this.label110.Location = new System.Drawing.Point(213, 13); + this.label110.Location = new System.Drawing.Point(284, 16); + this.label110.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label110.Name = "label110"; - this.label110.Size = new System.Drawing.Size(23, 12); + this.label110.Size = new System.Drawing.Size(30, 15); this.label110.TabIndex = 0; this.label110.Text = "5排"; // @@ -2534,27 +2606,29 @@ this.panel13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.panel13.Controls.Add(this.label122); this.panel13.Controls.Add(this.label113); - this.panel13.Location = new System.Drawing.Point(509, 229); - this.panel13.Margin = new System.Windows.Forms.Padding(2); + this.panel13.Location = new System.Drawing.Point(679, 286); + this.panel13.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel13.Name = "panel13"; - this.panel13.Size = new System.Drawing.Size(412, 29); + this.panel13.Size = new System.Drawing.Size(549, 36); this.panel13.TabIndex = 6012; // // label122 // this.label122.AutoSize = true; - this.label122.Location = new System.Drawing.Point(114, 9); + this.label122.Location = new System.Drawing.Point(152, 11); + this.label122.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label122.Name = "label122"; - this.label122.Size = new System.Drawing.Size(71, 12); + this.label122.Size = new System.Drawing.Size(90, 15); this.label122.TabIndex = 8359; this.label122.Text = "3巷道常温库"; // // label113 // this.label113.AutoSize = true; - this.label113.Location = new System.Drawing.Point(213, 9); + this.label113.Location = new System.Drawing.Point(284, 11); + this.label113.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label113.Name = "label113"; - this.label113.Size = new System.Drawing.Size(23, 12); + this.label113.Size = new System.Drawing.Size(30, 15); this.label113.TabIndex = 0; this.label113.Text = "9排"; // @@ -2563,27 +2637,29 @@ this.panel6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.panel6.Controls.Add(this.label123); this.panel6.Controls.Add(this.label112); - this.panel6.Location = new System.Drawing.Point(509, 285); - this.panel6.Margin = new System.Windows.Forms.Padding(2); + this.panel6.Location = new System.Drawing.Point(679, 356); + this.panel6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(412, 30); + this.panel6.Size = new System.Drawing.Size(549, 38); this.panel6.TabIndex = 6013; // // label123 // this.label123.AutoSize = true; - this.label123.Location = new System.Drawing.Point(115, 11); + this.label123.Location = new System.Drawing.Point(153, 14); + this.label123.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label123.Name = "label123"; - this.label123.Size = new System.Drawing.Size(71, 12); + this.label123.Size = new System.Drawing.Size(90, 15); this.label123.TabIndex = 8359; this.label123.Text = "2巷道常温库"; // // label112 // this.label112.AutoSize = true; - this.label112.Location = new System.Drawing.Point(213, 12); + this.label112.Location = new System.Drawing.Point(284, 15); + this.label112.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label112.Name = "label112"; - this.label112.Size = new System.Drawing.Size(23, 12); + this.label112.Size = new System.Drawing.Size(30, 15); this.label112.TabIndex = 0; this.label112.Text = "7排"; // @@ -2592,27 +2668,29 @@ this.panel12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.panel12.Controls.Add(this.label118); this.panel12.Controls.Add(this.label117); - this.panel12.Location = new System.Drawing.Point(509, 100); - this.panel12.Margin = new System.Windows.Forms.Padding(2); + this.panel12.Location = new System.Drawing.Point(679, 125); + this.panel12.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel12.Name = "panel12"; - this.panel12.Size = new System.Drawing.Size(412, 29); + this.panel12.Size = new System.Drawing.Size(549, 36); this.panel12.TabIndex = 6014; // // label118 // this.label118.AutoSize = true; - this.label118.Location = new System.Drawing.Point(115, 12); + this.label118.Location = new System.Drawing.Point(153, 15); + this.label118.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label118.Name = "label118"; - this.label118.Size = new System.Drawing.Size(71, 12); + this.label118.Size = new System.Drawing.Size(90, 15); this.label118.TabIndex = 8359; this.label118.Text = "3巷道常温库"; // // label117 // this.label117.AutoSize = true; - this.label117.Location = new System.Drawing.Point(207, 12); + this.label117.Location = new System.Drawing.Point(276, 15); + this.label117.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label117.Name = "label117"; - this.label117.Size = new System.Drawing.Size(29, 12); + this.label117.Size = new System.Drawing.Size(38, 15); this.label117.TabIndex = 0; this.label117.Text = "12排"; // @@ -2621,27 +2699,29 @@ this.panel11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.panel11.Controls.Add(this.label121); this.panel11.Controls.Add(this.label116); - this.panel11.Location = new System.Drawing.Point(509, 129); - this.panel11.Margin = new System.Windows.Forms.Padding(2); + this.panel11.Location = new System.Drawing.Point(679, 161); + this.panel11.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel11.Name = "panel11"; - this.panel11.Size = new System.Drawing.Size(412, 29); + this.panel11.Size = new System.Drawing.Size(549, 36); this.panel11.TabIndex = 6015; // // label121 // this.label121.AutoSize = true; - this.label121.Location = new System.Drawing.Point(115, 9); + this.label121.Location = new System.Drawing.Point(153, 11); + this.label121.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label121.Name = "label121"; - this.label121.Size = new System.Drawing.Size(71, 12); + this.label121.Size = new System.Drawing.Size(90, 15); this.label121.TabIndex = 8359; this.label121.Text = "3巷道常温库"; // // label116 // this.label116.AutoSize = true; - this.label116.Location = new System.Drawing.Point(207, 11); + this.label116.Location = new System.Drawing.Point(276, 14); + this.label116.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label116.Name = "label116"; - this.label116.Size = new System.Drawing.Size(29, 12); + this.label116.Size = new System.Drawing.Size(38, 15); this.label116.TabIndex = 0; this.label116.Text = "11排"; // @@ -2650,27 +2730,29 @@ this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.panel2.Controls.Add(this.label124); this.panel2.Controls.Add(this.label109); - this.panel2.Location = new System.Drawing.Point(516, 532); - this.panel2.Margin = new System.Windows.Forms.Padding(2); + this.panel2.Location = new System.Drawing.Point(688, 665); + this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(412, 29); + this.panel2.Size = new System.Drawing.Size(549, 36); this.panel2.TabIndex = 6016; // // label124 // this.label124.AutoSize = true; - this.label124.Location = new System.Drawing.Point(108, 9); + this.label124.Location = new System.Drawing.Point(144, 11); + this.label124.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label124.Name = "label124"; - this.label124.Size = new System.Drawing.Size(71, 12); + this.label124.Size = new System.Drawing.Size(90, 15); this.label124.TabIndex = 8359; this.label124.Text = "1巷道低温库"; // // label109 // this.label109.AutoSize = true; - this.label109.Location = new System.Drawing.Point(206, 9); + this.label109.Location = new System.Drawing.Point(275, 11); + this.label109.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label109.Name = "label109"; - this.label109.Size = new System.Drawing.Size(23, 12); + this.label109.Size = new System.Drawing.Size(30, 15); this.label109.TabIndex = 0; this.label109.Text = "4排"; // @@ -2679,27 +2761,29 @@ this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.panel1.Controls.Add(this.label125); this.panel1.Controls.Add(this.label108); - this.panel1.Location = new System.Drawing.Point(516, 561); - this.panel1.Margin = new System.Windows.Forms.Padding(2); + this.panel1.Location = new System.Drawing.Point(688, 701); + this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(412, 29); + this.panel1.Size = new System.Drawing.Size(549, 36); this.panel1.TabIndex = 6007; // // label125 // this.label125.AutoSize = true; - this.label125.Location = new System.Drawing.Point(107, 7); + this.label125.Location = new System.Drawing.Point(143, 9); + this.label125.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label125.Name = "label125"; - this.label125.Size = new System.Drawing.Size(71, 12); + this.label125.Size = new System.Drawing.Size(90, 15); this.label125.TabIndex = 8359; this.label125.Text = "1巷道低温库"; // // label108 // this.label108.AutoSize = true; - this.label108.Location = new System.Drawing.Point(206, 9); + this.label108.Location = new System.Drawing.Point(275, 11); + this.label108.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label108.Name = "label108"; - this.label108.Size = new System.Drawing.Size(23, 12); + this.label108.Size = new System.Drawing.Size(30, 15); this.label108.TabIndex = 0; this.label108.Text = "3排"; // @@ -2708,10 +2792,11 @@ this.textBox70.BackColor = System.Drawing.Color.Blue; this.textBox70.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox70.Enabled = false; - this.textBox70.Location = new System.Drawing.Point(431, 525); + this.textBox70.Location = new System.Drawing.Point(575, 656); + this.textBox70.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox70.Multiline = true; this.textBox70.Name = "textBox70"; - this.textBox70.Size = new System.Drawing.Size(13, 13); + this.textBox70.Size = new System.Drawing.Size(17, 16); this.textBox70.TabIndex = 5968; this.textBox70.Tag = "12047.0"; this.textBox70.Visible = false; @@ -2721,10 +2806,11 @@ this.textBox69.BackColor = System.Drawing.Color.Blue; this.textBox69.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox69.Enabled = false; - this.textBox69.Location = new System.Drawing.Point(431, 468); + this.textBox69.Location = new System.Drawing.Point(575, 585); + this.textBox69.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox69.Multiline = true; this.textBox69.Name = "textBox69"; - this.textBox69.Size = new System.Drawing.Size(13, 13); + this.textBox69.Size = new System.Drawing.Size(17, 16); this.textBox69.TabIndex = 5967; this.textBox69.Tag = "12046.0"; this.textBox69.Visible = false; @@ -2734,10 +2820,11 @@ this.textBox68.BackColor = System.Drawing.Color.Blue; this.textBox68.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox68.Enabled = false; - this.textBox68.Location = new System.Drawing.Point(431, 408); + this.textBox68.Location = new System.Drawing.Point(575, 510); + this.textBox68.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox68.Multiline = true; this.textBox68.Name = "textBox68"; - this.textBox68.Size = new System.Drawing.Size(13, 13); + this.textBox68.Size = new System.Drawing.Size(17, 16); this.textBox68.TabIndex = 5966; this.textBox68.Tag = "12045.0"; this.textBox68.Visible = false; @@ -2747,10 +2834,11 @@ this.textBox111.BackColor = System.Drawing.Color.Blue; this.textBox111.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox111.Enabled = false; - this.textBox111.Location = new System.Drawing.Point(327, 329); + this.textBox111.Location = new System.Drawing.Point(436, 411); + this.textBox111.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox111.Multiline = true; this.textBox111.Name = "textBox111"; - this.textBox111.Size = new System.Drawing.Size(13, 13); + this.textBox111.Size = new System.Drawing.Size(17, 16); this.textBox111.TabIndex = 5957; this.textBox111.Tag = "12039.0"; this.textBox111.Visible = false; @@ -2760,10 +2848,11 @@ this.textBox33.BackColor = System.Drawing.Color.Blue; this.textBox33.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox33.Enabled = false; - this.textBox33.Location = new System.Drawing.Point(1063, 337); + this.textBox33.Location = new System.Drawing.Point(1417, 421); + this.textBox33.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox33.Multiline = true; this.textBox33.Name = "textBox33"; - this.textBox33.Size = new System.Drawing.Size(13, 13); + this.textBox33.Size = new System.Drawing.Size(17, 16); this.textBox33.TabIndex = 5964; this.textBox33.Tag = "12016.0"; this.textBox33.Visible = false; @@ -2773,10 +2862,11 @@ this.textBox12.BackColor = System.Drawing.Color.Blue; this.textBox12.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox12.Enabled = false; - this.textBox12.Location = new System.Drawing.Point(327, 253); + this.textBox12.Location = new System.Drawing.Point(436, 316); + this.textBox12.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox12.Multiline = true; this.textBox12.Name = "textBox12"; - this.textBox12.Size = new System.Drawing.Size(13, 13); + this.textBox12.Size = new System.Drawing.Size(17, 16); this.textBox12.TabIndex = 5963; this.textBox12.Tag = "12035.0"; this.textBox12.Visible = false; @@ -2786,10 +2876,11 @@ this.textBox85.BackColor = System.Drawing.Color.Blue; this.textBox85.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox85.Enabled = false; - this.textBox85.Location = new System.Drawing.Point(1062, 179); + this.textBox85.Location = new System.Drawing.Point(1416, 224); + this.textBox85.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox85.Multiline = true; this.textBox85.Name = "textBox85"; - this.textBox85.Size = new System.Drawing.Size(13, 13); + this.textBox85.Size = new System.Drawing.Size(17, 16); this.textBox85.TabIndex = 5962; this.textBox85.Tag = "12008.0"; this.textBox85.Visible = false; @@ -2799,10 +2890,11 @@ this.textBox5.BackColor = System.Drawing.Color.Blue; this.textBox5.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox5.Enabled = false; - this.textBox5.Location = new System.Drawing.Point(327, 180); + this.textBox5.Location = new System.Drawing.Point(436, 225); + this.textBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox5.Multiline = true; this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(13, 13); + this.textBox5.Size = new System.Drawing.Size(17, 16); this.textBox5.TabIndex = 5961; this.textBox5.Tag = "12030.0"; this.textBox5.Visible = false; @@ -2812,10 +2904,11 @@ this.textBox17.BackColor = System.Drawing.Color.Blue; this.textBox17.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox17.Enabled = false; - this.textBox17.Location = new System.Drawing.Point(465, 295); + this.textBox17.Location = new System.Drawing.Point(620, 369); + this.textBox17.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox17.Multiline = true; this.textBox17.Name = "textBox17"; - this.textBox17.Size = new System.Drawing.Size(13, 13); + this.textBox17.Size = new System.Drawing.Size(17, 16); this.textBox17.TabIndex = 5960; this.textBox17.Tag = "12038.0"; this.textBox17.Visible = false; @@ -2825,10 +2918,11 @@ this.textBox8.BackColor = System.Drawing.Color.Blue; this.textBox8.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox8.Enabled = false; - this.textBox8.Location = new System.Drawing.Point(465, 210); + this.textBox8.Location = new System.Drawing.Point(620, 262); + this.textBox8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox8.Multiline = true; this.textBox8.Name = "textBox8"; - this.textBox8.Size = new System.Drawing.Size(13, 13); + this.textBox8.Size = new System.Drawing.Size(17, 16); this.textBox8.TabIndex = 5959; this.textBox8.Tag = "12034.0"; this.textBox8.Visible = false; @@ -2838,10 +2932,11 @@ this.textBox72.BackColor = System.Drawing.Color.Blue; this.textBox72.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox72.Enabled = false; - this.textBox72.Location = new System.Drawing.Point(465, 568); + this.textBox72.Location = new System.Drawing.Point(620, 710); + this.textBox72.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox72.Multiline = true; this.textBox72.Name = "textBox72"; - this.textBox72.Size = new System.Drawing.Size(13, 13); + this.textBox72.Size = new System.Drawing.Size(17, 16); this.textBox72.TabIndex = 5958; this.textBox72.Tag = "12048.0"; this.textBox72.Visible = false; @@ -2851,10 +2946,11 @@ this.textBox66.BackColor = System.Drawing.Color.Blue; this.textBox66.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox66.Enabled = false; - this.textBox66.Location = new System.Drawing.Point(465, 364); + this.textBox66.Location = new System.Drawing.Point(620, 455); + this.textBox66.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox66.Multiline = true; this.textBox66.Name = "textBox66"; - this.textBox66.Size = new System.Drawing.Size(13, 13); + this.textBox66.Size = new System.Drawing.Size(17, 16); this.textBox66.TabIndex = 5971; this.textBox66.Tag = "12040.0"; this.textBox66.Visible = false; @@ -2864,10 +2960,11 @@ this.textBox110.BackColor = System.Drawing.Color.Blue; this.textBox110.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox110.Enabled = false; - this.textBox110.Location = new System.Drawing.Point(1304, 573); + this.textBox110.Location = new System.Drawing.Point(1739, 716); + this.textBox110.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox110.Multiline = true; this.textBox110.Name = "textBox110"; - this.textBox110.Size = new System.Drawing.Size(13, 13); + this.textBox110.Size = new System.Drawing.Size(17, 16); this.textBox110.TabIndex = 5956; this.textBox110.Tag = "12004.0"; this.textBox110.Visible = false; @@ -2877,10 +2974,11 @@ this.textBox107.BackColor = System.Drawing.Color.Blue; this.textBox107.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox107.Enabled = false; - this.textBox107.Location = new System.Drawing.Point(1306, 369); + this.textBox107.Location = new System.Drawing.Point(1741, 461); + this.textBox107.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox107.Multiline = true; this.textBox107.Name = "textBox107"; - this.textBox107.Size = new System.Drawing.Size(13, 13); + this.textBox107.Size = new System.Drawing.Size(17, 16); this.textBox107.TabIndex = 5954; this.textBox107.Tag = "12003.0"; this.textBox107.Visible = false; @@ -2890,10 +2988,11 @@ this.textBox104.BackColor = System.Drawing.Color.Blue; this.textBox104.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox104.Enabled = false; - this.textBox104.Location = new System.Drawing.Point(1304, 297); + this.textBox104.Location = new System.Drawing.Point(1739, 371); + this.textBox104.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox104.Multiline = true; this.textBox104.Name = "textBox104"; - this.textBox104.Size = new System.Drawing.Size(13, 13); + this.textBox104.Size = new System.Drawing.Size(17, 16); this.textBox104.TabIndex = 5945; this.textBox104.Tag = "12002.0"; this.textBox104.Visible = false; @@ -2903,10 +3002,11 @@ this.textBox79.BackColor = System.Drawing.Color.Blue; this.textBox79.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox79.Enabled = false; - this.textBox79.Location = new System.Drawing.Point(1303, 139); + this.textBox79.Location = new System.Drawing.Point(1737, 174); + this.textBox79.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox79.Multiline = true; this.textBox79.Name = "textBox79"; - this.textBox79.Size = new System.Drawing.Size(13, 13); + this.textBox79.Size = new System.Drawing.Size(17, 16); this.textBox79.TabIndex = 5946; this.textBox79.Tag = "12001.0"; this.textBox79.Visible = false; @@ -2916,10 +3016,11 @@ this.textBox84.BackColor = System.Drawing.Color.Blue; this.textBox84.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox84.Enabled = false; - this.textBox84.Location = new System.Drawing.Point(467, 140); + this.textBox84.Location = new System.Drawing.Point(623, 175); + this.textBox84.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox84.Multiline = true; this.textBox84.Name = "textBox84"; - this.textBox84.Size = new System.Drawing.Size(13, 13); + this.textBox84.Size = new System.Drawing.Size(17, 16); this.textBox84.TabIndex = 5947; this.textBox84.Tag = "12026.0"; this.textBox84.Visible = false; @@ -2929,10 +3030,11 @@ this.textBox109.BackColor = System.Drawing.Color.Blue; this.textBox109.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox109.Enabled = false; - this.textBox109.Location = new System.Drawing.Point(1201, 571); + this.textBox109.Location = new System.Drawing.Point(1601, 714); + this.textBox109.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox109.Multiline = true; this.textBox109.Name = "textBox109"; - this.textBox109.Size = new System.Drawing.Size(13, 13); + this.textBox109.Size = new System.Drawing.Size(17, 16); this.textBox109.TabIndex = 5948; this.textBox109.Tag = "14004.0"; this.textBox109.Visible = false; @@ -2942,10 +3044,11 @@ this.textBox106.BackColor = System.Drawing.Color.Blue; this.textBox106.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox106.Enabled = false; - this.textBox106.Location = new System.Drawing.Point(1190, 369); + this.textBox106.Location = new System.Drawing.Point(1587, 461); + this.textBox106.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox106.Multiline = true; this.textBox106.Name = "textBox106"; - this.textBox106.Size = new System.Drawing.Size(13, 13); + this.textBox106.Size = new System.Drawing.Size(17, 16); this.textBox106.TabIndex = 5949; this.textBox106.Tag = "14003.0"; this.textBox106.Visible = false; @@ -2955,10 +3058,11 @@ this.textBox103.BackColor = System.Drawing.Color.Blue; this.textBox103.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox103.Enabled = false; - this.textBox103.Location = new System.Drawing.Point(1189, 298); + this.textBox103.Location = new System.Drawing.Point(1585, 372); + this.textBox103.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox103.Multiline = true; this.textBox103.Name = "textBox103"; - this.textBox103.Size = new System.Drawing.Size(13, 13); + this.textBox103.Size = new System.Drawing.Size(17, 16); this.textBox103.TabIndex = 5955; this.textBox103.Tag = "14002.0"; this.textBox103.Visible = false; @@ -2968,10 +3072,11 @@ this.textBox4.BackColor = System.Drawing.Color.Blue; this.textBox4.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox4.Enabled = false; - this.textBox4.Location = new System.Drawing.Point(1188, 140); + this.textBox4.Location = new System.Drawing.Point(1584, 175); + this.textBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox4.Multiline = true; this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(13, 13); + this.textBox4.Size = new System.Drawing.Size(17, 16); this.textBox4.TabIndex = 5951; this.textBox4.Tag = "14001.0"; this.textBox4.Visible = false; @@ -2981,10 +3086,11 @@ this.textBox13.BackColor = System.Drawing.Color.Blue; this.textBox13.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox13.Enabled = false; - this.textBox13.Location = new System.Drawing.Point(389, 294); + this.textBox13.Location = new System.Drawing.Point(519, 368); + this.textBox13.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox13.Multiline = true; this.textBox13.Name = "textBox13"; - this.textBox13.Size = new System.Drawing.Size(13, 13); + this.textBox13.Size = new System.Drawing.Size(17, 16); this.textBox13.TabIndex = 5952; this.textBox13.Tag = "12037.0"; this.textBox13.Visible = false; @@ -2994,10 +3100,11 @@ this.textBox7.BackColor = System.Drawing.Color.Blue; this.textBox7.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox7.Enabled = false; - this.textBox7.Location = new System.Drawing.Point(389, 209); + this.textBox7.Location = new System.Drawing.Point(519, 261); + this.textBox7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox7.Multiline = true; this.textBox7.Name = "textBox7"; - this.textBox7.Size = new System.Drawing.Size(13, 13); + this.textBox7.Size = new System.Drawing.Size(17, 16); this.textBox7.TabIndex = 5950; this.textBox7.Tag = "12033.0"; this.textBox7.Visible = false; @@ -3007,10 +3114,11 @@ this.textBox65.BackColor = System.Drawing.Color.Blue; this.textBox65.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox65.Enabled = false; - this.textBox65.Location = new System.Drawing.Point(371, 363); + this.textBox65.Location = new System.Drawing.Point(495, 454); + this.textBox65.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox65.Multiline = true; this.textBox65.Name = "textBox65"; - this.textBox65.Size = new System.Drawing.Size(13, 13); + this.textBox65.Size = new System.Drawing.Size(17, 16); this.textBox65.TabIndex = 5953; this.textBox65.Tag = "12042.0"; this.textBox65.Visible = false; @@ -3020,10 +3128,11 @@ this.textBox83.BackColor = System.Drawing.Color.Blue; this.textBox83.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox83.Enabled = false; - this.textBox83.Location = new System.Drawing.Point(373, 139); + this.textBox83.Location = new System.Drawing.Point(497, 174); + this.textBox83.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox83.Multiline = true; this.textBox83.Name = "textBox83"; - this.textBox83.Size = new System.Drawing.Size(13, 13); + this.textBox83.Size = new System.Drawing.Size(17, 16); this.textBox83.TabIndex = 5973; this.textBox83.Tag = "12027.0"; this.textBox83.Visible = false; @@ -3033,10 +3142,11 @@ this.textBox108.BackColor = System.Drawing.Color.Blue; this.textBox108.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox108.Enabled = false; - this.textBox108.Location = new System.Drawing.Point(1134, 582); + this.textBox108.Location = new System.Drawing.Point(1512, 728); + this.textBox108.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox108.Multiline = true; this.textBox108.Name = "textBox108"; - this.textBox108.Size = new System.Drawing.Size(13, 13); + this.textBox108.Size = new System.Drawing.Size(17, 16); this.textBox108.TabIndex = 5981; this.textBox108.Tag = "13104.0"; this.textBox108.Visible = false; @@ -3046,10 +3156,11 @@ this.textBox116.BackColor = System.Drawing.Color.Blue; this.textBox116.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox116.Enabled = false; - this.textBox116.Location = new System.Drawing.Point(1127, 382); + this.textBox116.Location = new System.Drawing.Point(1503, 478); + this.textBox116.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox116.Multiline = true; this.textBox116.Name = "textBox116"; - this.textBox116.Size = new System.Drawing.Size(13, 13); + this.textBox116.Size = new System.Drawing.Size(17, 16); this.textBox116.TabIndex = 5981; this.textBox116.Tag = "13103.0"; this.textBox116.Visible = false; @@ -3059,10 +3170,11 @@ this.textBox114.BackColor = System.Drawing.Color.Blue; this.textBox114.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox114.Enabled = false; - this.textBox114.Location = new System.Drawing.Point(1127, 295); + this.textBox114.Location = new System.Drawing.Point(1503, 369); + this.textBox114.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox114.Multiline = true; this.textBox114.Name = "textBox114"; - this.textBox114.Size = new System.Drawing.Size(13, 13); + this.textBox114.Size = new System.Drawing.Size(17, 16); this.textBox114.TabIndex = 5981; this.textBox114.Tag = "13102.0"; this.textBox114.Visible = false; @@ -3072,10 +3184,11 @@ this.textBox105.BackColor = System.Drawing.Color.Blue; this.textBox105.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox105.Enabled = false; - this.textBox105.Location = new System.Drawing.Point(1101, 582); + this.textBox105.Location = new System.Drawing.Point(1468, 728); + this.textBox105.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox105.Multiline = true; this.textBox105.Name = "textBox105"; - this.textBox105.Size = new System.Drawing.Size(13, 13); + this.textBox105.Size = new System.Drawing.Size(17, 16); this.textBox105.TabIndex = 5981; this.textBox105.Tag = "13004.0"; this.textBox105.Visible = false; @@ -3085,10 +3198,11 @@ this.textBox115.BackColor = System.Drawing.Color.Blue; this.textBox115.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox115.Enabled = false; - this.textBox115.Location = new System.Drawing.Point(1094, 382); + this.textBox115.Location = new System.Drawing.Point(1459, 478); + this.textBox115.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox115.Multiline = true; this.textBox115.Name = "textBox115"; - this.textBox115.Size = new System.Drawing.Size(13, 13); + this.textBox115.Size = new System.Drawing.Size(17, 16); this.textBox115.TabIndex = 5981; this.textBox115.Tag = "13003.0"; this.textBox115.Visible = false; @@ -3098,10 +3212,11 @@ this.textBox102.BackColor = System.Drawing.Color.Blue; this.textBox102.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox102.Enabled = false; - this.textBox102.Location = new System.Drawing.Point(1094, 295); + this.textBox102.Location = new System.Drawing.Point(1459, 369); + this.textBox102.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox102.Multiline = true; this.textBox102.Name = "textBox102"; - this.textBox102.Size = new System.Drawing.Size(13, 13); + this.textBox102.Size = new System.Drawing.Size(17, 16); this.textBox102.TabIndex = 5981; this.textBox102.Tag = "13002.0"; this.textBox102.Visible = false; @@ -3111,10 +3226,11 @@ this.textBox120.BackColor = System.Drawing.Color.Blue; this.textBox120.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox120.Enabled = false; - this.textBox120.Location = new System.Drawing.Point(302, 580); + this.textBox120.Location = new System.Drawing.Point(403, 725); + this.textBox120.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox120.Multiline = true; this.textBox120.Name = "textBox120"; - this.textBox120.Size = new System.Drawing.Size(13, 13); + this.textBox120.Size = new System.Drawing.Size(17, 16); this.textBox120.TabIndex = 5974; this.textBox120.Tag = "13008.0"; this.textBox120.Visible = false; @@ -3124,10 +3240,11 @@ this.textBox119.BackColor = System.Drawing.Color.Blue; this.textBox119.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox119.Enabled = false; - this.textBox119.Location = new System.Drawing.Point(290, 304); + this.textBox119.Location = new System.Drawing.Point(387, 380); + this.textBox119.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox119.Multiline = true; this.textBox119.Name = "textBox119"; - this.textBox119.Size = new System.Drawing.Size(13, 13); + this.textBox119.Size = new System.Drawing.Size(17, 16); this.textBox119.TabIndex = 5974; this.textBox119.Tag = "13007.0"; this.textBox119.Visible = false; @@ -3137,10 +3254,11 @@ this.textBox81.BackColor = System.Drawing.Color.Blue; this.textBox81.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox81.Enabled = false; - this.textBox81.Location = new System.Drawing.Point(295, 220); + this.textBox81.Location = new System.Drawing.Point(393, 275); + this.textBox81.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox81.Multiline = true; this.textBox81.Name = "textBox81"; - this.textBox81.Size = new System.Drawing.Size(13, 13); + this.textBox81.Size = new System.Drawing.Size(17, 16); this.textBox81.TabIndex = 5974; this.textBox81.Tag = "13006.0"; this.textBox81.Visible = false; @@ -3150,10 +3268,11 @@ this.textBox118.BackColor = System.Drawing.Color.Blue; this.textBox118.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox118.Enabled = false; - this.textBox118.Location = new System.Drawing.Point(295, 138); + this.textBox118.Location = new System.Drawing.Point(393, 172); + this.textBox118.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox118.Multiline = true; this.textBox118.Name = "textBox118"; - this.textBox118.Size = new System.Drawing.Size(13, 13); + this.textBox118.Size = new System.Drawing.Size(17, 16); this.textBox118.TabIndex = 5974; this.textBox118.Tag = "13005.0"; this.textBox118.Visible = false; @@ -3163,10 +3282,11 @@ this.textBox113.BackColor = System.Drawing.Color.Blue; this.textBox113.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox113.Enabled = false; - this.textBox113.Location = new System.Drawing.Point(1098, 140); + this.textBox113.Location = new System.Drawing.Point(1464, 175); + this.textBox113.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox113.Multiline = true; this.textBox113.Name = "textBox113"; - this.textBox113.Size = new System.Drawing.Size(13, 13); + this.textBox113.Size = new System.Drawing.Size(17, 16); this.textBox113.TabIndex = 5974; this.textBox113.Tag = "13001.0"; this.textBox113.Visible = false; @@ -3176,10 +3296,11 @@ this.textBox75.BackColor = System.Drawing.Color.Blue; this.textBox75.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox75.Enabled = false; - this.textBox75.Location = new System.Drawing.Point(270, 580); + this.textBox75.Location = new System.Drawing.Point(360, 725); + this.textBox75.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox75.Multiline = true; this.textBox75.Name = "textBox75"; - this.textBox75.Size = new System.Drawing.Size(13, 13); + this.textBox75.Size = new System.Drawing.Size(17, 16); this.textBox75.TabIndex = 5974; this.textBox75.Tag = "13108.0"; this.textBox75.Visible = false; @@ -3189,10 +3310,11 @@ this.textBox26.BackColor = System.Drawing.Color.Blue; this.textBox26.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox26.Enabled = false; - this.textBox26.Location = new System.Drawing.Point(258, 304); + this.textBox26.Location = new System.Drawing.Point(344, 380); + this.textBox26.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox26.Multiline = true; this.textBox26.Name = "textBox26"; - this.textBox26.Size = new System.Drawing.Size(13, 13); + this.textBox26.Size = new System.Drawing.Size(17, 16); this.textBox26.TabIndex = 5974; this.textBox26.Tag = "13107.0"; this.textBox26.Visible = false; @@ -3202,10 +3324,11 @@ this.textBox10.BackColor = System.Drawing.Color.Blue; this.textBox10.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox10.Enabled = false; - this.textBox10.Location = new System.Drawing.Point(263, 220); + this.textBox10.Location = new System.Drawing.Point(351, 275); + this.textBox10.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox10.Multiline = true; this.textBox10.Name = "textBox10"; - this.textBox10.Size = new System.Drawing.Size(13, 13); + this.textBox10.Size = new System.Drawing.Size(17, 16); this.textBox10.TabIndex = 5974; this.textBox10.Tag = "13106.0"; this.textBox10.Visible = false; @@ -3215,10 +3338,11 @@ this.textBox117.BackColor = System.Drawing.Color.Blue; this.textBox117.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox117.Enabled = false; - this.textBox117.Location = new System.Drawing.Point(263, 138); + this.textBox117.Location = new System.Drawing.Point(351, 172); + this.textBox117.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox117.Multiline = true; this.textBox117.Name = "textBox117"; - this.textBox117.Size = new System.Drawing.Size(13, 13); + this.textBox117.Size = new System.Drawing.Size(17, 16); this.textBox117.TabIndex = 5974; this.textBox117.Tag = "13105.0"; this.textBox117.Visible = false; @@ -3228,10 +3352,11 @@ this.textBox3.BackColor = System.Drawing.Color.Blue; this.textBox3.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox3.Enabled = false; - this.textBox3.Location = new System.Drawing.Point(1125, 140); + this.textBox3.Location = new System.Drawing.Point(1500, 175); + this.textBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox3.Multiline = true; this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(13, 13); + this.textBox3.Size = new System.Drawing.Size(17, 16); this.textBox3.TabIndex = 5974; this.textBox3.Tag = "13101.0"; this.textBox3.Visible = false; @@ -3241,10 +3366,11 @@ this.textBox22.BackColor = System.Drawing.Color.Blue; this.textBox22.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox22.Enabled = false; - this.textBox22.Location = new System.Drawing.Point(327, 293); + this.textBox22.Location = new System.Drawing.Point(436, 366); + this.textBox22.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox22.Multiline = true; this.textBox22.Name = "textBox22"; - this.textBox22.Size = new System.Drawing.Size(13, 13); + this.textBox22.Size = new System.Drawing.Size(17, 16); this.textBox22.TabIndex = 5992; this.textBox22.Tag = "12036.0"; this.textBox22.Visible = false; @@ -3254,10 +3380,11 @@ this.textBox6.BackColor = System.Drawing.Color.Blue; this.textBox6.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox6.Enabled = false; - this.textBox6.Location = new System.Drawing.Point(327, 209); + this.textBox6.Location = new System.Drawing.Point(436, 261); + this.textBox6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox6.Multiline = true; this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(13, 13); + this.textBox6.Size = new System.Drawing.Size(17, 16); this.textBox6.TabIndex = 5993; this.textBox6.Tag = "12032.0"; this.textBox6.Visible = false; @@ -3267,10 +3394,11 @@ this.textBox71.BackColor = System.Drawing.Color.Blue; this.textBox71.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox71.Enabled = false; - this.textBox71.Location = new System.Drawing.Point(431, 568); + this.textBox71.Location = new System.Drawing.Point(575, 710); + this.textBox71.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox71.Multiline = true; this.textBox71.Name = "textBox71"; - this.textBox71.Size = new System.Drawing.Size(13, 13); + this.textBox71.Size = new System.Drawing.Size(17, 16); this.textBox71.TabIndex = 5994; this.textBox71.Tag = "12049.0"; this.textBox71.Visible = false; @@ -3280,10 +3408,11 @@ this.textBox67.BackColor = System.Drawing.Color.Blue; this.textBox67.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox67.Enabled = false; - this.textBox67.Location = new System.Drawing.Point(431, 364); + this.textBox67.Location = new System.Drawing.Point(575, 455); + this.textBox67.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox67.Multiline = true; this.textBox67.Name = "textBox67"; - this.textBox67.Size = new System.Drawing.Size(13, 13); + this.textBox67.Size = new System.Drawing.Size(17, 16); this.textBox67.TabIndex = 5995; this.textBox67.Tag = "12041.0"; this.textBox67.Visible = false; @@ -3293,10 +3422,11 @@ this.textBox59.BackColor = System.Drawing.Color.Blue; this.textBox59.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox59.Enabled = false; - this.textBox59.Location = new System.Drawing.Point(327, 364); + this.textBox59.Location = new System.Drawing.Point(436, 455); + this.textBox59.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox59.Multiline = true; this.textBox59.Name = "textBox59"; - this.textBox59.Size = new System.Drawing.Size(13, 13); + this.textBox59.Size = new System.Drawing.Size(17, 16); this.textBox59.TabIndex = 5996; this.textBox59.Tag = "12043.0"; this.textBox59.Visible = false; @@ -3306,10 +3436,11 @@ this.textBox82.BackColor = System.Drawing.Color.Blue; this.textBox82.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox82.Enabled = false; - this.textBox82.Location = new System.Drawing.Point(329, 140); + this.textBox82.Location = new System.Drawing.Point(439, 175); + this.textBox82.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox82.Multiline = true; this.textBox82.Name = "textBox82"; - this.textBox82.Size = new System.Drawing.Size(13, 13); + this.textBox82.Size = new System.Drawing.Size(17, 16); this.textBox82.TabIndex = 5998; this.textBox82.Tag = "12028.0"; this.textBox82.Visible = false; @@ -3319,10 +3450,11 @@ this.textBox100.BackColor = System.Drawing.Color.Blue; this.textBox100.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox100.Enabled = false; - this.textBox100.Location = new System.Drawing.Point(1063, 568); + this.textBox100.Location = new System.Drawing.Point(1417, 710); + this.textBox100.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox100.Multiline = true; this.textBox100.Name = "textBox100"; - this.textBox100.Size = new System.Drawing.Size(13, 13); + this.textBox100.Size = new System.Drawing.Size(17, 16); this.textBox100.TabIndex = 6005; this.textBox100.Tag = "12023.0"; this.textBox100.Visible = false; @@ -3332,10 +3464,11 @@ this.textBox95.BackColor = System.Drawing.Color.Blue; this.textBox95.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox95.Enabled = false; - this.textBox95.Location = new System.Drawing.Point(1063, 365); + this.textBox95.Location = new System.Drawing.Point(1417, 456); + this.textBox95.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox95.Multiline = true; this.textBox95.Name = "textBox95"; - this.textBox95.Size = new System.Drawing.Size(13, 13); + this.textBox95.Size = new System.Drawing.Size(17, 16); this.textBox95.TabIndex = 6006; this.textBox95.Tag = "12017.0"; this.textBox95.Visible = false; @@ -3345,10 +3478,11 @@ this.textBox88.BackColor = System.Drawing.Color.Blue; this.textBox88.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox88.Enabled = false; - this.textBox88.Location = new System.Drawing.Point(1062, 209); + this.textBox88.Location = new System.Drawing.Point(1416, 261); + this.textBox88.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox88.Multiline = true; this.textBox88.Name = "textBox88"; - this.textBox88.Size = new System.Drawing.Size(13, 13); + this.textBox88.Size = new System.Drawing.Size(17, 16); this.textBox88.TabIndex = 6004; this.textBox88.Tag = "12009.0"; this.textBox88.Visible = false; @@ -3358,10 +3492,11 @@ this.textBox92.BackColor = System.Drawing.Color.Blue; this.textBox92.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox92.Enabled = false; - this.textBox92.Location = new System.Drawing.Point(1062, 292); + this.textBox92.Location = new System.Drawing.Point(1416, 365); + this.textBox92.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox92.Multiline = true; this.textBox92.Name = "textBox92"; - this.textBox92.Size = new System.Drawing.Size(13, 13); + this.textBox92.Size = new System.Drawing.Size(17, 16); this.textBox92.TabIndex = 6003; this.textBox92.Tag = "12013.0"; this.textBox92.Visible = false; @@ -3371,10 +3506,11 @@ this.textBox2.BackColor = System.Drawing.Color.Blue; this.textBox2.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox2.Enabled = false; - this.textBox2.Location = new System.Drawing.Point(1062, 138); + this.textBox2.Location = new System.Drawing.Point(1416, 172); + this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox2.Multiline = true; this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(13, 13); + this.textBox2.Size = new System.Drawing.Size(17, 16); this.textBox2.TabIndex = 6002; this.textBox2.Tag = "12005.0"; this.textBox2.Visible = false; @@ -3384,10 +3520,11 @@ this.textBox76.BackColor = System.Drawing.Color.Blue; this.textBox76.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox76.Enabled = false; - this.textBox76.Location = new System.Drawing.Point(371, 568); + this.textBox76.Location = new System.Drawing.Point(495, 710); + this.textBox76.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox76.Multiline = true; this.textBox76.Name = "textBox76"; - this.textBox76.Size = new System.Drawing.Size(13, 13); + this.textBox76.Size = new System.Drawing.Size(17, 16); this.textBox76.TabIndex = 6000; this.textBox76.Tag = "12050.0"; this.textBox76.Visible = false; @@ -3397,10 +3534,11 @@ this.textBox94.BackColor = System.Drawing.Color.Blue; this.textBox94.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox94.Enabled = false; - this.textBox94.Location = new System.Drawing.Point(1015, 365); + this.textBox94.Location = new System.Drawing.Point(1353, 456); + this.textBox94.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox94.Multiline = true; this.textBox94.Name = "textBox94"; - this.textBox94.Size = new System.Drawing.Size(13, 13); + this.textBox94.Size = new System.Drawing.Size(17, 16); this.textBox94.TabIndex = 5988; this.textBox94.Tag = "12018.0"; this.textBox94.Visible = false; @@ -3410,10 +3548,11 @@ this.textBox87.BackColor = System.Drawing.Color.Blue; this.textBox87.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox87.Enabled = false; - this.textBox87.Location = new System.Drawing.Point(1015, 208); + this.textBox87.Location = new System.Drawing.Point(1353, 260); + this.textBox87.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox87.Multiline = true; this.textBox87.Name = "textBox87"; - this.textBox87.Size = new System.Drawing.Size(13, 13); + this.textBox87.Size = new System.Drawing.Size(17, 16); this.textBox87.TabIndex = 5987; this.textBox87.Tag = "12010.0"; this.textBox87.Visible = false; @@ -3423,10 +3562,11 @@ this.textBox91.BackColor = System.Drawing.Color.Blue; this.textBox91.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox91.Enabled = false; - this.textBox91.Location = new System.Drawing.Point(1013, 292); + this.textBox91.Location = new System.Drawing.Point(1351, 365); + this.textBox91.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox91.Multiline = true; this.textBox91.Name = "textBox91"; - this.textBox91.Size = new System.Drawing.Size(13, 13); + this.textBox91.Size = new System.Drawing.Size(17, 16); this.textBox91.TabIndex = 5986; this.textBox91.Tag = "12014.0"; this.textBox91.Visible = false; @@ -3436,10 +3576,11 @@ this.textBox1.BackColor = System.Drawing.Color.Blue; this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox1.Enabled = false; - this.textBox1.Location = new System.Drawing.Point(1013, 138); + this.textBox1.Location = new System.Drawing.Point(1351, 172); + this.textBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox1.Multiline = true; this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(13, 13); + this.textBox1.Size = new System.Drawing.Size(17, 16); this.textBox1.TabIndex = 5985; this.textBox1.Tag = "12006.0"; this.textBox1.Visible = false; @@ -3449,10 +3590,11 @@ this.textBox25.BackColor = System.Drawing.Color.Blue; this.textBox25.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox25.Enabled = false; - this.textBox25.Location = new System.Drawing.Point(211, 292); + this.textBox25.Location = new System.Drawing.Point(281, 365); + this.textBox25.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox25.Multiline = true; this.textBox25.Name = "textBox25"; - this.textBox25.Size = new System.Drawing.Size(13, 13); + this.textBox25.Size = new System.Drawing.Size(17, 16); this.textBox25.TabIndex = 5984; this.textBox25.Tag = "12044.0"; this.textBox25.Visible = false; @@ -3462,10 +3604,11 @@ this.textBox73.BackColor = System.Drawing.Color.Blue; this.textBox73.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox73.Enabled = false; - this.textBox73.Location = new System.Drawing.Point(221, 568); + this.textBox73.Location = new System.Drawing.Point(295, 710); + this.textBox73.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox73.Multiline = true; this.textBox73.Name = "textBox73"; - this.textBox73.Size = new System.Drawing.Size(13, 13); + this.textBox73.Size = new System.Drawing.Size(17, 16); this.textBox73.TabIndex = 5983; this.textBox73.Tag = "12051.0"; this.textBox73.Visible = false; @@ -3475,10 +3618,11 @@ this.textBox9.BackColor = System.Drawing.Color.Blue; this.textBox9.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox9.Enabled = false; - this.textBox9.Location = new System.Drawing.Point(211, 208); + this.textBox9.Location = new System.Drawing.Point(281, 260); + this.textBox9.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox9.Multiline = true; this.textBox9.Name = "textBox9"; - this.textBox9.Size = new System.Drawing.Size(13, 13); + this.textBox9.Size = new System.Drawing.Size(17, 16); this.textBox9.TabIndex = 5982; this.textBox9.Tag = "12031.0"; this.textBox9.Visible = false; @@ -3488,10 +3632,11 @@ this.textBox80.BackColor = System.Drawing.Color.Blue; this.textBox80.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox80.Enabled = false; - this.textBox80.Location = new System.Drawing.Point(221, 141); + this.textBox80.Location = new System.Drawing.Point(295, 176); + this.textBox80.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox80.Multiline = true; this.textBox80.Name = "textBox80"; - this.textBox80.Size = new System.Drawing.Size(13, 13); + this.textBox80.Size = new System.Drawing.Size(17, 16); this.textBox80.TabIndex = 5990; this.textBox80.Tag = "12029.0"; this.textBox80.Visible = false; @@ -3501,10 +3646,11 @@ this.textBox101.BackColor = System.Drawing.Color.Blue; this.textBox101.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox101.Enabled = false; - this.textBox101.Location = new System.Drawing.Point(955, 568); + this.textBox101.Location = new System.Drawing.Point(1273, 710); + this.textBox101.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox101.Multiline = true; this.textBox101.Name = "textBox101"; - this.textBox101.Size = new System.Drawing.Size(13, 13); + this.textBox101.Size = new System.Drawing.Size(17, 16); this.textBox101.TabIndex = 5980; this.textBox101.Tag = "12025.0"; this.textBox101.Visible = false; @@ -3514,10 +3660,11 @@ this.textBox99.BackColor = System.Drawing.Color.Blue; this.textBox99.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox99.Enabled = false; - this.textBox99.Location = new System.Drawing.Point(1037, 568); + this.textBox99.Location = new System.Drawing.Point(1383, 710); + this.textBox99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox99.Multiline = true; this.textBox99.Name = "textBox99"; - this.textBox99.Size = new System.Drawing.Size(13, 13); + this.textBox99.Size = new System.Drawing.Size(17, 16); this.textBox99.TabIndex = 5979; this.textBox99.Tag = "12024.0"; this.textBox99.Visible = false; @@ -3527,10 +3674,11 @@ this.textBox93.BackColor = System.Drawing.Color.Blue; this.textBox93.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox93.Enabled = false; - this.textBox93.Location = new System.Drawing.Point(953, 365); + this.textBox93.Location = new System.Drawing.Point(1271, 456); + this.textBox93.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox93.Multiline = true; this.textBox93.Name = "textBox93"; - this.textBox93.Size = new System.Drawing.Size(13, 13); + this.textBox93.Size = new System.Drawing.Size(17, 16); this.textBox93.TabIndex = 5978; this.textBox93.Tag = "12019.0"; this.textBox93.Visible = false; @@ -3540,10 +3688,11 @@ this.textBox86.BackColor = System.Drawing.Color.Blue; this.textBox86.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox86.Enabled = false; - this.textBox86.Location = new System.Drawing.Point(953, 208); + this.textBox86.Location = new System.Drawing.Point(1271, 260); + this.textBox86.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox86.Multiline = true; this.textBox86.Name = "textBox86"; - this.textBox86.Size = new System.Drawing.Size(13, 13); + this.textBox86.Size = new System.Drawing.Size(17, 16); this.textBox86.TabIndex = 5977; this.textBox86.Tag = "12011.0"; this.textBox86.Visible = false; @@ -3553,10 +3702,11 @@ this.textBox89.BackColor = System.Drawing.Color.Blue; this.textBox89.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox89.Enabled = false; - this.textBox89.Location = new System.Drawing.Point(953, 292); + this.textBox89.Location = new System.Drawing.Point(1271, 365); + this.textBox89.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox89.Multiline = true; this.textBox89.Name = "textBox89"; - this.textBox89.Size = new System.Drawing.Size(13, 13); + this.textBox89.Size = new System.Drawing.Size(17, 16); this.textBox89.TabIndex = 5976; this.textBox89.Tag = "12015.0"; this.textBox89.Visible = false; @@ -3566,10 +3716,11 @@ this.textBox24.BackColor = System.Drawing.Color.Blue; this.textBox24.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox24.Enabled = false; - this.textBox24.Location = new System.Drawing.Point(953, 138); + this.textBox24.Location = new System.Drawing.Point(1271, 172); + this.textBox24.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox24.Multiline = true; this.textBox24.Name = "textBox24"; - this.textBox24.Size = new System.Drawing.Size(13, 13); + this.textBox24.Size = new System.Drawing.Size(17, 16); this.textBox24.TabIndex = 5975; this.textBox24.Tag = "12007.0"; this.textBox24.Visible = false; @@ -3578,9 +3729,10 @@ // this.button41.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button41.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button41.Location = new System.Drawing.Point(319, 286); + this.button41.Location = new System.Drawing.Point(425, 358); + this.button41.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button41.Name = "button41"; - this.button41.Size = new System.Drawing.Size(31, 28); + this.button41.Size = new System.Drawing.Size(41, 35); this.button41.TabIndex = 5931; this.button41.Tag = "12036"; this.button41.UseVisualStyleBackColor = false; @@ -3589,9 +3741,10 @@ // this.button56.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button56.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button56.Location = new System.Drawing.Point(424, 561); + this.button56.Location = new System.Drawing.Point(565, 701); + this.button56.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button56.Name = "button56"; - this.button56.Size = new System.Drawing.Size(31, 28); + this.button56.Size = new System.Drawing.Size(41, 35); this.button56.TabIndex = 5932; this.button56.Tag = "12049"; this.button56.UseVisualStyleBackColor = false; @@ -3600,9 +3753,10 @@ // this.button51.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button51.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button51.Location = new System.Drawing.Point(424, 357); + this.button51.Location = new System.Drawing.Point(565, 446); + this.button51.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button51.Name = "button51"; - this.button51.Size = new System.Drawing.Size(31, 28); + this.button51.Size = new System.Drawing.Size(41, 35); this.button51.TabIndex = 5933; this.button51.Tag = "12041"; this.button51.UseVisualStyleBackColor = false; @@ -3611,9 +3765,10 @@ // this.button18.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button18.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button18.Location = new System.Drawing.Point(319, 202); + this.button18.Location = new System.Drawing.Point(425, 252); + this.button18.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button18.Name = "button18"; - this.button18.Size = new System.Drawing.Size(31, 28); + this.button18.Size = new System.Drawing.Size(41, 35); this.button18.TabIndex = 5934; this.button18.Tag = "12032"; this.button18.UseVisualStyleBackColor = false; @@ -3622,9 +3777,10 @@ // this.button50.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button50.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button50.Location = new System.Drawing.Point(319, 356); + this.button50.Location = new System.Drawing.Point(425, 445); + this.button50.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button50.Name = "button50"; - this.button50.Size = new System.Drawing.Size(31, 28); + this.button50.Size = new System.Drawing.Size(41, 35); this.button50.TabIndex = 5935; this.button50.Tag = "12043"; this.button50.UseVisualStyleBackColor = false; @@ -3633,9 +3789,10 @@ // this.button67.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button67.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button67.Location = new System.Drawing.Point(321, 132); + this.button67.Location = new System.Drawing.Point(428, 165); + this.button67.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button67.Name = "button67"; - this.button67.Size = new System.Drawing.Size(31, 28); + this.button67.Size = new System.Drawing.Size(41, 35); this.button67.TabIndex = 5944; this.button67.Tag = "12028"; this.button67.UseVisualStyleBackColor = false; @@ -3644,9 +3801,10 @@ // this.button84.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button84.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button84.Location = new System.Drawing.Point(1055, 560); + this.button84.Location = new System.Drawing.Point(1407, 700); + this.button84.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button84.Name = "button84"; - this.button84.Size = new System.Drawing.Size(31, 28); + this.button84.Size = new System.Drawing.Size(41, 35); this.button84.TabIndex = 5937; this.button84.Tag = "12023"; this.button84.UseVisualStyleBackColor = false; @@ -3655,9 +3813,10 @@ // this.button75.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button75.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button75.Location = new System.Drawing.Point(1055, 284); + this.button75.Location = new System.Drawing.Point(1407, 355); + this.button75.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button75.Name = "button75"; - this.button75.Size = new System.Drawing.Size(31, 28); + this.button75.Size = new System.Drawing.Size(41, 35); this.button75.TabIndex = 5938; this.button75.Tag = "12013"; this.button75.UseVisualStyleBackColor = false; @@ -3666,9 +3825,10 @@ // this.button78.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button78.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button78.Location = new System.Drawing.Point(1055, 358); + this.button78.Location = new System.Drawing.Point(1407, 448); + this.button78.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button78.Name = "button78"; - this.button78.Size = new System.Drawing.Size(31, 28); + this.button78.Size = new System.Drawing.Size(41, 35); this.button78.TabIndex = 5939; this.button78.Tag = "12017"; this.button78.UseVisualStyleBackColor = false; @@ -3677,9 +3837,10 @@ // this.button71.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button71.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button71.Location = new System.Drawing.Point(1055, 202); + this.button71.Location = new System.Drawing.Point(1407, 252); + this.button71.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button71.Name = "button71"; - this.button71.Size = new System.Drawing.Size(31, 28); + this.button71.Size = new System.Drawing.Size(41, 35); this.button71.TabIndex = 5940; this.button71.Tag = "12009"; this.button71.UseVisualStyleBackColor = false; @@ -3688,9 +3849,10 @@ // this.button3.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button3.Location = new System.Drawing.Point(1055, 131); + this.button3.Location = new System.Drawing.Point(1407, 164); + this.button3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(31, 28); + this.button3.Size = new System.Drawing.Size(41, 35); this.button3.TabIndex = 5941; this.button3.Tag = "12005"; this.button3.UseVisualStyleBackColor = false; @@ -3699,9 +3861,10 @@ // this.button54.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button54.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button54.Location = new System.Drawing.Point(424, 500); + this.button54.Location = new System.Drawing.Point(565, 625); + this.button54.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button54.Name = "button54"; - this.button54.Size = new System.Drawing.Size(31, 61); + this.button54.Size = new System.Drawing.Size(41, 76); this.button54.TabIndex = 5942; this.button54.Tag = "12047"; this.button54.Text = "12047"; @@ -3711,9 +3874,10 @@ // this.button53.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button53.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button53.Location = new System.Drawing.Point(424, 443); + this.button53.Location = new System.Drawing.Point(565, 554); + this.button53.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button53.Name = "button53"; - this.button53.Size = new System.Drawing.Size(31, 61); + this.button53.Size = new System.Drawing.Size(41, 76); this.button53.TabIndex = 5943; this.button53.Tag = "12046"; this.button53.Text = "12046"; @@ -3723,9 +3887,10 @@ // this.button52.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button52.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button52.Location = new System.Drawing.Point(424, 384); + this.button52.Location = new System.Drawing.Point(565, 480); + this.button52.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button52.Name = "button52"; - this.button52.Size = new System.Drawing.Size(31, 61); + this.button52.Size = new System.Drawing.Size(41, 76); this.button52.TabIndex = 5927; this.button52.Tag = "12045"; this.button52.Text = "12045"; @@ -3735,9 +3900,10 @@ // this.button94.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button94.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button94.Location = new System.Drawing.Point(319, 312); + this.button94.Location = new System.Drawing.Point(425, 390); + this.button94.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button94.Name = "button94"; - this.button94.Size = new System.Drawing.Size(31, 45); + this.button94.Size = new System.Drawing.Size(41, 56); this.button94.TabIndex = 5926; this.button94.Tag = "12039"; this.button94.Text = "12039"; @@ -3747,9 +3913,10 @@ // this.button45.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button45.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button45.Location = new System.Drawing.Point(1055, 312); + this.button45.Location = new System.Drawing.Point(1407, 390); + this.button45.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button45.Name = "button45"; - this.button45.Size = new System.Drawing.Size(31, 45); + this.button45.Size = new System.Drawing.Size(41, 56); this.button45.TabIndex = 5936; this.button45.Tag = "12016"; this.button45.Text = " 12016"; @@ -3759,9 +3926,10 @@ // this.button38.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button38.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button38.Location = new System.Drawing.Point(319, 228); + this.button38.Location = new System.Drawing.Point(425, 285); + this.button38.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button38.Name = "button38"; - this.button38.Size = new System.Drawing.Size(31, 61); + this.button38.Size = new System.Drawing.Size(41, 76); this.button38.TabIndex = 5925; this.button38.Tag = "12035"; this.button38.Text = "12035"; @@ -3773,9 +3941,10 @@ this.label52.BackColor = System.Drawing.Color.Transparent; this.label52.Enabled = false; this.label52.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label52.Location = new System.Drawing.Point(409, 524); + this.label52.Location = new System.Drawing.Point(545, 655); + this.label52.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label52.Name = "label52"; - this.label52.Size = new System.Drawing.Size(17, 12); + this.label52.Size = new System.Drawing.Size(22, 15); this.label52.TabIndex = 5845; this.label52.Text = "↓"; // @@ -3783,9 +3952,10 @@ // this.button68.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button68.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button68.Location = new System.Drawing.Point(1055, 160); + this.button68.Location = new System.Drawing.Point(1407, 200); + this.button68.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button68.Name = "button68"; - this.button68.Size = new System.Drawing.Size(31, 42); + this.button68.Size = new System.Drawing.Size(41, 52); this.button68.TabIndex = 5897; this.button68.Tag = "12008"; this.button68.Text = "12005"; @@ -3795,9 +3965,10 @@ // this.button5.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button5.Location = new System.Drawing.Point(319, 160); + this.button5.Location = new System.Drawing.Point(425, 200); + this.button5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(31, 42); + this.button5.Size = new System.Drawing.Size(41, 52); this.button5.TabIndex = 5896; this.button5.Tag = "12030"; this.button5.Text = "12030"; @@ -3809,9 +3980,10 @@ this.label51.BackColor = System.Drawing.Color.Transparent; this.label51.Enabled = false; this.label51.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label51.Location = new System.Drawing.Point(409, 466); + this.label51.Location = new System.Drawing.Point(545, 582); + this.label51.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label51.Name = "label51"; - this.label51.Size = new System.Drawing.Size(17, 12); + this.label51.Size = new System.Drawing.Size(22, 15); this.label51.TabIndex = 5846; this.label51.Text = "↓"; // @@ -3819,9 +3991,10 @@ // this.button40.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button40.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button40.Location = new System.Drawing.Point(424, 287); + this.button40.Location = new System.Drawing.Point(565, 359); + this.button40.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button40.Name = "button40"; - this.button40.Size = new System.Drawing.Size(87, 28); + this.button40.Size = new System.Drawing.Size(116, 35); this.button40.TabIndex = 5895; this.button40.Tag = "12038"; this.button40.Text = "12038"; @@ -3833,9 +4006,10 @@ this.label50.BackColor = System.Drawing.Color.Transparent; this.label50.Enabled = false; this.label50.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label50.Location = new System.Drawing.Point(409, 407); + this.label50.Location = new System.Drawing.Point(545, 509); + this.label50.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label50.Name = "label50"; - this.label50.Size = new System.Drawing.Size(17, 12); + this.label50.Size = new System.Drawing.Size(22, 15); this.label50.TabIndex = 5847; this.label50.Text = "↓"; // @@ -3845,9 +4019,10 @@ this.label93.BackColor = System.Drawing.Color.Transparent; this.label93.Enabled = false; this.label93.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label93.Location = new System.Drawing.Point(356, 329); + this.label93.Location = new System.Drawing.Point(475, 411); + this.label93.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label93.Name = "label93"; - this.label93.Size = new System.Drawing.Size(17, 12); + this.label93.Size = new System.Drawing.Size(22, 15); this.label93.TabIndex = 5848; this.label93.Text = "↓"; // @@ -3855,9 +4030,10 @@ // this.button17.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button17.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button17.Location = new System.Drawing.Point(424, 202); + this.button17.Location = new System.Drawing.Point(565, 252); + this.button17.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button17.Name = "button17"; - this.button17.Size = new System.Drawing.Size(87, 28); + this.button17.Size = new System.Drawing.Size(116, 35); this.button17.TabIndex = 5894; this.button17.Tag = "12034"; this.button17.Text = "12034"; @@ -3869,9 +4045,10 @@ this.label33.BackColor = System.Drawing.Color.Transparent; this.label33.Enabled = false; this.label33.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label33.Location = new System.Drawing.Point(1077, 343); + this.label33.Location = new System.Drawing.Point(1436, 429); + this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(17, 12); + this.label33.Size = new System.Drawing.Size(22, 15); this.label33.TabIndex = 5849; this.label33.Text = "↓"; // @@ -3879,9 +4056,10 @@ // this.button55.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button55.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button55.Location = new System.Drawing.Point(455, 560); + this.button55.Location = new System.Drawing.Point(607, 700); + this.button55.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button55.Name = "button55"; - this.button55.Size = new System.Drawing.Size(57, 28); + this.button55.Size = new System.Drawing.Size(76, 35); this.button55.TabIndex = 5888; this.button55.Tag = "12048"; this.button55.Text = " 12048"; @@ -3891,9 +4069,10 @@ // this.button49.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button49.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button49.Location = new System.Drawing.Point(424, 356); + this.button49.Location = new System.Drawing.Point(565, 445); + this.button49.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button49.Name = "button49"; - this.button49.Size = new System.Drawing.Size(87, 28); + this.button49.Size = new System.Drawing.Size(116, 35); this.button49.TabIndex = 5892; this.button49.Tag = "12040"; this.button49.Text = " 12040"; @@ -3903,9 +4082,10 @@ // this.button93.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button93.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button93.Location = new System.Drawing.Point(1263, 565); + this.button93.Location = new System.Drawing.Point(1684, 706); + this.button93.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button93.Name = "button93"; - this.button93.Size = new System.Drawing.Size(87, 28); + this.button93.Size = new System.Drawing.Size(116, 35); this.button93.TabIndex = 5891; this.button93.Tag = "12004"; this.button93.Text = "12004"; @@ -3915,9 +4095,10 @@ // this.button90.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button90.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button90.Location = new System.Drawing.Point(1257, 360); + this.button90.Location = new System.Drawing.Point(1676, 450); + this.button90.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button90.Name = "button90"; - this.button90.Size = new System.Drawing.Size(87, 28); + this.button90.Size = new System.Drawing.Size(116, 35); this.button90.TabIndex = 5890; this.button90.Tag = "12003"; this.button90.Text = "12003"; @@ -3927,9 +4108,10 @@ // this.button87.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button87.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button87.Location = new System.Drawing.Point(1257, 289); + this.button87.Location = new System.Drawing.Point(1676, 361); + this.button87.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button87.Name = "button87"; - this.button87.Size = new System.Drawing.Size(87, 28); + this.button87.Size = new System.Drawing.Size(116, 35); this.button87.TabIndex = 5889; this.button87.Tag = "12002"; this.button87.Text = "12002"; @@ -3939,9 +4121,10 @@ // this.button97.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button97.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button97.Location = new System.Drawing.Point(1213, 632); + this.button97.Location = new System.Drawing.Point(1617, 790); + this.button97.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button97.Name = "button97"; - this.button97.Size = new System.Drawing.Size(118, 28); + this.button97.Size = new System.Drawing.Size(157, 35); this.button97.TabIndex = 5898; this.button97.Tag = "15102"; this.button97.Text = "12004出入库属性"; @@ -3951,9 +4134,10 @@ // this.button62.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button62.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button62.Location = new System.Drawing.Point(1257, 131); + this.button62.Location = new System.Drawing.Point(1676, 164); + this.button62.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button62.Name = "button62"; - this.button62.Size = new System.Drawing.Size(87, 28); + this.button62.Size = new System.Drawing.Size(116, 35); this.button62.TabIndex = 5898; this.button62.Tag = "12001"; this.button62.Text = "12001"; @@ -3963,9 +4147,10 @@ // this.button66.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button66.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button66.Location = new System.Drawing.Point(425, 132); + this.button66.Location = new System.Drawing.Point(567, 165); + this.button66.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button66.Name = "button66"; - this.button66.Size = new System.Drawing.Size(87, 28); + this.button66.Size = new System.Drawing.Size(116, 35); this.button66.TabIndex = 5887; this.button66.Tag = "12026"; this.button66.Text = "12026"; @@ -3975,9 +4160,10 @@ // this.button92.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button92.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button92.Location = new System.Drawing.Point(1160, 563); + this.button92.Location = new System.Drawing.Point(1547, 704); + this.button92.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button92.Name = "button92"; - this.button92.Size = new System.Drawing.Size(87, 28); + this.button92.Size = new System.Drawing.Size(116, 35); this.button92.TabIndex = 5883; this.button92.Tag = "14004"; this.button92.Text = "14004"; @@ -3987,9 +4173,10 @@ // this.button89.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button89.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button89.Location = new System.Drawing.Point(1149, 361); + this.button89.Location = new System.Drawing.Point(1532, 451); + this.button89.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button89.Name = "button89"; - this.button89.Size = new System.Drawing.Size(87, 28); + this.button89.Size = new System.Drawing.Size(116, 35); this.button89.TabIndex = 5886; this.button89.Tag = "14003"; this.button89.Text = "14003"; @@ -3999,9 +4186,10 @@ // this.button86.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button86.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button86.Location = new System.Drawing.Point(1148, 290); + this.button86.Location = new System.Drawing.Point(1531, 362); + this.button86.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button86.Name = "button86"; - this.button86.Size = new System.Drawing.Size(87, 28); + this.button86.Size = new System.Drawing.Size(116, 35); this.button86.TabIndex = 5885; this.button86.Tag = "14002"; this.button86.Text = "14002"; @@ -4011,9 +4199,10 @@ // this.button4.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button4.Location = new System.Drawing.Point(1147, 132); + this.button4.Location = new System.Drawing.Point(1529, 165); + this.button4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(87, 28); + this.button4.Size = new System.Drawing.Size(116, 35); this.button4.TabIndex = 5884; this.button4.Tag = "14001"; this.button4.Text = "14001"; @@ -4025,9 +4214,10 @@ this.label69.BackColor = System.Drawing.Color.Transparent; this.label69.Enabled = false; this.label69.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label69.Location = new System.Drawing.Point(1039, 166); + this.label69.Location = new System.Drawing.Point(1385, 208); + this.label69.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label69.Name = "label69"; - this.label69.Size = new System.Drawing.Size(17, 12); + this.label69.Size = new System.Drawing.Size(22, 15); this.label69.TabIndex = 5850; this.label69.Text = "↓"; // @@ -4037,9 +4227,10 @@ this.label45.BackColor = System.Drawing.Color.Transparent; this.label45.Enabled = false; this.label45.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label45.Location = new System.Drawing.Point(356, 245); + this.label45.Location = new System.Drawing.Point(475, 306); + this.label45.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label45.Name = "label45"; - this.label45.Size = new System.Drawing.Size(17, 12); + this.label45.Size = new System.Drawing.Size(22, 15); this.label45.TabIndex = 5851; this.label45.Text = "↓"; // @@ -4049,9 +4240,10 @@ this.label26.BackColor = System.Drawing.Color.Transparent; this.label26.Enabled = false; this.label26.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label26.Location = new System.Drawing.Point(356, 166); + this.label26.Location = new System.Drawing.Point(475, 208); + this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(17, 12); + this.label26.Size = new System.Drawing.Size(22, 15); this.label26.TabIndex = 5853; this.label26.Text = "↓"; // @@ -4059,9 +4251,10 @@ // this.button39.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button39.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button39.Location = new System.Drawing.Point(319, 286); + this.button39.Location = new System.Drawing.Point(425, 358); + this.button39.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button39.Name = "button39"; - this.button39.Size = new System.Drawing.Size(106, 28); + this.button39.Size = new System.Drawing.Size(141, 35); this.button39.TabIndex = 5893; this.button39.Tag = "12037"; this.button39.Text = "12037"; @@ -4073,9 +4266,10 @@ this.label40.BackColor = System.Drawing.Color.Transparent; this.label40.Enabled = false; this.label40.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label40.Location = new System.Drawing.Point(454, 272); + this.label40.Location = new System.Drawing.Point(605, 340); + this.label40.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label40.Name = "label40"; - this.label40.Size = new System.Drawing.Size(17, 12); + this.label40.Size = new System.Drawing.Size(22, 15); this.label40.TabIndex = 5861; this.label40.Text = "←"; // @@ -4083,9 +4277,10 @@ // this.button13.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button13.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button13.Location = new System.Drawing.Point(319, 201); + this.button13.Location = new System.Drawing.Point(425, 251); + this.button13.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button13.Name = "button13"; - this.button13.Size = new System.Drawing.Size(106, 28); + this.button13.Size = new System.Drawing.Size(141, 35); this.button13.TabIndex = 5912; this.button13.Tag = "12033"; this.button13.Text = "12033"; @@ -4097,9 +4292,10 @@ this.label30.BackColor = System.Drawing.Color.Transparent; this.label30.Enabled = false; this.label30.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label30.Location = new System.Drawing.Point(454, 187); + this.label30.Location = new System.Drawing.Point(605, 234); + this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(17, 12); + this.label30.Size = new System.Drawing.Size(22, 15); this.label30.TabIndex = 5854; this.label30.Text = "←"; // @@ -4109,9 +4305,10 @@ this.label38.BackColor = System.Drawing.Color.Transparent; this.label38.Enabled = false; this.label38.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label38.Location = new System.Drawing.Point(356, 270); + this.label38.Location = new System.Drawing.Point(475, 338); + this.label38.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(59, 12); + this.label38.Size = new System.Drawing.Size(77, 15); this.label38.TabIndex = 5855; this.label38.Text = "12036移栽"; // @@ -4119,9 +4316,10 @@ // this.button48.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button48.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button48.Location = new System.Drawing.Point(319, 356); + this.button48.Location = new System.Drawing.Point(425, 445); + this.button48.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button48.Name = "button48"; - this.button48.Size = new System.Drawing.Size(106, 28); + this.button48.Size = new System.Drawing.Size(141, 35); this.button48.TabIndex = 5922; this.button48.Tag = "12042"; this.button48.Text = "12042"; @@ -4131,9 +4329,10 @@ // this.button65.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button65.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button65.Location = new System.Drawing.Point(321, 132); + this.button65.Location = new System.Drawing.Point(428, 165); + this.button65.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button65.Name = "button65"; - this.button65.Size = new System.Drawing.Size(106, 28); + this.button65.Size = new System.Drawing.Size(141, 35); this.button65.TabIndex = 5900; this.button65.Tag = "12027"; this.button65.Text = "12027"; @@ -4143,9 +4342,10 @@ // this.button101.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button101.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button101.Location = new System.Drawing.Point(1127, 556); + this.button101.Location = new System.Drawing.Point(1503, 695); + this.button101.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button101.Name = "button101"; - this.button101.Size = new System.Drawing.Size(28, 61); + this.button101.Size = new System.Drawing.Size(37, 76); this.button101.TabIndex = 5919; this.button101.Tag = "13104"; this.button101.Text = "13104"; @@ -4155,9 +4355,10 @@ // this.button100.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button100.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button100.Location = new System.Drawing.Point(1120, 356); + this.button100.Location = new System.Drawing.Point(1493, 445); + this.button100.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button100.Name = "button100"; - this.button100.Size = new System.Drawing.Size(28, 61); + this.button100.Size = new System.Drawing.Size(37, 76); this.button100.TabIndex = 5919; this.button100.Tag = "13103"; this.button100.Text = "13103"; @@ -4167,9 +4368,10 @@ // this.button99.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button99.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button99.Location = new System.Drawing.Point(1120, 269); + this.button99.Location = new System.Drawing.Point(1493, 336); + this.button99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button99.Name = "button99"; - this.button99.Size = new System.Drawing.Size(28, 61); + this.button99.Size = new System.Drawing.Size(37, 76); this.button99.TabIndex = 5919; this.button99.Tag = "13102"; this.button99.Text = "13102"; @@ -4179,9 +4381,10 @@ // this.button91.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button91.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button91.Location = new System.Drawing.Point(1093, 556); + this.button91.Location = new System.Drawing.Point(1457, 695); + this.button91.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button91.Name = "button91"; - this.button91.Size = new System.Drawing.Size(28, 61); + this.button91.Size = new System.Drawing.Size(37, 76); this.button91.TabIndex = 5919; this.button91.Tag = "13004"; this.button91.Text = "13004"; @@ -4191,9 +4394,10 @@ // this.button88.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button88.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button88.Location = new System.Drawing.Point(1086, 356); + this.button88.Location = new System.Drawing.Point(1448, 445); + this.button88.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button88.Name = "button88"; - this.button88.Size = new System.Drawing.Size(28, 61); + this.button88.Size = new System.Drawing.Size(37, 76); this.button88.TabIndex = 5919; this.button88.Tag = "13003"; this.button88.Text = "13003"; @@ -4203,9 +4407,10 @@ // this.button85.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button85.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button85.Location = new System.Drawing.Point(1086, 269); + this.button85.Location = new System.Drawing.Point(1448, 336); + this.button85.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button85.Name = "button85"; - this.button85.Size = new System.Drawing.Size(28, 61); + this.button85.Size = new System.Drawing.Size(37, 76); this.button85.TabIndex = 5919; this.button85.Tag = "13002"; this.button85.Text = "13002"; @@ -4215,9 +4420,10 @@ // this.button105.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button105.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button105.Location = new System.Drawing.Point(294, 556); + this.button105.Location = new System.Drawing.Point(392, 695); + this.button105.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button105.Name = "button105"; - this.button105.Size = new System.Drawing.Size(29, 61); + this.button105.Size = new System.Drawing.Size(39, 76); this.button105.TabIndex = 5918; this.button105.Tag = "13008"; this.button105.Text = "13008"; @@ -4227,9 +4433,10 @@ // this.button104.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button104.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button104.Location = new System.Drawing.Point(282, 280); + this.button104.Location = new System.Drawing.Point(376, 350); + this.button104.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button104.Name = "button104"; - this.button104.Size = new System.Drawing.Size(29, 61); + this.button104.Size = new System.Drawing.Size(39, 76); this.button104.TabIndex = 5918; this.button104.Tag = "13007"; this.button104.Text = "13007"; @@ -4239,9 +4446,10 @@ // this.button64.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button64.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button64.Location = new System.Drawing.Point(287, 196); + this.button64.Location = new System.Drawing.Point(383, 245); + this.button64.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button64.Name = "button64"; - this.button64.Size = new System.Drawing.Size(29, 61); + this.button64.Size = new System.Drawing.Size(39, 76); this.button64.TabIndex = 5918; this.button64.Tag = "13006"; this.button64.Text = "13006"; @@ -4251,9 +4459,10 @@ // this.button103.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button103.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button103.Location = new System.Drawing.Point(287, 113); + this.button103.Location = new System.Drawing.Point(383, 141); + this.button103.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button103.Name = "button103"; - this.button103.Size = new System.Drawing.Size(29, 61); + this.button103.Size = new System.Drawing.Size(39, 76); this.button103.TabIndex = 5918; this.button103.Tag = "13005"; this.button103.Text = "13005"; @@ -4263,9 +4472,10 @@ // this.button58.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button58.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button58.Location = new System.Drawing.Point(264, 556); + this.button58.Location = new System.Drawing.Point(352, 695); + this.button58.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button58.Name = "button58"; - this.button58.Size = new System.Drawing.Size(29, 61); + this.button58.Size = new System.Drawing.Size(39, 76); this.button58.TabIndex = 5918; this.button58.Tag = "13108"; this.button58.Text = "13108"; @@ -4275,9 +4485,10 @@ // this.button44.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button44.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button44.Location = new System.Drawing.Point(252, 280); + this.button44.Location = new System.Drawing.Point(336, 350); + this.button44.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button44.Name = "button44"; - this.button44.Size = new System.Drawing.Size(29, 61); + this.button44.Size = new System.Drawing.Size(39, 76); this.button44.TabIndex = 5918; this.button44.Tag = "13107"; this.button44.Text = "13107"; @@ -4287,9 +4498,10 @@ // this.button37.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button37.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button37.Location = new System.Drawing.Point(257, 196); + this.button37.Location = new System.Drawing.Point(343, 245); + this.button37.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button37.Name = "button37"; - this.button37.Size = new System.Drawing.Size(29, 61); + this.button37.Size = new System.Drawing.Size(39, 76); this.button37.TabIndex = 5918; this.button37.Tag = "13106"; this.button37.Text = "13106"; @@ -4299,9 +4511,10 @@ // this.button102.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button102.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button102.Location = new System.Drawing.Point(257, 114); + this.button102.Location = new System.Drawing.Point(343, 142); + this.button102.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button102.Name = "button102"; - this.button102.Size = new System.Drawing.Size(29, 61); + this.button102.Size = new System.Drawing.Size(39, 76); this.button102.TabIndex = 5918; this.button102.Tag = "13105"; this.button102.Text = "13105"; @@ -4311,9 +4524,10 @@ // this.button98.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button98.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button98.Location = new System.Drawing.Point(1090, 115); + this.button98.Location = new System.Drawing.Point(1453, 144); + this.button98.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button98.Name = "button98"; - this.button98.Size = new System.Drawing.Size(29, 61); + this.button98.Size = new System.Drawing.Size(39, 76); this.button98.TabIndex = 5918; this.button98.Tag = "13001"; this.button98.Text = "13001"; @@ -4323,9 +4537,10 @@ // this.button2.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button2.Location = new System.Drawing.Point(1119, 116); + this.button2.Location = new System.Drawing.Point(1492, 145); + this.button2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(29, 61); + this.button2.Size = new System.Drawing.Size(39, 76); this.button2.TabIndex = 5918; this.button2.Tag = "13101"; this.button2.Text = "13101"; @@ -4337,9 +4552,10 @@ this.label29.BackColor = System.Drawing.Color.Transparent; this.label29.Enabled = false; this.label29.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label29.Location = new System.Drawing.Point(356, 185); + this.label29.Location = new System.Drawing.Point(475, 231); + this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(59, 12); + this.label29.Size = new System.Drawing.Size(77, 15); this.label29.TabIndex = 5856; this.label29.Text = "12032移栽"; // @@ -4349,9 +4565,10 @@ this.label48.BackColor = System.Drawing.Color.Transparent; this.label48.Enabled = false; this.label48.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label48.Location = new System.Drawing.Point(482, 388); + this.label48.Location = new System.Drawing.Point(643, 485); + this.label48.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label48.Name = "label48"; - this.label48.Size = new System.Drawing.Size(17, 12); + this.label48.Size = new System.Drawing.Size(22, 15); this.label48.TabIndex = 5857; this.label48.Text = "→"; // @@ -4361,9 +4578,10 @@ this.label96.BackColor = System.Drawing.Color.Transparent; this.label96.Enabled = false; this.label96.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label96.Location = new System.Drawing.Point(1302, 274); + this.label96.Location = new System.Drawing.Point(1736, 342); + this.label96.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label96.Name = "label96"; - this.label96.Size = new System.Drawing.Size(17, 12); + this.label96.Size = new System.Drawing.Size(22, 15); this.label96.TabIndex = 5858; this.label96.Text = "→"; // @@ -4373,9 +4591,10 @@ this.label103.BackColor = System.Drawing.Color.Transparent; this.label103.Enabled = false; this.label103.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label103.Location = new System.Drawing.Point(960, 544); + this.label103.Location = new System.Drawing.Point(1280, 680); + this.label103.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label103.Name = "label103"; - this.label103.Size = new System.Drawing.Size(29, 12); + this.label103.Size = new System.Drawing.Size(37, 15); this.label103.TabIndex = 5859; this.label103.Text = "←→"; // @@ -4385,9 +4604,10 @@ this.label102.BackColor = System.Drawing.Color.Transparent; this.label102.Enabled = false; this.label102.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label102.Location = new System.Drawing.Point(1116, 532); + this.label102.Location = new System.Drawing.Point(1488, 665); + this.label102.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label102.Name = "label102"; - this.label102.Size = new System.Drawing.Size(29, 12); + this.label102.Size = new System.Drawing.Size(37, 15); this.label102.TabIndex = 5860; this.label102.Text = "←→"; // @@ -4397,9 +4617,10 @@ this.label34.BackColor = System.Drawing.Color.Transparent; this.label34.Enabled = false; this.label34.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label34.Location = new System.Drawing.Point(420, 270); + this.label34.Location = new System.Drawing.Point(560, 338); + this.label34.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(17, 12); + this.label34.Size = new System.Drawing.Size(22, 15); this.label34.TabIndex = 5844; this.label34.Text = "←"; // @@ -4409,9 +4630,10 @@ this.label101.BackColor = System.Drawing.Color.Transparent; this.label101.Enabled = false; this.label101.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label101.Location = new System.Drawing.Point(1187, 548); + this.label101.Location = new System.Drawing.Point(1583, 685); + this.label101.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label101.Name = "label101"; - this.label101.Size = new System.Drawing.Size(29, 12); + this.label101.Size = new System.Drawing.Size(37, 15); this.label101.TabIndex = 5843; this.label101.Text = "←→"; // @@ -4421,9 +4643,10 @@ this.label97.BackColor = System.Drawing.Color.Transparent; this.label97.Enabled = false; this.label97.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label97.Location = new System.Drawing.Point(1105, 345); + this.label97.Location = new System.Drawing.Point(1473, 431); + this.label97.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label97.Name = "label97"; - this.label97.Size = new System.Drawing.Size(29, 12); + this.label97.Size = new System.Drawing.Size(37, 15); this.label97.TabIndex = 5842; this.label97.Text = "←→"; // @@ -4433,9 +4656,10 @@ this.label98.BackColor = System.Drawing.Color.Transparent; this.label98.Enabled = false; this.label98.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label98.Location = new System.Drawing.Point(1290, 550); + this.label98.Location = new System.Drawing.Point(1720, 688); + this.label98.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label98.Name = "label98"; - this.label98.Size = new System.Drawing.Size(29, 12); + this.label98.Size = new System.Drawing.Size(37, 15); this.label98.TabIndex = 5841; this.label98.Text = "←→"; // @@ -4445,9 +4669,10 @@ this.label99.BackColor = System.Drawing.Color.Transparent; this.label99.Enabled = false; this.label99.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label99.Location = new System.Drawing.Point(1176, 346); + this.label99.Location = new System.Drawing.Point(1568, 432); + this.label99.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label99.Name = "label99"; - this.label99.Size = new System.Drawing.Size(29, 12); + this.label99.Size = new System.Drawing.Size(37, 15); this.label99.TabIndex = 5826; this.label99.Text = "←→"; // @@ -4457,9 +4682,10 @@ this.label100.BackColor = System.Drawing.Color.Transparent; this.label100.Enabled = false; this.label100.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label100.Location = new System.Drawing.Point(1291, 345); + this.label100.Location = new System.Drawing.Point(1721, 431); + this.label100.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label100.Name = "label100"; - this.label100.Size = new System.Drawing.Size(29, 12); + this.label100.Size = new System.Drawing.Size(37, 15); this.label100.TabIndex = 5827; this.label100.Text = "←→"; // @@ -4469,9 +4695,10 @@ this.label57.BackColor = System.Drawing.Color.Transparent; this.label57.Enabled = false; this.label57.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label57.Location = new System.Drawing.Point(1301, 116); + this.label57.Location = new System.Drawing.Point(1735, 145); + this.label57.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label57.Name = "label57"; - this.label57.Size = new System.Drawing.Size(29, 12); + this.label57.Size = new System.Drawing.Size(37, 15); this.label57.TabIndex = 5828; this.label57.Text = "←→"; // @@ -4481,9 +4708,10 @@ this.label53.BackColor = System.Drawing.Color.Transparent; this.label53.Enabled = false; this.label53.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label53.Location = new System.Drawing.Point(409, 592); + this.label53.Location = new System.Drawing.Point(545, 740); + this.label53.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label53.Name = "label53"; - this.label53.Size = new System.Drawing.Size(59, 12); + this.label53.Size = new System.Drawing.Size(77, 15); this.label53.TabIndex = 5829; this.label53.Text = "12049移栽"; // @@ -4493,9 +4721,10 @@ this.label95.BackColor = System.Drawing.Color.Transparent; this.label95.Enabled = false; this.label95.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label95.Location = new System.Drawing.Point(1187, 275); + this.label95.Location = new System.Drawing.Point(1583, 344); + this.label95.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label95.Name = "label95"; - this.label95.Size = new System.Drawing.Size(17, 12); + this.label95.Size = new System.Drawing.Size(22, 15); this.label95.TabIndex = 5830; this.label95.Text = "→"; // @@ -4505,9 +4734,10 @@ this.label68.BackColor = System.Drawing.Color.Transparent; this.label68.Enabled = false; this.label68.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label68.Location = new System.Drawing.Point(464, 118); + this.label68.Location = new System.Drawing.Point(619, 148); + this.label68.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label68.Name = "label68"; - this.label68.Size = new System.Drawing.Size(17, 12); + this.label68.Size = new System.Drawing.Size(22, 15); this.label68.TabIndex = 5863; this.label68.Text = "→"; // @@ -4517,9 +4747,10 @@ this.label25.BackColor = System.Drawing.Color.Transparent; this.label25.Enabled = false; this.label25.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label25.Location = new System.Drawing.Point(1186, 117); + this.label25.Location = new System.Drawing.Point(1581, 146); + this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(29, 12); + this.label25.Size = new System.Drawing.Size(37, 15); this.label25.TabIndex = 5832; this.label25.Text = "←→"; // @@ -4529,9 +4760,10 @@ this.label49.BackColor = System.Drawing.Color.Transparent; this.label49.Enabled = false; this.label49.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label49.Location = new System.Drawing.Point(410, 340); + this.label49.Location = new System.Drawing.Point(547, 425); + this.label49.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label49.Name = "label49"; - this.label49.Size = new System.Drawing.Size(59, 12); + this.label49.Size = new System.Drawing.Size(77, 15); this.label49.TabIndex = 5833; this.label49.Text = "12041移栽"; // @@ -4541,9 +4773,10 @@ this.label47.BackColor = System.Drawing.Color.Transparent; this.label47.Enabled = false; this.label47.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label47.Location = new System.Drawing.Point(256, 363); + this.label47.Location = new System.Drawing.Point(341, 454); + this.label47.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label47.Name = "label47"; - this.label47.Size = new System.Drawing.Size(59, 12); + this.label47.Size = new System.Drawing.Size(77, 15); this.label47.TabIndex = 5834; this.label47.Text = "12043移栽"; // @@ -4553,9 +4786,10 @@ this.label28.BackColor = System.Drawing.Color.Transparent; this.label28.Enabled = false; this.label28.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label28.Location = new System.Drawing.Point(420, 186); + this.label28.Location = new System.Drawing.Point(560, 232); + this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(17, 12); + this.label28.Size = new System.Drawing.Size(22, 15); this.label28.TabIndex = 5835; this.label28.Text = "←"; // @@ -4565,9 +4799,10 @@ this.label46.BackColor = System.Drawing.Color.Transparent; this.label46.Enabled = false; this.label46.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label46.Location = new System.Drawing.Point(368, 341); + this.label46.Location = new System.Drawing.Point(491, 426); + this.label46.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label46.Name = "label46"; - this.label46.Size = new System.Drawing.Size(17, 12); + this.label46.Size = new System.Drawing.Size(22, 15); this.label46.TabIndex = 5836; this.label46.Text = "→"; // @@ -4577,9 +4812,10 @@ this.label67.BackColor = System.Drawing.Color.Transparent; this.label67.Enabled = false; this.label67.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label67.Location = new System.Drawing.Point(314, 98); + this.label67.Location = new System.Drawing.Point(419, 122); + this.label67.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label67.Name = "label67"; - this.label67.Size = new System.Drawing.Size(59, 12); + this.label67.Size = new System.Drawing.Size(77, 15); this.label67.TabIndex = 5837; this.label67.Text = "12028移栽"; // @@ -4589,9 +4825,10 @@ this.label88.BackColor = System.Drawing.Color.Transparent; this.label88.Enabled = false; this.label88.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label88.Location = new System.Drawing.Point(985, 257); + this.label88.Location = new System.Drawing.Point(1313, 321); + this.label88.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label88.Name = "label88"; - this.label88.Size = new System.Drawing.Size(59, 12); + this.label88.Size = new System.Drawing.Size(77, 15); this.label88.TabIndex = 5838; this.label88.Text = "12013移栽"; // @@ -4601,9 +4838,10 @@ this.label87.BackColor = System.Drawing.Color.Transparent; this.label87.Enabled = false; this.label87.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label87.Location = new System.Drawing.Point(991, 336); + this.label87.Location = new System.Drawing.Point(1321, 420); + this.label87.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label87.Name = "label87"; - this.label87.Size = new System.Drawing.Size(59, 12); + this.label87.Size = new System.Drawing.Size(77, 15); this.label87.TabIndex = 5839; this.label87.Text = "12017移栽"; // @@ -4613,9 +4851,10 @@ this.label24.BackColor = System.Drawing.Color.Transparent; this.label24.Enabled = false; this.label24.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label24.Location = new System.Drawing.Point(998, 184); + this.label24.Location = new System.Drawing.Point(1331, 230); + this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(59, 12); + this.label24.Size = new System.Drawing.Size(77, 15); this.label24.TabIndex = 5840; this.label24.Text = "12009移栽"; // @@ -4625,9 +4864,10 @@ this.label94.BackColor = System.Drawing.Color.Transparent; this.label94.Enabled = false; this.label94.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label94.Location = new System.Drawing.Point(1111, 258); + this.label94.Location = new System.Drawing.Point(1481, 322); + this.label94.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label94.Name = "label94"; - this.label94.Size = new System.Drawing.Size(17, 12); + this.label94.Size = new System.Drawing.Size(22, 15); this.label94.TabIndex = 5852; this.label94.Text = "→"; // @@ -4637,9 +4877,10 @@ this.label64.BackColor = System.Drawing.Color.Transparent; this.label64.Enabled = false; this.label64.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label64.Location = new System.Drawing.Point(370, 117); + this.label64.Location = new System.Drawing.Point(493, 146); + this.label64.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label64.Name = "label64"; - this.label64.Size = new System.Drawing.Size(17, 12); + this.label64.Size = new System.Drawing.Size(22, 15); this.label64.TabIndex = 5862; this.label64.Text = "→"; // @@ -4649,9 +4890,10 @@ this.label23.BackColor = System.Drawing.Color.Transparent; this.label23.Enabled = false; this.label23.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label23.Location = new System.Drawing.Point(1103, 116); + this.label23.Location = new System.Drawing.Point(1471, 145); + this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(17, 12); + this.label23.Size = new System.Drawing.Size(22, 15); this.label23.TabIndex = 5874; this.label23.Text = "←"; // @@ -4659,9 +4901,10 @@ // this.button59.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button59.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button59.Location = new System.Drawing.Point(327, 561); + this.button59.Location = new System.Drawing.Point(436, 701); + this.button59.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button59.Name = "button59"; - this.button59.Size = new System.Drawing.Size(98, 28); + this.button59.Size = new System.Drawing.Size(131, 35); this.button59.TabIndex = 5902; this.button59.Tag = "12050"; this.button59.Text = "12050"; @@ -4671,9 +4914,10 @@ // this.button83.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button83.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button83.Location = new System.Drawing.Point(994, 562); + this.button83.Location = new System.Drawing.Point(1325, 702); + this.button83.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button83.Name = "button83"; - this.button83.Size = new System.Drawing.Size(92, 28); + this.button83.Size = new System.Drawing.Size(123, 35); this.button83.TabIndex = 5906; this.button83.Tag = "12024"; this.button83.Text = "12024"; @@ -4683,9 +4927,10 @@ // this.button77.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button77.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button77.Location = new System.Drawing.Point(987, 358); + this.button77.Location = new System.Drawing.Point(1316, 448); + this.button77.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button77.Name = "button77"; - this.button77.Size = new System.Drawing.Size(98, 28); + this.button77.Size = new System.Drawing.Size(131, 35); this.button77.TabIndex = 5907; this.button77.Tag = "12018"; this.button77.Text = "12018"; @@ -4695,9 +4940,10 @@ // this.button70.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button70.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button70.Location = new System.Drawing.Point(987, 200); + this.button70.Location = new System.Drawing.Point(1316, 250); + this.button70.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button70.Name = "button70"; - this.button70.Size = new System.Drawing.Size(98, 28); + this.button70.Size = new System.Drawing.Size(131, 35); this.button70.TabIndex = 5908; this.button70.Tag = "12010"; this.button70.Text = "12010"; @@ -4707,9 +4953,10 @@ // this.button74.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button74.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button74.Location = new System.Drawing.Point(987, 284); + this.button74.Location = new System.Drawing.Point(1316, 355); + this.button74.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button74.Name = "button74"; - this.button74.Size = new System.Drawing.Size(98, 28); + this.button74.Size = new System.Drawing.Size(131, 35); this.button74.TabIndex = 5909; this.button74.Tag = "12014"; this.button74.Text = "12014"; @@ -4719,9 +4966,10 @@ // this.button1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button1.Location = new System.Drawing.Point(987, 131); + this.button1.Location = new System.Drawing.Point(1316, 164); + this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(98, 28); + this.button1.Size = new System.Drawing.Size(131, 35); this.button1.TabIndex = 5910; this.button1.Tag = "12006"; this.button1.Text = "12006"; @@ -4733,9 +4981,10 @@ this.label42.BackColor = System.Drawing.Color.Transparent; this.label42.Enabled = false; this.label42.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label42.Location = new System.Drawing.Point(276, 270); + this.label42.Location = new System.Drawing.Point(368, 338); + this.label42.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label42.Name = "label42"; - this.label42.Size = new System.Drawing.Size(17, 12); + this.label42.Size = new System.Drawing.Size(22, 15); this.label42.TabIndex = 5872; this.label42.Text = "←"; // @@ -4745,9 +4994,10 @@ this.label32.BackColor = System.Drawing.Color.Transparent; this.label32.Enabled = false; this.label32.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label32.Location = new System.Drawing.Point(276, 185); + this.label32.Location = new System.Drawing.Point(368, 231); + this.label32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(17, 12); + this.label32.Size = new System.Drawing.Size(22, 15); this.label32.TabIndex = 5873; this.label32.Text = "←"; // @@ -4757,9 +5007,10 @@ this.label59.BackColor = System.Drawing.Color.Transparent; this.label59.Enabled = false; this.label59.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label59.Location = new System.Drawing.Point(276, 101); + this.label59.Location = new System.Drawing.Point(368, 126); + this.label59.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label59.Name = "label59"; - this.label59.Size = new System.Drawing.Size(17, 12); + this.label59.Size = new System.Drawing.Size(22, 15); this.label59.TabIndex = 5871; this.label59.Text = "→"; // @@ -4769,9 +5020,10 @@ this.label86.BackColor = System.Drawing.Color.Transparent; this.label86.Enabled = false; this.label86.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label86.Location = new System.Drawing.Point(991, 270); + this.label86.Location = new System.Drawing.Point(1321, 338); + this.label86.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label86.Name = "label86"; - this.label86.Size = new System.Drawing.Size(17, 12); + this.label86.Size = new System.Drawing.Size(22, 15); this.label86.TabIndex = 5870; this.label86.Text = "→"; // @@ -4781,9 +5033,10 @@ this.label75.BackColor = System.Drawing.Color.Transparent; this.label75.Enabled = false; this.label75.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label75.Location = new System.Drawing.Point(1009, 232); + this.label75.Location = new System.Drawing.Point(1345, 290); + this.label75.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label75.Name = "label75"; - this.label75.Size = new System.Drawing.Size(17, 12); + this.label75.Size = new System.Drawing.Size(22, 15); this.label75.TabIndex = 5869; this.label75.Text = "→"; // @@ -4793,9 +5046,10 @@ this.label80.BackColor = System.Drawing.Color.Transparent; this.label80.Enabled = false; this.label80.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label80.Location = new System.Drawing.Point(1009, 389); + this.label80.Location = new System.Drawing.Point(1345, 486); + this.label80.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label80.Name = "label80"; - this.label80.Size = new System.Drawing.Size(17, 12); + this.label80.Size = new System.Drawing.Size(22, 15); this.label80.TabIndex = 5868; this.label80.Text = "←"; // @@ -4805,9 +5059,10 @@ this.label5.BackColor = System.Drawing.Color.Transparent; this.label5.Enabled = false; this.label5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(1011, 116); + this.label5.Location = new System.Drawing.Point(1348, 145); + this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(17, 12); + this.label5.Size = new System.Drawing.Size(22, 15); this.label5.TabIndex = 5867; this.label5.Text = "←"; // @@ -4815,9 +5070,10 @@ // this.button42.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button42.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button42.Location = new System.Drawing.Point(185, 285); + this.button42.Location = new System.Drawing.Point(247, 356); + this.button42.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button42.Name = "button42"; - this.button42.Size = new System.Drawing.Size(69, 28); + this.button42.Size = new System.Drawing.Size(92, 35); this.button42.TabIndex = 5911; this.button42.Tag = "12044"; this.button42.Text = "12044"; @@ -4829,9 +5085,10 @@ this.label41.BackColor = System.Drawing.Color.Transparent; this.label41.Enabled = false; this.label41.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label41.Location = new System.Drawing.Point(209, 270); + this.label41.Location = new System.Drawing.Point(279, 338); + this.label41.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label41.Name = "label41"; - this.label41.Size = new System.Drawing.Size(17, 12); + this.label41.Size = new System.Drawing.Size(22, 15); this.label41.TabIndex = 5866; this.label41.Text = "←"; // @@ -4839,9 +5096,10 @@ // this.button108.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button108.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button108.Location = new System.Drawing.Point(1236, 115); + this.button108.Location = new System.Drawing.Point(1648, 144); + this.button108.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button108.Name = "button108"; - this.button108.Size = new System.Drawing.Size(19, 62); + this.button108.Size = new System.Drawing.Size(25, 78); this.button108.TabIndex = 5913; this.button108.Tag = "18103"; this.button108.UseVisualStyleBackColor = false; @@ -4850,9 +5108,10 @@ // this.button107.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button107.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button107.Location = new System.Drawing.Point(1237, 269); + this.button107.Location = new System.Drawing.Point(1649, 336); + this.button107.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button107.Name = "button107"; - this.button107.Size = new System.Drawing.Size(19, 59); + this.button107.Size = new System.Drawing.Size(25, 74); this.button107.TabIndex = 5913; this.button107.Tag = "18104"; this.button107.UseVisualStyleBackColor = false; @@ -4861,9 +5120,10 @@ // this.button106.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button106.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button106.Location = new System.Drawing.Point(1237, 345); + this.button106.Location = new System.Drawing.Point(1649, 431); + this.button106.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button106.Name = "button106"; - this.button106.Size = new System.Drawing.Size(19, 59); + this.button106.Size = new System.Drawing.Size(25, 74); this.button106.TabIndex = 5913; this.button106.Tag = "18105"; this.button106.UseVisualStyleBackColor = false; @@ -4872,9 +5132,10 @@ // this.button96.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button96.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button96.Location = new System.Drawing.Point(1246, 554); + this.button96.Location = new System.Drawing.Point(1661, 692); + this.button96.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button96.Name = "button96"; - this.button96.Size = new System.Drawing.Size(19, 61); + this.button96.Size = new System.Drawing.Size(25, 76); this.button96.TabIndex = 5913; this.button96.Tag = "18106"; this.button96.UseVisualStyleBackColor = false; @@ -4883,9 +5144,10 @@ // this.button61.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button61.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button61.Location = new System.Drawing.Point(1093, 434); + this.button61.Location = new System.Drawing.Point(1457, 542); + this.button61.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button61.Name = "button61"; - this.button61.Size = new System.Drawing.Size(28, 94); + this.button61.Size = new System.Drawing.Size(37, 118); this.button61.TabIndex = 5913; this.button61.Tag = "18101"; this.button61.Text = "快速卷帘门 1"; @@ -4895,9 +5157,10 @@ // this.button60.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button60.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button60.Location = new System.Drawing.Point(379, 410); + this.button60.Location = new System.Drawing.Point(505, 512); + this.button60.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button60.Name = "button60"; - this.button60.Size = new System.Drawing.Size(23, 126); + this.button60.Size = new System.Drawing.Size(31, 158); this.button60.TabIndex = 5913; this.button60.Tag = "18102"; this.button60.Text = "快速卷帘门2"; @@ -4907,9 +5170,10 @@ // this.button57.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button57.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button57.Location = new System.Drawing.Point(194, 561); + this.button57.Location = new System.Drawing.Point(259, 701); + this.button57.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button57.Name = "button57"; - this.button57.Size = new System.Drawing.Size(69, 28); + this.button57.Size = new System.Drawing.Size(92, 35); this.button57.TabIndex = 5913; this.button57.Tag = "12051"; this.button57.Text = "12051"; @@ -4919,9 +5183,10 @@ // this.button36.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button36.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button36.Location = new System.Drawing.Point(185, 200); + this.button36.Location = new System.Drawing.Point(247, 250); + this.button36.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button36.Name = "button36"; - this.button36.Size = new System.Drawing.Size(69, 28); + this.button36.Size = new System.Drawing.Size(92, 35); this.button36.TabIndex = 5924; this.button36.Tag = "12031"; this.button36.Text = "12031"; @@ -4933,9 +5198,10 @@ this.label31.BackColor = System.Drawing.Color.Transparent; this.label31.Enabled = false; this.label31.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label31.Location = new System.Drawing.Point(216, 190); + this.label31.Location = new System.Drawing.Point(288, 238); + this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(17, 12); + this.label31.Size = new System.Drawing.Size(22, 15); this.label31.TabIndex = 5865; this.label31.Text = "←"; // @@ -4943,9 +5209,10 @@ // this.button118.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button118.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button118.Location = new System.Drawing.Point(130, 622); + this.button118.Location = new System.Drawing.Point(173, 778); + this.button118.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button118.Name = "button118"; - this.button118.Size = new System.Drawing.Size(104, 23); + this.button118.Size = new System.Drawing.Size(139, 29); this.button118.TabIndex = 5914; this.button118.Tag = "30005"; this.button118.Text = "12051AGV对接信号"; @@ -4955,9 +5222,10 @@ // this.button116.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button116.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button116.Location = new System.Drawing.Point(120, 378); + this.button116.Location = new System.Drawing.Point(160, 472); + this.button116.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button116.Name = "button116"; - this.button116.Size = new System.Drawing.Size(104, 23); + this.button116.Size = new System.Drawing.Size(139, 29); this.button116.TabIndex = 5914; this.button116.Tag = "30004"; this.button116.Text = "12044AGV对接信号"; @@ -4967,9 +5235,10 @@ // this.button117.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button117.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button117.Location = new System.Drawing.Point(120, 163); + this.button117.Location = new System.Drawing.Point(160, 204); + this.button117.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button117.Name = "button117"; - this.button117.Size = new System.Drawing.Size(104, 23); + this.button117.Size = new System.Drawing.Size(139, 29); this.button117.TabIndex = 5914; this.button117.Tag = "30002"; this.button117.Text = "12029AGV对接信号"; @@ -4980,9 +5249,10 @@ // this.button115.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button115.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button115.Location = new System.Drawing.Point(122, 245); + this.button115.Location = new System.Drawing.Point(163, 306); + this.button115.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button115.Name = "button115"; - this.button115.Size = new System.Drawing.Size(104, 23); + this.button115.Size = new System.Drawing.Size(139, 29); this.button115.TabIndex = 5914; this.button115.Tag = "30003"; this.button115.Text = "12031AGV对接信号"; @@ -4992,9 +5262,10 @@ // this.button63.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button63.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button63.Location = new System.Drawing.Point(185, 132); + this.button63.Location = new System.Drawing.Point(247, 165); + this.button63.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button63.Name = "button63"; - this.button63.Size = new System.Drawing.Size(69, 28); + this.button63.Size = new System.Drawing.Size(92, 35); this.button63.TabIndex = 5914; this.button63.Tag = "12029"; this.button63.Text = "12029"; @@ -5004,9 +5275,10 @@ // this.button82.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button82.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button82.Location = new System.Drawing.Point(926, 562); + this.button82.Location = new System.Drawing.Point(1235, 702); + this.button82.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button82.Name = "button82"; - this.button82.Size = new System.Drawing.Size(69, 28); + this.button82.Size = new System.Drawing.Size(92, 35); this.button82.TabIndex = 5915; this.button82.Tag = "12025"; this.button82.Text = "12025"; @@ -5016,9 +5288,10 @@ // this.button76.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button76.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button76.Location = new System.Drawing.Point(919, 358); + this.button76.Location = new System.Drawing.Point(1225, 448); + this.button76.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button76.Name = "button76"; - this.button76.Size = new System.Drawing.Size(69, 28); + this.button76.Size = new System.Drawing.Size(92, 35); this.button76.TabIndex = 5916; this.button76.Tag = "12019"; this.button76.Text = "12019"; @@ -5028,9 +5301,10 @@ // this.button69.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button69.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button69.Location = new System.Drawing.Point(919, 200); + this.button69.Location = new System.Drawing.Point(1225, 250); + this.button69.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button69.Name = "button69"; - this.button69.Size = new System.Drawing.Size(69, 28); + this.button69.Size = new System.Drawing.Size(92, 35); this.button69.TabIndex = 5917; this.button69.Tag = "12011"; this.button69.Text = "12011"; @@ -5040,9 +5314,10 @@ // this.button72.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button72.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button72.Location = new System.Drawing.Point(919, 284); + this.button72.Location = new System.Drawing.Point(1225, 355); + this.button72.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button72.Name = "button72"; - this.button72.Size = new System.Drawing.Size(69, 28); + this.button72.Size = new System.Drawing.Size(92, 35); this.button72.TabIndex = 5923; this.button72.Tag = "12015"; this.button72.Text = "12015"; @@ -5052,9 +5327,10 @@ // this.button47.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button47.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button47.Location = new System.Drawing.Point(919, 131); + this.button47.Location = new System.Drawing.Point(1225, 164); + this.button47.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button47.Name = "button47"; - this.button47.Size = new System.Drawing.Size(69, 28); + this.button47.Size = new System.Drawing.Size(92, 35); this.button47.TabIndex = 5901; this.button47.Tag = "12007"; this.button47.Text = "12007"; @@ -5066,9 +5342,10 @@ this.label56.BackColor = System.Drawing.Color.Transparent; this.label56.Enabled = false; this.label56.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label56.Location = new System.Drawing.Point(217, 596); + this.label56.Location = new System.Drawing.Point(289, 745); + this.label56.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label56.Name = "label56"; - this.label56.Size = new System.Drawing.Size(17, 12); + this.label56.Size = new System.Drawing.Size(22, 15); this.label56.TabIndex = 5864; this.label56.Text = "←"; // @@ -5078,9 +5355,10 @@ this.label55.BackColor = System.Drawing.Color.Transparent; this.label55.Enabled = false; this.label55.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label55.Location = new System.Drawing.Point(345, 596); + this.label55.Location = new System.Drawing.Point(460, 745); + this.label55.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label55.Name = "label55"; - this.label55.Size = new System.Drawing.Size(17, 12); + this.label55.Size = new System.Drawing.Size(22, 15); this.label55.TabIndex = 5879; this.label55.Text = "←"; // @@ -5090,9 +5368,10 @@ this.label81.BackColor = System.Drawing.Color.Transparent; this.label81.Enabled = false; this.label81.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label81.Location = new System.Drawing.Point(931, 270); + this.label81.Location = new System.Drawing.Point(1241, 338); + this.label81.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label81.Name = "label81"; - this.label81.Size = new System.Drawing.Size(17, 12); + this.label81.Size = new System.Drawing.Size(22, 15); this.label81.TabIndex = 5882; this.label81.Text = "→"; // @@ -5102,9 +5381,10 @@ this.label58.BackColor = System.Drawing.Color.Transparent; this.label58.Enabled = false; this.label58.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label58.Location = new System.Drawing.Point(217, 116); + this.label58.Location = new System.Drawing.Point(289, 145); + this.label58.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label58.Name = "label58"; - this.label58.Size = new System.Drawing.Size(29, 12); + this.label58.Size = new System.Drawing.Size(37, 15); this.label58.TabIndex = 5876; this.label58.Text = "←→"; // @@ -5114,9 +5394,10 @@ this.label70.BackColor = System.Drawing.Color.Transparent; this.label70.Enabled = false; this.label70.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label70.Location = new System.Drawing.Point(949, 232); + this.label70.Location = new System.Drawing.Point(1265, 290); + this.label70.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label70.Name = "label70"; - this.label70.Size = new System.Drawing.Size(17, 12); + this.label70.Size = new System.Drawing.Size(22, 15); this.label70.TabIndex = 5878; this.label70.Text = "→"; // @@ -5126,9 +5407,10 @@ this.label76.BackColor = System.Drawing.Color.Transparent; this.label76.Enabled = false; this.label76.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label76.Location = new System.Drawing.Point(949, 389); + this.label76.Location = new System.Drawing.Point(1265, 486); + this.label76.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label76.Name = "label76"; - this.label76.Size = new System.Drawing.Size(17, 12); + this.label76.Size = new System.Drawing.Size(22, 15); this.label76.TabIndex = 5881; this.label76.Text = "←"; // @@ -5138,9 +5420,10 @@ this.label54.BackColor = System.Drawing.Color.Transparent; this.label54.Enabled = false; this.label54.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label54.Location = new System.Drawing.Point(461, 544); + this.label54.Location = new System.Drawing.Point(615, 680); + this.label54.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label54.Name = "label54"; - this.label54.Size = new System.Drawing.Size(29, 12); + this.label54.Size = new System.Drawing.Size(37, 15); this.label54.TabIndex = 5831; this.label54.Text = "←→"; // @@ -5150,9 +5433,10 @@ this.label27.BackColor = System.Drawing.Color.Transparent; this.label27.Enabled = false; this.label27.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label27.Location = new System.Drawing.Point(951, 116); + this.label27.Location = new System.Drawing.Point(1268, 145); + this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(17, 12); + this.label27.Size = new System.Drawing.Size(22, 15); this.label27.TabIndex = 5825; this.label27.Text = "←"; // @@ -5160,9 +5444,10 @@ // this.Converyor11003tips.AutoSize = true; this.Converyor11003tips.ForeColor = System.Drawing.Color.IndianRed; - this.Converyor11003tips.Location = new System.Drawing.Point(967, 162); + this.Converyor11003tips.Location = new System.Drawing.Point(1289, 202); + this.Converyor11003tips.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.Converyor11003tips.Name = "Converyor11003tips"; - this.Converyor11003tips.Size = new System.Drawing.Size(65, 12); + this.Converyor11003tips.Size = new System.Drawing.Size(82, 15); this.Converyor11003tips.TabIndex = 8361; this.Converyor11003tips.Tag = "11001"; this.Converyor11003tips.Text = "条码不匹配"; @@ -5172,9 +5457,10 @@ // this.Converyor12031tips.AutoSize = true; this.Converyor12031tips.ForeColor = System.Drawing.Color.IndianRed; - this.Converyor12031tips.Location = new System.Drawing.Point(114, 208); + this.Converyor12031tips.Location = new System.Drawing.Point(152, 260); + this.Converyor12031tips.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.Converyor12031tips.Name = "Converyor12031tips"; - this.Converyor12031tips.Size = new System.Drawing.Size(65, 12); + this.Converyor12031tips.Size = new System.Drawing.Size(82, 15); this.Converyor12031tips.TabIndex = 8361; this.Converyor12031tips.Tag = "11001"; this.Converyor12031tips.Text = "条码不匹配"; @@ -5184,9 +5470,10 @@ // this.Converyor12044tips.AutoSize = true; this.Converyor12044tips.ForeColor = System.Drawing.Color.IndianRed; - this.Converyor12044tips.Location = new System.Drawing.Point(118, 287); + this.Converyor12044tips.Location = new System.Drawing.Point(157, 359); + this.Converyor12044tips.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.Converyor12044tips.Name = "Converyor12044tips"; - this.Converyor12044tips.Size = new System.Drawing.Size(65, 12); + this.Converyor12044tips.Size = new System.Drawing.Size(82, 15); this.Converyor12044tips.TabIndex = 8361; this.Converyor12044tips.Tag = "11001"; this.Converyor12044tips.Text = "条码不匹配"; @@ -5196,9 +5483,10 @@ // this.Converyor12051tips.AutoSize = true; this.Converyor12051tips.ForeColor = System.Drawing.Color.IndianRed; - this.Converyor12051tips.Location = new System.Drawing.Point(128, 574); + this.Converyor12051tips.Location = new System.Drawing.Point(171, 718); + this.Converyor12051tips.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.Converyor12051tips.Name = "Converyor12051tips"; - this.Converyor12051tips.Size = new System.Drawing.Size(65, 12); + this.Converyor12051tips.Size = new System.Drawing.Size(82, 15); this.Converyor12051tips.TabIndex = 8361; this.Converyor12051tips.Tag = "11001"; this.Converyor12051tips.Text = "条码不匹配"; @@ -5208,9 +5496,10 @@ // this.Converyor11001tips.AutoSize = true; this.Converyor11001tips.ForeColor = System.Drawing.Color.IndianRed; - this.Converyor11001tips.Location = new System.Drawing.Point(991, 596); + this.Converyor11001tips.Location = new System.Drawing.Point(1321, 745); + this.Converyor11001tips.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.Converyor11001tips.Name = "Converyor11001tips"; - this.Converyor11001tips.Size = new System.Drawing.Size(65, 12); + this.Converyor11001tips.Size = new System.Drawing.Size(82, 15); this.Converyor11001tips.TabIndex = 8361; this.Converyor11001tips.Tag = "11001"; this.Converyor11001tips.Text = "条码不匹配"; @@ -6504,16 +6793,17 @@ // // FrmControlMonitor // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; this.BackColor = System.Drawing.Color.WhiteSmoke; - this.ClientSize = new System.Drawing.Size(1490, 844); + this.ClientSize = new System.Drawing.Size(1924, 1055); this.ControlBox = false; this.Controls.Add(this.tabControl1); this.Controls.Add(this.tsStatus); this.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmControlMonitor"; diff --git a/ControlMonitorClient/FrmControlMonitor.resx b/ControlMonitorClient/FrmControlMonitor.resx index f1842be..159a40f 100644 --- a/ControlMonitorClient/FrmControlMonitor.resx +++ b/ControlMonitorClient/FrmControlMonitor.resx @@ -922,7 +922,7 @@ 572, 12 - 25 + 146 diff --git a/ControlMonitorClient/app.config b/ControlMonitorClient/app.config index 7241f68..3ecfdc2 100644 --- a/ControlMonitorClient/app.config +++ b/ControlMonitorClient/app.config @@ -11,7 +11,7 @@ - + @@ -56,9 +56,9 @@ - + - + diff --git a/WcfControlMonitorHost/DBFactory.dll.config b/WcfControlMonitorHost/DBFactory.dll.config index 7e19417..9867693 100644 --- a/WcfControlMonitorHost/DBFactory.dll.config +++ b/WcfControlMonitorHost/DBFactory.dll.config @@ -3,14 +3,14 @@ - + - + diff --git a/WcfControlMonitorHost/FrmHost.Designer.cs b/WcfControlMonitorHost/FrmHost.Designer.cs index 6b9af9d..60263d1 100644 --- a/WcfControlMonitorHost/FrmHost.Designer.cs +++ b/WcfControlMonitorHost/FrmHost.Designer.cs @@ -96,11 +96,12 @@ this.listBox1.FormattingEnabled = true; this.listBox1.HorizontalScrollbar = true; this.listBox1.ItemHeight = 15; - this.listBox1.Location = new System.Drawing.Point(12, 45); + this.listBox1.Location = new System.Drawing.Point(16, 56); + this.listBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.listBox1.Name = "listBox1"; this.listBox1.ScrollAlwaysVisible = true; this.listBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; - this.listBox1.Size = new System.Drawing.Size(632, 394); + this.listBox1.Size = new System.Drawing.Size(841, 484); this.listBox1.TabIndex = 0; // // contextMenuStrip1 @@ -115,51 +116,51 @@ this.toolStripSeparator9, this.toolStripMenuItem9}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(149, 126); + this.contextMenuStrip1.Size = new System.Drawing.Size(169, 136); // // toolStripMenuItem8 // this.toolStripMenuItem8.DoubleClickEnabled = true; this.toolStripMenuItem8.Name = "toolStripMenuItem8"; - this.toolStripMenuItem8.Size = new System.Drawing.Size(148, 22); + this.toolStripMenuItem8.Size = new System.Drawing.Size(168, 24); this.toolStripMenuItem8.Text = "显示主界面"; this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click); // // toolStripMenuItem10 // this.toolStripMenuItem10.Name = "toolStripMenuItem10"; - this.toolStripMenuItem10.Size = new System.Drawing.Size(148, 22); + this.toolStripMenuItem10.Size = new System.Drawing.Size(168, 24); this.toolStripMenuItem10.Text = "最小化窗口"; this.toolStripMenuItem10.Click += new System.EventHandler(this.toolStripMenuItem10_Click); // // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(145, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(165, 6); // // tsmTurnOn // this.tsmTurnOn.Name = "tsmTurnOn"; - this.tsmTurnOn.Size = new System.Drawing.Size(148, 22); + this.tsmTurnOn.Size = new System.Drawing.Size(168, 24); this.tsmTurnOn.Text = "打开命令开关"; this.tsmTurnOn.Click += new System.EventHandler(this.toolStripMenuItem13_Click); // // tsmTurnOff // this.tsmTurnOff.Name = "tsmTurnOff"; - this.tsmTurnOff.Size = new System.Drawing.Size(148, 22); + this.tsmTurnOff.Size = new System.Drawing.Size(168, 24); this.tsmTurnOff.Text = "关闭命令开关"; this.tsmTurnOff.Click += new System.EventHandler(this.toolStripMenuItem14_Click); // // toolStripSeparator9 // this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(145, 6); + this.toolStripSeparator9.Size = new System.Drawing.Size(165, 6); // // toolStripMenuItem9 // this.toolStripMenuItem9.Name = "toolStripMenuItem9"; - this.toolStripMenuItem9.Size = new System.Drawing.Size(148, 22); + this.toolStripMenuItem9.Size = new System.Drawing.Size(168, 24); this.toolStripMenuItem9.Text = "退出系统"; this.toolStripMenuItem9.Click += new System.EventHandler(this.toolStripMenuItem9_Click); // @@ -197,11 +198,12 @@ this.tsStatus.BorderStyle = System.Windows.Forms.BorderStyle.None; this.tsStatus.Font = new System.Drawing.Font("黑体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.tsStatus.ForeColor = System.Drawing.Color.Red; - this.tsStatus.Location = new System.Drawing.Point(10, 492); + this.tsStatus.Location = new System.Drawing.Point(13, 615); + this.tsStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tsStatus.Multiline = true; this.tsStatus.Name = "tsStatus"; this.tsStatus.ReadOnly = true; - this.tsStatus.Size = new System.Drawing.Size(1006, 30); + this.tsStatus.Size = new System.Drawing.Size(1341, 38); this.tsStatus.TabIndex = 1564; // // button1 @@ -209,9 +211,10 @@ this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.button1.Image = global::wcfControlMonitorClient.Properties.Resources.call_modul_volume_reduce; this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button1.Location = new System.Drawing.Point(545, 455); + this.button1.Location = new System.Drawing.Point(727, 569); + this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(87, 34); + this.button1.Size = new System.Drawing.Size(116, 42); this.button1.TabIndex = 1565; this.button1.Text = "清空日志"; this.button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -223,18 +226,20 @@ this.listBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.listBox2.FormattingEnabled = true; - this.listBox2.ItemHeight = 12; - this.listBox2.Location = new System.Drawing.Point(663, 45); + this.listBox2.ItemHeight = 15; + this.listBox2.Location = new System.Drawing.Point(884, 56); + this.listBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.listBox2.Name = "listBox2"; - this.listBox2.Size = new System.Drawing.Size(353, 400); + this.listBox2.Size = new System.Drawing.Size(469, 499); this.listBox2.TabIndex = 1567; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 29); + this.label1.Location = new System.Drawing.Point(16, 36); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(125, 12); + this.label1.Size = new System.Drawing.Size(157, 15); this.label1.TabIndex = 1568; this.label1.Text = "与客户端交互的消息："; // @@ -242,9 +247,10 @@ // this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(661, 29); + this.label2.Location = new System.Drawing.Point(881, 36); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(101, 12); + this.label2.Size = new System.Drawing.Size(127, 15); this.label2.TabIndex = 1568; this.label2.Text = "在线客户端信息："; // @@ -254,9 +260,10 @@ this.button4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.button4.Image = global::wcfControlMonitorClient.Properties.Resources.MSN; this.button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button4.Location = new System.Drawing.Point(845, 455); + this.button4.Location = new System.Drawing.Point(1127, 569); + this.button4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(157, 34); + this.button4.Size = new System.Drawing.Size(209, 42); this.button4.TabIndex = 1569; this.button4.Text = "刷新在线客户端列表"; this.button4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -274,8 +281,8 @@ this.MMExitSystem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Padding = new System.Windows.Forms.Padding(3, 1, 0, 1); - this.menuStrip1.Size = new System.Drawing.Size(962, 24); + this.menuStrip1.Padding = new System.Windows.Forms.Padding(4, 1, 0, 1); + this.menuStrip1.Size = new System.Drawing.Size(1283, 26); this.menuStrip1.TabIndex = 1570; this.menuStrip1.Text = "menuStrip1"; // @@ -285,20 +292,20 @@ this.MISystemInit, this.MIDataClear}); this.MMInit.Name = "MMInit"; - this.MMInit.Size = new System.Drawing.Size(56, 22); + this.MMInit.Size = new System.Drawing.Size(68, 24); this.MMInit.Text = "初始化"; // // MISystemInit // this.MISystemInit.Name = "MISystemInit"; - this.MISystemInit.Size = new System.Drawing.Size(148, 22); + this.MISystemInit.Size = new System.Drawing.Size(182, 26); this.MISystemInit.Text = "设备初始化"; this.MISystemInit.Click += new System.EventHandler(this.MISystemInit_Click); // // MIDataClear // this.MIDataClear.Name = "MIDataClear"; - this.MIDataClear.Size = new System.Drawing.Size(148, 22); + this.MIDataClear.Size = new System.Drawing.Size(182, 26); this.MIDataClear.Text = "调度数据清理"; this.MIDataClear.Visible = false; this.MIDataClear.Click += new System.EventHandler(this.MIDataClear_Click); @@ -309,20 +316,20 @@ this.MIStartRetrieveTask, this.MIStopRetrieveTask}); this.MMRetriveTask.Name = "MMRetriveTask"; - this.MMRetriveTask.Size = new System.Drawing.Size(68, 22); + this.MMRetriveTask.Size = new System.Drawing.Size(83, 24); this.MMRetriveTask.Text = "获取任务"; // // MIStartRetrieveTask // this.MIStartRetrieveTask.Name = "MIStartRetrieveTask"; - this.MIStartRetrieveTask.Size = new System.Drawing.Size(148, 22); + this.MIStartRetrieveTask.Size = new System.Drawing.Size(182, 26); this.MIStartRetrieveTask.Text = "开始获取任务"; this.MIStartRetrieveTask.Click += new System.EventHandler(this.MIStartRetrieveTask_Click); // // MIStopRetrieveTask // this.MIStopRetrieveTask.Name = "MIStopRetrieveTask"; - this.MIStopRetrieveTask.Size = new System.Drawing.Size(148, 22); + this.MIStopRetrieveTask.Size = new System.Drawing.Size(182, 26); this.MIStopRetrieveTask.Text = "停止获取任务"; this.MIStopRetrieveTask.Click += new System.EventHandler(this.MIStopRetrieveTask_Click); // @@ -332,20 +339,20 @@ this.MITurnOn, this.MITurnOff}); this.MMMonitorControl.Name = "MMMonitorControl"; - this.MMMonitorControl.Size = new System.Drawing.Size(68, 22); + this.MMMonitorControl.Size = new System.Drawing.Size(83, 24); this.MMMonitorControl.Text = "调度控制"; // // MITurnOn // this.MITurnOn.Name = "MITurnOn"; - this.MITurnOn.Size = new System.Drawing.Size(148, 22); + this.MITurnOn.Size = new System.Drawing.Size(182, 26); this.MITurnOn.Text = "打开命令开关"; this.MITurnOn.Click += new System.EventHandler(this.MITurnOn_Click); // // MITurnOff // this.MITurnOff.Name = "MITurnOff"; - this.MITurnOff.Size = new System.Drawing.Size(148, 22); + this.MITurnOff.Size = new System.Drawing.Size(182, 26); this.MITurnOff.Text = "关闭命令开关"; this.MITurnOff.Click += new System.EventHandler(this.MITurnOff_Click); // @@ -357,34 +364,34 @@ this.toolStripMenuItem1, this.MIDarketFileSet}); this.MMDarketManage.Name = "MMDarketManage"; - this.MMDarketManage.Size = new System.Drawing.Size(68, 22); + this.MMDarketManage.Size = new System.Drawing.Size(83, 24); this.MMDarketManage.Text = "数据查询"; // // MIAutoTaskHistory // this.MIAutoTaskHistory.Name = "MIAutoTaskHistory"; - this.MIAutoTaskHistory.Size = new System.Drawing.Size(172, 22); + this.MIAutoTaskHistory.Size = new System.Drawing.Size(212, 26); this.MIAutoTaskHistory.Text = "查询历史任务记录"; this.MIAutoTaskHistory.Click += new System.EventHandler(this.MIAutoTaskHistory_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(172, 22); + this.toolStripMenuItem2.Size = new System.Drawing.Size(212, 26); this.toolStripMenuItem2.Text = "查询设备报警记录"; this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(172, 22); + this.toolStripMenuItem1.Size = new System.Drawing.Size(212, 26); this.toolStripMenuItem1.Text = "查询货位状态"; this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click); // // MIDarketFileSet // this.MIDarketFileSet.Name = "MIDarketFileSet"; - this.MIDarketFileSet.Size = new System.Drawing.Size(172, 22); + this.MIDarketFileSet.Size = new System.Drawing.Size(212, 26); this.MIDarketFileSet.Text = "文件设置"; this.MIDarketFileSet.Visible = false; this.MIDarketFileSet.Click += new System.EventHandler(this.MIDarketFileSet_Click); @@ -392,7 +399,7 @@ // MMExitSystem // this.MMExitSystem.Name = "MMExitSystem"; - this.MMExitSystem.Size = new System.Drawing.Size(68, 22); + this.MMExitSystem.Size = new System.Drawing.Size(83, 24); this.MMExitSystem.Text = "退出系统"; this.MMExitSystem.Click += new System.EventHandler(this.MMExitSystem_Click); // @@ -402,9 +409,10 @@ this.button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.button3.Image = global::wcfControlMonitorClient.Properties.Resources.SCDCNCLL; this.button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button3.Location = new System.Drawing.Point(669, 455); + this.button3.Location = new System.Drawing.Point(892, 569); + this.button3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(118, 34); + this.button3.Size = new System.Drawing.Size(157, 42); this.button3.TabIndex = 1569; this.button3.Text = "注销在线客户端"; this.button3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -420,9 +428,10 @@ // pbF1S7 // this.pbF1S7.Image = global::wcfControlMonitorClient.Properties.Resources.linkerror; - this.pbF1S7.Location = new System.Drawing.Point(305, 26); + this.pbF1S7.Location = new System.Drawing.Point(407, 32); + this.pbF1S7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pbF1S7.Name = "pbF1S7"; - this.pbF1S7.Size = new System.Drawing.Size(22, 17); + this.pbF1S7.Size = new System.Drawing.Size(29, 21); this.pbF1S7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pbF1S7.TabIndex = 2659; this.pbF1S7.TabStop = false; @@ -430,9 +439,10 @@ // lblFloor1S7 // this.lblFloor1S7.AutoSize = true; - this.lblFloor1S7.Location = new System.Drawing.Point(219, 26); + this.lblFloor1S7.Location = new System.Drawing.Point(292, 32); + this.lblFloor1S7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblFloor1S7.Name = "lblFloor1S7"; - this.lblFloor1S7.Size = new System.Drawing.Size(71, 12); + this.lblFloor1S7.Size = new System.Drawing.Size(91, 15); this.lblFloor1S7.TabIndex = 2656; this.lblFloor1S7.Text = "PLC连接状态"; this.lblFloor1S7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -440,9 +450,10 @@ // btcelltest // this.btcelltest.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.btcelltest.Location = new System.Drawing.Point(435, 461); + this.btcelltest.Location = new System.Drawing.Point(580, 576); + this.btcelltest.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btcelltest.Name = "btcelltest"; - this.btcelltest.Size = new System.Drawing.Size(92, 29); + this.btcelltest.Size = new System.Drawing.Size(123, 36); this.btcelltest.TabIndex = 2668; this.btcelltest.Text = "货位测试"; this.btcelltest.UseVisualStyleBackColor = true; @@ -452,9 +463,10 @@ // btStopOut // this.btStopOut.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.btStopOut.Location = new System.Drawing.Point(222, 461); + this.btStopOut.Location = new System.Drawing.Point(296, 576); + this.btStopOut.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btStopOut.Name = "btStopOut"; - this.btStopOut.Size = new System.Drawing.Size(92, 29); + this.btStopOut.Size = new System.Drawing.Size(123, 36); this.btStopOut.TabIndex = 2667; this.btStopOut.Text = "StopOut"; this.btStopOut.UseVisualStyleBackColor = false; @@ -464,9 +476,10 @@ // btStopIn // this.btStopIn.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.btStopIn.Location = new System.Drawing.Point(320, 461); + this.btStopIn.Location = new System.Drawing.Point(427, 576); + this.btStopIn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btStopIn.Name = "btStopIn"; - this.btStopIn.Size = new System.Drawing.Size(92, 29); + this.btStopIn.Size = new System.Drawing.Size(123, 36); this.btStopIn.TabIndex = 2666; this.btStopIn.Text = "StopIn"; this.btStopIn.UseVisualStyleBackColor = false; @@ -476,9 +489,10 @@ // btStopTest // this.btStopTest.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.btStopTest.Location = new System.Drawing.Point(124, 461); + this.btStopTest.Location = new System.Drawing.Point(165, 576); + this.btStopTest.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btStopTest.Name = "btStopTest"; - this.btStopTest.Size = new System.Drawing.Size(92, 29); + this.btStopTest.Size = new System.Drawing.Size(123, 36); this.btStopTest.TabIndex = 2665; this.btStopTest.Text = "StopTest"; this.btStopTest.UseVisualStyleBackColor = true; @@ -488,9 +502,10 @@ // btStartTest // this.btStartTest.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.btStartTest.Location = new System.Drawing.Point(26, 461); + this.btStartTest.Location = new System.Drawing.Point(35, 576); + this.btStartTest.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btStartTest.Name = "btStartTest"; - this.btStartTest.Size = new System.Drawing.Size(92, 29); + this.btStartTest.Size = new System.Drawing.Size(123, 36); this.btStartTest.TabIndex = 2664; this.btStartTest.Text = "StartTest"; this.btStartTest.UseVisualStyleBackColor = true; @@ -516,6 +531,7 @@ // // timer3 // + this.timer3.Enabled = true; this.timer3.Interval = 1000; this.timer3.Tick += new System.EventHandler(this.timer3_Tick); // @@ -533,9 +549,9 @@ // // FrmHost // - 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(962, 529); + this.ClientSize = new System.Drawing.Size(1283, 661); this.Controls.Add(this.btcelltest); this.Controls.Add(this.btStopOut); this.Controls.Add(this.btStopIn); @@ -553,6 +569,7 @@ this.Controls.Add(this.button3); this.Controls.Add(this.button1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "FrmHost"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; diff --git a/WcfControlMonitorHost/FrmHost.cs b/WcfControlMonitorHost/FrmHost.cs index 8eea574..8fb935d 100644 --- a/WcfControlMonitorHost/FrmHost.cs +++ b/WcfControlMonitorHost/FrmHost.cs @@ -1529,7 +1529,7 @@ namespace wcfControlMonitorClient try { //CStaticClass.WcfControl - //CStaticClass.WcfControl.SendConveyorTestTask(); + CStaticClass.WcfControl.SendConveyorTestTask(); //CStaticClass.WcfControl.SendConveyorTestTask2(); //CStaticClass.WcfControl.SendConveyorTestTask3(); } diff --git a/WcfControlMonitorHost/app.config b/WcfControlMonitorHost/app.config index 3541388..dda6f8b 100644 --- a/WcfControlMonitorHost/app.config +++ b/WcfControlMonitorHost/app.config @@ -29,20 +29,20 @@ - + - + - - + + @@ -72,7 +72,7 @@ - + @@ -103,6 +103,7 @@ + diff --git a/WcfControlMonitorLib/CCallService.cs b/WcfControlMonitorLib/CCallService.cs index fe117bb..d224006 100644 --- a/WcfControlMonitorLib/CCallService.cs +++ b/WcfControlMonitorLib/CCallService.cs @@ -21,7 +21,7 @@ using System.Xml.Serialization; using Newtonsoft.Json; using System.Threading.Tasks; using System.Timers; - +using System.Diagnostics.Eventing.Reader; namespace WcfControlMonitorLib { @@ -711,6 +711,7 @@ namespace WcfControlMonitorLib responseStream.Close(); } result = "获取数据失败，请重试！" + address + ex.ToString() + " 返回数据" + result; + CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "DealCallService", $"接口名称{address}:", "异常信息:", result.ToString()); return false; } } @@ -722,7 +723,7 @@ namespace WcfControlMonitorLib /// /// /// - public static string UpdateTaskStatusToWMS(long Managertask_Id,int state,out WMS_WCS_PARAM_UPDATE resp_data) + public static string UpdateTaskStatusToWMS(long Managertask_Id,int state,out WMS_WCS_PARAM_UPDATE resp_data) { string bResult = string.Empty; bool sResult = true; @@ -765,7 +766,6 @@ namespace WcfControlMonitorLib else { resp_data = Model.JsonHelper.Deserialize(outJson);//WMS的返回值需要反序列化 - } } return bResult; @@ -1113,7 +1113,9 @@ namespace WcfControlMonitorLib static StringBuilder[] witemnames = { new StringBuilder("") }; static Model.MDevice devinfo = new Model.MDevice(); static CCommonFunction ccf = new CCommonFunction(); - static Thread mythread; + public static Thread mythread; + public static Thread mythread1; + public static Thread mythread2; static Thread mythreadUpdatestatus; static Thread mythreadGetTaskCanMove; static Thread threadAGVStatusSend; @@ -1129,14 +1131,10 @@ namespace WcfControlMonitorLib get { return _CCallServiceError; } set { _CCallServiceError = value; } } - - //static Dictionary ErrorStation = new Dictionary - //{ - // {"12005","12006"},{"12008","12007"},{"22009","22008"} - //}; + //任务执行状态上报定时器 - private static void BeginListen() + public static async void BeginListen() {//20091107 while (!exitThread) { @@ -1163,30 +1161,128 @@ namespace WcfControlMonitorLib if (dataIOtaskstart.Count > 0) { for (int i = 0; i < dataIOtaskstart.Count; i++) { - CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "DealCallService", "taskStatusReporstart", "准备开始调用wms服务:", $"ID：{dataIOtaskstart[i]["CONTROL_ID"]},条码{dataIOtaskstart[i]["STOCK_BARCODE"]}"); - UpdateTaskStatusToWMS(Convert.ToInt64(dataIOtaskstart[i]["CONTROL_ID"]),1,out WMS_WCS_PARAM_UPDATE resp_data);//1任务开始 - if (resp_data.code == 0) - { //成功 - sql.Clear(); - sql.Append($"update IO_Control set IsSendLCS=1 where CONTROL_ID={dataIOtaskstart[i]["CONTROL_ID"]}");//查询还未发送给WMS但是任务状态已经是拆分完的状态的任务 - dbo.ExceSQL(sql.ToString()); - } - else { - CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "DealCallService", "taskStatusReporstart", "开始调用wms服务失败:", $"返回报错{resp_data.data}:{resp_data.msg}"); - return; - } + await Task.Run(() => + { + CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "DealCallService", "taskStatusReporstart", "准备开始调用wms服务:", $"ID：{dataIOtaskstart[i]["CONTROL_ID"]},条码{dataIOtaskstart[i]["STOCK_BARCODE"]}"); + UpdateTaskStatusToWMS(Convert.ToInt64(dataIOtaskstart[i]["CONTROL_ID"]), 1, out WMS_WCS_PARAM_UPDATE resp_data);//1任务开始 + if (resp_data == null) + { + CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "DealCallService", "taskStatusReporstart", "开始调用wms服务失败:", $"接口通讯异常返回报错:"); + return; + } + else if (resp_data.code == 0) + { //成功 + sql.Clear(); + sql.Append($"update IO_Control set IsSendLCS=1 where CONTROL_ID={dataIOtaskstart[i]["CONTROL_ID"]}");//查询还未发送给WMS但是任务状态已经是拆分完的状态的任务 + dbo.ExceSQL(sql.ToString()); + } + else + { + CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "DealCallService", "taskStatusReporstart", "开始调用wms服务失败:", $"返回报错{resp_data.data}:{resp_data.msg}"); + return; + } + + }); } } #endregion + //#region 发送任务完成给LCS 900任务直接删除 + //sql.Clear(); + //sql.Append("select * from IO_CONTROL WHERE (CONTROL_STATUS = 999 or CONTROL_STATUS=900 ) and CONTROL_TASK_TYPE<>99 ");//查询还未发送给WMS但是任务状态已经是完成的状态的任务 不用校验issendlcs=1的情况，防止还没上传给WMS就报错了 + + //dataIOtask2finish = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView; + //if (dataIOtask2finish.Count > 0) + //{ + // for (int i = 0; i < dataIOtask2finish.Count; i++) + // { + // if (dataIOtask2finish[i]["CONTROL_STATUS"].ToString() == "900") + // { + // sql.Clear(); + // sql.Append($"delete from IO_CONTROL where CONTROL_ID={dataIOtask2finish[i]["CONTROL_ID"]}");//查询还未发送给WMS但是任务状态已经是拆分完的状态的任务 + // dbo.ExceSQL(sql.ToString()); + // } + // else + // { + // CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "taskStatusReporfinish", "准备开始调用wms任务状态上报服务:", $"ID：{dataIOtask2finish[i]["CONTROL_ID"]},条码{dataIOtask2finish[i]["STOCK_BARCODE"]}"); + // UpdateTaskStatusToWMS(Convert.ToInt64(dataIOtask2finish[i]["CONTROL_ID"]), 2, out WMS_WCS_PARAM_UPDATE resp_data);//2任务结束 + // if (resp_data.code == 0) + // { //成功 + // sql.Clear(); + // sql.Append($"delete from IO_CONTROL where CONTROL_ID={dataIOtask2finish[i]["CONTROL_ID"]}");//查询还未发送给WMS但是任务状态已经是拆分完的状态的任务 + // dbo.ExceSQL(sql.ToString()); + // } + // else + // { + // //if ((resp_data.msg.Contains("不存在") && resp_data.msg.Contains("流程任务"))|| resp_data.msg.Contains("请求失败")) { + // sql.Clear(); + // sql.Append($"delete from IO_CONTROL where CONTROL_ID={dataIOtask2finish[i]["CONTROL_ID"]}");//删除LCS不存在的任务流程 + // dbo.ExceSQL(sql.ToString()); + // // } + // CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "DealCallService", "taskStatusReporstart", "开始调用wms服务失败:", $"返回报错{resp_data.data}:{resp_data.msg}"); + // //return; + // } + // } + // } + //} + //#endregion + //#region 处理回退任务 + //sql.Clear(); + //sql.Append("select * from IO_CONTROL WHERE ( CONTROL_STATUS = 999 OR CONTROL_STATUS = 900 OR CONTROL_STATUS = 970 ) and CONTROL_TASK_TYPE=99");//直接删除回退任务 //ControlTaskType=99是回退任务 + // dataIOBacktaskfinish = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView; + //if (dataIOBacktaskfinish.Count > 0) + //{ + // for (int i = 0; i < dataIOBacktaskfinish.Count; i++) + // { + // sql.Clear(); + // sql.Append($"delete from IO_CONTROL where CONTROL_ID={dataIOBacktaskfinish[i]["CONTROL_ID"]}");//查询还未发送给WMS但是任务状态已经是拆分完的状态的任务 + // dbo.ExceSQL(sql.ToString()); + // } + //} + //#endregion + } + catch (Exception ex) + { + _CCallServiceError = ex.StackTrace + ex.Message; + CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "DealCallService", $"接口名称:taskStatusReporstart:", "调用接口时异常:", ex.Message.ToString()); + //dbo.ExecuteSql(string.Format("UPDATE IO_CONTROL_APPLY set APPLY_TASK_STATUS = 2 where APPLY_TASK_STATUS = 0")); + } + finally + { + Thread.Sleep(3000); + } + } + } + + public static async void BeginListen1() + {//20091107 + while (!exitThread) + { + try + { + StringBuilder sql = new StringBuilder(); + StringBuilder sql2 = new StringBuilder(); + string bResult = ""; + DataView dataIOtaskstart = new DataView(); + //DataView dvl = new DataView(); + DataView dataIOtask2finish = new DataView(); + DataView dataIOBacktaskfinish = new DataView(); + string dtime = DateTime.Now.ToString("u"); + dtime = dtime.Substring(0, dtime.Length - 1); + //int AutoManageIdx = 0; int a = 0; + //string FSTARTCELL = ""; string FENDCELL = ""; + //int FSTARTDEVICE = 0; int FENDDEVICE = 0; + //int flaneway = 0; int fstack = 0; + //int FControlTaskType = 0; #region 发送任务完成给LCS 900任务直接删除 sql.Clear(); sql.Append("select * from IO_CONTROL WHERE (CONTROL_STATUS = 999 or CONTROL_STATUS=900 ) and CONTROL_TASK_TYPE<>99 ");//查询还未发送给WMS但是任务状态已经是完成的状态的任务 不用校验issendlcs=1的情况，防止还没上传给WMS就报错了 - + dataIOtask2finish = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView; if (dataIOtask2finish.Count > 0) { for (int i = 0; i < dataIOtask2finish.Count; i++) { + if (dataIOtask2finish[i]["CONTROL_STATUS"].ToString() == "900") { sql.Clear(); @@ -1195,39 +1291,82 @@ namespace WcfControlMonitorLib } else { - CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "taskStatusReporfinish", "准备开始调用wms服务:", $"ID：{dataIOtask2finish[i]["CONTROL_ID"]},条码{dataIOtask2finish[i]["STOCK_BARCODE"]}"); - UpdateTaskStatusToWMS(Convert.ToInt64(dataIOtask2finish[i]["CONTROL_ID"]), 2, out WMS_WCS_PARAM_UPDATE resp_data);//2任务结束 - if (resp_data.code == 0) - { //成功 - sql.Clear(); - sql.Append($"delete from IO_CONTROL where CONTROL_ID={dataIOtask2finish[i]["CONTROL_ID"]}");//查询还未发送给WMS但是任务状态已经是拆分完的状态的任务 - dbo.ExceSQL(sql.ToString()); - } - else + await Task.Run(() => { - //if ((resp_data.msg.Contains("不存在") && resp_data.msg.Contains("流程任务"))|| resp_data.msg.Contains("请求失败")) { + CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "taskStatusReporfinish", "准备开始调用wms任务状态上报服务:", $"ID：{dataIOtask2finish[i]["CONTROL_ID"]},条码{dataIOtask2finish[i]["STOCK_BARCODE"]}"); + UpdateTaskStatusToWMS(Convert.ToInt64(dataIOtask2finish[i]["CONTROL_ID"]), 2, out WMS_WCS_PARAM_UPDATE resp_data);//2任务结束 + if (resp_data == null) + { + CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "DealCallService", "taskStatusReporstart", "开始调用wms服务失败:", $"接口通讯异常返回报错:"); + return; + } + + else if (resp_data.code == 0) + { //成功 + sql.Clear(); + sql.Append($"delete from IO_CONTROL where CONTROL_ID={dataIOtask2finish[i]["CONTROL_ID"]}");//查询还未发送给WMS但是任务状态已经是拆分完的状态的任务 + dbo.ExceSQL(sql.ToString()); + } + else + { + //if ((resp_data.msg.Contains("不存在") && resp_data.msg.Contains("流程任务"))|| resp_data.msg.Contains("请求失败")) { sql.Clear(); sql.Append($"delete from IO_CONTROL where CONTROL_ID={dataIOtask2finish[i]["CONTROL_ID"]}");//删除LCS不存在的任务流程 dbo.ExceSQL(sql.ToString()); - // } - CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "DealCallService", "taskStatusReporstart", "开始调用wms服务失败:", $"返回报错{resp_data.data}:{resp_data.msg}"); - //return; - } + // } + CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "DealCallService", "taskStatusReporstart", "开始调用wms服务失败:", $"返回报错{resp_data.data}:{resp_data.msg}"); + //return; + } + }); } } } #endregion + + } + catch (Exception ex) + { + _CCallServiceError = ex.StackTrace + ex.Message; + CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "DealCallService", $"接口名称:taskStatusReporstart:", "调用接口时异常:", ex.Message.ToString()); + //dbo.ExecuteSql(string.Format("UPDATE IO_CONTROL_APPLY set APPLY_TASK_STATUS = 2 where APPLY_TASK_STATUS = 0")); + } + finally + { + Thread.Sleep(1000); + } + } + } + public static void BeginListen2() + {//20091107 + while (!exitThread) + { + try + { + StringBuilder sql = new StringBuilder(); + StringBuilder sql2 = new StringBuilder(); + string bResult = ""; + DataView dataIOtaskstart = new DataView(); + //DataView dvl = new DataView(); + DataView dataIOtask2finish = new DataView(); + DataView dataIOBacktaskfinish = new DataView(); + string dtime = DateTime.Now.ToString("u"); + dtime = dtime.Substring(0, dtime.Length - 1); + //int AutoManageIdx = 0; int a = 0; + //string FSTARTCELL = ""; string FENDCELL = ""; + //int FSTARTDEVICE = 0; int FENDDEVICE = 0; + //int flaneway = 0; int fstack = 0; + //int FControlTaskType = 0; #region 处理回退任务 sql.Clear(); sql.Append("select * from IO_CONTROL WHERE ( CONTROL_STATUS = 999 OR CONTROL_STATUS = 900 OR CONTROL_STATUS = 970 ) and CONTROL_TASK_TYPE=99");//直接删除回退任务 //ControlTaskType=99是回退任务 - dataIOBacktaskfinish = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView; + dataIOBacktaskfinish = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView; if (dataIOBacktaskfinish.Count > 0) { for (int i = 0; i < dataIOBacktaskfinish.Count; i++) - { - sql.Clear(); - sql.Append($"delete from IO_CONTROL where CONTROL_ID={dataIOBacktaskfinish[i]["CONTROL_ID"]}");//查询还未发送给WMS但是任务状态已经是拆分完的状态的任务 - dbo.ExceSQL(sql.ToString()); + { + sql.Clear(); + sql.Append($"delete from IO_CONTROL where CONTROL_ID={dataIOBacktaskfinish[i]["CONTROL_ID"]}");//查询还未发送给WMS但是任务状态已经是拆分完的状态的任务 + dbo.ExceSQL(sql.ToString()); } } #endregion @@ -1235,7 +1374,7 @@ namespace WcfControlMonitorLib catch (Exception ex) { _CCallServiceError = ex.StackTrace + ex.Message; - CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "DealCallService", $"接口名称:taskStatusReporstart:", "调用接口时异常:", ex.Message.ToString()); + CommonClassLib.CCarryConvert.WriteDarkCasket("CallService", "DealCallService", $"接口名称:taskStatusReporstart:", "调用接口时异常:", ex.Message.ToString()); //dbo.ExecuteSql(string.Format("UPDATE IO_CONTROL_APPLY set APPLY_TASK_STATUS = 2 where APPLY_TASK_STATUS = 0")); } finally @@ -1409,6 +1548,16 @@ namespace WcfControlMonitorLib mythread.Abort(); mythread = null; } + if (mythread1 != null) + { + mythread1.Abort(); + mythread1 = null; + } + if (mythread2 != null) + { + mythread2.Abort(); + mythread2 = null; + } if (mythreadGetTaskCanMove != null) { mythreadGetTaskCanMove.Abort(); mythreadGetTaskCanMove = null; @@ -1440,6 +1589,12 @@ namespace WcfControlMonitorLib mythread = new Thread(new ThreadStart(BeginListen)); mythread.IsBackground = true; mythread.Start(); + mythread1 = new Thread(new ThreadStart(BeginListen1)); + mythread1.IsBackground = true; + mythread1.Start(); + mythread2 = new Thread(new ThreadStart(BeginListen2)); + mythread2.IsBackground = true; + mythread2.Start(); exitThreadInRequestDeal = false; mythreadUpdatestatus = new Thread(new ThreadStart(BeginListenUpdatestatus)); // diff --git a/WcfControlMonitorLib/CStaticClass.cs b/WcfControlMonitorLib/CStaticClass.cs index d9ecdcb..22af898 100644 --- a/WcfControlMonitorLib/CStaticClass.cs +++ b/WcfControlMonitorLib/CStaticClass.cs @@ -115,6 +115,7 @@ namespace WcfControlMonitorLib //http://jndwllcs.catl.com/catl-be/api-lcs/lcs/thirdParty/inboundApply //20091107 static string _ManageServiceAddress = "http://jndwllcs.catl.com/catl-be/api-lcs/lcs/thirdParty/taskStatusReport";//WCS ִйִ̣е״̬ش LCS ϵͳ + //static string _ManageServiceAddress = "http://localhost:5252/lcs/thirdParty/taskStatusReport"; static string _ManageServiceAddress2 = "http://jndwllcs.catl.com/catl-be/api-lcs/lcs/thirdParty/inboundApply";//ҵҪⲿɨ豸λУǷʱWCS ͨ ӿ LCS 롣 static string _ManageServiceAddress3 = "http://jndwllcs.catl.com/catl-be/api-lcs/lcs/thirdParty/wcsTaskInfo";//WCS ֪ͨ LCS AGV ȡ static string _ManageServiceAddress4 = "http://jndwllcs.catl.com/catl-be/api-lcs/lcs/thirdParty/requestRescore";//WCS ͨýӿ LCS Ŀλ·䡣 diff --git a/WcfControlMonitorLib/SControlMonitor.cs b/WcfControlMonitorLib/SControlMonitor.cs index 7c9ec36..7a1b436 100644 --- a/WcfControlMonitorLib/SControlMonitor.cs +++ b/WcfControlMonitorLib/SControlMonitor.cs @@ -788,7 +788,7 @@ namespace WcfControlMonitorLib ob = new object[7] { apptype, dcode, barcode, 0, dtime, "", ccf.GetWarehouseIndex() }; try { - // dboMan.ExecuteSql(string.Format("INSERT INTO IO_CONTROL_APPLY( CONTROL_APPLY_TYPE,DEVICE_CODE, STOCK_BARCODE, APPLY_TASK_STATUS, CREATE_TIME,CONTROL_APPLY_REMARK,WAREHOUSE_CODE)VALUES ({0},'{1}','{2}',{3},'{4}','{5}','{6}')", ob)); + // dboMan.ExecuteSql(string.Format("INSERT INTO IO_CONTROL_APPLY( CONTROL_APPLY_TYPE,DEVICE_CODE, STOCK_BARCODE, APPLY_TASK_STATUS, CREATE_TIME,CONTROL_APPLY_REMARK,WAREHOUSE_CODE)VALUES ({0},'{1}','{2}',{3},'{4}','{5}','{6}')", ob)); } //20101124 @@ -2586,40 +2586,40 @@ namespace WcfControlMonitorLib #region 获得货位信息 else if (CellCode != "") + { + cell = CellCode.Split(cc); + if (cell.Length == 3) { - cell = CellCode.Split(cc); - if (cell.Length == 3) - { - #region 获得物料条码信息,连接管理系统数据库 + #region 获得物料条码信息,连接管理系统数据库 - //根据托盘条码查询物料信息 - sqlstr = string.Format("SELECT STOCK_BARCODE,GOODS_PROPERTY1,GOODS_PROPERTY2,GOODS_PROPERTY3,GOODS_PROPERTY4,GOODS_CLASS_NAME From V_STORAGE_LIST where CELL_CODE = '{0:D2}-{1:D2}-{2:D2}'", cell[0], cell[1], cell[2]); - dvclient = dboMan.ExceSQL(sqlstr).Tables[0].DefaultView; - if (dvclient.Count > 0) - { - PalletBarCode = dvclient[0]["STOCK_BARCODE"].ToString();//托盘条码 - GoodsType = dvclient[0]["GOODS_CLASS_NAME"].ToString();//物料类型 - GoodsBarCode = string.Format("{0}|{1}|{2}|{3}", - dvclient[0]["GOODS_PROPERTY1"].ToString().Trim(), - dvclient[0]["GOODS_PROPERTY2"].ToString().Trim(), - dvclient[0]["GOODS_PROPERTY3"].ToString().Trim(), - dvclient[0]["GOODS_PROPERTY4"].ToString().Trim()); + //根据托盘条码查询物料信息 + sqlstr = string.Format("SELECT STOCK_BARCODE,GOODS_PROPERTY1,GOODS_PROPERTY2,GOODS_PROPERTY3,GOODS_PROPERTY4,GOODS_CLASS_NAME From V_STORAGE_LIST where CELL_CODE = '{0:D2}-{1:D2}-{2:D2}'", cell[0], cell[1], cell[2]); + dvclient = dboMan.ExceSQL(sqlstr).Tables[0].DefaultView; + if (dvclient.Count > 0) + { + PalletBarCode = dvclient[0]["STOCK_BARCODE"].ToString();//托盘条码 + GoodsType = dvclient[0]["GOODS_CLASS_NAME"].ToString();//物料类型 + GoodsBarCode = string.Format("{0}|{1}|{2}|{3}", + dvclient[0]["GOODS_PROPERTY1"].ToString().Trim(), + dvclient[0]["GOODS_PROPERTY2"].ToString().Trim(), + dvclient[0]["GOODS_PROPERTY3"].ToString().Trim(), + dvclient[0]["GOODS_PROPERTY4"].ToString().Trim()); - } + } - #endregion - } - _tempSB - .Append(CellCode.Trim()).Append(",")//货位 - .Append(PalletBarCode.Trim()).Append(",")//托盘条码 - .Append(GoodsType.Trim()).Append(",")//物料类型 - .Append(GoodsBarCode.Trim());//物料条码 - //.Append(";"); + #endregion } + _tempSB + .Append(CellCode.Trim()).Append(",")//货位 + .Append(PalletBarCode.Trim()).Append(",")//托盘条码 + .Append(GoodsType.Trim()).Append(",")//物料类型 + .Append(GoodsBarCode.Trim());//物料条码 + //.Append(";"); + } #endregion @@ -2742,7 +2742,7 @@ namespace WcfControlMonitorLib CStaticClass.ObtainManageTask = true; CCallService.StartListen();//民航二所 打开开关后启用线程调用管理系统的webapi接口 - // CObtainTask.StartListen(); + // CObtainTask.StartListen(); return true; } catch @@ -2811,9 +2811,9 @@ namespace WcfControlMonitorLib CStaticClass.ReConnect(); SocketsTCPIP.CClientTCPIP.InitAllClientTCPIP(); CParsePLCData.StartListen(); - // CCallService.StartListenPLC();//山东时代 - // CDisassembleTask.StartListen(); - // CDisassembleTask.StartListen(); + // CCallService.StartListenPLC();//山东时代 + // CDisassembleTask.StartListen(); + // CDisassembleTask.StartListen(); CUpdateIoControl.StartListen(); // NewWrieDarkCasket 位置1 OPCClient.CCommonOPCClient.CreateSubscriptionGroup(); @@ -2855,7 +2855,7 @@ namespace WcfControlMonitorLib //SocketsTCPIP.CClientTCPIP.EndConnect(); CParsePLCData.EndListen(); CUpdateIoControl.EndListen(); // NewWrieDarkCasket 位置2' - // CCallService.EndListenPLC();//山东时代 + // CCallService.EndListenPLC();//山东时代 return true; } catch @@ -3192,7 +3192,7 @@ namespace WcfControlMonitorLib } string useawayfork1 = (Handtask._forkNo + 1 + i).ToString(); // - int length = Handtask._deviceIndex.ToString().Length; + int length = Handtask._deviceIndex.ToString().Length; int newindex = Handtask._deviceIndex; if (length == 6) { @@ -3511,7 +3511,7 @@ namespace WcfControlMonitorLib } - + if (_tasktype == "5") { iStartLayer = Convert.ToInt16(FSTARTCELL.Split('-')[2]); @@ -3520,12 +3520,12 @@ namespace WcfControlMonitorLib } } string FLOGIC_AREA = string.Empty;//逻辑区域 - if (_tasktype == "2" )//出库任务 + if (_tasktype == "2")//出库任务 { FLOGIC_AREA = FENDDEVICE.ToString(); iStartLayer = Convert.ToInt16(FSTARTCELL.Split('-')[2]); } - if ( _tasktype == "3")//移库任务 + if (_tasktype == "3")//移库任务 { FLOGIC_AREA = FENDDEVICE.ToString(); iStartLayer = Convert.ToInt16(FSTARTCELL.Split('-')[2]); @@ -3533,7 +3533,7 @@ namespace WcfControlMonitorLib } if (_tasktype == "6")//充电任务 dzf { - + stackno = FSTARTDEVICE; iEndLayer = Convert.ToInt16(FENDCELL.Split('-')[2]); iStartLayer = iEndLayer; @@ -3595,7 +3595,7 @@ namespace WcfControlMonitorLib public bool ModifyManageTask(int Mankind, long ManagetaskID, int ActionID, out string Errtext) { string barcode = ccf.GetBarCodeFromManageTask(ManagetaskID, Mankind); - + int mti = Mankind; long fid = ManagetaskID; @@ -3846,9 +3846,9 @@ namespace WcfControlMonitorLib //if (ControlType != 5 && ControlType != 6) //{ // int status = 0; - + // status = 900; - + // string dTime1 = DateTime.Now.ToString("u"); // dTime1 = dTime1.Substring(0, dTime1.Length - 1); @@ -3913,11 +3913,11 @@ namespace WcfControlMonitorLib var client = (IClient)OperationContext.Current.Channel; if (ClientCallbackLists[client] == null) { - userDescription = ""; + userDescription = ""; } else { - userDescription = ClientCallbackLists[client].ToString(); + userDescription = ClientCallbackLists[client].ToString(); } //string userID = ClientShowLists[client].ToString(); @@ -4934,8 +4934,8 @@ namespace WcfControlMonitorLib CUpdateIoControl.EndListen(); //民航二所 CCallService.EndListen();//民航二所 结束调用管理系统接口 - // CCallService.EndListenPLC();//山东时代 - //Application.Exit(); + // CCallService.EndListenPLC();//山东时代 + //Application.Exit(); return true; } catch (Exception ex) @@ -5292,7 +5292,7 @@ namespace WcfControlMonitorLib {//20120420 errtext = OPCClient.CCommonOPCClient.OpcError; RefreshMonitorEventArgs rmea = new RefreshMonitorEventArgs("tsStatus", string.Format("SControlMonitor.DealWithDeviceState时，订阅组:{0}发生异常,{1}！", deviceindex, errtext)); - OnRefreshMonitor(rmea); + OnRefreshMonitor(rmea); return false; } errtext = string.Empty; DataView dv = new DataView(); DataView dvsp = new DataView(); DataView dvbc = new DataView(); DataView dvyanshi = new DataView(); @@ -5309,8 +5309,8 @@ namespace WcfControlMonitorLib { devicebegin = Convert.ToInt32(dv[0]["F_DeviceIndex"]); DBW2Addressbegin = Convert.ToInt32(dv[0]["F_DBW2Address"]); - - SplitBytebegin = Convert.ToInt32(dv[0]["F_SplitByte"]); + + SplitBytebegin = Convert.ToInt32(dv[0]["F_SplitByte"]); S7Connection = dv[0]["F_S7Connection"].ToString(); sql.Clear(); @@ -5356,7 +5356,7 @@ namespace WcfControlMonitorLib for (int i = 0; i < dvsp.Count; i++) { devinfo = Model.CGetInfo.GetDeviceInfo(Convert.ToInt32(dvsp[i]["F_DeviceIndex"])); - + int delta = Convert.ToInt32(dvsp[i]["F_SplitByte"]) - SplitBytebegin; if (delta < 0) continue; devinfo.SplitByte_0 = (splitbyteValue[delta] & 1) == 1 ? 1 : 0; @@ -5381,7 +5381,7 @@ namespace WcfControlMonitorLib int tempdb2addr = 0; StringBuilder sss = new StringBuilder(); StringBuilder barcode = new StringBuilder(); if (devicestates != null) { - + Array.Copy(devicestates, CStaticClass.MutiReadSubscriptionDeviceStateReturns[deviceindex.ToString()], devicestates.Length); for (int di = 0; di < dv.Count; di++) { @@ -5395,7 +5395,7 @@ namespace WcfControlMonitorLib int taskindex2 = 0, taskindex3 = 0; //以下代码重新开发CStaticClass.MutiS7ConnReturns改为按照F_ReadSubscription tempdb2addr = Convert.ToInt32(dv[di]["F_DBW2Address"]) - DBW2Addressbegin; - + if (devinfo.DeviceKind == 1) { taskindex = (devicestates[tempdb2addr + 2] << 8) + devicestates[tempdb2addr + 3]; @@ -5419,7 +5419,7 @@ namespace WcfControlMonitorLib - int xc = 0; int yc = 0; + int xc = 0; int yc = 0; int devkind = ccf.GetDeviceKindIdx(devidx); if (devkind == 31) {//解析南京14所得高端自动化的是否有物信号，高位低位信号（I/O信号字节填写在状态字节的后面） @@ -5495,7 +5495,7 @@ namespace WcfControlMonitorLib //sdo = CommModeCreate.CreateSendDeviceOrder(devinfo.DeviceIndex); //sdo.SendDeviceOrder(0, 0, 0, devinfo.DeviceIndex, 0, 0, 0, 0, 0, 0); } - + } else @@ -5577,7 +5577,7 @@ namespace WcfControlMonitorLib yc = devicestates[tempdb2addr + 11] + (devicestates[tempdb2addr + 10] << 8);//Y坐标 devinfo.XCoor = xc; devinfo.YCoor = yc; - + devinfo.ReturnMessage = states; Model.CGetInfo.SetDeviceMessage(devinfo); @@ -5621,7 +5621,7 @@ namespace WcfControlMonitorLib #region 类输送机 case 2: - + devinfo.SplitByte_0 = (devicestates[tempdb2addr + 4] & 1) == 1 ? 1 : 0; devinfo.SplitByte_1 = (devicestates[tempdb2addr + 4] & 2) == 2 ? 1 : 0; devinfo.SplitByte_2 = (devicestates[tempdb2addr + 4] & 4) == 4 ? 1 : 0; @@ -5635,7 +5635,7 @@ namespace WcfControlMonitorLib bc = GetBarcodeFromMonitorIndex(taskindex); devinfo.ReturnMessage = states; - + Model.CGetInfo.SetDeviceMessage(devinfo); StringBuilder task23 = new StringBuilder(); @@ -5651,12 +5651,12 @@ namespace WcfControlMonitorLib task23.Append(",3叉任务号:").Append(taskindex3).Append(",3叉条码:").Append(GetBarcodeFromMonitorIndex(taskindex3)); } #region AGV取放货的输送线状态实时跟新 PLC断开连接后，该值不会变更，可能存在BUG,需要加以限制 有货可取货 - if (devinfo.DeviceIndex>=30002&&devinfo.DeviceIndex<=30005) + if (devinfo.DeviceIndex >= 30002 && devinfo.DeviceIndex <= 30005) { sql.Remove(0, sql.Length); sql.Append("select * from T_AGVIOStation where F_PLCOtherDevice=").Append(devinfo.DeviceIndex); - - DataView data= dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView; + + DataView data = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView; int status = 0; if (data[0]["F_AGVStatus"].ToString() == "6") { @@ -5672,13 +5672,13 @@ namespace WcfControlMonitorLib sql.Remove(0, sql.Length); sql.Append("update T_AGVIOStation set F_AGVIOStatus=").Append(status).Append(" where F_PLCOtherDevice=").Append(devinfo.DeviceIndex); dbo.ExecuteSql(sql.ToString()); - + } #endregion sss.Remove(0, sss.Length); sss.Append("**条码：").Append(bc).Append("**读标志" + devicestates[tempdb2addr + 0]).Append("**状态" + state).Append("**任务号:" + taskindex).Append(task23); CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "收到输送机机状态", devidx.ToString(), sss.ToString()); - + } @@ -5687,35 +5687,35 @@ namespace WcfControlMonitorLib { continue; } - + if ((taskindex2 > 0 || taskindex3 > 0) && (state == 2) && devinfo.IfCorrelDoubleFork == "1") { #region 根据电气报告三叉关联,配三叉 string aa; int mankind = 0, tindex = 0; - long relFID = 0,fid1 = 0, fid2 = 0, fid3 = 0; + long relFID = 0, fid1 = 0, fid2 = 0, fid3 = 0; if (taskindex3 > 0) { - mankind = GetManageTaskKindFromMonitor(out aa, taskindex3); - relFID = GetManageTaskIndexFromMonitor(out aa, taskindex3); + mankind = GetManageTaskKindFromMonitor(out aa, taskindex3); + relFID = GetManageTaskIndexFromMonitor(out aa, taskindex3); tindex = taskindex3; } if (taskindex2 > 0) { - mankind = GetManageTaskKindFromMonitor(out aa, taskindex2); - relFID = GetManageTaskIndexFromMonitor(out aa, taskindex2); + mankind = GetManageTaskKindFromMonitor(out aa, taskindex2); + relFID = GetManageTaskIndexFromMonitor(out aa, taskindex2); tindex = taskindex2; } if (taskindex > 0) { - mankind = GetManageTaskKindFromMonitor(out aa, taskindex); - relFID = GetManageTaskIndexFromMonitor(out aa, taskindex); + mankind = GetManageTaskKindFromMonitor(out aa, taskindex); + relFID = GetManageTaskIndexFromMonitor(out aa, taskindex); tindex = taskindex; } - fid1 = GetManageTaskIndexFromMonitor(out aa, taskindex); - fid2 = GetManageTaskIndexFromMonitor(out aa, taskindex2); - fid3 = GetManageTaskIndexFromMonitor(out aa, taskindex3); + fid1 = GetManageTaskIndexFromMonitor(out aa, taskindex); + fid2 = GetManageTaskIndexFromMonitor(out aa, taskindex2); + fid3 = GetManageTaskIndexFromMonitor(out aa, taskindex3); //关联分配三叉 sql.Remove(0, sql.Length); sql.Append("update T_Manage_Task set FUseAwayFork=1,F_RELATIVECONTORLID=").Append(relFID).Append(" where F_ManageTaskKindIndex=").Append(mankind).Append(" and FID=").Append(fid1); @@ -5797,7 +5797,7 @@ namespace WcfControlMonitorLib devinfo.SplitByte_6 = (devicestates[tempdb2addr + 8] & 64) == 64 ? 1 : 0; if (IsEquals(devinfo.ReturnMessage, states, 4) == false) { - + bc = GetBarcodeFromMonitorIndex(taskindex); //xc = devicestates[tempdb2addr + 7] + (devicestates[tempdb2addr + 6] << 8) + (devicestates[tempdb2addr + 5] << 16) + (devicestates[tempdb2addr + 4] << 32);//X坐标 @@ -5846,7 +5846,7 @@ namespace WcfControlMonitorLib } int size = devicestates[tempdb2addr + 1]; //异常信息// 高度值 1:矮货 2:高货 devinfo.RunState = size; - // int Weight = devicestates[tempdb2addr + 5] + (devicestates[tempdb2addr + 4] << 8) + (devicestates[tempdb2addr + 3] << 16) + (devicestates[tempdb2addr + 2] << 32); ;//称重重量:1轻,2重 3 超重 + // int Weight = devicestates[tempdb2addr + 5] + (devicestates[tempdb2addr + 4] << 8) + (devicestates[tempdb2addr + 3] << 16) + (devicestates[tempdb2addr + 2] << 32); ;//称重重量:1轻,2重 3 超重 int BarcodeTotalLength = BarcodeReservedLength * BoxQuality; int PalletBarcodeLength = Convert.ToInt32(dvsp[0]["F_PalletBarcodeLength"]);//电力纸箱码垛机器人专用\普通条码申请 int PalletBarcodeReservedLength = Convert.ToInt32(dvsp[0]["F_PalletBarcodeReservedLength"]);//电力纸箱码垛机器人专用\普通条码申请 @@ -5880,14 +5880,14 @@ namespace WcfControlMonitorLib { incompleteBarcode.Clear();//20150103 noneBarcode.Clear();//20150103 - for (int j = 2; j <= PalletBarcodeLength+2; j++) + for (int j = 2; j <= PalletBarcodeLength + 2; j++) {//20150103 incompleteBarcode.Append("1");//PLC扫到残码，但是有货物，转换为字符'1' noneBarcode.Append("0");//PLC没扫描，没货物，保留的空值0,转换为字符'\0' } //获得托盘条码值 //emptypallet=devicestates[tempdb2addr + 1];//托盘高度检测标志，0表示空托盘，1表示实托盘 - for (int j = 10; j < PalletBarcodeLength+10; j++)//标志位+空、实托盘+条码值 + for (int j = 10; j < PalletBarcodeLength + 10; j++)//标志位+空、实托盘+条码值 { if (devicestates[tempdb2addr + j] == 1) { @@ -5954,28 +5954,28 @@ namespace WcfControlMonitorLib if (barcode.ToString() == incompleteBarcode.ToString()) {//扫到残码 RefreshMonitorEventArgs rmea; - int abst; - //if (int.TryParse(dvsp[0]["F_Remark"].ToString(), out abst) == true) - //{ - // if (IfExitDeviceBarcodeTask(dcode, barcode.ToString()) == false) - // { - // object[] ob = new object[17] { ccf.GetTempManageIdx(), 2, barcode.ToString(), 1, 2, 1, 1, ccf.GetWarehouseIndex(), ccf.GetWarehouseIndex(), "-", dcode, dvsp[0]["F_Remark"].ToString(), "-", 0, DateTime.Now.ToString("u"), 0, Model.CGeneralFunction.TASKABEND }; - // dbo.ExceSQL(string.Format("INSERT INTO T_Manage_Task(FID, F_ManageTaskKindIndex,FPALLETBARCODE,FMANAGETASKTYPE,FCONTROLTASKTYPE, FTASKLEVEL, FISRETURN,FSTARTWAREHOUSE,FENDWAREHOUSE, FSTARTCELL, FSTARTDEVICE, FENDDEVICE, FENDCELL, FSTATUS, FBEGTIME, FIntoStepOK,FExceptionNO)VALUES({0},{1},'{2}',{3},{4},{5},{6},'{7}','{8}','{9}',{10},{11},'{12}',{13},'{14}','{15}',{16})", ob)); - // } - //} - //else - //{ - // CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "向管理条码申请任务时:", devidx.ToString(), ",站台：" + dcode + "，扫到残缺条码！" + barcode.ToString().ToUpper()); - // rmea = new RefreshMonitorEventArgs("notifyIcon1", "警告：向管理条码申请任务时,站台：" + dcode + "，扫到残缺条码！时间：" + DateTime.Now.ToString("u")); - // OnRefreshMonitor(rmea); - //} - //wv[0].Clear(); - //wv[0].Append("2"); - //sdo = CommModeCreate.CreateSendDeviceOrder(devidx); - //sdo.WriteDBData(witemnames, wv, devinfo.S7Connection); - //dbo.ExecuteSql(string.Format("UPDATE T_Base_PLC_Ask SET F_BarCode = '{1}',F_Time='{2}',F_Size='{3}',F_Hight='{4}' WHERE (F_DeviceIndex = {0}) ", devidx, barcode.ToString(), DateTime.Now, Weight, size)); - //continue;//20160120 - } + int abst; + //if (int.TryParse(dvsp[0]["F_Remark"].ToString(), out abst) == true) + //{ + // if (IfExitDeviceBarcodeTask(dcode, barcode.ToString()) == false) + // { + // object[] ob = new object[17] { ccf.GetTempManageIdx(), 2, barcode.ToString(), 1, 2, 1, 1, ccf.GetWarehouseIndex(), ccf.GetWarehouseIndex(), "-", dcode, dvsp[0]["F_Remark"].ToString(), "-", 0, DateTime.Now.ToString("u"), 0, Model.CGeneralFunction.TASKABEND }; + // dbo.ExceSQL(string.Format("INSERT INTO T_Manage_Task(FID, F_ManageTaskKindIndex,FPALLETBARCODE,FMANAGETASKTYPE,FCONTROLTASKTYPE, FTASKLEVEL, FISRETURN,FSTARTWAREHOUSE,FENDWAREHOUSE, FSTARTCELL, FSTARTDEVICE, FENDDEVICE, FENDCELL, FSTATUS, FBEGTIME, FIntoStepOK,FExceptionNO)VALUES({0},{1},'{2}',{3},{4},{5},{6},'{7}','{8}','{9}',{10},{11},'{12}',{13},'{14}','{15}',{16})", ob)); + // } + //} + //else + //{ + // CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "向管理条码申请任务时:", devidx.ToString(), ",站台：" + dcode + "，扫到残缺条码！" + barcode.ToString().ToUpper()); + // rmea = new RefreshMonitorEventArgs("notifyIcon1", "警告：向管理条码申请任务时,站台：" + dcode + "，扫到残缺条码！时间：" + DateTime.Now.ToString("u")); + // OnRefreshMonitor(rmea); + //} + //wv[0].Clear(); + //wv[0].Append("2"); + //sdo = CommModeCreate.CreateSendDeviceOrder(devidx); + //sdo.WriteDBData(witemnames, wv, devinfo.S7Connection); + //dbo.ExecuteSql(string.Format("UPDATE T_Base_PLC_Ask SET F_BarCode = '{1}',F_Time='{2}',F_Size='{3}',F_Hight='{4}' WHERE (F_DeviceIndex = {0}) ", devidx, barcode.ToString(), DateTime.Now, Weight, size)); + //continue;//20160120 + } #endregion @@ -6017,9 +6017,9 @@ namespace WcfControlMonitorLib string errormsg = ""; if (err != null) { - errormsg= err.ErrorName + "，代码：" + devinfo.ErrorCode.ToString(); + errormsg = err.ErrorName + "，代码：" + devinfo.ErrorCode.ToString(); } - + string sql5 = string.Format("insert into IO_CONTROL_APPLY_HIS(CONTROL_APPLY_ID,CONTROL_ID,CONTROL_APPLY_TYPE,WAREHOUSE_CODE,DEVICE_CODE,STOCK_BARCODE,APPLY_TASK_STATUS,CREATE_TIME,CONTROL_APPLY_PARAMETER,CONTROL_APPLY_PARA01,CONTROL_APPLY_PARA02,CONTROL_APPLY_REMARK)" + " values ({0},{1},'{2}','{3}','{4}','{5}',{6},'{7}','{8}','{9}','{10}','{11}')", 999, 999, 999, 1, dvsp[0]["F_BindingDevice"].ToString(), @@ -6060,7 +6060,7 @@ namespace WcfControlMonitorLib //barcode.Append(GetErrorBarcode(F_NearApplyStation, devidx, NearBarcodeLength)); barcode.Append(incompleteBarcode.ToString()); } - + #region 向管理申请任务 dvbc = dboMan.ExceSQL(string.Format("SELECT DEVICE_CODE,STOCK_BARCODE FROM IO_CONTROL_APPLY WHERE APPLY_TASK_STATUS<2 and DEVICE_CODE='{0}' and (STOCK_BARCODE = '{1}')", dcode, barcode)).Tables[0].DefaultView; @@ -6069,31 +6069,31 @@ namespace WcfControlMonitorLib //dvbc = dboMan.ExceSQL(string.Format("select CONTROL_ID from IO_CONTROL where STOCK_BARCODE like '%{0}%'", barcode)).Tables[0].DefaultView; //if (dvbc.Count <= 0) //{ - //dvbc = dbo.ExceSQL(string.Format("select fid from T_Manage_Task where FPALLETBARCODE like '%{0}%'", barcode)).Tables[0].DefaultView; - //if (dvbc.Count <= 0) - //{ - StringBuilder dtime = new StringBuilder(DateTime.Now.ToString("u")); - dtime.Remove(dtime.Length - 1, 1); - //int appid = dboMan.GetManageTableIndex("IO_CONTROL_APPLY", true);//CONTROL_APPLY_ID - //object[] ob = new object[9] { apptype, dcode, barcode, 0, dtime, "", warehouse.ToString(), appid, BoxQuality }; - - object[] ob = new object[9] { apptype, dcode, barcode, 0, dtime, "", warehouse.ToString(),Weight, size }; - try - { - - //dboMan.ExecuteSql(string.Format("INSERT INTO IO_CONTROL_APPLY(CONTROL_APPLY_ID, CONTROL_APPLY_TYPE,DEVICE_CODE, STOCK_BARCODE, APPLY_TASK_STATUS, CREATE_TIME,CONTROL_APPLY_REMARK,WAREHOUSE_CODE,BOX_QUANTITY)VALUES ({7},{0},'{1}','{2}',{3},'{4}','{5}','{6}',{8})", ob)); - dboMan.ExecuteSql(string.Format("INSERT INTO IO_CONTROL_APPLY(CONTROL_APPLY_TYPE,DEVICE_CODE, STOCK_BARCODE, APPLY_TASK_STATUS, CREATE_TIME,CONTROL_APPLY_REMARK,WAREHOUSE_CODE,CONTROL_APPLY_PARA01,CONTROL_APPLY_PARA02)VALUES ({0},'{1}','{2}',{3},'{4}','{5}','{6}','{7}','{8}')", ob)); - CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "向管理条码申请任务:", devidx.ToString(), ",站台：" + dcode + "，条码：" + barcode.ToString().ToUpper() + "，申请类型：" + apptype.ToString()+"申请高度:"+size+"申请重量:"+ Weight);//20140218 - } - catch (Exception ex) - { - RefreshMonitorEventArgs rmea = new RefreshMonitorEventArgs("tsStatus", "向管理申请入库任务时发生错误：" + ex.StackTrace + ex.Message); - OnRefreshMonitor(rmea); - continue;//20140218 - } + //dvbc = dbo.ExceSQL(string.Format("select fid from T_Manage_Task where FPALLETBARCODE like '%{0}%'", barcode)).Tables[0].DefaultView; + //if (dvbc.Count <= 0) + //{ + StringBuilder dtime = new StringBuilder(DateTime.Now.ToString("u")); + dtime.Remove(dtime.Length - 1, 1); + //int appid = dboMan.GetManageTableIndex("IO_CONTROL_APPLY", true);//CONTROL_APPLY_ID + //object[] ob = new object[9] { apptype, dcode, barcode, 0, dtime, "", warehouse.ToString(), appid, BoxQuality }; + object[] ob = new object[9] { apptype, dcode, barcode, 0, dtime, "", warehouse.ToString(), Weight, size }; + try + { - //} + //dboMan.ExecuteSql(string.Format("INSERT INTO IO_CONTROL_APPLY(CONTROL_APPLY_ID, CONTROL_APPLY_TYPE,DEVICE_CODE, STOCK_BARCODE, APPLY_TASK_STATUS, CREATE_TIME,CONTROL_APPLY_REMARK,WAREHOUSE_CODE,BOX_QUANTITY)VALUES ({7},{0},'{1}','{2}',{3},'{4}','{5}','{6}',{8})", ob)); + dboMan.ExecuteSql(string.Format("INSERT INTO IO_CONTROL_APPLY(CONTROL_APPLY_TYPE,DEVICE_CODE, STOCK_BARCODE, APPLY_TASK_STATUS, CREATE_TIME,CONTROL_APPLY_REMARK,WAREHOUSE_CODE,CONTROL_APPLY_PARA01,CONTROL_APPLY_PARA02)VALUES ({0},'{1}','{2}',{3},'{4}','{5}','{6}','{7}','{8}')", ob)); + CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "向管理条码申请任务:", devidx.ToString(), ",站台：" + dcode + "，条码：" + barcode.ToString().ToUpper() + "，申请类型：" + apptype.ToString() + "申请高度:" + size + "申请重量:" + Weight);//20140218 + } + catch (Exception ex) + { + RefreshMonitorEventArgs rmea = new RefreshMonitorEventArgs("tsStatus", "向管理申请入库任务时发生错误：" + ex.StackTrace + ex.Message); + OnRefreshMonitor(rmea); + continue;//20140218 + } + + + //} //} } @@ -6893,7 +6893,7 @@ namespace WcfControlMonitorLib break; - #endregion + #endregion case 32: #region 高端触摸屏 if (devicestates[tempdb2addr + 0] != 1) continue; @@ -7020,7 +7020,7 @@ namespace WcfControlMonitorLib break; - #endregion + #endregion #endregion #region 高端设备 @@ -7519,9 +7519,9 @@ namespace WcfControlMonitorLib } else if (dcode == 22066) - { - deviceend = 21001; - } + { + deviceend = 21001; + } dvbc = dbo.ExceSQL( string.Format( @@ -7752,107 +7752,107 @@ namespace WcfControlMonitorLib #region 检尺 case 37: - //if (devicestates[tempdb2addr + 0] != 1) continue; - //dvsp = dbo.ExceSQL(string.Format("select F_BarCode,F_Time, F_PalletBarcodeLength,F_PalletBarcodeReservedLength,F_BarcodeReservedLength,F_WareHouse,F_ManageAskkind,F_BarcodeForkAmount,F_BarcodeLength,F_BindingDevice,F_Askkind,F_Remark,F_TaskIndex from T_Base_PLC_Ask WHERE (F_DeviceIndex = {0}) ", devidx)).Tables[0].DefaultView; //20130510F_ManageAskkind - //if (dvsp.Count > 0) - //{ - - // StringBuilder warehouse = new StringBuilder(dvsp[0]["F_WareHouse"].ToString()); - // int dcode = Convert.ToInt32(dvsp[0]["F_BindingDevice"]); - // int apptype = Convert.ToInt32(dvsp[0]["F_ManageAskkind"]); - // int sb = Convert.ToInt32(dvsp[0]["F_remark"]); - // int BoxQuality = devicestates[tempdb2addr + 1]; - - // DateTime appdt = new DateTime(); - // if (dvsp[0]["F_Time"] == DBNull.Value) - // { - // appdt = DateTime.Now.AddSeconds(-10); - // } - // else - // { - // DateTime.TryParse(dvsp[0]["F_Time"].ToString(), out appdt); - - // } - - // if (dvsp[0]["F_TaskIndex"] != DBNull.Value) - // { - // if ((appdt.AddSeconds(5) > DateTime.Now) && (dvsp[0]["F_TaskIndex"].ToString() == BoxQuality.ToString())) - // { - // dbo.ExecuteSql(string.Format("UPDATE T_Base_PLC_Ask SET F_TaskIndex = '{1}',F_Time='{2}' WHERE (F_DeviceIndex = {0}) ", devidx, BoxQuality, DateTime.Now)); - // CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "PLC重复上报检尺:", devidx.ToString(), ",检尺：" + devidx + "，高度：" + BoxQuality.ToString().ToUpper()); - // break; - // } - - // } - - // CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "检尺上报", devidx.ToString(), "读标志1**：" + BoxQuality.ToString()); - - // StringBuilder dtime = new StringBuilder(DateTime.Now.ToString("u")); - // dtime.Remove(dtime.Length - 1, 1); - // barcode.Clear(); - // dvsp = dbo.ExceSQL(string.Format("select F_BarCode,F_BindingDevice from T_Base_PLC_Ask WHERE (F_DeviceIndex = {0}) ", dcode)).Tables[0].DefaultView; //20130510F_ManageAskkind - // if (dvsp.Count > 0) - // { - - // barcode.Append(dvsp[0]["F_BarCode"]); - // } - - // string jic = string.Empty; - // switch (BoxQuality) - // { - // case 1: - // jic = "Low"; - // break; - // case 2: - // jic = "Height%"; - // break; - - // case 3: - // jic = "Height"; - // break; - // default: - // jic = BoxQuality.ToString(); - // break; - - // } - // //int appid = dboMan.GetManageTableIndex("IO_CONTROL_APPLY", true);//CONTROL_APPLY_ID - // object[] ob = new object[8] { apptype, sb, barcode, 0, dtime, "", warehouse.ToString(), jic }; - // if (CStaticClass.StopTestLane == true) - // { - // if ((!WcfControlMonitorLib.CStaticClass.StopTest.ContainsKey(18001)) || ((WcfControlMonitorLib.CStaticClass.StopTest.ContainsKey(18001)) && WcfControlMonitorLib.CStaticClass.StopTest[18001] == true)) - // { - // try - // { - - // dboMan.ExecuteSql(string.Format("INSERT INTO IO_CONTROL_APPLY( CONTROL_APPLY_TYPE,DEVICE_CODE, STOCK_BARCODE, APPLY_TASK_STATUS, CREATE_TIME,CONTROL_APPLY_REMARK,WAREHOUSE_CODE,CONTROL_APPLY_PARAMETER)VALUES ({0},'{1}','{2}',{3},'{4}','{5}','{6}','{7}')", ob)); - // CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "向管理条码申请任务:", devidx.ToString(), ",站台：" + dcode + "，条码：" + barcode.ToString().ToUpper());//20140218 - // } - // catch (Exception ex) - // { - // RefreshMonitorEventArgs rmea = new RefreshMonitorEventArgs("tsStatus", "向管理申请入库任务时发生错误：" + ex.StackTrace + ex.Message); - // OnRefreshMonitor(rmea); - // continue;//20140218 - // } - // } - // } - // else - // { - // CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "调度系统测试:", devidx.ToString(), ",站台：" + dcode + "，条码：" + barcode.ToString().ToUpper());//20140218 - - // } - // witemnames[0].Clear(); - // witemnames[0].Append(Model.CGeneralFunction.DBGet).Append(".").Append(Convert.ToString(devinfo.Dbw2Address + 0)).Append(",b");//20130510 - // wv[0].Clear(); - // wv[0].Append("2"); - // sdo = CommModeCreate.CreateSendDeviceOrder(devidx); - // sdo.WriteDBData(witemnames, wv, devinfo.S7Connection); + //if (devicestates[tempdb2addr + 0] != 1) continue; + //dvsp = dbo.ExceSQL(string.Format("select F_BarCode,F_Time, F_PalletBarcodeLength,F_PalletBarcodeReservedLength,F_BarcodeReservedLength,F_WareHouse,F_ManageAskkind,F_BarcodeForkAmount,F_BarcodeLength,F_BindingDevice,F_Askkind,F_Remark,F_TaskIndex from T_Base_PLC_Ask WHERE (F_DeviceIndex = {0}) ", devidx)).Tables[0].DefaultView; //20130510F_ManageAskkind + //if (dvsp.Count > 0) + //{ - // CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "写检尺应答", devidx.ToString(), "写标志2**检尺：" + BoxQuality.ToString()); - // ob = new object[4] { devidx, BoxQuality.ToString(), DateTime.Now, barcode }; - // dbo.ExecuteSql(string.Format("UPDATE T_Base_PLC_Ask SET F_BarCode='{3}',F_Time='{2}', F_TaskIndex ={1} WHERE (F_DeviceIndex = {0}) ", ob)); + // StringBuilder warehouse = new StringBuilder(dvsp[0]["F_WareHouse"].ToString()); + // int dcode = Convert.ToInt32(dvsp[0]["F_BindingDevice"]); + // int apptype = Convert.ToInt32(dvsp[0]["F_ManageAskkind"]); + // int sb = Convert.ToInt32(dvsp[0]["F_remark"]); + // int BoxQuality = devicestates[tempdb2addr + 1]; + + // DateTime appdt = new DateTime(); + // if (dvsp[0]["F_Time"] == DBNull.Value) + // { + // appdt = DateTime.Now.AddSeconds(-10); + // } + // else + // { + // DateTime.TryParse(dvsp[0]["F_Time"].ToString(), out appdt); + + // } + + // if (dvsp[0]["F_TaskIndex"] != DBNull.Value) + // { + // if ((appdt.AddSeconds(5) > DateTime.Now) && (dvsp[0]["F_TaskIndex"].ToString() == BoxQuality.ToString())) + // { + // dbo.ExecuteSql(string.Format("UPDATE T_Base_PLC_Ask SET F_TaskIndex = '{1}',F_Time='{2}' WHERE (F_DeviceIndex = {0}) ", devidx, BoxQuality, DateTime.Now)); + // CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "PLC重复上报检尺:", devidx.ToString(), ",检尺：" + devidx + "，高度：" + BoxQuality.ToString().ToUpper()); + // break; + // } + + // } + + // CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "检尺上报", devidx.ToString(), "读标志1**：" + BoxQuality.ToString()); + + // StringBuilder dtime = new StringBuilder(DateTime.Now.ToString("u")); + // dtime.Remove(dtime.Length - 1, 1); + // barcode.Clear(); + // dvsp = dbo.ExceSQL(string.Format("select F_BarCode,F_BindingDevice from T_Base_PLC_Ask WHERE (F_DeviceIndex = {0}) ", dcode)).Tables[0].DefaultView; //20130510F_ManageAskkind + // if (dvsp.Count > 0) + // { + + // barcode.Append(dvsp[0]["F_BarCode"]); + // } + + // string jic = string.Empty; + // switch (BoxQuality) + // { + // case 1: + // jic = "Low"; + // break; + // case 2: + // jic = "Height%"; + // break; + + // case 3: + // jic = "Height"; + // break; + // default: + // jic = BoxQuality.ToString(); + // break; + + // } + // //int appid = dboMan.GetManageTableIndex("IO_CONTROL_APPLY", true);//CONTROL_APPLY_ID + // object[] ob = new object[8] { apptype, sb, barcode, 0, dtime, "", warehouse.ToString(), jic }; + // if (CStaticClass.StopTestLane == true) + // { + // if ((!WcfControlMonitorLib.CStaticClass.StopTest.ContainsKey(18001)) || ((WcfControlMonitorLib.CStaticClass.StopTest.ContainsKey(18001)) && WcfControlMonitorLib.CStaticClass.StopTest[18001] == true)) + // { + // try + // { + + // dboMan.ExecuteSql(string.Format("INSERT INTO IO_CONTROL_APPLY( CONTROL_APPLY_TYPE,DEVICE_CODE, STOCK_BARCODE, APPLY_TASK_STATUS, CREATE_TIME,CONTROL_APPLY_REMARK,WAREHOUSE_CODE,CONTROL_APPLY_PARAMETER)VALUES ({0},'{1}','{2}',{3},'{4}','{5}','{6}','{7}')", ob)); + // CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "向管理条码申请任务:", devidx.ToString(), ",站台：" + dcode + "，条码：" + barcode.ToString().ToUpper());//20140218 + // } + // catch (Exception ex) + // { + // RefreshMonitorEventArgs rmea = new RefreshMonitorEventArgs("tsStatus", "向管理申请入库任务时发生错误：" + ex.StackTrace + ex.Message); + // OnRefreshMonitor(rmea); + // continue;//20140218 + // } + // } + // } + // else + // { + // CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "调度系统测试:", devidx.ToString(), ",站台：" + dcode + "，条码：" + barcode.ToString().ToUpper());//20140218 + + // } + // witemnames[0].Clear(); + // witemnames[0].Append(Model.CGeneralFunction.DBGet).Append(".").Append(Convert.ToString(devinfo.Dbw2Address + 0)).Append(",b");//20130510 + // wv[0].Clear(); + // wv[0].Append("2"); + // sdo = CommModeCreate.CreateSendDeviceOrder(devidx); + // sdo.WriteDBData(witemnames, wv, devinfo.S7Connection); + + // CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "写检尺应答", devidx.ToString(), "写标志2**检尺：" + BoxQuality.ToString()); + // ob = new object[4] { devidx, BoxQuality.ToString(), DateTime.Now, barcode }; + // dbo.ExecuteSql(string.Format("UPDATE T_Base_PLC_Ask SET F_BarCode='{3}',F_Time='{2}', F_TaskIndex ={1} WHERE (F_DeviceIndex = {0}) ", ob)); - //} - //break; + //} + //break; #endregion #region 每楼层报警点 @@ -7948,8 +7948,8 @@ namespace WcfControlMonitorLib int mankindd = 0; long fidd1 = 0, fidd2 = 0, relFIDD = 0; string aainfo = string.Empty; - int mankind = GetManageTaskKindFromMonitor(out aainfo, taskindex); - long mantaskindex = GetManageTaskIndexFromMonitor(out aainfo, taskindex); + int mankind = GetManageTaskKindFromMonitor(out aainfo, taskindex); + long mantaskindex = GetManageTaskIndexFromMonitor(out aainfo, taskindex); int tasktypee = ccf.GetFCONTROLTASKTYPEFromManageTask(mankind, mantaskindex); int layer = 0; layer = ccf.getLayerFromMonitorTask(taskindex); @@ -7958,7 +7958,7 @@ namespace WcfControlMonitorLib int[] corrtasks = Model.CGeneralFunction.MutiForkIfSync(taskindex, devidx, 40); int boxnum = Model.CGeneralFunction.getDoubleForkMonitorCount(taskindex, tasktypee, order); cgs.ActionComplete(devidx, taskindex, 1); - if(corrtasks[0] != 0) + if (corrtasks[0] != 0) { CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "多工位提升机状态：", devidx.ToString(), "报完成时：查找关联任务：" + corrtasks[0] + "当前任务：" + taskindex.ToString() + "箱数：" + boxnum); } @@ -7966,17 +7966,17 @@ namespace WcfControlMonitorLib { CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "多工位提升机状态：", devidx.ToString(), "无关联任务，corrtasks为NULL" + "当前任务：" + taskindex.ToString() + "箱数：" + boxnum); } - + if (boxnum == 2) { cgs.ActionComplete(devidx, corrtasks[0], 1); - + } #region 20180427 add by lyj提升机送货完成解除关联 string sqlrela = string.Empty; - if (order == 5 && devinfo.SplitByte_0 == 0 && devinfo.SplitByte_1 == 0&&tasktypee==1) + if (order == 5 && devinfo.SplitByte_0 == 0 && devinfo.SplitByte_1 == 0 && tasktypee == 1) { sqlrela = "update T_Manage_Task set F_RELATIVECONTORLID=-" + relaid.ToString() + " where F_RELATIVECONTORLID=" + relaid.ToString(); @@ -7988,7 +7988,7 @@ namespace WcfControlMonitorLib cgs.ActionComplete(devidx, taskindex, 1); } - #endregion + #endregion #region add by lyj20180507出库不同层配关联 if (tasktypee == 2 && order == 4 && relaid <= 0) @@ -8048,16 +8048,16 @@ namespace WcfControlMonitorLib } break; - - case 50: + + case 50: devinfo.SplitByte_0 = (devicestates[tempdb2addr + 0] & 1) == 1 ? 1 : 0; Model.CGetInfo.SetDeviceMessage(devinfo); break; #endregion #region 20210324_上海晟碟，拣选塔灯清零确认 case 41: - if(states[0] == 1) + if (states[0] == 1) { //int iStation = deviceindex / 10; //sql.Remove(0, sql.Length); @@ -8078,7 +8078,7 @@ namespace WcfControlMonitorLib //} } break; - #endregion + #endregion } #endregion @@ -8144,7 +8144,7 @@ namespace WcfControlMonitorLib return false; } Model.MDevice md = Model.CGetInfo.GetDeviceInfo(deviceIndex); - + if (DBBlock == "DB1") { StringBuilder[] wv = { new StringBuilder("") }; @@ -8154,8 +8154,8 @@ namespace WcfControlMonitorLib wv[0].Clear(); wv[0].Append(Wdata); sdo = CommModeCreate.CreateSendDeviceOrder(deviceIndex); - sdo.WriteDBData(wn, wv, md.S7Connection); - + sdo.WriteDBData(wn, wv, md.S7Connection); + CommonClassLib.CCarryConvert.WriteDarkCasket("OPCClient", "写堆垛机急停按钮信号:", deviceIndex.ToString(), md.S7Connection + ";" + DBBlock + ";" + (md.Dbw1Address + 22).ToString() + ";" + Wdata); } @@ -8242,7 +8242,7 @@ namespace WcfControlMonitorLib if (DBBlock == "DB2") { - StringBuilder[] wv = { new StringBuilder("") ,new StringBuilder("")}; + StringBuilder[] wv = { new StringBuilder(""), new StringBuilder("") }; StringBuilder[] wn = { new StringBuilder(""), new StringBuilder("") }; wn[0].Clear(); wn[0].Append(DBBlock).Append(".").Append(Convert.ToString(md.Dbw1Address + 1)).Append(",b");// @@ -8289,7 +8289,7 @@ namespace WcfControlMonitorLib /// 索引 /// /// - public bool WriteDBData2(int deviceIndex, string DBBlock, string Wdata,string byteindex, out string errtext) + public bool WriteDBData2(int deviceIndex, string DBBlock, string Wdata, string byteindex, out string errtext) { errtext = string.Empty; try @@ -8922,17 +8922,17 @@ namespace WcfControlMonitorLib { Model.MDevice md = Model.CGetInfo.GetDeviceInfo(Convert.ToInt32(dv[i]["Device_Index"])); if (md == null) return false; - + if (md.RunState.ToString() != dv[i]["INOut_Value"].ToString()) { md.RunState = Convert.ToInt32(dv[i]["INOut_Value"]); //Model.CGetInfo.SetDeviceMessage(devinfo); - WriteDBDataConveyor(Convert.ToInt32(dv[i]["Device_Index"]),"DB1", dv[i]["INOut_Value"].ToString(), out string errtext); - if (errtext != null&&errtext!="") + WriteDBDataConveyor(Convert.ToInt32(dv[i]["Device_Index"]), "DB1", dv[i]["INOut_Value"].ToString(), out string errtext); + if (errtext != null && errtext != "") { CommonClassLib.CCarryConvert.WriteDarkCasket("opcclient", "设备编号：" + Convert.ToInt32(dv[i]["Device_Index"]).ToString(), - "写入的值：" + dv[i]["INOut_Value"].ToString()+"异常信息:"+errtext.ToString(), "PLC标识：" + md.S7Connection.ToString()); + "写入的值：" + dv[i]["INOut_Value"].ToString() + "异常信息:" + errtext.ToString(), "PLC标识：" + md.S7Connection.ToString()); } } } @@ -8966,8 +8966,8 @@ namespace WcfControlMonitorLib int[] States; if (CStaticClass.Order == true) { - int[] iDeviceIn = { 12004 };//出库路径终点设备 - int[] iDevice = { 15102};//写点灯，指示灯设备名称 + int[] iDeviceIn = { 12004 };//出库路径终点设备 + int[] iDevice = { 15102 };//写点灯，指示灯设备名称 DataView dvi = new DataView(); DataView dviMon = new DataView(); DataView dv = new DataView(); @@ -8992,14 +8992,14 @@ namespace WcfControlMonitorLib if (States != null) { - Model.MDevice md = Model.CGetInfo.GetDeviceInfo(iDevice[i]); - witemnames[0].Clear(); - witemnames[0].Append(Model.CGeneralFunction.DBGet).Append(".").Append(Convert.ToString(md.Dbw2Address + 2)).Append(",b");// - wv[0].Clear(); - wv[0].Append("1"); - sdo = CommModeCreate.CreateSendDeviceOrder(iDevice[i]); - sdo.WriteDBData(witemnames, wv, md.S7Connection); - // CommonClassLib.CCarryConvert.WriteDarkCasket("发送", "亮灯", "指令", "2,亮灯站台：" + iDeviceIn[i].ToString()); + Model.MDevice md = Model.CGetInfo.GetDeviceInfo(iDevice[i]); + witemnames[0].Clear(); + witemnames[0].Append(Model.CGeneralFunction.DBGet).Append(".").Append(Convert.ToString(md.Dbw2Address + 2)).Append(",b");// + wv[0].Clear(); + wv[0].Append("1"); + sdo = CommModeCreate.CreateSendDeviceOrder(iDevice[i]); + sdo.WriteDBData(witemnames, wv, md.S7Connection); + // CommonClassLib.CCarryConvert.WriteDarkCasket("发送", "亮灯", "指令", "2,亮灯站台：" + iDeviceIn[i].ToString()); } } else //灭灯 @@ -9008,14 +9008,14 @@ namespace WcfControlMonitorLib States = CStaticClass.GetDeviceState(iDevice[i]); //1为亮绿灯 2为灭灯 if (States != null) { - Model.MDevice md = Model.CGetInfo.GetDeviceInfo(iDevice[i]); - witemnames[0].Clear(); - witemnames[0].Append(Model.CGeneralFunction.DBGet).Append(".").Append(Convert.ToString(md.Dbw2Address + 2)).Append(",b");// - wv[0].Clear(); - wv[0].Append("2"); - sdo = CommModeCreate.CreateSendDeviceOrder(iDevice[i]); - sdo.WriteDBData(witemnames, wv, md.S7Connection); - // CommonClassLib.CCarryConvert.WriteDarkCasket("发送", "灭灯", "指令", "1,灭灯站台：" + iDeviceIn[i].ToString()); + Model.MDevice md = Model.CGetInfo.GetDeviceInfo(iDevice[i]); + witemnames[0].Clear(); + witemnames[0].Append(Model.CGeneralFunction.DBGet).Append(".").Append(Convert.ToString(md.Dbw2Address + 2)).Append(",b");// + wv[0].Clear(); + wv[0].Append("2"); + sdo = CommModeCreate.CreateSendDeviceOrder(iDevice[i]); + sdo.WriteDBData(witemnames, wv, md.S7Connection); + // CommonClassLib.CCarryConvert.WriteDarkCasket("发送", "灭灯", "指令", "1,灭灯站台：" + iDeviceIn[i].ToString()); } } @@ -9036,68 +9036,61 @@ namespace WcfControlMonitorLib //堆垛机测试 public void SendConveyorTestTask() { - if (1==1) { - string startCode = "01-02-01"; - - string endCode = "01-01-01"; - int Y = 3;//最高层 - int hand = 19; //中间货位(2+37)/2 中间货位到后正常排序 - int ConveryorDeviceIndex = 18001; - int deviceIndex = 11001; - StringBuilder sql1 = new StringBuilder(); - sql1.Append("select * from T_Manage_Task where F_ManageTaskKindIndex=2 and FSTARTDEVICE='").Append(ConveryorDeviceIndex).Append("'");//查找任务类型为自动任务的某台堆垛机的任务 - int Count= dbo.ExceSQL(sql1.ToString()).Tables[0].DefaultView.Count; - if (Count == 0) { - #region 寻找起点 - sql1.Clear(); - sql1.Append("SELECT LastTaskEndDevice from T_LastDeviceTaskMsg where ConveryorDeviceIndex='").Append(ConveryorDeviceIndex).Append("'"); - DataView data = dbo.ExceSQL(sql1.ToString()).Tables[0].DefaultView; - var a = data[0]["LastTaskEndDevice"].ToString(); - if (data[0]["LastTaskEndDevice"].ToString() == null|| data[0]["LastTaskEndDevice"].ToString() == "") + if (CStaticClass.ObtainManageTask == true) { + try { + if (CCallService.mythread == null) { - - - startCode = "01-02-01"; - } - else { - startCode = data[0]["LastTaskEndDevice"].ToString(); + //CCallService.mythread.Start(); + CCallService.mythread = new Thread(new ThreadStart(CCallService.BeginListen)); + CCallService.mythread.IsBackground = true; + CCallService.mythread.Start(); } - #endregion - #region 寻找终点 - DataView data1 = new DataView(); - var row = Convert.ToInt32(startCode.Split('-')[1]);//获取列 - if (row < hand)//后半区 + else { - sql1.Clear(); - sql1 = new StringBuilder("select top 1 FCELLCODE from ST_CELL where FLaneWay='").Append(ConveryorDeviceIndex).Append("' and F_FLAG=0 order by F_Z desc,F_X desc,F_Y DESC"); - data1 = dbo.ExceSQL(sql1.ToString()).Tables[0].DefaultView; - if (data1.Count > 0) - { - endCode = data1[0]["FCELLCODE"].ToString();//获取终点 - } - else { - return; + if (CCallService.mythread.IsAlive == false) { + CCallService.mythread.Abort(); + CCallService. mythread = null; } } - else { - sql1.Clear(); - sql1 = new StringBuilder("select top 1 FCELLCODE from ST_CELL where FLaneWay='").Append(ConveryorDeviceIndex).Append("' and F_FLAG=0 order by F_Z,F_X ,F_Y"); - data1 = dbo.ExceSQL(sql1.ToString()).Tables[0].DefaultView; - if (data1.Count > 0) + if (CCallService.mythread1 == null) + { + // CCallService.mythread1.Start(); + CCallService.mythread1 = new Thread(new ThreadStart(CCallService.BeginListen1)); + CCallService.mythread1.IsBackground = true; + CCallService.mythread1.Start(); + } + else + { + if (CCallService.mythread1.IsAlive == false) { - endCode = data1[0]["FCELLCODE"].ToString();//获取终点 + CCallService.mythread1.Abort(); + CCallService.mythread1 = null; } - else + } + if (CCallService.mythread2 == null) + { + // CCallService.mythread2.Start(); + CCallService.mythread2 = new Thread(new ThreadStart(CCallService.BeginListen2)); + CCallService.mythread2.IsBackground = true; + CCallService.mythread2.Start(); + } + else + { + if (CCallService.mythread2.IsAlive == false) { - return; + CCallService.mythread2.Abort(); + CCallService.mythread2 = null; } + } - Model.AutoTask at = new Model.AutoTask(3, "111111", ConveryorDeviceIndex.ToString(), startCode, ConveryorDeviceIndex.ToString(), endCode, false, false, 0); - BuildAutoTask(at, out string _listenPLCAskError); - #endregion } + catch (Exception ex) { + + + } - } + } + } public void SendConveyorTestTask2() { diff --git a/webapi/WindowsFormsApp1/APIChannel.cs b/webapi/WindowsFormsApp1/APIChannel.cs index 2f8072b..905e5fa 100644 --- a/webapi/WindowsFormsApp1/APIChannel.cs +++ b/webapi/WindowsFormsApp1/APIChannel.cs @@ -206,8 +206,7 @@ namespace WindowsFormsApp1 else if (stepOk == 1 && FSTATUS == 0) { sql.Remove(0, sql.Length); sql.Append("INSERT INTO T_Manage_Task_BAK SELECT * FROM T_Manage_Task where FID=").Append(wms_wcs_cancel.taskId).Append(" and F_ManageTaskKindIndex>=1"); - dbo.ExecuteSql(sql.ToString()); - + dbo.ExecuteSql(sql.ToString()); sql.Clear(); sql.Append("delete from T_Monitor_Task where F_ManageTaskIndex = '").Append(wms_wcs_cancel.taskId).Append("'"); dbo.ExecuteSql(sql.ToString()); diff --git a/webapi/WindowsFormsApp1/App.config b/webapi/WindowsFormsApp1/App.config index 06d76fd..e89e503 100644 --- a/webapi/WindowsFormsApp1/App.config +++ b/webapi/WindowsFormsApp1/App.config @@ -10,8 +10,8 @@ - - + + @@ -20,8 +20,8 @@ - - + +