Skip to content

孙克 / RC1250-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 66a8fe18 由 LN
选项

皮带线调试修改

1 个父辈 4f9a19c2
内嵌 并排
正在显示 9 个修改的文件 包含 194 行增加 和 70 行删除
source/AssemblyLineClient/App.config
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<add key ="OpenRFIDWrite" value ="1"/> <add key ="OpenRFIDWrite" value ="1"/>
<add key="DefaultPWD" value ="123456"/> <add key="DefaultPWD" value ="123456"/>
<!--当前调试的设备ID，分号分割--> <!--当前调试的设备ID，分号分割-->
<add key ="DebugDeviceId" value ="103"/> <add key ="DebugDeviceId" value ="301"/>
<add key ="NeedScanCode" value ="1"/> <add key ="NeedScanCode" value ="1"/>
<add key ="Server_Log_Open" value ="0"/> <add key ="Server_Log_Open" value ="0"/>
<add key ="CodeCount" value ="1"/> <add key ="CodeCount" value ="1"/>
......
source/AssemblyLineClient/FrmDischargeLine.Designer.cs
...@@ -49,6 +49,11 @@ ...@@ -49,6 +49,11 @@
this.btnOutStore = new System.Windows.Forms.Button(); this.btnOutStore = new System.Windows.Forms.Button();
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.lblLineInfo = new System.Windows.Forms.Label();
this.btnStrart = new System.Windows.Forms.Button();
this.btnlineStop = new System.Windows.Forms.Button();
this.cmbLineType = new System.Windows.Forms.ComboBox();
this.groupBox6 = new System.Windows.Forms.GroupBox(); this.groupBox6 = new System.Windows.Forms.GroupBox();
this.lblMoveInfo = new System.Windows.Forms.Label(); this.lblMoveInfo = new System.Windows.Forms.Label();
this.lblTrayNum = new System.Windows.Forms.Label(); this.lblTrayNum = new System.Windows.Forms.Label();
...@@ -61,6 +66,7 @@ ...@@ -61,6 +66,7 @@
this.groupBox5.SuspendLayout(); this.groupBox5.SuspendLayout();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox6.SuspendLayout(); this.groupBox6.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
...@@ -85,7 +91,7 @@ ...@@ -85,7 +91,7 @@
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(497, 6); this.groupBox1.Location = new System.Drawing.Point(497, 6);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(394, 160); this.groupBox1.Size = new System.Drawing.Size(394, 150);
this.groupBox1.TabIndex = 105; this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入"; this.groupBox1.Text = "DO写入";
...@@ -200,7 +206,7 @@ ...@@ -200,7 +206,7 @@
this.cmbWriteIO.DisplayMember = "ProName"; this.cmbWriteIO.DisplayMember = "ProName";
this.cmbWriteIO.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable; this.cmbWriteIO.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
this.cmbWriteIO.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbWriteIO.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbWriteIO.FormattingEnabled = true; this.cmbWriteIO.FormattingEnabled = true;
this.cmbWriteIO.ItemHeight = 22; this.cmbWriteIO.ItemHeight = 22;
this.cmbWriteIO.Location = new System.Drawing.Point(17, 25); this.cmbWriteIO.Location = new System.Drawing.Point(17, 25);
...@@ -218,7 +224,7 @@ ...@@ -218,7 +224,7 @@
this.groupBox4.Controls.Add(this.tableLayoutPanel2); this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(251, 6); this.groupBox4.Location = new System.Drawing.Point(251, 6);
this.groupBox4.Name = "groupBox4"; this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(240, 427); this.groupBox4.Size = new System.Drawing.Size(240, 517);
this.groupBox4.TabIndex = 104; this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表"; this.groupBox4.Text = "DO列表";
...@@ -235,7 +241,7 @@ ...@@ -235,7 +241,7 @@
this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 407); this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 497);
this.tableLayoutPanel2.TabIndex = 103; this.tableLayoutPanel2.TabIndex = 103;
// //
// groupBox3 // groupBox3
...@@ -245,7 +251,7 @@ ...@@ -245,7 +251,7 @@
this.groupBox3.Controls.Add(this.tableLayoutPanel1); this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(6, 6); this.groupBox3.Location = new System.Drawing.Point(6, 6);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(240, 427); this.groupBox3.Size = new System.Drawing.Size(240, 517);
this.groupBox3.TabIndex = 103; this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表"; this.groupBox3.Text = "DI列表";
...@@ -262,7 +268,7 @@ ...@@ -262,7 +268,7 @@
this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 407); this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 497);
this.tableLayoutPanel1.TabIndex = 102; this.tableLayoutPanel1.TabIndex = 102;
// //
// groupBox5 // groupBox5
...@@ -277,7 +283,7 @@ ...@@ -277,7 +283,7 @@
this.groupBox5.Controls.Add(this.btnStop1Up); this.groupBox5.Controls.Add(this.btnStop1Up);
this.groupBox5.Location = new System.Drawing.Point(897, 6); this.groupBox5.Location = new System.Drawing.Point(897, 6);
this.groupBox5.Name = "groupBox5"; this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(393, 160); this.groupBox5.Size = new System.Drawing.Size(393, 150);
this.groupBox5.TabIndex = 255; this.groupBox5.TabIndex = 255;
this.groupBox5.TabStop = false; this.groupBox5.TabStop = false;
this.groupBox5.Text = "IO操作测试"; this.groupBox5.Text = "IO操作测试";
...@@ -287,7 +293,7 @@ ...@@ -287,7 +293,7 @@
this.btnSRun.BackColor = System.Drawing.Color.White; this.btnSRun.BackColor = System.Drawing.Color.White;
this.btnSRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSRun.Location = new System.Drawing.Point(19, 108); this.btnSRun.Location = new System.Drawing.Point(19, 104);
this.btnSRun.Name = "btnSRun"; this.btnSRun.Name = "btnSRun";
this.btnSRun.Size = new System.Drawing.Size(140, 34); this.btnSRun.Size = new System.Drawing.Size(140, 34);
this.btnSRun.TabIndex = 263; this.btnSRun.TabIndex = 263;
...@@ -300,7 +306,7 @@ ...@@ -300,7 +306,7 @@
this.btnRun2.BackColor = System.Drawing.Color.White; this.btnRun2.BackColor = System.Drawing.Color.White;
this.btnRun2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnRun2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnRun2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnRun2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRun2.Location = new System.Drawing.Point(174, 26); this.btnRun2.Location = new System.Drawing.Point(174, 22);
this.btnRun2.Name = "btnRun2"; this.btnRun2.Name = "btnRun2";
this.btnRun2.Size = new System.Drawing.Size(140, 34); this.btnRun2.Size = new System.Drawing.Size(140, 34);
this.btnRun2.TabIndex = 262; this.btnRun2.TabIndex = 262;
...@@ -313,7 +319,7 @@ ...@@ -313,7 +319,7 @@
this.btnRun3.BackColor = System.Drawing.Color.White; this.btnRun3.BackColor = System.Drawing.Color.White;
this.btnRun3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnRun3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnRun3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnRun3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRun3.Location = new System.Drawing.Point(19, 68); this.btnRun3.Location = new System.Drawing.Point(19, 64);
this.btnRun3.Name = "btnRun3"; this.btnRun3.Name = "btnRun3";
this.btnRun3.Size = new System.Drawing.Size(140, 34); this.btnRun3.Size = new System.Drawing.Size(140, 34);
this.btnRun3.TabIndex = 261; this.btnRun3.TabIndex = 261;
...@@ -326,7 +332,7 @@ ...@@ -326,7 +332,7 @@
this.btnRun1.BackColor = System.Drawing.Color.White; this.btnRun1.BackColor = System.Drawing.Color.White;
this.btnRun1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnRun1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnRun1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnRun1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRun1.Location = new System.Drawing.Point(19, 26); this.btnRun1.Location = new System.Drawing.Point(19, 22);
this.btnRun1.Name = "btnRun1"; this.btnRun1.Name = "btnRun1";
this.btnRun1.Size = new System.Drawing.Size(140, 34); this.btnRun1.Size = new System.Drawing.Size(140, 34);
this.btnRun1.TabIndex = 260; this.btnRun1.TabIndex = 260;
...@@ -339,7 +345,7 @@ ...@@ -339,7 +345,7 @@
this.btnCloseAll.BackColor = System.Drawing.Color.White; this.btnCloseAll.BackColor = System.Drawing.Color.White;
this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAll.Location = new System.Drawing.Point(174, 108); this.btnCloseAll.Location = new System.Drawing.Point(174, 104);
this.btnCloseAll.Name = "btnCloseAll"; this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(140, 34); this.btnCloseAll.Size = new System.Drawing.Size(140, 34);
this.btnCloseAll.TabIndex = 259; this.btnCloseAll.TabIndex = 259;
...@@ -352,7 +358,7 @@ ...@@ -352,7 +358,7 @@
this.btnStop1Up.BackColor = System.Drawing.Color.White; this.btnStop1Up.BackColor = System.Drawing.Color.White;
this.btnStop1Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStop1Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStop1Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStop1Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStop1Up.Location = new System.Drawing.Point(174, 66); this.btnStop1Up.Location = new System.Drawing.Point(174, 62);
this.btnStop1Up.Name = "btnStop1Up"; this.btnStop1Up.Name = "btnStop1Up";
this.btnStop1Up.Size = new System.Drawing.Size(140, 34); this.btnStop1Up.Size = new System.Drawing.Size(140, 34);
this.btnStop1Up.TabIndex = 256; this.btnStop1Up.TabIndex = 256;
...@@ -461,11 +467,12 @@ ...@@ -461,11 +467,12 @@
this.tabControl1.Location = new System.Drawing.Point(5, 60); this.tabControl1.Location = new System.Drawing.Point(5, 60);
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1307, 469); this.tabControl1.Size = new System.Drawing.Size(1307, 559);
this.tabControl1.TabIndex = 257; this.tabControl1.TabIndex = 257;
// //
// tabPage1 // tabPage1
// //
this.tabPage1.Controls.Add(this.groupBox2);
this.tabPage1.Controls.Add(this.groupBox6); this.tabPage1.Controls.Add(this.groupBox6);
this.tabPage1.Controls.Add(this.groupBox3); this.tabPage1.Controls.Add(this.groupBox3);
this.tabPage1.Controls.Add(this.groupBox4); this.tabPage1.Controls.Add(this.groupBox4);
...@@ -474,11 +481,77 @@ ...@@ -474,11 +481,77 @@
this.tabPage1.Location = new System.Drawing.Point(4, 26); this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(1299, 439); this.tabPage1.Size = new System.Drawing.Size(1299, 529);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 "; this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
// //
// groupBox2
//
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox2.Controls.Add(this.lblLineInfo);
this.groupBox2.Controls.Add(this.btnStrart);
this.groupBox2.Controls.Add(this.btnlineStop);
this.groupBox2.Controls.Add(this.cmbLineType);
this.groupBox2.Location = new System.Drawing.Point(497, 449);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(793, 72);
this.groupBox2.TabIndex = 279;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "皮带转动测试";
//
// lblLineInfo
//
this.lblLineInfo.AutoSize = true;
this.lblLineInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblLineInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblLineInfo.Location = new System.Drawing.Point(30, 31);
this.lblLineInfo.Name = "lblLineInfo";
this.lblLineInfo.Size = new System.Drawing.Size(68, 17);
this.lblLineInfo.TabIndex = 280;
this.lblLineInfo.Text = "线体未启动";
//
// btnStrart
//
this.btnStrart.BackColor = System.Drawing.Color.White;
this.btnStrart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStrart.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStrart.Location = new System.Drawing.Point(296, 22);
this.btnStrart.Name = "btnStrart";
this.btnStrart.Size = new System.Drawing.Size(100, 34);
this.btnStrart.TabIndex = 267;
this.btnStrart.Text = "开始";
this.btnStrart.UseVisualStyleBackColor = false;
this.btnStrart.Click += new System.EventHandler(this.btnStrart_Click);
//
// btnlineStop
//
this.btnlineStop.BackColor = System.Drawing.Color.White;
this.btnlineStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnlineStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnlineStop.Location = new System.Drawing.Point(411, 22);
this.btnlineStop.Name = "btnlineStop";
this.btnlineStop.Size = new System.Drawing.Size(100, 34);
this.btnlineStop.TabIndex = 266;
this.btnlineStop.Text = "停止";
this.btnlineStop.UseVisualStyleBackColor = false;
this.btnlineStop.Click += new System.EventHandler(this.btnlineStop_Click);
//
// cmbLineType
//
this.cmbLineType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbLineType.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbLineType.FormattingEnabled = true;
this.cmbLineType.Items.AddRange(new object[] {
"皮带线1运转测试",
"皮带线2运转测试",
"皮带线3运转测试"});
this.cmbLineType.Location = new System.Drawing.Point(113, 25);
this.cmbLineType.Name = "cmbLineType";
this.cmbLineType.Size = new System.Drawing.Size(168, 28);
this.cmbLineType.TabIndex = 0;
//
// groupBox6 // groupBox6
// //
this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
...@@ -488,9 +561,9 @@ ...@@ -488,9 +561,9 @@
this.groupBox6.Controls.Add(this.lblTrayNum); this.groupBox6.Controls.Add(this.lblTrayNum);
this.groupBox6.Controls.Add(this.lblInstoreList); this.groupBox6.Controls.Add(this.lblInstoreList);
this.groupBox6.Controls.Add(this.lblThisSta); this.groupBox6.Controls.Add(this.lblThisSta);
this.groupBox6.Location = new System.Drawing.Point(498, 172); this.groupBox6.Location = new System.Drawing.Point(498, 158);
this.groupBox6.Name = "groupBox6"; this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(792, 261); this.groupBox6.Size = new System.Drawing.Size(792, 288);
this.groupBox6.TabIndex = 278; this.groupBox6.TabIndex = 278;
this.groupBox6.TabStop = false; this.groupBox6.TabStop = false;
this.groupBox6.Text = "消息"; this.groupBox6.Text = "消息";
...@@ -524,9 +597,9 @@ ...@@ -524,9 +597,9 @@
this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblInstoreList.ForeColor = System.Drawing.Color.Green; this.lblInstoreList.ForeColor = System.Drawing.Color.Green;
this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblInstoreList.Location = new System.Drawing.Point(247, 164); this.lblInstoreList.Location = new System.Drawing.Point(247, 149);
this.lblInstoreList.Name = "lblInstoreList"; this.lblInstoreList.Name = "lblInstoreList";
this.lblInstoreList.Size = new System.Drawing.Size(539, 82); this.lblInstoreList.Size = new System.Drawing.Size(539, 44);
this.lblInstoreList.TabIndex = 277; this.lblInstoreList.TabIndex = 277;
// //
// panel1 // panel1
...@@ -560,7 +633,7 @@ ...@@ -560,7 +633,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1318, 532); this.ClientSize = new System.Drawing.Size(1318, 622);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.Controls.Add(this.tabControl1); this.Controls.Add(this.tabControl1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
...@@ -578,6 +651,8 @@ ...@@ -578,6 +651,8 @@
this.groupBox5.ResumeLayout(false); this.groupBox5.ResumeLayout(false);
this.tabControl1.ResumeLayout(false); this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false); this.tabPage1.ResumeLayout(false);
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupBox6.ResumeLayout(false); this.groupBox6.ResumeLayout(false);
this.groupBox6.PerformLayout(); this.groupBox6.PerformLayout();
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
...@@ -626,6 +701,11 @@ ...@@ -626,6 +701,11 @@
private System.Windows.Forms.Button btnRun1; private System.Windows.Forms.Button btnRun1;
private System.Windows.Forms.Label lblName; private System.Windows.Forms.Label lblName;
private System.Windows.Forms.Label lblMoveInfo; private System.Windows.Forms.Label lblMoveInfo;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Button btnStrart;
private System.Windows.Forms.Button btnlineStop;
private System.Windows.Forms.ComboBox cmbLineType;
private System.Windows.Forms.Label lblLineInfo;
} }
} }
source/AssemblyLineClient/FrmDischargeLine.cs
...@@ -79,6 +79,17 @@ namespace OnlineStore.AssemblyLine ...@@ -79,6 +79,17 @@ namespace OnlineStore.AssemblyLine
ReadIOList(); ReadIOList();
//lblTrayNum.Text = "托盘编码：" + TrayManager.GetTrayNum(equipBean.DeviceID); //lblTrayNum.Text = "托盘编码：" + TrayManager.GetTrayNum(equipBean.DeviceID);
} }
cmbLineType.Enabled = !equipBean.LineRuning;
if (equipBean.LineRuning)
{
lblLineInfo.Text = "线体运转中";
lblLineInfo.ForeColor = Color.Green;
}
else
{
lblLineInfo.Text = "线体未运转";
lblLineInfo.ForeColor = Color.Black;
}
if (equipBean.runStatus > LineRunStatus.Wait) if (equipBean.runStatus > LineRunStatus.Wait)
{ {
lblName.BackColor = Color.Green; lblName.BackColor = Color.Green;
...@@ -195,7 +206,7 @@ namespace OnlineStore.AssemblyLine ...@@ -195,7 +206,7 @@ namespace OnlineStore.AssemblyLine
private void FrmStoreIOStatus_Load(object sender, EventArgs e) private void FrmStoreIOStatus_Load(object sender, EventArgs e)
{ {
chbDebug.Checked = equipBean.IsDebug; chbDebug.Checked = equipBean.IsDebug;
cmbLineType.SelectedIndex = 2;
lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.lineStatus, equipBean.runStatus); lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.lineStatus, equipBean.runStatus);
lblThisSta.Text = equipBean.WarnMsg; lblThisSta.Text = equipBean.WarnMsg;
lblName.Text = equipBean.Name; lblName.Text = equipBean.Name;
...@@ -336,7 +347,37 @@ namespace OnlineStore.AssemblyLine ...@@ -336,7 +347,37 @@ namespace OnlineStore.AssemblyLine
private void btnSRun_Click(object sender, EventArgs e) private void btnSRun_Click(object sender, EventArgs e)
{ {
BtnMove(btnRun3, "分盘装置电机1驱动", "分盘装置电机1停止", IO_Type.SeparateDevice_Run); BtnMove(btnSRun, "分盘装置电机1驱动", "分盘装置电机1停止", IO_Type.SeparateDevice_Run);
}
private void btnStrart_Click(object sender, EventArgs e)
{
if (equipBean.LineRuning)
{
MessageBox.Show("线体已在运转中，请先点击停止");
return;
}
int index = cmbLineType.SelectedIndex;
string moveIo = IO_Type.DLine_Run1;
string waitIo = IO_Type.Location_Check1;
if (index.Equals(1))
{
moveIo = IO_Type.DLine_Run2;
waitIo = IO_Type.Location_Check2;
}
else if (index.Equals(2))
{
moveIo = IO_Type.DLine_Run3;
waitIo = IO_Type.Location_Check3;
}
equipBean.StartLineRun(moveIo, waitIo);
cmbLineType.Enabled = false;
}
private void btnlineStop_Click(object sender, EventArgs e)
{
equipBean.StopLineRun();
} }
} }
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv
...@@ -19,7 +19,7 @@ PRO,0,提升上料轴原点高速,BatchAxis_HomeHighSpeed,500,,,,, ...@@ -19,7 +19,7 @@ PRO,0,提升上料轴原点高速,BatchAxis_HomeHighSpeed,500,,,,,
PRO,0,提升上料轴原点加速度,BatchAxis_HomeAddSpeed,500,,,,, PRO,0,提升上料轴原点加速度,BatchAxis_HomeAddSpeed,500,,,,,
PRO,0,提升上料轴P1速度,BatchAxis_P1Speed,2800,,,,, PRO,0,提升上料轴P1速度,BatchAxis_P1Speed,2800,,,,,
PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,2800,,,,, PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,2800,,,,,
PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,1000,,,,, PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,1500,,,,,
PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,38000,,,,, PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,38000,,,,,
,,,,,,,,, ,,,,,,,,,
AXIS,0,轴一移栽上下轴,UpDown_Axis,2,COM5,0,,, AXIS,0,轴一移栽上下轴,UpDown_Axis,2,COM5,0,,,
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_2.csv
...@@ -19,7 +19,7 @@ PRO,0,提升上料轴原点高速,BatchAxis_HomeHighSpeed,500,,,,, ...@@ -19,7 +19,7 @@ PRO,0,提升上料轴原点高速,BatchAxis_HomeHighSpeed,500,,,,,
PRO,0,提升上料轴原点加速度,BatchAxis_HomeAddSpeed,500,,,,, PRO,0,提升上料轴原点加速度,BatchAxis_HomeAddSpeed,500,,,,,
PRO,0,提升上料轴P1速度,BatchAxis_P1Speed,2800,,,,, PRO,0,提升上料轴P1速度,BatchAxis_P1Speed,2800,,,,,
PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,2800,,,,, PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,2800,,,,,
PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,1000,,,,, PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,1500,,,,,
PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,38000,,,,, PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,38000,,,,,
,,,,,,,,, ,,,,,,,,,
AXIS,0,轴一移栽上下轴,UpDown_Axis,4,COM5,0,,, AXIS,0,轴一移栽上下轴,UpDown_Axis,4,COM5,0,,,
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv
...@@ -19,7 +19,7 @@ PRO,0,提升上料轴原点高速,BatchAxis_HomeHighSpeed,500,,,,, ...@@ -19,7 +19,7 @@ PRO,0,提升上料轴原点高速,BatchAxis_HomeHighSpeed,500,,,,,
PRO,0,提升上料轴原点加速度,BatchAxis_HomeAddSpeed,500,,,,, PRO,0,提升上料轴原点加速度,BatchAxis_HomeAddSpeed,500,,,,,
PRO,0,提升上料轴P1速度,BatchAxis_P1Speed,2800,,,,, PRO,0,提升上料轴P1速度,BatchAxis_P1Speed,2800,,,,,
PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,2800,,,,, PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,2800,,,,,
PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,1000,,,,, PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,1500,,,,,
PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,38000,,,,, PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,38000,,,,,
,,,,,,,,, ,,,,,,,,,
AXIS,0,轴一移栽上下轴,UpDown_Axis,6,COM5,0,,, AXIS,0,轴一移栽上下轴,UpDown_Axis,6,COM5,0,,,
......
source/DeviceLibrary/assemblyLine/DischargeLine.cs
...@@ -191,26 +191,26 @@ namespace OnlineStore.DeviceLibrary ...@@ -191,26 +191,26 @@ namespace OnlineStore.DeviceLibrary
if (runStatus.Equals(LineRunStatus.Runing) && NoAlarm()) if (runStatus.Equals(LineRunStatus.Runing) && NoAlarm())
{ {
//判断是否需要入库 //判断是否需要入库
if (IOValue(IO_Type.DLine_Exit_Check3).Equals(IO_VALUE.LOW) && LineRuning.Equals(false)) if (IOValue(IO_Type.ExitPosition_Check3).Equals(IO_VALUE.LOW) && LineRuning.Equals(false))
{ {
//皮带3入口或者中间有料盘，出口无料盘，转动皮带三 //皮带3入口或者中间有料盘，出口无料盘，转动皮带三
if ((IOValue(IO_Type.DLine_Entry_Check3).Equals(IO_VALUE.HIGH) || IOValue(IO_Type.DLine_Middle_Check3).Equals(IO_VALUE.HIGH))) if ((IOValue(IO_Type.ExitPosition_Check3).Equals(IO_VALUE.HIGH) || IOValue(IO_Type.MiddlePosition_Check3).Equals(IO_VALUE.HIGH)))
{ {
StartLineRun(IO_Type.DLine_Run3, IO_Type.DLine_Location_Check3); StartLineRun(IO_Type.DLine_Run3, IO_Type.Location_Check3);
} }
} }
if (IOValue(IO_Type.DLine_Entry_Check3).Equals(IO_VALUE.LOW) && LineRuning.Equals(false) && MoveInfo.MoveType.Equals(LineMoveType.None)) if (IOValue(IO_Type.ExitPosition_Check3).Equals(IO_VALUE.LOW) && LineRuning.Equals(false) && MoveInfo.MoveType.Equals(LineMoveType.None))
{ {
if ((IOValue(IO_Type.DLine_Entry_Check1).Equals(IO_VALUE.HIGH) || IOValue(IO_Type.DLine_Exit_Check1).Equals(IO_VALUE.HIGH))) if ((IOValue(IO_Type.ExitPosition_Check1).Equals(IO_VALUE.HIGH) || IOValue(IO_Type.ExitPosition_Check1).Equals(IO_VALUE.HIGH)))
{ {
StartLineRun(IO_Type.DLine_Run1, IO_Type.DLine_Location_Check1); StartLineRun(IO_Type.DLine_Run1, IO_Type.Location_Check1);
} }
} }
if (IOValue(IO_Type.DLine_Middle_Check3).Equals(IO_VALUE.LOW) && LineRuning.Equals(false) && SecondMoveInfo.MoveType.Equals(LineMoveType.None)) if (IOValue(IO_Type.MiddlePosition_Check3).Equals(IO_VALUE.LOW) && LineRuning.Equals(false) && SecondMoveInfo.MoveType.Equals(LineMoveType.None))
{ {
if ((IOValue(IO_Type.DLine_Entry_Check2).Equals(IO_VALUE.HIGH) || IOValue(IO_Type.DLine_Exit_Check2).Equals(IO_VALUE.HIGH))) if ((IOValue(IO_Type.ExitPosition_Check2).Equals(IO_VALUE.HIGH) || IOValue(IO_Type.ExitPosition_Check2).Equals(IO_VALUE.HIGH)))
{ {
StartLineRun(IO_Type.DLine_Run2, IO_Type.DLine_Location_Check2); StartLineRun(IO_Type.DLine_Run2, IO_Type.Location_Check2);
} }
} }
//皮带1皮带2先转动，到达位置后，皮带3再转动 //皮带1皮带2先转动，到达位置后，皮带3再转动
......
source/DeviceLibrary/assemblyLine/DischargeLine_Partial.cs
...@@ -26,7 +26,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -26,7 +26,7 @@ namespace OnlineStore.DeviceLibrary
{ {
return false; return false;
} }
if (MoveInfo.MoveType.Equals(LineMoveType.None)&& IOValue(IO_Type.DLine_Entry_Check1).Equals(IO_VALUE.LOW)) if (MoveInfo.MoveType.Equals(LineMoveType.None)&& IOValue(IO_Type.EntryPosition_Check1).Equals(IO_VALUE.LOW))
{ {
MoveInfo.NewMove(LineMoveType.OutStore); MoveInfo.NewMove(LineMoveType.OutStore);
return true; return true;
...@@ -37,7 +37,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -37,7 +37,7 @@ namespace OnlineStore.DeviceLibrary
{ {
return false; return false;
} }
if (SecondMoveInfo.MoveType.Equals(LineMoveType.None) && IOValue(IO_Type.DLine_Entry_Check2).Equals(IO_VALUE.LOW)) if (SecondMoveInfo.MoveType.Equals(LineMoveType.None) && IOValue(IO_Type.EntryPosition_Check2).Equals(IO_VALUE.LOW))
{ {
SecondMoveInfo.NewMove(LineMoveType.OutStore); SecondMoveInfo.NewMove(LineMoveType.OutStore);
return true; return true;
...@@ -108,18 +108,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -108,18 +108,12 @@ namespace OnlineStore.DeviceLibrary
private void StartLineRun(string moveDO, string checkDI, int timeOutMS = 10000)
{
LineRuning = true;
Task.Factory.StartNew( delegate {
LineRunAndWait(moveDO, checkDI, timeOutMS);
});
}
private bool LineRuning = false; public bool LineRuning = false;
private string LastMoveDO = ""; private string LastMoveDO = "";
private string LastCheckDI = ""; private string LastCheckDI = "";
private void StopLineRun()
public void StopLineRun()
{ {
if (LineRuning) if (LineRuning)
{ {
...@@ -127,8 +121,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -127,8 +121,15 @@ namespace OnlineStore.DeviceLibrary
} }
} }
public void StartLineRun(string moveDO, string checkDI, int timeOutMS = 30000)
{
LineRuning = true;
Task.Factory.StartNew(delegate {
LineRunAndWait(moveDO, checkDI, timeOutMS);
});
}
private string LineRunAndWait(string moveDO, string checkDI, int timeOutMS = 10000) private string LineRunAndWait(string moveDO, string checkDI, int timeOutMS = 30000)
{ {
LastMoveDO = moveDO; LastMoveDO = moveDO;
LastCheckDI = checkDI; LastCheckDI = checkDI;
...@@ -165,6 +166,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -165,6 +166,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
result = ""; result = "";
isStop = false;
while (true) while (true)
{ {
Thread.Sleep(20); Thread.Sleep(20);
......
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
...@@ -271,55 +271,56 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -271,55 +271,56 @@ namespace OnlineStore.LoadCSVLibrary
public static string DLine_Reset = "DLine_Reset"; public static string DLine_Reset = "DLine_Reset";
/// <summary> /// <summary>
/// DI 皮带线1定位检测,DLine_Location_Check1, ,X021 /// DI,0,皮带线1定位检测,Location_Check1,2,PRO_AOI_IP_2,0,皮带线1定位检测,X023,X023
/// </summary> /// </summary>
public static string DLine_Location_Check1 = "DLine_Location_Check1"; public static string Location_Check1 = "Location_Check1";
/// <summary> /// <summary>
/// DI 皮带线1入口料盘检测, DLine_Entry_Check1, , X022 /// DI,0,皮带线1入口料盘检测, EntryPosition_Check1,3, PRO_AOI_IP_2,0, 皮带线1入口料盘检测, X024, X024
/// </summary> /// </summary>
public static string DLine_Entry_Check1 = "DLine_Entry_Check1"; public static string EntryPosition_Check1 = "EntryPosition_Check1";
/// <summary> /// <summary>
/// DI 皮带线1出口料盘检测,DLine_Exit_Check1, X023 /// DI,0, 皮带线1出口料盘检测,ExitPosition_Check1,4,PRO_AOI_IP_2,0,皮带线1出口料盘检测,X025,X025
/// </summary> /// </summary>
public static string DLine_Exit_Check1 = "DLine_Exit_Check1"; public static string ExitPosition_Check1 = "ExitPosition_Check1";
/// <summary> /// <summary>
/// DI 皮带线2定位检测, DLine_Location_Check2, X024 /// DI,0,皮带线2定位检测, Location_Check2,5, PRO_AOI_IP_2,0, 皮带线2定位检测, X026, X026
/// </summary> /// </summary>
public static string DLine_Location_Check2 = "DLine_Location_Check2"; public static string Location_Check2 = "Location_Check2";
/// <summary> /// <summary>
/// DI 皮带线2入口料盘检测,DLine_Entry_Check2, ,X025 /// DI 皮带线2入口料盘检测,EntryPosition_Check2,6,PRO_AOI_IP_2,0,皮带线2入口料盘检测,X027,X027
/// </summary> /// </summary>
public static string DLine_Entry_Check2 = "DLine_Entry_Check2"; public static string EntryPosition_Check2 = " EntryPosition_Check2";
/// <summary> /// <summary>
/// DI 皮带线2出口料盘检测, DLine_Exit_Check2, X026 /// DI 皮带线2出口料盘检测, ExitPosition_Check2,7, PRO_AOI_IP_2,0, 皮带线2出口料盘检测, X028, X028
/// </summary> /// </summary>
public static string DLine_Exit_Check2 = "DLine_Exit_Check2"; public static string ExitPosition_Check2 = "ExitPosition_Check2";
/// <summary> /// <summary>
/// DI 皮带线3定位检测,DLine_Location_Check3, X027 /// DI 皮带线3定位检测,Location_Check3,8,PRO_AOI_IP_2,0,皮带线3定位检测,X029,X029
/// </summary> /// </summary>
public static string DLine_Location_Check3 = "DLine_Location_Check3"; public static string Location_Check3 = "Location_Check3";
/// <summary> /// <summary>
/// DI 皮带线3入口料盘检测, DLine_Entry_Check3, X028 /// DI 皮带线3入口料盘检测, EntryPosition_Check3,9, PRO_AOI_IP_2,0, 皮带线3入口料盘检测, X030, X030
/// </summary> /// </summary>
public static string DLine_Entry_Check3 = "DLine_Entry_Check3"; public static string EntryPosition_Check3 = " EntryPosition_Check3";
/// <summary> /// <summary>
/// DI 皮带线3中间位置料盘检测,DLine_Middle_Check3, ,X029 /// DI 皮带线3中间位置料盘检测,MiddlePosition_Check3,10,PRO_AOI_IP_2,0,皮带线3中间位置料盘检测,X031,X031
/// </summary> /// </summary>
public static string DLine_Middle_Check3 = "DLine_Middle_Check3"; public static string MiddlePosition_Check3 = "MiddlePosition_Check3";
/// <summary> /// <summary>
/// DI 皮带线3出口料盘检测, DLine_Exit_Check3, X030 /// DI 皮带线3出口料盘检测, ExitPosition_Check3,11, PRO_AOI_IP_2,0, 皮带线3出口料盘检测, X032, X032
/// </summary> /// </summary>
public static string DLine_Exit_Check3 = "DLine_Exit_Check3"; public static string ExitPosition_Check3 = "ExitPosition_Check3";
/// <summary> /// <summary>
/// DI 分盘装置1定位气缸上升端,SeparateDevice_Up, X031 /// DI 分盘装置1定位气缸上升端,SeparateDevice_Up,12,PRO_AOI_IP_2,0,分盘装置1定位气缸上升端,X033,X033
/// </summary> /// </summary>
public static string SeparateDevice_Up = "SeparateDevice_Up"; public static string SeparateDevice_Up = "SeparateDevice_Up";
/// <summary> /// <summary>
/// DI 分盘装置1定位气缸下降端, SeparateDevice_Down, X032 /// DI 分盘装置1定位气缸下降端, SeparateDevice_Down,13, PRO_AOI_IP_2,0, 分盘装置1定位气缸下降端, X034, X034
/// </summary> /// </summary>
public static string SeparateDevice_Down = "SeparateDevice_Down"; public static string SeparateDevice_Down = "SeparateDevice_Down";
/// <summary> /// <summary>
/// DI 分盘装置1料盘检测,SeparateDevice_Check, ,X033 /// DI 分盘装置1料盘检测,SeparateDevice_Check,14,PRO_AOI_IP_2,0,分盘装置1料盘检测,X035,X035
/// </summary> /// </summary>
public static string SeparateDevice_Check = "SeparateDevice_Check"; public static string SeparateDevice_Check = "SeparateDevice_Check";
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!