gaojianan
/
SSWCS_PZHDS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

测试修改

master
高佳男 1 year ago
parent
b17a4053ea
commit
f41796fe25
6 changed files with 313 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ControlMonitorClient/FrmControlMonitor.cs
  2. 359
      ControlMonitorClient/FrmControlMonitor.designer.cs
  3. 6
      WcfControlMonitorLib/CCommonFunction.cs
  4. 8
      WcfControlMonitorLib/CControl.cs
  5. 1
      WcfControlMonitorLib/CDisassembleTask.cs
  6. 1
      WcfControlMonitorLib/SControlMonitor.cs

4
ControlMonitorClient/FrmControlMonitor.cs
View File

@ -199,7 +199,7 @@ namespace wcfControlMonitorClient
tw5 = tb1_stacker5;
}
#region tabPage2
else if (this.tab.SelectedTab.Name == "tabPage3")
else if (this.tab.SelectedTab.Name == "tabPage2")
{
pp = plAccessorial2;
@ -268,7 +268,7 @@ namespace wcfControlMonitorClient
switch (device.DeviceIndex)
{
case 11001:// +46(880)/15 = 58.67
stack1.Location = new Point((int)(308 + 23.2 * (device.XCoor - 1)), stack1.Location.Y);
stack1.Location = new Point((int)(708 + 23.2 * (device.XCoor - 1)), stack1.Location.Y);
tw1.Location = new Point(stack1.Location.X + 16, tw1.Location.Y);
break;
case 11002://308 + 925/41=23.2

359
ControlMonitorClient/FrmControlMonitor.designer.cs
View File

@ -377,8 +377,7 @@
this.label34 = new System.Windows.Forms.Label();
this.label35 = new System.Windows.Forms.Label();
this.tab = new System.Windows.Forms.TabControl();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.panel37 = new System.Windows.Forms.Panel();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.plAccessorial2 = new System.Windows.Forms.Panel();
this.label126 = new System.Windows.Forms.Label();
this.label127 = new System.Windows.Forms.Label();
@ -568,6 +567,24 @@
this.label182 = new System.Windows.Forms.Label();
this.label183 = new System.Windows.Forms.Label();
this.label184 = new System.Windows.Forms.Label();
this.label36 = new System.Windows.Forms.Label();
this.label37 = new System.Windows.Forms.Label();
this.label38 = new System.Windows.Forms.Label();
this.label39 = new System.Windows.Forms.Label();
this.label40 = new System.Windows.Forms.Label();
this.label41 = new System.Windows.Forms.Label();
this.label42 = new System.Windows.Forms.Label();
this.label44 = new System.Windows.Forms.Label();
this.label45 = new System.Windows.Forms.Label();
this.label47 = new System.Windows.Forms.Label();
this.label48 = new System.Windows.Forms.Label();
this.label49 = new System.Windows.Forms.Label();
this.label50 = new System.Windows.Forms.Label();
this.label53 = new System.Windows.Forms.Label();
this.label54 = new System.Windows.Forms.Label();
this.label58 = new System.Windows.Forms.Label();
this.label61 = new System.Windows.Forms.Label();
this.label62 = new System.Windows.Forms.Label();
pictureBox13 = new System.Windows.Forms.PictureBox();
pictureBox12 = new System.Windows.Forms.PictureBox();
pictureBox14 = new System.Windows.Forms.PictureBox();
@ -603,8 +620,7 @@
((System.ComponentModel.ISupportInitialize)(this.pic30003)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pic30001)).BeginInit();
this.tab.SuspendLayout();
this.tabPage3.SuspendLayout();
this.panel37.SuspendLayout();
this.tabPage2.SuspendLayout();
this.plAccessorial2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pic30011)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pic30010)).BeginInit();
@ -731,6 +747,19 @@
// plAccessorial1
//
this.plAccessorial1.BackColor = System.Drawing.Color.WhiteSmoke;
this.plAccessorial1.Controls.Add(this.label62);
this.plAccessorial1.Controls.Add(this.label61);
this.plAccessorial1.Controls.Add(this.label54);
this.plAccessorial1.Controls.Add(this.label53);
this.plAccessorial1.Controls.Add(this.label47);
this.plAccessorial1.Controls.Add(this.label44);
this.plAccessorial1.Controls.Add(this.label42);
this.plAccessorial1.Controls.Add(this.label41);
this.plAccessorial1.Controls.Add(this.label40);
this.plAccessorial1.Controls.Add(this.label39);
this.plAccessorial1.Controls.Add(this.label38);
this.plAccessorial1.Controls.Add(this.label37);
this.plAccessorial1.Controls.Add(this.label36);
this.plAccessorial1.Controls.Add(this.textBox142);
this.plAccessorial1.Controls.Add(this.button167);
this.plAccessorial1.Controls.Add(this.label111);
@ -1045,9 +1074,14 @@
this.plAccessorial1.Controls.Add(this.label28);
this.plAccessorial1.Controls.Add(this.label30);
this.plAccessorial1.Controls.Add(this.label31);
this.plAccessorial1.Controls.Add(this.label33);
this.plAccessorial1.Controls.Add(this.label34);
this.plAccessorial1.Controls.Add(this.label35);
this.plAccessorial1.Controls.Add(this.label45);
this.plAccessorial1.Controls.Add(this.label48);
this.plAccessorial1.Controls.Add(this.label50);
this.plAccessorial1.Controls.Add(this.label33);
this.plAccessorial1.Controls.Add(this.label49);
this.plAccessorial1.Controls.Add(this.label58);
this.plAccessorial1.Dock = System.Windows.Forms.DockStyle.Fill;
this.plAccessorial1.Location = new System.Drawing.Point(3, 2);
this.plAccessorial1.Margin = new System.Windows.Forms.Padding(4);
@ -4298,7 +4332,7 @@
this.panel27.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.panel27.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel27.Controls.Add(this.label3);
this.panel27.Location = new System.Drawing.Point(467, 539);
this.panel27.Location = new System.Drawing.Point(467, 541);
this.panel27.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panel27.Name = "panel27";
this.panel27.Size = new System.Drawing.Size(505, 20);
@ -4338,7 +4372,7 @@
this.tb1_stacker5.BackColor = System.Drawing.Color.Blue;
this.tb1_stacker5.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.tb1_stacker5.Enabled = false;
this.tb1_stacker5.Location = new System.Drawing.Point(799, 134);
this.tb1_stacker5.Location = new System.Drawing.Point(799, 133);
this.tb1_stacker5.Margin = new System.Windows.Forms.Padding(4);
this.tb1_stacker5.Multiline = true;
this.tb1_stacker5.Name = "tb1_stacker5";
@ -4405,7 +4439,7 @@
//
this.bt1_stacker5.BackColor = System.Drawing.Color.DarkOrange;
this.bt1_stacker5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.bt1_stacker5.Location = new System.Drawing.Point(789, 129);
this.bt1_stacker5.Location = new System.Drawing.Point(789, 128);
this.bt1_stacker5.Margin = new System.Windows.Forms.Padding(4);
this.bt1_stacker5.Name = "bt1_stacker5";
this.bt1_stacker5.Size = new System.Drawing.Size(30, 20);
@ -4668,7 +4702,7 @@
this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel3.Controls.Add(this.label69);
this.panel3.Location = new System.Drawing.Point(196, 87);
this.panel3.Location = new System.Drawing.Point(196, 86);
this.panel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(794, 20);
@ -4755,7 +4789,7 @@
this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel2.Controls.Add(this.label70);
this.panel2.Location = new System.Drawing.Point(196, 107);
this.panel2.Location = new System.Drawing.Point(196, 106);
this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(794, 20);
@ -4813,7 +4847,7 @@
this.tb1_stacker1.BackColor = System.Drawing.Color.Blue;
this.tb1_stacker1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.tb1_stacker1.Enabled = false;
this.tb1_stacker1.Location = new System.Drawing.Point(799, 523);
this.tb1_stacker1.Location = new System.Drawing.Point(799, 525);
this.tb1_stacker1.Margin = new System.Windows.Forms.Padding(4);
this.tb1_stacker1.Multiline = true;
this.tb1_stacker1.Name = "tb1_stacker1";
@ -4826,7 +4860,7 @@
//
this.bt1_stacker1.BackColor = System.Drawing.Color.DarkOrange;
this.bt1_stacker1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.bt1_stacker1.Location = new System.Drawing.Point(789, 518);
this.bt1_stacker1.Location = new System.Drawing.Point(789, 520);
this.bt1_stacker1.Margin = new System.Windows.Forms.Padding(4);
this.bt1_stacker1.Name = "bt1_stacker1";
this.bt1_stacker1.Size = new System.Drawing.Size(30, 20);
@ -4851,7 +4885,7 @@
//
this.label57.AutoSize = true;
this.label57.ForeColor = System.Drawing.Color.DarkGray;
this.label57.Location = new System.Drawing.Point(513, 523);
this.label57.Location = new System.Drawing.Point(513, 525);
this.label57.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label57.Name = "label57";
this.label57.Size = new System.Drawing.Size(71, 12);
@ -4895,7 +4929,7 @@
//
this.label22.AutoSize = true;
this.label22.ForeColor = System.Drawing.Color.DarkGray;
this.label22.Location = new System.Drawing.Point(336, 134);
this.label22.Location = new System.Drawing.Point(336, 133);
this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(59, 12);
@ -5077,7 +5111,7 @@
this.label95.AutoSize = true;
this.label95.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label95.ForeColor = System.Drawing.Color.Blue;
this.label95.Location = new System.Drawing.Point(1276, 412);
this.label95.Location = new System.Drawing.Point(1291, 416);
this.label95.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label95.Name = "label95";
this.label95.Size = new System.Drawing.Size(35, 12);
@ -5089,7 +5123,7 @@
this.label94.AutoSize = true;
this.label94.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label94.ForeColor = System.Drawing.Color.Blue;
this.label94.Location = new System.Drawing.Point(1276, 564);
this.label94.Location = new System.Drawing.Point(1291, 568);
this.label94.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label94.Name = "label94";
this.label94.Size = new System.Drawing.Size(35, 12);
@ -5101,7 +5135,7 @@
this.label93.AutoSize = true;
this.label93.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label93.ForeColor = System.Drawing.Color.Blue;
this.label93.Location = new System.Drawing.Point(1276, 725);
this.label93.Location = new System.Drawing.Point(1291, 729);
this.label93.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label93.Name = "label93";
this.label93.Size = new System.Drawing.Size(35, 12);
@ -5245,7 +5279,7 @@
this.label112.AutoSize = true;
this.label112.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label112.ForeColor = System.Drawing.Color.Blue;
this.label112.Location = new System.Drawing.Point(979, 76);
this.label112.Location = new System.Drawing.Point(979, 73);
this.label112.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label112.Name = "label112";
this.label112.Size = new System.Drawing.Size(71, 12);
@ -5257,7 +5291,7 @@
this.label113.AutoSize = true;
this.label113.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label113.ForeColor = System.Drawing.Color.Blue;
this.label113.Location = new System.Drawing.Point(1022, 29);
this.label113.Location = new System.Drawing.Point(1020, 31);
this.label113.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label113.Name = "label113";
this.label113.Size = new System.Drawing.Size(35, 12);
@ -5351,7 +5385,7 @@
// tab
//
this.tab.Controls.Add(this.tabPage1);
this.tab.Controls.Add(this.tabPage3);
this.tab.Controls.Add(this.tabPage2);
this.tab.Dock = System.Windows.Forms.DockStyle.Fill;
this.tab.Location = new System.Drawing.Point(0, 0);
this.tab.Margin = new System.Windows.Forms.Padding(4);
@ -5362,28 +5396,15 @@
this.tab.Tag = "2";
this.tab.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
//
// tabPage3
//
this.tabPage3.Controls.Add(this.panel37);
this.tabPage3.Location = new System.Drawing.Point(4, 22);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(1383, 792);
this.tabPage3.TabIndex = 3;
this.tabPage3.Tag = "2";
this.tabPage3.Text = "库区及三楼投料设备";
this.tabPage3.UseVisualStyleBackColor = true;
//
// panel37
//
this.panel37.BackColor = System.Drawing.Color.WhiteSmoke;
this.panel37.Controls.Add(this.plAccessorial2);
this.panel37.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel37.Location = new System.Drawing.Point(0, 0);
this.panel37.Margin = new System.Windows.Forms.Padding(4);
this.panel37.Name = "panel37";
this.panel37.Size = new System.Drawing.Size(1383, 792);
this.panel37.TabIndex = 3;
this.panel37.Tag = "1";
// tabPage2
//
this.tabPage2.Controls.Add(this.plAccessorial2);
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(1383, 792);
this.tabPage2.TabIndex = 3;
this.tabPage2.Tag = "2";
this.tabPage2.Text = "库区及三楼投料设备";
//
// plAccessorial2
//
@ -5531,9 +5552,6 @@
this.plAccessorial2.Controls.Add(this.label156);
this.plAccessorial2.Controls.Add(this.label157);
this.plAccessorial2.Controls.Add(this.label158);
this.plAccessorial2.Controls.Add(this.label159);
this.plAccessorial2.Controls.Add(this.label160);
this.plAccessorial2.Controls.Add(this.label161);
this.plAccessorial2.Controls.Add(this.label162);
this.plAccessorial2.Controls.Add(this.label163);
this.plAccessorial2.Controls.Add(this.label164);
@ -5557,6 +5575,9 @@
this.plAccessorial2.Controls.Add(this.label182);
this.plAccessorial2.Controls.Add(this.label183);
this.plAccessorial2.Controls.Add(this.label184);
this.plAccessorial2.Controls.Add(this.label159);
this.plAccessorial2.Controls.Add(this.label160);
this.plAccessorial2.Controls.Add(this.label161);
this.plAccessorial2.Dock = System.Windows.Forms.DockStyle.Fill;
this.plAccessorial2.Location = new System.Drawing.Point(0, 0);
this.plAccessorial2.Margin = new System.Windows.Forms.Padding(4);
@ -6435,7 +6456,7 @@
this.bt2_stacker6.Size = new System.Drawing.Size(30, 20);
this.bt2_stacker6.TabIndex = 4003;
this.bt2_stacker6.Tag = "15001";
this.bt2_stacker6.Text = "5";
this.bt2_stacker6.Text = "R";
this.bt2_stacker6.UseVisualStyleBackColor = false;
//
// label128
@ -7278,7 +7299,7 @@
this.panel53.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.panel53.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel53.Controls.Add(this.label145);
this.panel53.Location = new System.Drawing.Point(196, 87);
this.panel53.Location = new System.Drawing.Point(196, 86);
this.panel53.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panel53.Name = "panel53";
this.panel53.Size = new System.Drawing.Size(794, 20);
@ -7368,7 +7389,7 @@
this.panel56.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.panel56.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel56.Controls.Add(this.label148);
this.panel56.Location = new System.Drawing.Point(196, 107);
this.panel56.Location = new System.Drawing.Point(196, 106);
this.panel56.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panel56.Name = "panel56";
this.panel56.Size = new System.Drawing.Size(794, 20);
@ -7915,6 +7936,222 @@
this.label184.TabIndex = 4090;
this.label184.Text = "22037";
//
// label36
//
this.label36.AutoSize = true;
this.label36.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label36.ForeColor = System.Drawing.Color.Blue;
this.label36.Location = new System.Drawing.Point(1131, 640);
this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label36.Name = "label36";
this.label36.Size = new System.Drawing.Size(35, 12);
this.label36.TabIndex = 3551;
this.label36.Text = "12081";
//
// label37
//
this.label37.AutoSize = true;
this.label37.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label37.ForeColor = System.Drawing.Color.Blue;
this.label37.Location = new System.Drawing.Point(1131, 671);
this.label37.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label37.Name = "label37";
this.label37.Size = new System.Drawing.Size(35, 12);
this.label37.TabIndex = 3552;
this.label37.Text = "12078";
//
// label38
//
this.label38.AutoSize = true;
this.label38.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label38.ForeColor = System.Drawing.Color.Blue;
this.label38.Location = new System.Drawing.Point(1131, 703);
this.label38.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label38.Name = "label38";
this.label38.Size = new System.Drawing.Size(35, 12);
this.label38.TabIndex = 3553;
this.label38.Text = "12075";
//
// label39
//
this.label39.AutoSize = true;
this.label39.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label39.ForeColor = System.Drawing.Color.Blue;
this.label39.Location = new System.Drawing.Point(1131, 544);
this.label39.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label39.Name = "label39";
this.label39.Size = new System.Drawing.Size(35, 12);
this.label39.TabIndex = 3554;
this.label39.Text = "12086";
//
// label40
//
this.label40.AutoSize = true;
this.label40.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label40.ForeColor = System.Drawing.Color.Blue;
this.label40.Location = new System.Drawing.Point(1131, 358);
this.label40.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label40.Name = "label40";
this.label40.Size = new System.Drawing.Size(35, 12);
this.label40.TabIndex = 3555;
this.label40.Text = "12093";
//
// label41
//
this.label41.AutoSize = true;
this.label41.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label41.ForeColor = System.Drawing.Color.Blue;
this.label41.Location = new System.Drawing.Point(1131, 319);
this.label41.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label41.Name = "label41";
this.label41.Size = new System.Drawing.Size(35, 12);
this.label41.TabIndex = 3556;
this.label41.Text = "12096";
//
// label42
//
this.label42.AutoSize = true;
this.label42.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label42.ForeColor = System.Drawing.Color.Blue;
this.label42.Location = new System.Drawing.Point(1131, 112);
this.label42.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label42.Name = "label42";
this.label42.Size = new System.Drawing.Size(35, 12);
this.label42.TabIndex = 3557;
this.label42.Text = "12103";
//
// label44
//
this.label44.AutoSize = true;
this.label44.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label44.ForeColor = System.Drawing.Color.Blue;
this.label44.Location = new System.Drawing.Point(1124, 427);
this.label44.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label44.Name = "label44";
this.label44.Size = new System.Drawing.Size(35, 12);
this.label44.TabIndex = 3558;
this.label44.Text = "12091";
//
// label45
//
this.label45.AutoSize = true;
this.label45.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label45.ForeColor = System.Drawing.Color.Blue;
this.label45.Location = new System.Drawing.Point(1019, 188);
this.label45.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label45.Name = "label45";
this.label45.Size = new System.Drawing.Size(35, 12);
this.label45.TabIndex = 3559;
this.label45.Text = "12019";
//
// label47
//
this.label47.AutoSize = true;
this.label47.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label47.ForeColor = System.Drawing.Color.Blue;
this.label47.Location = new System.Drawing.Point(1124, 188);
this.label47.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label47.Name = "label47";
this.label47.Size = new System.Drawing.Size(35, 12);
this.label47.TabIndex = 3560;
this.label47.Text = "12101";
//
// label48
//
this.label48.AutoSize = true;
this.label48.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label48.ForeColor = System.Drawing.Color.Blue;
this.label48.Location = new System.Drawing.Point(1019, 236);
this.label48.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label48.Name = "label48";
this.label48.Size = new System.Drawing.Size(35, 12);
this.label48.TabIndex = 3561;
this.label48.Text = "12023";
//
// label49
//
this.label49.AutoSize = true;
this.label49.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label49.ForeColor = System.Drawing.Color.Blue;
this.label49.Location = new System.Drawing.Point(1019, 294);
this.label49.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label49.Name = "label49";
this.label49.Size = new System.Drawing.Size(35, 12);
this.label49.TabIndex = 3562;
this.label49.Text = "12028";
//
// label50
//
this.label50.AutoSize = true;
this.label50.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label50.ForeColor = System.Drawing.Color.Blue;
this.label50.Location = new System.Drawing.Point(1019, 338);
this.label50.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label50.Name = "label50";
this.label50.Size = new System.Drawing.Size(35, 12);
this.label50.TabIndex = 3563;
this.label50.Text = "12032";
//
// label53
//
this.label53.AutoSize = true;
this.label53.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label53.ForeColor = System.Drawing.Color.Blue;
this.label53.Location = new System.Drawing.Point(1020, 391);
this.label53.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label53.Name = "label53";
this.label53.Size = new System.Drawing.Size(35, 12);
this.label53.TabIndex = 3564;
this.label53.Text = "12036";
//
// label54
//
this.label54.AutoSize = true;
this.label54.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label54.ForeColor = System.Drawing.Color.Blue;
this.label54.Location = new System.Drawing.Point(1020, 440);
this.label54.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label54.Name = "label54";
this.label54.Size = new System.Drawing.Size(35, 12);
this.label54.TabIndex = 3565;
this.label54.Text = "12040";
//
// label58
//
this.label58.AutoSize = true;
this.label58.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label58.ForeColor = System.Drawing.Color.Blue;
this.label58.Location = new System.Drawing.Point(1020, 524);
this.label58.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label58.Name = "label58";
this.label58.Size = new System.Drawing.Size(35, 12);
this.label58.TabIndex = 3566;
this.label58.Text = "12050";
//
// label61
//
this.label61.AutoSize = true;
this.label61.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label61.ForeColor = System.Drawing.Color.Blue;
this.label61.Location = new System.Drawing.Point(1291, 254);
this.label61.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label61.Name = "label61";
this.label61.Size = new System.Drawing.Size(35, 12);
this.label61.TabIndex = 3567;
this.label61.Text = "22070";
//
// label62
//
this.label62.AutoSize = true;
this.label62.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label62.ForeColor = System.Drawing.Color.Blue;
this.label62.Location = new System.Drawing.Point(1124, 294);
this.label62.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label62.Name = "label62";
this.label62.Size = new System.Drawing.Size(35, 12);
this.label62.TabIndex = 3568;
this.label62.Text = "12098";
//
// FrmControlMonitor
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@ -7932,7 +8169,7 @@
this.Name = "FrmControlMonitor";
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "当升";
this.Text = "攀枝花当升";
this.Load += new System.EventHandler(this.FrmControlMonitor_Load);
((System.ComponentModel.ISupportInitialize)(pictureBox13)).EndInit();
((System.ComponentModel.ISupportInitialize)(pictureBox12)).EndInit();
@ -7984,8 +8221,7 @@
((System.ComponentModel.ISupportInitialize)(this.pic30003)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pic30001)).EndInit();
this.tab.ResumeLayout(false);
this.tabPage3.ResumeLayout(false);
this.panel37.ResumeLayout(false);
this.tabPage2.ResumeLayout(false);
this.plAccessorial2.ResumeLayout(false);
this.plAccessorial2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pic30011)).EndInit();
@ -8388,8 +8624,7 @@
private System.Windows.Forms.Label label113;
private System.Windows.Forms.Label label29;
private System.Windows.Forms.Label label28;
private System.Windows.Forms.TabPage tabPage3;
private System.Windows.Forms.Panel panel37;
private System.Windows.Forms.TabPage tabPage2;
private System.Windows.Forms.Panel plAccessorial2;
private System.Windows.Forms.Label label126;
private System.Windows.Forms.Label label127;
@ -8584,5 +8819,23 @@
private System.Windows.Forms.Label label33;
private System.Windows.Forms.Label label34;
private System.Windows.Forms.Label label35;
private System.Windows.Forms.Label label38;
private System.Windows.Forms.Label label37;
private System.Windows.Forms.Label label36;
private System.Windows.Forms.Label label39;
private System.Windows.Forms.Label label41;
private System.Windows.Forms.Label label40;
private System.Windows.Forms.Label label42;
private System.Windows.Forms.Label label44;
private System.Windows.Forms.Label label47;
private System.Windows.Forms.Label label45;
private System.Windows.Forms.Label label48;
private System.Windows.Forms.Label label49;
private System.Windows.Forms.Label label50;
private System.Windows.Forms.Label label53;
private System.Windows.Forms.Label label54;
private System.Windows.Forms.Label label58;
private System.Windows.Forms.Label label61;
private System.Windows.Forms.Label label62;
}
}

6
WcfControlMonitorLib/CCommonFunction.cs
View File

@ -1086,7 +1086,7 @@ namespace WcfControlMonitorLib
dv = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView;
if (dv.Count > 0)
{
return Convert.ToInt32(dv[0]["fcontroltasktype"]);
return Convert.ToInt32(dv[0]["FSTARTDEVICE"]);
}
else
{
@ -1125,7 +1125,7 @@ namespace WcfControlMonitorLib
dv = dbo.ExceSQL(sql.ToString()).Tables[0].DefaultView;
if (dv.Count > 0)
{
return Convert.ToInt32(dv[0]["fcontroltasktype"]);
return Convert.ToInt32(dv[0]["FENDDEVICE"]);
}
else
{
@ -1638,7 +1638,7 @@ namespace WcfControlMonitorLib
rr[0] = dv[0]["F_RGVGateDeviceIndex"].ToString();
rr[1] = dv[0]["F_Device_Stop"].ToString();
rr[2] = dv[0]["F_Device_Allow"].ToString();
//rr[3] = dv[0]["F_Input"].ToString();
//rr[3] = dv[0]["F_Allow_Device"].ToString();
//rr[4] = dv[0]["F_Output"].ToString();
//rr[5] = dv[0]["F_Top"].ToString();
//rr[6] = dv[0]["F_Left"].ToString();

8
WcfControlMonitorLib/CControl.cs
View File

@ -4402,10 +4402,6 @@ namespace WcfControlMonitorLib
if (GetFirstDeviceIFLocked(MonitorIndex, true) == false)//没有被锁定，空闲
{
for (int g = 0; g < 3; g++)//控制入库不能在输送线上停盘
{
}
//攀枝花当升控制投料层，双向输送线顶牛
if ((deviceIdx == 15001) && (deviceOrder == 2) && (TaskControlType == 1))//执行穿梭车入库取货任务
{
@ -4419,12 +4415,10 @@ namespace WcfControlMonitorLib
}
}
if (((deviceIdx == 11001) || (deviceIdx == 11002) || (deviceIdx == 11003) || (deviceIdx == 11004) || (deviceIdx == 11005)) && (deviceOrder == 4) && (TaskControlType == 2) && (ManageEnddeviceIndex > 22020) && (ManageEnddeviceIndex < 22049))//执行垛机投料口取货任务
if ((devinfo.DeviceKind == 1) && (deviceOrder == 4) && (TaskControlType == 2) && (ManageEnddeviceIndex > 22020) && (ManageEnddeviceIndex < 22049))//执行垛机投料口取货任务
{
//for (int g = 0; g < 3; g++)//控制出库不能在输送线上停盘
//{
//}
DataView dvRouteJ = dbo.ExceSQL(string.Format("SELECT * FROM T_Manage_Task WHERE FCONTROLTASKTYPE =1 and FENDDEVICE = {0} and (FSTARTDEVICE = 22021 or FSTARTDEVICE = 22006 or FSTARTDEVICE = 22012)", ManageStartDeviceIndex)).Tables[0].DefaultView;// and FCurrentLocation < 22019//and FSTATUS > 0
if (dvRouteJ.Count > 0)//存在已执行的对应巷道3楼入库库任务，且已经运行到穿梭车货巷道对应输送线上或穿梭车上

1
WcfControlMonitorLib/CDisassembleTask.cs
View File

@ -1052,6 +1052,7 @@ namespace WcfControlMonitorLib
{
//选择最短调度路径并且判断此路径上是否有设备发生故障
routeid = MinRouteID(Convert.ToInt32(dv[j]["FSTARTDEVICE"]), Convert.ToInt32(dv[j]["FENDDEVICE"]), dv[j]["FUseAwayFork"]);
routeid = 122001;
if (routeid == -1)
{
if (CStaticClass.DeviceErrorAutoModifyRoutePath == "1")

1
WcfControlMonitorLib/SControlMonitor.cs
View File

@ -5826,7 +5826,6 @@ namespace WcfControlMonitorLib
//{
// barcode.Append(Convert.ToChar(devicestates[tempdb2addr + j]).ToString().ToUpper());
//}
int startindex = 10;//条码开始位置 db2预留了10个字节 托盘条码获取的地方
if (dvsp[0]["F_Askkind"].ToString() != "16")
{

Write Preview
Loading…
Cancel
Save