Skip to content

孙克 / RC1250-AssemblyLine

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

1

1 个父辈 c0a0de6a
内嵌 并排
正在显示 18 个修改的文件 包含 599 行增加 和 321 行删除
source/AssemblyLineClient/FrmDischargeLine.Designer.cs
...@@ -19,6 +19,14 @@ ...@@ -19,6 +19,14 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmDischargeLine)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmDischargeLine));
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.txtDOIndex = new System.Windows.Forms.TextBox();
this.txtDoName = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.btnOpenDo = new System.Windows.Forms.Button();
this.btnWriteSingleDO = new System.Windows.Forms.Button();
this.txtWriteTime = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.txtSlaveId = new System.Windows.Forms.TextBox(); this.txtSlaveId = new System.Windows.Forms.TextBox();
this.chbAutoRead = new System.Windows.Forms.CheckBox(); this.chbAutoRead = new System.Windows.Forms.CheckBox();
this.cmbWriteIO = new System.Windows.Forms.ComboBox(); this.cmbWriteIO = new System.Windows.Forms.ComboBox();
...@@ -42,14 +50,10 @@ ...@@ -42,14 +50,10 @@
this.lblTrayNum = new System.Windows.Forms.Label(); this.lblTrayNum = new System.Windows.Forms.Label();
this.lblInstoreList = new System.Windows.Forms.Label(); this.lblInstoreList = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.txtDOIndex = new System.Windows.Forms.TextBox(); this.btnRun1 = new System.Windows.Forms.Button();
this.txtDoName = new System.Windows.Forms.TextBox(); this.btnRun3 = new System.Windows.Forms.Button();
this.label17 = new System.Windows.Forms.Label(); this.btnRun2 = new System.Windows.Forms.Button();
this.label14 = new System.Windows.Forms.Label(); this.btnSRun = new System.Windows.Forms.Button();
this.btnOpenDo = new System.Windows.Forms.Button();
this.btnWriteSingleDO = new System.Windows.Forms.Button();
this.txtWriteTime = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout(); this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
...@@ -86,6 +90,100 @@ ...@@ -86,6 +90,100 @@
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入"; this.groupBox1.Text = "DO写入";
// //
// txtDOIndex
//
this.txtDOIndex.Enabled = false;
this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDOIndex.Location = new System.Drawing.Point(328, 67);
this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(47, 23);
this.txtDOIndex.TabIndex = 268;
this.txtDOIndex.Text = "0";
//
// txtDoName
//
this.txtDoName.Enabled = false;
this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDoName.Location = new System.Drawing.Point(71, 67);
this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(116, 23);
this.txtDoName.TabIndex = 267;
this.txtDoName.Text = "0";
//
// label17
//
this.label17.AutoSize = true;
this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label17.Location = new System.Drawing.Point(19, 70);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(46, 17);
this.label17.TabIndex = 266;
this.label17.Text = "设备IP:";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label14
//
this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label14.Location = new System.Drawing.Point(272, 70);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(35, 17);
this.label14.TabIndex = 265;
this.label14.Text = "地址:";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnOpenDo
//
this.btnOpenDo.BackColor = System.Drawing.Color.White;
this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDo.Location = new System.Drawing.Point(169, 107);
this.btnOpenDo.Name = "btnOpenDo";
this.btnOpenDo.Size = new System.Drawing.Size(100, 34);
this.btnOpenDo.TabIndex = 264;
this.btnOpenDo.Text = "打开";
this.btnOpenDo.UseVisualStyleBackColor = false;
this.btnOpenDo.Click += new System.EventHandler(this.btnOpenDo_Click);
//
// btnWriteSingleDO
//
this.btnWriteSingleDO.BackColor = System.Drawing.Color.White;
this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWriteSingleDO.Location = new System.Drawing.Point(275, 107);
this.btnWriteSingleDO.Name = "btnWriteSingleDO";
this.btnWriteSingleDO.Size = new System.Drawing.Size(100, 34);
this.btnWriteSingleDO.TabIndex = 261;
this.btnWriteSingleDO.Text = "关闭";
this.btnWriteSingleDO.UseVisualStyleBackColor = false;
this.btnWriteSingleDO.Click += new System.EventHandler(this.btnWriteSingleDO_Click);
//
// txtWriteTime
//
this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtWriteTime.Location = new System.Drawing.Point(82, 113);
this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(66, 23);
this.txtWriteTime.TabIndex = 263;
this.txtWriteTime.Text = "0";
//
// label5
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(19, 116);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 17);
this.label5.TabIndex = 262;
this.label5.Text = "定时(ms):";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtSlaveId // txtSlaveId
// //
this.txtSlaveId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtSlaveId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -134,7 +232,7 @@ ...@@ -134,7 +232,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, 634); this.groupBox4.Size = new System.Drawing.Size(240, 764);
this.groupBox4.TabIndex = 104; this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表"; this.groupBox4.Text = "DO列表";
...@@ -151,7 +249,7 @@ ...@@ -151,7 +249,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, 614); this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 744);
this.tableLayoutPanel2.TabIndex = 103; this.tableLayoutPanel2.TabIndex = 103;
// //
// groupBox3 // groupBox3
...@@ -161,7 +259,7 @@ ...@@ -161,7 +259,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, 634); this.groupBox3.Size = new System.Drawing.Size(240, 764);
this.groupBox3.TabIndex = 103; this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表"; this.groupBox3.Text = "DI列表";
...@@ -178,18 +276,22 @@ ...@@ -178,18 +276,22 @@
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, 614); this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 744);
this.tableLayoutPanel1.TabIndex = 102; this.tableLayoutPanel1.TabIndex = 102;
// //
// groupBox5 // groupBox5
// //
this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox5.Controls.Add(this.btnSRun);
this.groupBox5.Controls.Add(this.btnRun2);
this.groupBox5.Controls.Add(this.btnRun3);
this.groupBox5.Controls.Add(this.btnRun1);
this.groupBox5.Controls.Add(this.btnCloseAll); this.groupBox5.Controls.Add(this.btnCloseAll);
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(382, 208); this.groupBox5.Size = new System.Drawing.Size(459, 208);
this.groupBox5.TabIndex = 255; this.groupBox5.TabIndex = 255;
this.groupBox5.TabStop = false; this.groupBox5.TabStop = false;
this.groupBox5.Text = "IO操作测试"; this.groupBox5.Text = "IO操作测试";
...@@ -199,7 +301,7 @@ ...@@ -199,7 +301,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(220, 26); this.btnCloseAll.Location = new System.Drawing.Point(44, 152);
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;
...@@ -212,7 +314,7 @@ ...@@ -212,7 +314,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(44, 27); this.btnStop1Up.Location = new System.Drawing.Point(44, 110);
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;
...@@ -319,7 +421,7 @@ ...@@ -319,7 +421,7 @@
this.tabControl1.Location = new System.Drawing.Point(5, 69); this.tabControl1.Location = new System.Drawing.Point(5, 69);
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1296, 676); this.tabControl1.Size = new System.Drawing.Size(1373, 806);
this.tabControl1.TabIndex = 257; this.tabControl1.TabIndex = 257;
// //
// tabPage1 // tabPage1
...@@ -332,19 +434,22 @@ ...@@ -332,19 +434,22 @@
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(1288, 646); this.tabPage1.Size = new System.Drawing.Size(1365, 776);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 "; this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
// //
// groupBox6 // groupBox6
// //
this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
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, 221); this.groupBox6.Location = new System.Drawing.Point(498, 221);
this.groupBox6.Name = "groupBox6"; this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(781, 419); this.groupBox6.Size = new System.Drawing.Size(858, 549);
this.groupBox6.TabIndex = 278; this.groupBox6.TabIndex = 278;
this.groupBox6.TabStop = false; this.groupBox6.TabStop = false;
this.groupBox6.Text = "消息"; this.groupBox6.Text = "消息";
...@@ -373,6 +478,8 @@ ...@@ -373,6 +478,8 @@
// //
// panel1 // panel1
// //
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel1.Controls.Add(this.chbDebug); this.panel1.Controls.Add(this.chbDebug);
this.panel1.Controls.Add(this.lblStoreStatus); this.panel1.Controls.Add(this.lblStoreStatus);
this.panel1.Controls.Add(this.btnOutStore); this.panel1.Controls.Add(this.btnOutStore);
...@@ -381,108 +488,66 @@ ...@@ -381,108 +488,66 @@
this.panel1.Controls.Add(this.btnReset); this.panel1.Controls.Add(this.btnReset);
this.panel1.Location = new System.Drawing.Point(2, 1); this.panel1.Location = new System.Drawing.Point(2, 1);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1295, 68); this.panel1.Size = new System.Drawing.Size(1369, 68);
this.panel1.TabIndex = 258; this.panel1.TabIndex = 258;
// //
// txtDOIndex // btnRun1
// //
this.txtDOIndex.Enabled = false; this.btnRun1.BackColor = System.Drawing.Color.White;
this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnRun1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.txtDOIndex.Location = new System.Drawing.Point(328, 67); this.btnRun1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDOIndex.MaxLength = 10; this.btnRun1.Location = new System.Drawing.Point(44, 26);
this.txtDOIndex.Name = "txtDOIndex"; this.btnRun1.Name = "btnRun1";
this.txtDOIndex.Size = new System.Drawing.Size(47, 23); this.btnRun1.Size = new System.Drawing.Size(140, 34);
this.txtDOIndex.TabIndex = 268; this.btnRun1.TabIndex = 260;
this.txtDOIndex.Text = "0"; this.btnRun1.Text = "皮带线1运转";
// this.btnRun1.UseVisualStyleBackColor = false;
// txtDoName this.btnRun1.Click += new System.EventHandler(this.btnRun1_Click);
// //
this.txtDoName.Enabled = false; // btnRun3
this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); //
this.txtDoName.Location = new System.Drawing.Point(71, 67); this.btnRun3.BackColor = System.Drawing.Color.White;
this.txtDoName.MaxLength = 10; this.btnRun3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.txtDoName.Name = "txtDoName"; this.btnRun3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDoName.Size = new System.Drawing.Size(116, 23); this.btnRun3.Location = new System.Drawing.Point(44, 68);
this.txtDoName.TabIndex = 267; this.btnRun3.Name = "btnRun3";
this.txtDoName.Text = "0"; this.btnRun3.Size = new System.Drawing.Size(140, 34);
// this.btnRun3.TabIndex = 261;
// label17 this.btnRun3.Text = "皮带先3运转";
// this.btnRun3.UseVisualStyleBackColor = false;
this.label17.AutoSize = true; this.btnRun3.Click += new System.EventHandler(this.btnRun3_Click);
this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); //
this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; // btnRun2
this.label17.Location = new System.Drawing.Point(19, 70); //
this.label17.Name = "label17"; this.btnRun2.BackColor = System.Drawing.Color.White;
this.label17.Size = new System.Drawing.Size(46, 17); this.btnRun2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.label17.TabIndex = 266; this.btnRun2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.Text = "设备IP:"; this.btnRun2.Location = new System.Drawing.Point(199, 26);
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.btnRun2.Name = "btnRun2";
// this.btnRun2.Size = new System.Drawing.Size(140, 34);
// label14 this.btnRun2.TabIndex = 262;
// this.btnRun2.Text = "皮带线2运转";
this.label14.AutoSize = true; this.btnRun2.UseVisualStyleBackColor = false;
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnRun2.Click += new System.EventHandler(this.btnRun2_Click);
this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; //
this.label14.Location = new System.Drawing.Point(272, 70); // btnSRun
this.label14.Name = "label14"; //
this.label14.Size = new System.Drawing.Size(35, 17); this.btnSRun.BackColor = System.Drawing.Color.White;
this.label14.TabIndex = 265; this.btnSRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.label14.Text = "地址:"; this.btnSRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.btnSRun.Location = new System.Drawing.Point(199, 68);
// this.btnSRun.Name = "btnSRun";
// btnOpenDo this.btnSRun.Size = new System.Drawing.Size(140, 34);
// this.btnSRun.TabIndex = 263;
this.btnOpenDo.BackColor = System.Drawing.Color.White; this.btnSRun.Text = "分盘装置电机1驱动";
this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSRun.UseVisualStyleBackColor = false;
this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSRun.Click += new System.EventHandler(this.btnSRun_Click);
this.btnOpenDo.Location = new System.Drawing.Point(169, 107);
this.btnOpenDo.Name = "btnOpenDo";
this.btnOpenDo.Size = new System.Drawing.Size(100, 34);
this.btnOpenDo.TabIndex = 264;
this.btnOpenDo.Text = "打开";
this.btnOpenDo.UseVisualStyleBackColor = false;
this.btnOpenDo.Click += new System.EventHandler(this.btnOpenDo_Click);
//
// btnWriteSingleDO
//
this.btnWriteSingleDO.BackColor = System.Drawing.Color.White;
this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWriteSingleDO.Location = new System.Drawing.Point(275, 107);
this.btnWriteSingleDO.Name = "btnWriteSingleDO";
this.btnWriteSingleDO.Size = new System.Drawing.Size(100, 34);
this.btnWriteSingleDO.TabIndex = 261;
this.btnWriteSingleDO.Text = "关闭";
this.btnWriteSingleDO.UseVisualStyleBackColor = false;
this.btnWriteSingleDO.Click += new System.EventHandler(this.btnWriteSingleDO_Click);
//
// txtWriteTime
//
this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtWriteTime.Location = new System.Drawing.Point(82, 113);
this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(66, 23);
this.txtWriteTime.TabIndex = 263;
this.txtWriteTime.Text = "0";
//
// label5
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(19, 116);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 17);
this.label5.TabIndex = 262;
this.label5.Text = "定时(ms):";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// FrmDischargeLine // FrmDischargeLine
// //
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(1307, 751); this.ClientSize = new System.Drawing.Size(1384, 881);
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")));
...@@ -543,6 +608,10 @@ ...@@ -543,6 +608,10 @@
private System.Windows.Forms.Button btnWriteSingleDO; private System.Windows.Forms.Button btnWriteSingleDO;
private System.Windows.Forms.TextBox txtWriteTime; private System.Windows.Forms.TextBox txtWriteTime;
private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label5;
private System.Windows.Forms.Button btnSRun;
private System.Windows.Forms.Button btnRun2;
private System.Windows.Forms.Button btnRun3;
private System.Windows.Forms.Button btnRun1;
} }
} }
source/AssemblyLineClient/FrmDischargeLine.cs
...@@ -310,22 +310,7 @@ namespace OnlineStore.AssemblyLine ...@@ -310,22 +310,7 @@ namespace OnlineStore.AssemblyLine
equipBean.Reset(); equipBean.Reset();
} }
} }
private void btnStop1Up_Click(object sender, EventArgs e)
{
LogUtil.info("点击【" + btnStop1Up.Text + "】 ");
if (btnStop1Up.Text.Equals("定位气缸上升"))
{
equipBean.CylinderMove(null, IO_Type.SeparateDevice_Down, IO_Type.SeparateDevice_Up);
btnStop1Up.Text = "定位气缸下降";
btnStop1Up.BackColor = Color.Aqua;
}
else
{
equipBean.CylinderMove(null, IO_Type.SeparateDevice_Up, IO_Type.SeparateDevice_Down);
btnStop1Up.Text = "定位气缸上升";
btnStop1Up.BackColor = Color.SkyBlue;
}
}
private void btnCloseAll_Click(object sender, EventArgs e) private void btnCloseAll_Click(object sender, EventArgs e)
{ {
...@@ -338,7 +323,29 @@ namespace OnlineStore.AssemblyLine ...@@ -338,7 +323,29 @@ namespace OnlineStore.AssemblyLine
} }
} }
} }
private void btnStop1Up_Click(object sender, EventArgs e)
{
BtnMove(btnStop1Up, "定位气缸上升", "定位气缸下降", IO_Type.SeparateDevice_Down, IO_Type.SeparateDevice_Up);
}
private void btnRun1_Click(object sender, EventArgs e)
{
BtnMove(btnRun1, "皮带线1运转", "皮带线1停止", IO_Type.DLine_Run1);
}
private void btnRun2_Click(object sender, EventArgs e)
{
BtnMove(btnRun2, "皮带线2运转", "皮带线2停止", IO_Type.DLine_Run2);
}
private void btnRun3_Click(object sender, EventArgs e)
{
BtnMove(btnRun3, "皮带线3运转", "皮带线3停止", IO_Type.DLine_Run3);
}
private void btnSRun_Click(object sender, EventArgs e)
{
BtnMove(btnRun3, "分盘装置电机1驱动", "分盘装置电机1停止", IO_Type.SeparateDevice_Run);
}
} }
} }
......
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
...@@ -117,6 +117,11 @@ ...@@ -117,6 +117,11 @@
this.label46 = new System.Windows.Forms.Label(); this.label46 = new System.Windows.Forms.Label();
this.label49 = new System.Windows.Forms.Label(); this.label49 = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.btnLineRun = new System.Windows.Forms.Button();
this.btnOSWRun = new System.Windows.Forms.Button();
this.btnEStopDown = new System.Windows.Forms.Button();
this.btnLSWRun = new System.Windows.Forms.Button();
this.btnBStopDown = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout(); this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
...@@ -353,6 +358,11 @@ ...@@ -353,6 +358,11 @@
this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox5.Controls.Add(this.btnBStopDown);
this.groupBox5.Controls.Add(this.btnEStopDown);
this.groupBox5.Controls.Add(this.btnOSWRun);
this.groupBox5.Controls.Add(this.btnLSWRun);
this.groupBox5.Controls.Add(this.btnLineRun);
this.groupBox5.Controls.Add(this.btnFL_TopCylinder); this.groupBox5.Controls.Add(this.btnFL_TopCylinder);
this.groupBox5.Controls.Add(this.btnSwLocationCylinder); this.groupBox5.Controls.Add(this.btnSwLocationCylinder);
this.groupBox5.Controls.Add(this.btnSWTop); this.groupBox5.Controls.Add(this.btnSWTop);
...@@ -375,9 +385,9 @@ ...@@ -375,9 +385,9 @@
this.btnFL_TopCylinder.BackColor = System.Drawing.Color.White; this.btnFL_TopCylinder.BackColor = System.Drawing.Color.White;
this.btnFL_TopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFL_TopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFL_TopCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFL_TopCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFL_TopCylinder.Location = new System.Drawing.Point(16, 160); this.btnFL_TopCylinder.Location = new System.Drawing.Point(193, 130);
this.btnFL_TopCylinder.Name = "btnFL_TopCylinder"; this.btnFL_TopCylinder.Name = "btnFL_TopCylinder";
this.btnFL_TopCylinder.Size = new System.Drawing.Size(140, 34); this.btnFL_TopCylinder.Size = new System.Drawing.Size(153, 34);
this.btnFL_TopCylinder.TabIndex = 262; this.btnFL_TopCylinder.TabIndex = 262;
this.btnFL_TopCylinder.Text = "FL顶升上升"; this.btnFL_TopCylinder.Text = "FL顶升上升";
this.btnFL_TopCylinder.UseVisualStyleBackColor = false; this.btnFL_TopCylinder.UseVisualStyleBackColor = false;
...@@ -388,9 +398,9 @@ ...@@ -388,9 +398,9 @@
this.btnSwLocationCylinder.BackColor = System.Drawing.Color.White; this.btnSwLocationCylinder.BackColor = System.Drawing.Color.White;
this.btnSwLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSwLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSwLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSwLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSwLocationCylinder.Location = new System.Drawing.Point(162, 206); this.btnSwLocationCylinder.Location = new System.Drawing.Point(34, 318);
this.btnSwLocationCylinder.Name = "btnSwLocationCylinder"; this.btnSwLocationCylinder.Name = "btnSwLocationCylinder";
this.btnSwLocationCylinder.Size = new System.Drawing.Size(140, 34); this.btnSwLocationCylinder.Size = new System.Drawing.Size(153, 34);
this.btnSwLocationCylinder.TabIndex = 261; this.btnSwLocationCylinder.TabIndex = 261;
this.btnSwLocationCylinder.Text = "环形线横移定位上升"; this.btnSwLocationCylinder.Text = "环形线横移定位上升";
this.btnSwLocationCylinder.UseVisualStyleBackColor = false; this.btnSwLocationCylinder.UseVisualStyleBackColor = false;
...@@ -401,9 +411,9 @@ ...@@ -401,9 +411,9 @@
this.btnSWTop.BackColor = System.Drawing.Color.White; this.btnSWTop.BackColor = System.Drawing.Color.White;
this.btnSWTop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSWTop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSWTop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSWTop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSWTop.Location = new System.Drawing.Point(162, 160); this.btnSWTop.Location = new System.Drawing.Point(193, 318);
this.btnSWTop.Name = "btnSWTop"; this.btnSWTop.Name = "btnSWTop";
this.btnSWTop.Size = new System.Drawing.Size(140, 34); this.btnSWTop.Size = new System.Drawing.Size(153, 34);
this.btnSWTop.TabIndex = 260; this.btnSWTop.TabIndex = 260;
this.btnSWTop.Text = "环形线横移顶升上升"; this.btnSWTop.Text = "环形线横移顶升上升";
this.btnSWTop.UseVisualStyleBackColor = false; this.btnSWTop.UseVisualStyleBackColor = false;
...@@ -414,9 +424,9 @@ ...@@ -414,9 +424,9 @@
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(14, 276); this.btnCloseAll.Location = new System.Drawing.Point(34, 405);
this.btnCloseAll.Name = "btnCloseAll"; this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(140, 34); this.btnCloseAll.Size = new System.Drawing.Size(153, 34);
this.btnCloseAll.TabIndex = 259; this.btnCloseAll.TabIndex = 259;
this.btnCloseAll.Text = "关闭所有DO"; this.btnCloseAll.Text = "关闭所有DO";
this.btnCloseAll.UseVisualStyleBackColor = false; this.btnCloseAll.UseVisualStyleBackColor = false;
...@@ -427,9 +437,9 @@ ...@@ -427,9 +437,9 @@
this.btnOutTopCylinder.BackColor = System.Drawing.Color.White; this.btnOutTopCylinder.BackColor = System.Drawing.Color.White;
this.btnOutTopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOutTopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutTopCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOutTopCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutTopCylinder.Location = new System.Drawing.Point(162, 27); this.btnOutTopCylinder.Location = new System.Drawing.Point(193, 177);
this.btnOutTopCylinder.Name = "btnOutTopCylinder"; this.btnOutTopCylinder.Name = "btnOutTopCylinder";
this.btnOutTopCylinder.Size = new System.Drawing.Size(140, 34); this.btnOutTopCylinder.Size = new System.Drawing.Size(153, 34);
this.btnOutTopCylinder.TabIndex = 258; this.btnOutTopCylinder.TabIndex = 258;
this.btnOutTopCylinder.Text = "SL出口顶升上升"; this.btnOutTopCylinder.Text = "SL出口顶升上升";
this.btnOutTopCylinder.UseVisualStyleBackColor = false; this.btnOutTopCylinder.UseVisualStyleBackColor = false;
...@@ -440,9 +450,9 @@ ...@@ -440,9 +450,9 @@
this.btnLocationCylinder.BackColor = System.Drawing.Color.White; this.btnLocationCylinder.BackColor = System.Drawing.Color.White;
this.btnLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLocationCylinder.Location = new System.Drawing.Point(14, 27); this.btnLocationCylinder.Location = new System.Drawing.Point(34, 177);
this.btnLocationCylinder.Name = "btnLocationCylinder"; this.btnLocationCylinder.Name = "btnLocationCylinder";
this.btnLocationCylinder.Size = new System.Drawing.Size(140, 34); this.btnLocationCylinder.Size = new System.Drawing.Size(153, 34);
this.btnLocationCylinder.TabIndex = 256; this.btnLocationCylinder.TabIndex = 256;
this.btnLocationCylinder.Text = "SL定位气缸上升"; this.btnLocationCylinder.Text = "SL定位气缸上升";
this.btnLocationCylinder.UseVisualStyleBackColor = false; this.btnLocationCylinder.UseVisualStyleBackColor = false;
...@@ -453,9 +463,9 @@ ...@@ -453,9 +463,9 @@
this.btnTrayLocationCylinder.BackColor = System.Drawing.Color.White; this.btnTrayLocationCylinder.BackColor = System.Drawing.Color.White;
this.btnTrayLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTrayLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTrayLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnTrayLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTrayLocationCylinder.Location = new System.Drawing.Point(162, 116); this.btnTrayLocationCylinder.Location = new System.Drawing.Point(193, 271);
this.btnTrayLocationCylinder.Name = "btnTrayLocationCylinder"; this.btnTrayLocationCylinder.Name = "btnTrayLocationCylinder";
this.btnTrayLocationCylinder.Size = new System.Drawing.Size(140, 34); this.btnTrayLocationCylinder.Size = new System.Drawing.Size(153, 34);
this.btnTrayLocationCylinder.TabIndex = 255; this.btnTrayLocationCylinder.TabIndex = 255;
this.btnTrayLocationCylinder.Text = "SL升降盘定位气缸前进"; this.btnTrayLocationCylinder.Text = "SL升降盘定位气缸前进";
this.btnTrayLocationCylinder.UseVisualStyleBackColor = false; this.btnTrayLocationCylinder.UseVisualStyleBackColor = false;
...@@ -466,9 +476,9 @@ ...@@ -466,9 +476,9 @@
this.btnFeedSideWayCylinder.BackColor = System.Drawing.Color.White; this.btnFeedSideWayCylinder.BackColor = System.Drawing.Color.White;
this.btnFeedSideWayCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFeedSideWayCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFeedSideWayCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFeedSideWayCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFeedSideWayCylinder.Location = new System.Drawing.Point(162, 72); this.btnFeedSideWayCylinder.Location = new System.Drawing.Point(193, 224);
this.btnFeedSideWayCylinder.Name = "btnFeedSideWayCylinder"; this.btnFeedSideWayCylinder.Name = "btnFeedSideWayCylinder";
this.btnFeedSideWayCylinder.Size = new System.Drawing.Size(140, 34); this.btnFeedSideWayCylinder.Size = new System.Drawing.Size(153, 34);
this.btnFeedSideWayCylinder.TabIndex = 252; this.btnFeedSideWayCylinder.TabIndex = 252;
this.btnFeedSideWayCylinder.Text = "SL上料横移气缸取料"; this.btnFeedSideWayCylinder.Text = "SL上料横移气缸取料";
this.btnFeedSideWayCylinder.UseVisualStyleBackColor = false; this.btnFeedSideWayCylinder.UseVisualStyleBackColor = false;
...@@ -479,9 +489,9 @@ ...@@ -479,9 +489,9 @@
this.btnFeedCylinder.BackColor = System.Drawing.Color.White; this.btnFeedCylinder.BackColor = System.Drawing.Color.White;
this.btnFeedCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFeedCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFeedCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFeedCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFeedCylinder.Location = new System.Drawing.Point(14, 116); this.btnFeedCylinder.Location = new System.Drawing.Point(34, 271);
this.btnFeedCylinder.Name = "btnFeedCylinder"; this.btnFeedCylinder.Name = "btnFeedCylinder";
this.btnFeedCylinder.Size = new System.Drawing.Size(140, 34); this.btnFeedCylinder.Size = new System.Drawing.Size(153, 34);
this.btnFeedCylinder.TabIndex = 249; this.btnFeedCylinder.TabIndex = 249;
this.btnFeedCylinder.Text = "SL上料气缸放松"; this.btnFeedCylinder.Text = "SL上料气缸放松";
this.btnFeedCylinder.UseVisualStyleBackColor = false; this.btnFeedCylinder.UseVisualStyleBackColor = false;
...@@ -492,9 +502,9 @@ ...@@ -492,9 +502,9 @@
this.btnFeedSideWay.BackColor = System.Drawing.Color.White; this.btnFeedSideWay.BackColor = System.Drawing.Color.White;
this.btnFeedSideWay.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFeedSideWay.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFeedSideWay.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFeedSideWay.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFeedSideWay.Location = new System.Drawing.Point(14, 72); this.btnFeedSideWay.Location = new System.Drawing.Point(34, 224);
this.btnFeedSideWay.Name = "btnFeedSideWay"; this.btnFeedSideWay.Name = "btnFeedSideWay";
this.btnFeedSideWay.Size = new System.Drawing.Size(140, 34); this.btnFeedSideWay.Size = new System.Drawing.Size(153, 34);
this.btnFeedSideWay.TabIndex = 246; this.btnFeedSideWay.TabIndex = 246;
this.btnFeedSideWay.Text = "SL上料横移机构上升"; this.btnFeedSideWay.Text = "SL上料横移机构上升";
this.btnFeedSideWay.UseVisualStyleBackColor = false; this.btnFeedSideWay.UseVisualStyleBackColor = false;
...@@ -734,7 +744,7 @@ ...@@ -734,7 +744,7 @@
this.tabPage2.Location = new System.Drawing.Point(4, 26); this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3); this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(1321, 745); this.tabPage2.Size = new System.Drawing.Size(1365, 776);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 伺服信息 "; this.tabPage2.Text = " 伺服信息 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
...@@ -1432,6 +1442,71 @@ ...@@ -1432,6 +1442,71 @@
this.panel1.Size = new System.Drawing.Size(1372, 68); this.panel1.Size = new System.Drawing.Size(1372, 68);
this.panel1.TabIndex = 258; this.panel1.TabIndex = 258;
// //
// btnLineRun
//
this.btnLineRun.BackColor = System.Drawing.Color.White;
this.btnLineRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLineRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLineRun.Location = new System.Drawing.Point(34, 36);
this.btnLineRun.Name = "btnLineRun";
this.btnLineRun.Size = new System.Drawing.Size(153, 34);
this.btnLineRun.TabIndex = 263;
this.btnLineRun.Text = "SL进料线体运转";
this.btnLineRun.UseVisualStyleBackColor = false;
this.btnLineRun.Click += new System.EventHandler(this.btnLineRun_Click);
//
// btnOSWRun
//
this.btnOSWRun.BackColor = System.Drawing.Color.White;
this.btnOSWRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOSWRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOSWRun.Location = new System.Drawing.Point(34, 83);
this.btnOSWRun.Name = "btnOSWRun";
this.btnOSWRun.Size = new System.Drawing.Size(153, 34);
this.btnOSWRun.TabIndex = 265;
this.btnOSWRun.Text = "SL线体出口横移电机运转";
this.btnOSWRun.UseVisualStyleBackColor = false;
this.btnOSWRun.Click += new System.EventHandler(this.btnOSWRun_Click);
//
// btnEStopDown
//
this.btnEStopDown.BackColor = System.Drawing.Color.White;
this.btnEStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnEStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnEStopDown.Location = new System.Drawing.Point(193, 83);
this.btnEStopDown.Name = "btnEStopDown";
this.btnEStopDown.Size = new System.Drawing.Size(153, 34);
this.btnEStopDown.TabIndex = 266;
this.btnEStopDown.Text = "SL进料阻挡下降";
this.btnEStopDown.UseVisualStyleBackColor = false;
this.btnEStopDown.Click += new System.EventHandler(this.btnEStopDown_Click);
//
// btnLSWRun
//
this.btnLSWRun.BackColor = System.Drawing.Color.White;
this.btnLSWRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLSWRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLSWRun.Location = new System.Drawing.Point(193, 36);
this.btnLSWRun.Name = "btnLSWRun";
this.btnLSWRun.Size = new System.Drawing.Size(153, 34);
this.btnLSWRun.TabIndex = 264;
this.btnLSWRun.Text = "SL线体定位横移电机运转";
this.btnLSWRun.UseVisualStyleBackColor = false;
this.btnLSWRun.Click += new System.EventHandler(this.btnLSWRun_Click);
//
// btnBStopDown
//
this.btnBStopDown.BackColor = System.Drawing.Color.White;
this.btnBStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBStopDown.Location = new System.Drawing.Point(34, 130);
this.btnBStopDown.Name = "btnBStopDown";
this.btnBStopDown.Size = new System.Drawing.Size(153, 34);
this.btnBStopDown.TabIndex = 267;
this.btnBStopDown.Text = "SL缓冲阻挡下降";
this.btnBStopDown.UseVisualStyleBackColor = false;
this.btnBStopDown.Click += new System.EventHandler(this.btnBStopDown_Click);
//
// FrmFeedingEquip // FrmFeedingEquip
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
...@@ -1571,6 +1646,11 @@ ...@@ -1571,6 +1646,11 @@
private System.Windows.Forms.Button btnSwLocationCylinder; private System.Windows.Forms.Button btnSwLocationCylinder;
private System.Windows.Forms.Button btnSWTop; private System.Windows.Forms.Button btnSWTop;
private System.Windows.Forms.Button btnFL_TopCylinder; private System.Windows.Forms.Button btnFL_TopCylinder;
private System.Windows.Forms.Button btnEStopDown;
private System.Windows.Forms.Button btnOSWRun;
private System.Windows.Forms.Button btnLineRun;
private System.Windows.Forms.Button btnLSWRun;
private System.Windows.Forms.Button btnBStopDown;
} }
} }
source/AssemblyLineClient/FrmFeedingEquip.cs
...@@ -626,6 +626,30 @@ namespace OnlineStore.AssemblyLine ...@@ -626,6 +626,30 @@ namespace OnlineStore.AssemblyLine
} }
private void btnLineRun_Click(object sender, EventArgs e)
{
BtnMove(btnLineRun, "SL进料线体运转", "SL进料线体停止", IO_Type.SL_Line_Run);
}
private void btnLSWRun_Click(object sender, EventArgs e)
{
BtnMove(btnLSWRun, "SL线体定位横移电机运转", "SL线体定位横移电机停止", IO_Type.SL_LocationSideWay_Run);
}
private void btnOSWRun_Click(object sender, EventArgs e)
{
BtnMove(btnOSWRun, "SL线体出口横移电机运转", "SL线体出口横移电机停止", IO_Type.SL_OutSideWay_Run);
}
private void btnEStopDown_Click(object sender, EventArgs e)
{
BtnMove(btnEStopDown, "SL进料阻挡下降", "SL进料阻挡上升", IO_Type.SL_Entry_StopDown);
}
private void btnBStopDown_Click(object sender, EventArgs e)
{
BtnMove(btnBStopDown, "缓冲阻挡下降", "缓冲阻挡上升", IO_Type.SL_Buffer_StopDown);
}
} }
} }
......
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
...@@ -378,7 +378,7 @@ ...@@ -378,7 +378,7 @@
this.btnStop2Up.Name = "btnStop2Up"; this.btnStop2Up.Name = "btnStop2Up";
this.btnStop2Up.Size = new System.Drawing.Size(140, 34); this.btnStop2Up.Size = new System.Drawing.Size(140, 34);
this.btnStop2Up.TabIndex = 258; this.btnStop2Up.TabIndex = 258;
this.btnStop2Up.Text = "阻挡气缸2下降"; this.btnStop2Up.Text = "阻挡2下降";
this.btnStop2Up.UseVisualStyleBackColor = false; this.btnStop2Up.UseVisualStyleBackColor = false;
this.btnStop2Up.Click += new System.EventHandler(this.btnStop2Up_Click); this.btnStop2Up.Click += new System.EventHandler(this.btnStop2Up_Click);
// //
...@@ -391,7 +391,7 @@ ...@@ -391,7 +391,7 @@
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;
this.btnStop1Up.Text = "阻挡气缸1下降"; this.btnStop1Up.Text = "阻挡1下降";
this.btnStop1Up.UseVisualStyleBackColor = false; this.btnStop1Up.UseVisualStyleBackColor = false;
this.btnStop1Up.Click += new System.EventHandler(this.btnStop1Up_Click); this.btnStop1Up.Click += new System.EventHandler(this.btnStop1Up_Click);
// //
...@@ -400,7 +400,7 @@ ...@@ -400,7 +400,7 @@
this.btnClampSlack.BackColor = System.Drawing.Color.White; this.btnClampSlack.BackColor = System.Drawing.Color.White;
this.btnClampSlack.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClampSlack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClampSlack.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnClampSlack.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClampSlack.Location = new System.Drawing.Point(220, 72); this.btnClampSlack.Location = new System.Drawing.Point(44, 116);
this.btnClampSlack.Name = "btnClampSlack"; this.btnClampSlack.Name = "btnClampSlack";
this.btnClampSlack.Size = new System.Drawing.Size(140, 34); this.btnClampSlack.Size = new System.Drawing.Size(140, 34);
this.btnClampSlack.TabIndex = 255; this.btnClampSlack.TabIndex = 255;
...@@ -426,11 +426,11 @@ ...@@ -426,11 +426,11 @@
this.btnBeforeAfterBefore.BackColor = System.Drawing.Color.White; this.btnBeforeAfterBefore.BackColor = System.Drawing.Color.White;
this.btnBeforeAfterBefore.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBeforeAfterBefore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBeforeAfterBefore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBeforeAfterBefore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBeforeAfterBefore.Location = new System.Drawing.Point(44, 116); this.btnBeforeAfterBefore.Location = new System.Drawing.Point(220, 72);
this.btnBeforeAfterBefore.Name = "btnBeforeAfterBefore"; this.btnBeforeAfterBefore.Name = "btnBeforeAfterBefore";
this.btnBeforeAfterBefore.Size = new System.Drawing.Size(140, 34); this.btnBeforeAfterBefore.Size = new System.Drawing.Size(140, 34);
this.btnBeforeAfterBefore.TabIndex = 249; this.btnBeforeAfterBefore.TabIndex = 249;
this.btnBeforeAfterBefore.Text = "前后气缸前进"; this.btnBeforeAfterBefore.Text = "横移前进";
this.btnBeforeAfterBefore.UseVisualStyleBackColor = false; this.btnBeforeAfterBefore.UseVisualStyleBackColor = false;
this.btnBeforeAfterBefore.Click += new System.EventHandler(this.btnBeforeAfterBefore_Click); this.btnBeforeAfterBefore.Click += new System.EventHandler(this.btnBeforeAfterBefore_Click);
// //
...@@ -622,7 +622,7 @@ ...@@ -622,7 +622,7 @@
this.tabPage2.Location = new System.Drawing.Point(4, 26); this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3); this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(1288, 646); this.tabPage2.Size = new System.Drawing.Size(1365, 776);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 伺服信息 "; this.tabPage2.Text = " 伺服信息 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
......
source/AssemblyLineClient/FrmProvidingEquip.Designer.cs
...@@ -320,7 +320,7 @@ ...@@ -320,7 +320,7 @@
this.btnStop2Up.Name = "btnStop2Up"; this.btnStop2Up.Name = "btnStop2Up";
this.btnStop2Up.Size = new System.Drawing.Size(140, 34); this.btnStop2Up.Size = new System.Drawing.Size(140, 34);
this.btnStop2Up.TabIndex = 258; this.btnStop2Up.TabIndex = 258;
this.btnStop2Up.Text = "阻挡气缸2下降"; this.btnStop2Up.Text = "阻挡2下降";
this.btnStop2Up.UseVisualStyleBackColor = false; this.btnStop2Up.UseVisualStyleBackColor = false;
this.btnStop2Up.Click += new System.EventHandler(this.btnStop2Up_Click); this.btnStop2Up.Click += new System.EventHandler(this.btnStop2Up_Click);
// //
...@@ -333,7 +333,7 @@ ...@@ -333,7 +333,7 @@
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;
this.btnStop1Up.Text = "阻挡气缸1下降"; this.btnStop1Up.Text = "阻挡1下降";
this.btnStop1Up.UseVisualStyleBackColor = false; this.btnStop1Up.UseVisualStyleBackColor = false;
this.btnStop1Up.Click += new System.EventHandler(this.btnStop1Up_Click); this.btnStop1Up.Click += new System.EventHandler(this.btnStop1Up_Click);
// //
...@@ -342,7 +342,7 @@ ...@@ -342,7 +342,7 @@
this.btnClampSlack.BackColor = System.Drawing.Color.White; this.btnClampSlack.BackColor = System.Drawing.Color.White;
this.btnClampSlack.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClampSlack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClampSlack.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnClampSlack.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClampSlack.Location = new System.Drawing.Point(220, 72); this.btnClampSlack.Location = new System.Drawing.Point(44, 116);
this.btnClampSlack.Name = "btnClampSlack"; this.btnClampSlack.Name = "btnClampSlack";
this.btnClampSlack.Size = new System.Drawing.Size(140, 34); this.btnClampSlack.Size = new System.Drawing.Size(140, 34);
this.btnClampSlack.TabIndex = 255; this.btnClampSlack.TabIndex = 255;
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
this.btnBeforeAfterBefore.BackColor = System.Drawing.Color.White; this.btnBeforeAfterBefore.BackColor = System.Drawing.Color.White;
this.btnBeforeAfterBefore.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBeforeAfterBefore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBeforeAfterBefore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBeforeAfterBefore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBeforeAfterBefore.Location = new System.Drawing.Point(44, 116); this.btnBeforeAfterBefore.Location = new System.Drawing.Point(220, 72);
this.btnBeforeAfterBefore.Name = "btnBeforeAfterBefore"; this.btnBeforeAfterBefore.Name = "btnBeforeAfterBefore";
this.btnBeforeAfterBefore.Size = new System.Drawing.Size(140, 34); this.btnBeforeAfterBefore.Size = new System.Drawing.Size(140, 34);
this.btnBeforeAfterBefore.TabIndex = 249; this.btnBeforeAfterBefore.TabIndex = 249;
......
source/DeviceLibrary/LineConfig/Config_DischargeLine_1.csv
类型,分类编号,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义 类型,分类编号,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,, PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,Name1#Name1,,,,,
,,,,,,,,, ,,,,,,,,,
DI,0,出料皮带线体1急停,DLine_SuddenStop,0,192.168.200.12,0,出料皮带线体1急停,X021,X021 DI,0,出料皮带线体1急停,DLine_SuddenStop,0,192.168.200.12,0,出料皮带线体1急停,X021,X021
DI,0,出料皮带线体1复位,DLine_Reset,1,192.168.200.12,0,出料皮带线体1复位,X022,X022 DI,0,出料皮带线体1复位,DLine_Reset,1,192.168.200.12,0,出料皮带线体1复位,X022,X022
......
source/DeviceLibrary/LineConfig/Config_DischargeLine_2.csv
类型,分类编号,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义 类型,分类编号,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,, PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,Name1#Name1,,,,,
,,,,,,,,, ,,,,,,,,,
DI,0,出料皮带线体2急停,DLine_SuddenStop,0,192.168.200.13,0,出料皮带线体2急停,X041,X041 DI,0,出料皮带线体2急停,DLine_SuddenStop,0,192.168.200.13,0,出料皮带线体2急停,X041,X041
DI,0,出料皮带线体2复位,DLine_Reset,1,192.168.200.13,0,出料皮带线体2复位,X042,X042 DI,0,出料皮带线体2复位,DLine_Reset,1,192.168.200.13,0,出料皮带线体2复位,X042,X042
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -437,7 +437,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -437,7 +437,7 @@ namespace OnlineStore.DeviceLibrary
continue; continue;
} }
NotOkMsg = wait.ToStr(); NotOkMsg = wait.ToStr();
if (wait.WaitType.Equals(1)) if (wait.WaitType.Equals(WaitEnum.W001_AxisMove))
{ {
string msg = ""; string msg = "";
if (wait.IsHomeMove) if (wait.IsHomeMove)
...@@ -452,11 +452,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -452,11 +452,11 @@ namespace OnlineStore.DeviceLibrary
{ {
isOk = false; isOk = false;
WarnMsg = msg; WarnMsg = msg;
Alarm(LineAlarmType.AxisMoveError ); Alarm(LineAlarmType.AxisMoveError);
break; break;
} }
} }
else if (wait.WaitType.Equals(2)) else if (wait.WaitType.Equals(WaitEnum.W002_IOValue))
{ {
NotOkMsg = " (" + baseConfig.GetDisplayName(wait.IoType) + "=" + wait.IoValue + ") "; NotOkMsg = " (" + baseConfig.GetDisplayName(wait.IoType) + "=" + wait.IoValue + ") ";
wait.IsEnd = IOValue(wait.IoType).Equals(wait.IoValue); wait.IsEnd = IOValue(wait.IoType).Equals(wait.IoValue);
...@@ -469,7 +469,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -469,7 +469,7 @@ namespace OnlineStore.DeviceLibrary
// LogUtil.debug(moveInfo.Name + "未检测到：IsUse_Tray_Check= " + wait.IoValue + "，直接跳过检测继续下一步"); // LogUtil.debug(moveInfo.Name + "未检测到：IsUse_Tray_Check= " + wait.IoValue + "，直接跳过检测继续下一步");
//} //}
//夹紧按钮若果超过一秒钟还未收到，默认成功 //夹紧按钮若果超过一秒钟还未收到，默认成功
if (wait.IoType.Equals(IO_Type.ClampCylinder_Slack) && wait.IoValue.Equals(IO_VALUE.HIGH) && span.TotalMilliseconds > 4000) if (wait.IoType.Equals(IO_Type.ClampCylinder_Slack) && wait.IoValue.Equals(IO_VALUE.HIGH) && span.TotalMilliseconds > 4000)
{ {
LogInfo("未检测到：ClampCylinder_Slack=HIGH，超过4秒钟，默认下一步骤"); LogInfo("未检测到：ClampCylinder_Slack=HIGH，超过4秒钟，默认下一步骤");
wait.IsEnd = true; wait.IsEnd = true;
...@@ -482,8 +482,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -482,8 +482,8 @@ namespace OnlineStore.DeviceLibrary
{ {
ConfigIO io = baseConfig.getWaitIO(wait.IoType); ConfigIO io = baseConfig.getWaitIO(wait.IoType);
WarnMsg = Name + "等待" + NotOkMsg + " 超时"; WarnMsg = Name + "等待" + NotOkMsg + " 超时";
Alarm(LineAlarmType.IoSingleTimeOut ); Alarm(LineAlarmType.IoSingleTimeOut);
LogUtil.error(MoveInfo.Name + WarnMsg, 13); LogUtil.error(MoveInfo.Name + WarnMsg, DeviceID+ 13);
} }
else if (rwSpan.TotalSeconds > 3 && span.TotalSeconds > 3) else if (rwSpan.TotalSeconds > 3 && span.TotalSeconds > 3)
{ {
...@@ -509,21 +509,25 @@ namespace OnlineStore.DeviceLibrary ...@@ -509,21 +509,25 @@ namespace OnlineStore.DeviceLibrary
} }
} }
} }
else if (wait.WaitType.Equals(3)) else if (wait.WaitType.Equals(WaitEnum.W003_Time))
{ {
wait.IsEnd = (span.TotalMilliseconds >= wait.TimeMSeconds); wait.IsEnd = (span.TotalMilliseconds >= wait.TimeMSeconds);
} }
else if (wait.WaitType.Equals(8)) else if (wait.WaitType.Equals(WaitEnum.W008_InStoreCheckOK))
{ {
string posId = moveInfo.MoveParam.PosId; string posId = moveInfo.MoveParam.PosId;
int id = moveInfo.MoveParam.GetStoreId(); int id = moveInfo.MoveParam.GetStoreId();
wait.IsEnd = LineServer.RightInPosId(id, posId); wait.IsEnd = LineServer.RightInPosId(id, posId);
} }
else if (wait.WaitType.Equals(9)) else if (wait.WaitType.Equals(WaitEnum.W009_BoxCanInstore))
{ {
int storeId = moveInfo.MoveParam.GetStoreId(); int storeId = moveInfo.MoveParam.GetStoreId();
wait.IsEnd = LineServer.BoxCanReviceTray(storeId); wait.IsEnd = LineServer.BoxCanReviceTray(storeId);
} }
else
{
wait.IsEnd = CheckWaitResult(wait);
}
//else if (wait.WaitType.Equals(10)) //else if (wait.WaitType.Equals(10))
//{ //{
// wait.IsEnd = LineManager.Line.SideWay34HasTray().Equals(false); // wait.IsEnd = LineManager.Line.SideWay34HasTray().Equals(false);
...@@ -547,12 +551,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -547,12 +551,17 @@ namespace OnlineStore.DeviceLibrary
{ {
WarnMsg = moveInfo.Name + "[" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "]等待[" + NotOkMsg WarnMsg = moveInfo.Name + "[" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "]等待[" + NotOkMsg
+ "]超时[" + Math.Round(span.TotalSeconds, 1) + "]秒"; + "]超时[" + Math.Round(span.TotalSeconds, 1) + "]秒";
LogUtil.error(WarnMsg, 18); LogUtil.error(WarnMsg,DeviceID+ 18);
Alarm(LineAlarmType.IoSingleTimeOut ); Alarm(LineAlarmType.IoSingleTimeOut );
} }
} }
protected virtual bool CheckWaitResult(WaitResultInfo wait)
{
return false;
}
#endregion #endregion
protected void CheckLog(string msg) protected void CheckLog(string msg)
......
source/DeviceLibrary/assemblyLine/FeedingEquip_Partial.cs
...@@ -99,7 +99,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -99,7 +99,7 @@ namespace OnlineStore.DeviceLibrary
{ {
//preTrayNum = currMoveTrayNum; //preTrayNum = currMoveTrayNum;
SecondMoveInfo.MoveParam = new InOutParam(currMoveTrayNum); SecondMoveInfo.MoveParam = new InOutParam(currMoveTrayNum);
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_05_CodeRember); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_11_CodeRember);
SecondMoveInfo.EndStepWait(); SecondMoveInfo.EndStepWait();
return; return;
} }
...@@ -118,8 +118,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -118,8 +118,8 @@ namespace OnlineStore.DeviceLibrary
{ {
TrayManager.UpdateTrayNumError(-1, ""); TrayManager.UpdateTrayNumError(-1, "");
} }
CheckLog("托盘放行 SecondStoreMove：(MO_07_WaitCanGo ，移栽2，需要判断是否可以放盘通过,最多等待10000）"); CheckLog("托盘放行 SecondStoreMove：(MO_13_WaitCanGo ，移栽2，需要判断是否可以放盘通过,最多等待10000）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_07_WaitCanGo); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_13_WaitCanGo);
} }
catch (Exception ex) catch (Exception ex)
...@@ -150,7 +150,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -150,7 +150,7 @@ namespace OnlineStore.DeviceLibrary
{ {
SecondMoveInfo.MoveParam = new InOutParam(currMoveTrayNum); SecondMoveInfo.MoveParam = new InOutParam(currMoveTrayNum);
LogInfo(SecondMoveInfo.MoveNum + "*************** 托盘号【" + currMoveTrayNum + "】可以放出料托盘，正在出料中，移栽料盘"); LogInfo(SecondMoveInfo.MoveNum + "*************** 托盘号【" + currMoveTrayNum + "】可以放出料托盘，正在出料中，移栽料盘");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_05_CodeRember); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_11_CodeRember);
SecondMoveInfo.EndStepWait(); SecondMoveInfo.EndStepWait();
} }
else else
...@@ -160,8 +160,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -160,8 +160,8 @@ namespace OnlineStore.DeviceLibrary
{ {
TrayManager.UpdateTrayNumError(-1, ""); TrayManager.UpdateTrayNumError(-1, "");
} }
CheckLog("托盘检测 SecondStoreMove：(MO_09_TopCylinder_Down ，托盘号【" + currMoveTrayNum + "】,直接放盘通过，顶升气缸下降）"); CheckLog("托盘检测 SecondStoreMove：(MO_12_TopCylinder_Down ，托盘号【" + currMoveTrayNum + "】,直接放盘通过，顶升气缸下降）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_06_TopCylinder_Down); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_12_TopCylinder_Down);
CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down); CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
} }
...@@ -175,10 +175,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -175,10 +175,10 @@ namespace OnlineStore.DeviceLibrary
#endregion #endregion
#region 不需要出出料，直接放行 #region 不需要出出料，直接放行
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_06_TopCylinder_Down)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_12_TopCylinder_Down))
{ {
CheckLog("托盘放行 SecondStoreMove：(MO_07_WaitCanGo ，移栽2，需要判断是否可以放盘通过,最多等待10000）"); CheckLog("托盘放行 SecondStoreMove：(MO_13_WaitCanGo ，移栽2，需要判断是否可以放盘通过,最多等待10000）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_07_WaitCanGo); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_13_WaitCanGo);
//更新横移托盘已处理完成 //更新横移托盘已处理完成
TrayManager.UpdateSWState(Config.SidesWayNum, 1); TrayManager.UpdateSWState(Config.SidesWayNum, 1);
//if (DeviceID.Equals(2)) //if (DeviceID.Equals(2))
...@@ -189,29 +189,29 @@ namespace OnlineStore.DeviceLibrary ...@@ -189,29 +189,29 @@ namespace OnlineStore.DeviceLibrary
//} //}
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_07_WaitCanGo)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_13_WaitCanGo))
{ {
CheckLog("托盘放行 SecondStoreMove：(MO_10_StopCylinder2_Down ，阻挡气缸1-2下降）"); CheckLog("托盘放行 SecondStoreMove：(MO_14_StopCylinder2_Down ，阻挡气缸1-2下降）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_10_StopCylinder2_Down); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_StopCylinder2_Down);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH); IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH));
// SecondMoveInfo.EndStepWait(); // SecondMoveInfo.EndStepWait();
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_10_StopCylinder2_Down)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_14_StopCylinder2_Down))
{ {
CheckLog("托盘放行 SecondStoreMove：(MO_11_Tray_Check ， 阻挡2托盘检测=0）, 延时2秒）"); CheckLog("托盘放行 SecondStoreMove：(MO_15_Tray_Check ， 阻挡2托盘检测=0）, 延时2秒）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_11_Tray_Check); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_15_Tray_Check);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.LOW)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.LOW));
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_11_Tray_Check)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_15_Tray_Check))
{ {
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_12_StopCylinder_Back); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_16_StopCylinder_Back);
CheckLog("托盘放行 SecondStoreMove：(MO_12_StopCylinder_Back ， 阻挡气缸1-2上升 ）"); CheckLog("托盘放行 SecondStoreMove：(MO_16_StopCylinder_Back ， 阻挡气缸1-2上升 ）");
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW); IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.LOW)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.LOW));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200));
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_12_StopCylinder_Back)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_16_StopCylinder_Back))
{ {
preTrayNum = currMoveTrayNum; preTrayNum = currMoveTrayNum;
CheckLog("托盘放行 SecondStoreMove：(托盘放行结束） "); CheckLog("托盘放行 SecondStoreMove：(托盘放行结束） ");
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
...@@ -284,7 +284,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -284,7 +284,7 @@ namespace OnlineStore.DeviceLibrary
continue; continue;
} }
NotOkMsg = wait.ToStr(); NotOkMsg = wait.ToStr();
if (wait.WaitType == 2) if (wait.WaitType .Equals(WaitEnum.W002_IOValue))
{ {
NotOkMsg = " (" + Config.GetDisplayName(wait.IoType) + "=" + wait.IoValue + ") "; NotOkMsg = " (" + Config.GetDisplayName(wait.IoType) + "=" + wait.IoValue + ") ";
wait.IsEnd = IOValue(wait.IoType).Equals(wait.IoValue); wait.IsEnd = IOValue(wait.IoType).Equals(wait.IoValue);
...@@ -317,17 +317,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -317,17 +317,17 @@ namespace OnlineStore.DeviceLibrary
} }
} }
} }
else if (wait.WaitType == 3) else if (wait.WaitType.Equals(WaitEnum.W003_Time))
{ {
wait.IsEnd = (span.TotalMilliseconds >= wait.TimeMSeconds); wait.IsEnd = (span.TotalMilliseconds >= wait.TimeMSeconds);
} }
else if (wait.WaitType == 8) else if (wait.WaitType.Equals(WaitEnum.W008_InStoreCheckOK))
{ {
string posId = checkWaitInfo.MoveParam.PosId; string posId = checkWaitInfo.MoveParam.PosId;
int id = checkWaitInfo.MoveParam.GetStoreId(); int id = checkWaitInfo.MoveParam.GetStoreId();
wait.IsEnd = LineServer.RightInPosId(id, posId); wait.IsEnd = LineServer.RightInPosId(id, posId);
} }
else if (wait.WaitType.Equals(9)) else if (wait.WaitType.Equals(WaitEnum.W009_BoxCanInstore))
{ {
int storeId = checkWaitInfo.MoveParam.GetStoreId(); int storeId = checkWaitInfo.MoveParam.GetStoreId();
wait.IsEnd = LineServer.BoxCanReviceTray(storeId); wait.IsEnd = LineServer.BoxCanReviceTray(storeId);
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -104,7 +104,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -104,7 +104,7 @@ namespace OnlineStore.DeviceLibrary
#endregion #endregion
#region 移载装置，放物品到流水线操作 #region 移载装置，放物品到流水线操作
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_05_CodeRember) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_11_CodeRember)
&& MoveInfo.MoveStep.Equals(LineMoveStep.MO_56_BeforeAfterCylinderAfter) && MoveInfo.MoveStep.Equals(LineMoveStep.MO_56_BeforeAfterCylinderAfter)
&& !SecondMoveInfo.IsInWait) && !SecondMoveInfo.IsInWait)
{ {
...@@ -163,7 +163,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -163,7 +163,7 @@ namespace OnlineStore.DeviceLibrary
TrayManager.DelNeedEmptyTrayNum(); TrayManager.DelNeedEmptyTrayNum();
OutStoreLog("出库 SecondStoreMove：移栽完成，放行托盘"); OutStoreLog("出库 SecondStoreMove：移栽完成，放行托盘");
SecondMoveInfo.NewMove(LineMoveType.CheckFixture); SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_06_TopCylinder_Down); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_12_TopCylinder_Down);
CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down); CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
LogInfo("【" + posId + "】出库处理结束，！"); LogInfo("【" + posId + "】出库处理结束，！");
...@@ -252,9 +252,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -252,9 +252,9 @@ namespace OnlineStore.DeviceLibrary
TrayManager.UpdateFixtureValue(num ); TrayManager.UpdateFixtureValue(num );
//阻挡气缸移动 //阻挡气缸移动
InStoreLog("放托盘（放开阻挡）：SecondStoreMove=MO_09_TopCylinder_Down 物品已移走，顶升气缸1下降）"); InStoreLog("放托盘（放开阻挡）：SecondStoreMove=MO_12_TopCylinder_Down 物品已移走，顶升气缸1下降）");
SecondMoveInfo.NewMove(LineMoveType.CheckFixture); SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_06_TopCylinder_Down); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_12_TopCylinder_Down);
CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down); CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.MI_10_WaitBox)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.MI_10_WaitBox))
...@@ -499,7 +499,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -499,7 +499,7 @@ namespace OnlineStore.DeviceLibrary
{ {
//preTrayNum = currMoveTrayNum; //preTrayNum = currMoveTrayNum;
SecondMoveInfo.MoveParam = new InOutParam(currMoveTrayNum); SecondMoveInfo.MoveParam = new InOutParam(currMoveTrayNum);
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_05_CodeRember); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_11_CodeRember);
SecondMoveInfo.EndStepWait(); SecondMoveInfo.EndStepWait();
return; return;
} }
...@@ -529,8 +529,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -529,8 +529,8 @@ namespace OnlineStore.DeviceLibrary
{ {
TrayManager.UpdateTrayNumError(-1, ""); TrayManager.UpdateTrayNumError(-1, "");
} }
CheckLog("托盘放行 SecondStoreMove：(MO_07_WaitCanGo ，移栽2，需要判断是否可以放盘通过,最多等待10000）"); CheckLog("托盘放行 SecondStoreMove：(MO_13_WaitCanGo ，移栽2，需要判断是否可以放盘通过,最多等待10000）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_07_WaitCanGo); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_13_WaitCanGo);
if (DeviceID.Equals(2)) if (DeviceID.Equals(2))
{ {
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000));
...@@ -569,7 +569,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -569,7 +569,7 @@ namespace OnlineStore.DeviceLibrary
SecondMoveInfo.MoveParam = new InOutParam(currMoveTrayNum); SecondMoveInfo.MoveParam = new InOutParam(currMoveTrayNum);
isNeedMove = true; isNeedMove = true;
LogInfo(SecondMoveInfo.MoveNum + "*************** 托盘号【" + currMoveTrayNum + "】可以放出库托盘，正在出库中，移栽料盘"); LogInfo(SecondMoveInfo.MoveNum + "*************** 托盘号【" + currMoveTrayNum + "】可以放出库托盘，正在出库中，移栽料盘");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_05_CodeRember); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_11_CodeRember);
SecondMoveInfo.EndStepWait(); SecondMoveInfo.EndStepWait();
} }
else else
...@@ -592,8 +592,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -592,8 +592,8 @@ namespace OnlineStore.DeviceLibrary
{ {
TrayManager.UpdateTrayNumError(-1, ""); TrayManager.UpdateTrayNumError(-1, "");
} }
CheckLog("托盘检测 SecondStoreMove：(MO_09_TopCylinder_Down ，托盘号【" + currMoveTrayNum + "】,直接放盘通过，顶升气缸下降）"); CheckLog("托盘检测 SecondStoreMove：(MO_12_TopCylinder_Down ，托盘号【" + currMoveTrayNum + "】,直接放盘通过，顶升气缸下降）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_06_TopCylinder_Down); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_12_TopCylinder_Down);
CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down); CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
} }
...@@ -607,10 +607,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -607,10 +607,10 @@ namespace OnlineStore.DeviceLibrary
#endregion #endregion
#region 不需要出入库，直接放行 #region 不需要出入库，直接放行
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_06_TopCylinder_Down)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_12_TopCylinder_Down))
{ {
CheckLog("托盘放行 SecondStoreMove：(MO_07_WaitCanGo ，移栽2，需要判断是否可以放盘通过,最多等待10000）"); CheckLog("托盘放行 SecondStoreMove：(MO_13_WaitCanGo ，移栽2，需要判断是否可以放盘通过,最多等待10000）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_07_WaitCanGo); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_13_WaitCanGo);
if (DeviceID.Equals(2)) if (DeviceID.Equals(2))
{ {
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000));
...@@ -619,29 +619,29 @@ namespace OnlineStore.DeviceLibrary ...@@ -619,29 +619,29 @@ namespace OnlineStore.DeviceLibrary
} }
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_07_WaitCanGo)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_13_WaitCanGo))
{ {
CheckLog("托盘放行 SecondStoreMove：(MO_10_StopCylinder2_Down ，阻挡气缸1-2下降）"); CheckLog("托盘放行 SecondStoreMove：(MO_14_StopCylinder2_Down ，阻挡气缸1-2下降）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_10_StopCylinder2_Down); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_StopCylinder2_Down);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH); IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH));
// SecondMoveInfo.EndStepWait(); // SecondMoveInfo.EndStepWait();
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_10_StopCylinder2_Down)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_14_StopCylinder2_Down))
{ {
CheckLog("托盘放行 SecondStoreMove：(MO_11_Tray_Check ， 阻挡2托盘检测=0）, 延时2秒）"); CheckLog("托盘放行 SecondStoreMove：(MO_15_Tray_Check ， 阻挡2托盘检测=0）, 延时2秒）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_11_Tray_Check); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_15_Tray_Check);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.LOW)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.LOW));
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_11_Tray_Check)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_15_Tray_Check))
{ {
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_12_StopCylinder_Back); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_16_StopCylinder_Back);
CheckLog("托盘放行 SecondStoreMove：(MO_12_StopCylinder_Back ， 阻挡气缸1-2上升 ）"); CheckLog("托盘放行 SecondStoreMove：(MO_16_StopCylinder_Back ， 阻挡气缸1-2上升 ）");
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW); IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.LOW)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.LOW));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200));
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_12_StopCylinder_Back)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_16_StopCylinder_Back))
{ {
preTrayNum = currMoveTrayNum; preTrayNum = currMoveTrayNum;
CheckLog("托盘放行 SecondStoreMove：(托盘放行结束） "); CheckLog("托盘放行 SecondStoreMove：(托盘放行结束） ");
......
source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs
...@@ -11,6 +11,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -11,6 +11,19 @@ namespace OnlineStore.DeviceLibrary
partial class ProvidingEquip partial class ProvidingEquip
{ {
#region 托盘检测 #region 托盘检测
protected override bool CheckWaitResult(WaitResultInfo wait)
{
if (wait.WaitType.Equals(WaitEnum.W201_ProvidingCanOut))
{
if (MoveInfo.MoveType.Equals(LineMoveType.None))
{
return true;
}
}
return false;
}
private void StartCheckFixture() private void StartCheckFixture()
{ {
int num = TrayManager.GetNum(DeviceID); int num = TrayManager.GetNum(DeviceID);
...@@ -90,9 +103,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -90,9 +103,6 @@ namespace OnlineStore.DeviceLibrary
{ {
try try
{ {
//判断是否需要顶升
bool isNeed = false;
//此处先对托盘号进行验证 //此处先对托盘号进行验证
currMoveTrayNum = TrayManager.GetNum(DeviceID); currMoveTrayNum = TrayManager.GetNum(DeviceID);
bool isFull = TrayManager.IsFixTureFull(currMoveTrayNum); bool isFull = TrayManager.IsFixTureFull(currMoveTrayNum);
...@@ -101,12 +111,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -101,12 +111,16 @@ namespace OnlineStore.DeviceLibrary
//出料中，需要拦盘 //出料中，需要拦盘
if (CheckIsNeedOutStore()) if (CheckIsNeedOutStore())
{ {
//preTrayNum = currMoveTrayNum; TrayInfo trayInfo = TrayManager.GetTrayInfo(currMoveTrayNum);
SecondMoveInfo.MoveParam = new InOutParam(currMoveTrayNum); InOutParam param = new InOutParam(currMoveTrayNum, trayInfo.WareCode, trayInfo.PosId, trayInfo.PlateH, trayInfo.PlateW);
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_05_CodeRember); CheckLog("托盘检测（流水线阻挡）是需要出库" + param.ToStr() + "：(MIO_05_WaitTime 等待1秒后顶升上升 ）");
SecondMoveInfo.EndStepWait(); SecondMoveInfo.MoveParam = param;
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_05_WaitTime);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitProvidingEquipCanOut());//等待
return; return;
} }
} }
else else
{ {
...@@ -115,29 +129,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -115,29 +129,15 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(msg); LogUtil.error(msg);
return; return;
} }
if (isNeed)
{ LogInfo(SecondMoveInfo.MoveNum + "***************上个托盘号【" + preTrayNum + "】，当前" + (isFull ? "有料托盘" : "空托盘") + "【" + currMoveTrayNum + "】没有出入料任务，放盘通过~");
CheckLog("托盘检测（流水线阻挡）SecondStoreMove：(MIO_05_WaitTime 等待一秒钟）"); // preTrayNum = currMoveTrayNum;
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_05_WaitTime); if (TrayManager.ErrorStoreId.Equals(DeviceID))
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200));
}
else
{ {
LogInfo(SecondMoveInfo.MoveNum + "***************上个托盘号【" + preTrayNum + "】，当前" + (isFull ? "有料托盘" : "空托盘") + "【" + currMoveTrayNum + "】没有出出料任务，放盘通过~"); TrayManager.UpdateTrayNumError(-1, "");
// preTrayNum = currMoveTrayNum;
if (TrayManager.ErrorStoreId.Equals(DeviceID))
{
TrayManager.UpdateTrayNumError(-1, "");
}
CheckLog("托盘放行 SecondStoreMove：(MO_07_WaitCanGo ，移栽2，需要判断是否可以放盘通过,最多等待10000）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_07_WaitCanGo);
//if (DeviceID.Equals(2))
//{
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000));
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitSideWay());
// SecondMoveInfo.OneWaitCanEndStep = true;
//}
} }
CheckLog("托盘放行 SecondStoreMove：(MO_07_WaitCanGo ，移栽2，需要判断是否可以放盘通过,最多等待10000）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_13_WaitCanGo);
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -149,6 +149,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -149,6 +149,10 @@ namespace OnlineStore.DeviceLibrary
CheckLog("托盘检测（流水线阻挡）SecondStoreMove：(MIO_06_TopCylinderUp 顶升气缸上 升 ）"); CheckLog("托盘检测（流水线阻挡）SecondStoreMove：(MIO_06_TopCylinderUp 顶升气缸上 升 ）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_06_TopCylinderUp); SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_06_TopCylinderUp);
CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_UP); CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_UP);
//移栽开始出库
LogInfo("开始新的出库任务~" + SecondMoveInfo.MoveParam.ToStr());
bool result = StartOutStoreMove(SecondMoveInfo.MoveParam);
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_06_TopCylinderUp)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_06_TopCylinderUp))
{ {
...@@ -158,30 +162,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -158,30 +162,10 @@ namespace OnlineStore.DeviceLibrary
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_07_TopCylinderUpWait)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_07_TopCylinderUpWait))
{ {
CheckLog("托盘检测（流水线阻挡）*************** 托盘号【" + currMoveTrayNum + "】"); SecondMoveInfo.MoveParam = new InOutParam(currMoveTrayNum);
LogInfo(SecondMoveInfo.MoveNum + " 托盘号【" + currMoveTrayNum + "】等待移栽料盘");
//托盘号正确 SecondMoveInfo.NextMoveStep(LineMoveStep.MO_11_CodeRember);
//preTrayNum = num; SecondMoveInfo.EndStepWait();
//判断盘是空盘,空盘并且编号正确才需要放料盘过去
if (CheckIsNeedOutStore())
{
SecondMoveInfo.MoveParam = new InOutParam(currMoveTrayNum);
LogInfo(SecondMoveInfo.MoveNum + "*************** 托盘号【" + currMoveTrayNum + "】可以放出料托盘，正在出料中，移栽料盘");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_05_CodeRember);
SecondMoveInfo.EndStepWait();
}
else
{
//preTrayNum = num;
if (TrayManager.ErrorStoreId.Equals(DeviceID))
{
TrayManager.UpdateTrayNumError(-1, "");
}
CheckLog("托盘检测 SecondStoreMove：(MO_09_TopCylinder_Down ，托盘号【" + currMoveTrayNum + "】,直接放盘通过，顶升气缸下降）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_06_TopCylinder_Down);
CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
}
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_08_WaitInStore) && MoveInfo.MoveType.Equals(LineMoveType.None)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_08_WaitInStore) && MoveInfo.MoveType.Equals(LineMoveType.None))
{ {
...@@ -192,43 +176,37 @@ namespace OnlineStore.DeviceLibrary ...@@ -192,43 +176,37 @@ namespace OnlineStore.DeviceLibrary
#endregion #endregion
#region 不需要出出料，直接放行 #region 不需要出出料，直接放行
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_06_TopCylinder_Down)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_12_TopCylinder_Down))
{ {
CheckLog("托盘放行 SecondStoreMove：(MO_07_WaitCanGo ，移栽2，需要判断是否可以放盘通过,最多等待10000）"); CheckLog("托盘放行 SecondStoreMove：(MO_13_WaitCanGo ，移栽2，需要判断是否可以放盘通过,最多等待10000）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_07_WaitCanGo); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_13_WaitCanGo);
//更新横移托盘已处理完成 //更新横移托盘已处理完成
TrayManager.UpdateSWState(Config.SidesWayNum, 1); TrayManager.UpdateSWState(Config.SidesWayNum, 1);
//if (DeviceID.Equals(2))
//{
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000));
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitSideWay());
// SecondMoveInfo.OneWaitCanEndStep = true;
//}
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_07_WaitCanGo)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_13_WaitCanGo))
{ {
CheckLog("托盘放行 SecondStoreMove：(MO_10_StopCylinder2_Down ，阻挡气缸1-2下降）"); CheckLog("托盘放行 SecondStoreMove：(MO_14_StopCylinder2_Down ，阻挡气缸1-2下降）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_10_StopCylinder2_Down); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_StopCylinder2_Down);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH); IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH));
// SecondMoveInfo.EndStepWait(); // SecondMoveInfo.EndStepWait();
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_10_StopCylinder2_Down)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_14_StopCylinder2_Down))
{ {
CheckLog("托盘放行 SecondStoreMove：(MO_11_Tray_Check ， 阻挡2托盘检测=0）, 延时2秒）"); CheckLog("托盘放行 SecondStoreMove：(MO_15_Tray_Check ， 阻挡2托盘检测=0）, 延时2秒）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_11_Tray_Check); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_15_Tray_Check);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.LOW)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.LOW));
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_11_Tray_Check)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_15_Tray_Check))
{ {
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_12_StopCylinder_Back); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_16_StopCylinder_Back);
CheckLog("托盘放行 SecondStoreMove：(MO_12_StopCylinder_Back ， 阻挡气缸1-2上升 ）"); CheckLog("托盘放行 SecondStoreMove：(MO_16_StopCylinder_Back ， 阻挡气缸1-2上升 ）");
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW); IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.LOW)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.LOW));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200));
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_12_StopCylinder_Back)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_16_StopCylinder_Back))
{ {
preTrayNum = currMoveTrayNum; preTrayNum = currMoveTrayNum;
CheckLog("托盘放行 SecondStoreMove：(托盘放行结束） "); CheckLog("托盘放行 SecondStoreMove：(托盘放行结束） ");
...@@ -286,7 +264,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -286,7 +264,7 @@ namespace OnlineStore.DeviceLibrary
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosId : ""; string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosId : "";
if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_01_UpDownCylinderDown)) if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_01_UpDownCylinderDown))
{ {
InStoreLog("出料：(PO_02_UpDownCylinderDownWait, 编码与仓位一致，上下气缸1下降后等待0.3秒再夹紧，防止没有下降到位就夹紧"); InStoreLog("出料：(PO_02_UpDownCylinderDownWait, 上下气缸1下降后等待0.3秒再夹紧");
MoveInfo.NextMoveStep(LineMoveStep.PO_02_UpDownCylinderDownWait); MoveInfo.NextMoveStep(LineMoveStep.PO_02_UpDownCylinderDownWait);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
} }
...@@ -312,10 +290,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -312,10 +290,13 @@ namespace OnlineStore.DeviceLibrary
TrayManager.UpdateFixtureValue(num ); TrayManager.UpdateFixtureValue(num );
//阻挡气缸移动 //阻挡气缸移动
InStoreLog("放托盘（放开阻挡）：SecondStoreMove=MO_09_TopCylinder_Down 物品已移走，顶升气缸1下降）"); InStoreLog("放托盘（放开阻挡）：SecondStoreMove=MO_12_TopCylinder_Down 物品已移走，顶升气缸1下降）");
SecondMoveInfo.NewMove(LineMoveType.CheckFixture); SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_06_TopCylinder_Down); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_12_TopCylinder_Down);
CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down); if (Config.SidesWayNum <= 0)
{
CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
}
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_05_WaitBox)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_05_WaitBox))
{ {
......
source/DeviceLibrary/assemblyLine/TrayManager.cs
...@@ -76,6 +76,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -76,6 +76,18 @@ namespace OnlineStore.DeviceLibrary
} }
return false; return false;
} }
internal static TrayInfo GetTrayInfo(int trayNum)
{
lock (fixtureMapLock)
{
if (fixtureCodeFullMap.ContainsKey(trayNum))
{
return fixtureCodeFullMap[trayNum];
}
}
return null;
}
///// <summary> ///// <summary>
///// 托盘是否可以累积扔盘，判断是出库的托盘，并且所放的托盘为七寸 ///// 托盘是否可以累积扔盘，判断是出库的托盘，并且所放的托盘为七寸
///// </summary> ///// </summary>
......
source/DeviceLibrary/model/StoreMoveInfo.cs
...@@ -170,7 +170,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -170,7 +170,7 @@ namespace OnlineStore.DeviceLibrary
{ {
WaitResultInfo wait = new WaitResultInfo(); WaitResultInfo wait = new WaitResultInfo();
wait.CanWhileMoveCount = 0; wait.CanWhileMoveCount = 0;
wait.WaitType = 2; wait.WaitType = WaitEnum.W002_IOValue;
wait.IoType = ioType; wait.IoType = ioType;
wait.IoValue = ioValue; wait.IoValue = ioValue;
wait.IsEnd = false; wait.IsEnd = false;
...@@ -180,7 +180,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -180,7 +180,7 @@ namespace OnlineStore.DeviceLibrary
{ {
WaitResultInfo wait = new WaitResultInfo(); WaitResultInfo wait = new WaitResultInfo();
wait.CanWhileMoveCount = 0; wait.CanWhileMoveCount = 0;
wait.WaitType = 1; wait.WaitType = WaitEnum.W001_AxisMove;
wait.AxisInfo = axis; wait.AxisInfo = axis;
wait.IsHomeMove = false; wait.IsHomeMove = false;
wait.TargetPosition = targetPosition; wait.TargetPosition = targetPosition;
...@@ -192,7 +192,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -192,7 +192,7 @@ namespace OnlineStore.DeviceLibrary
{ {
WaitResultInfo wait = new WaitResultInfo(); WaitResultInfo wait = new WaitResultInfo();
wait.CanWhileMoveCount = 0; wait.CanWhileMoveCount = 0;
wait.WaitType = 1; wait.WaitType = WaitEnum.W001_AxisMove;
wait.AxisInfo = axis; wait.AxisInfo = axis;
wait.IsHomeMove = true; wait.IsHomeMove = true;
wait.IsEnd = false; wait.IsEnd = false;
...@@ -202,7 +202,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -202,7 +202,7 @@ namespace OnlineStore.DeviceLibrary
{ {
WaitResultInfo wait = new WaitResultInfo(); WaitResultInfo wait = new WaitResultInfo();
wait.CanWhileMoveCount =10; wait.CanWhileMoveCount =10;
wait.WaitType = 4; wait.WaitType = WaitEnum.W004_StellMove;
wait.SlvAddr = slvAddr; wait.SlvAddr = slvAddr;
wait.IsHomeMove = false; wait.IsHomeMove = false;
wait.TargetPosition = targetPosition; wait.TargetPosition = targetPosition;
...@@ -214,7 +214,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -214,7 +214,7 @@ namespace OnlineStore.DeviceLibrary
{ {
WaitResultInfo wait = new WaitResultInfo(); WaitResultInfo wait = new WaitResultInfo();
wait.CanWhileMoveCount = 10; wait.CanWhileMoveCount = 10;
wait.WaitType = 4; wait.WaitType = WaitEnum.W004_StellMove;
wait.SlvAddr = slvAddr; wait.SlvAddr = slvAddr;
wait.IsHomeMove = true; wait.IsHomeMove = true;
wait.TargetPosition = 0; wait.TargetPosition = 0;
...@@ -226,8 +226,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -226,8 +226,8 @@ namespace OnlineStore.DeviceLibrary
{ {
WaitResultInfo wait = new WaitResultInfo(); WaitResultInfo wait = new WaitResultInfo();
wait.CanWhileMoveCount = 0; wait.CanWhileMoveCount = 0;
wait.WaitType = 5; wait.WaitType = WaitEnum.W005_ShuoKe;
wait.SlvAddr =(byte) slvAddr; wait.SlvAddr =(byte) slvAddr;
wait.TargetPosition = targetPosition; wait.TargetPosition = targetPosition;
wait.IsHomeMove = isHome; wait.IsHomeMove = isHome;
return wait; return wait;
...@@ -236,7 +236,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -236,7 +236,7 @@ namespace OnlineStore.DeviceLibrary
{ {
WaitResultInfo wait = new WaitResultInfo(); WaitResultInfo wait = new WaitResultInfo();
wait.CanWhileMoveCount = 0; wait.CanWhileMoveCount = 0;
wait.WaitType = 3; wait.WaitType = WaitEnum.W003_Time;
wait.TimeMSeconds = MScends; wait.TimeMSeconds = MScends;
wait.IsEnd = false; wait.IsEnd = false;
return wait; return wait;
...@@ -245,7 +245,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -245,7 +245,7 @@ namespace OnlineStore.DeviceLibrary
{ {
WaitResultInfo wait = new WaitResultInfo(); WaitResultInfo wait = new WaitResultInfo();
wait.CanWhileMoveCount = 0; wait.CanWhileMoveCount = 0;
wait.WaitType = 6; wait.WaitType = WaitEnum.W006_AxisOrg;
wait.AxisInfo = axis; wait.AxisInfo = axis;
wait.IsHomeMove = true; wait.IsHomeMove = true;
wait.IoValue = value; wait.IoValue = value;
...@@ -256,7 +256,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -256,7 +256,7 @@ namespace OnlineStore.DeviceLibrary
public static WaitResultInfo WaitHeight(int height) public static WaitResultInfo WaitHeight(int height)
{ {
WaitResultInfo wait = new WaitResultInfo(); WaitResultInfo wait = new WaitResultInfo();
wait.WaitType = 7; wait.WaitType = WaitEnum.W007_ReelHeight;
wait.HeightValue = height; wait.HeightValue = height;
wait.IsEnd = false; wait.IsEnd = false;
return wait; return wait;
...@@ -264,24 +264,34 @@ namespace OnlineStore.DeviceLibrary ...@@ -264,24 +264,34 @@ namespace OnlineStore.DeviceLibrary
public static WaitResultInfo WaitCanInstore() public static WaitResultInfo WaitCanInstore()
{ {
WaitResultInfo wait = new WaitResultInfo(); WaitResultInfo wait = new WaitResultInfo();
wait.WaitType = 8; wait.WaitType = WaitEnum.W008_InStoreCheckOK;
return wait; return wait;
} }
public static WaitResultInfo WaitBoxCanReviceTray( ) public static WaitResultInfo WaitBoxCanReviceTray( )
{ {
WaitResultInfo wait = new WaitResultInfo(); WaitResultInfo wait = new WaitResultInfo();
wait.WaitType = 9; wait.WaitType = WaitEnum.W009_BoxCanInstore;
return wait; return wait;
} }
public static WaitResultInfo WaitSideWay() public static WaitResultInfo WaitSideWay()
{ {
WaitResultInfo wait = new WaitResultInfo(); WaitResultInfo wait = new WaitResultInfo();
wait.WaitType = 10; wait.WaitType = WaitEnum.W010_SW34NoTray;
return wait;
}
/// <summary>
/// 等待出料移栽可以开始移栽
/// </summary>
/// <returns></returns>
public static WaitResultInfo WaitProvidingEquipCanOut()
{
WaitResultInfo wait = new WaitResultInfo();
wait.WaitType = WaitEnum.W201_ProvidingCanOut;
return wait; return wait;
} }
public string ToStr() public string ToStr()
{ {
if (WaitType == 1) if (WaitType.Equals(WaitEnum.W001_AxisMove))
{ {
if (IsHomeMove) if (IsHomeMove)
{ {
...@@ -292,38 +302,41 @@ namespace OnlineStore.DeviceLibrary ...@@ -292,38 +302,41 @@ namespace OnlineStore.DeviceLibrary
return "轴【" + AxisInfo.DisplayStr + "】绝对运动，目标位置【" + TargetPosition + "】"; return "轴【" + AxisInfo.DisplayStr + "】绝对运动，目标位置【" + TargetPosition + "】";
} }
} }
else if (WaitType == 2) else if (WaitType.Equals(WaitEnum.W002_IOValue))
{ {
return "等待【" + IoType + "】=【" + IoValue + "】"; return "等待【" + IoType + "】=【" + IoValue + "】";
} }
else if (WaitType == 3) else if (WaitType.Equals(WaitEnum.W003_Time))
{ {
return "时间等待：【" + TimeMSeconds + "】毫秒"; return "时间等待：【" + TimeMSeconds + "】毫秒";
} }
else if (WaitType == 4) else if (WaitType.Equals(WaitEnum.W004_StellMove))
{ {
return "电钢目标位置：【" + TargetPosition + "】 "; return "电钢目标位置：【" + TargetPosition + "】 ";
} }
else if (WaitType == 5) else if (WaitType.Equals(WaitEnum.W005_ShuoKe))
{ {
return "硕科电机目标位置：【" + TargetPosition + "】 "; return "硕科电机目标位置：【" + TargetPosition + "】 ";
} }
else if (WaitType == 6) else if (WaitType.Equals(WaitEnum.W006_AxisOrg))
{ {
return "轴【" + AxisInfo.DisplayStr + "】ORG信号：【" + IoValue + "】 "; return "轴【" + AxisInfo.DisplayStr + "】ORG信号：【" + IoValue + "】 ";
}else if (WaitType == 7) }else if (WaitType.Equals(WaitEnum.W007_ReelHeight))
{ {
return "料盘高度【" + HeightValue + "】 "; return "料盘高度【" + HeightValue + "】 ";
}else if (WaitType == 8) }else if (WaitType.Equals(WaitEnum.W008_InStoreCheckOK))
{ {
return "入库库位验证完成"; return "入库库位验证完成";
} }
else if (WaitType == 9) else if (WaitType.Equals(WaitEnum.W009_BoxCanInstore))
{ {
return "BOX可以开始入库"; return "BOX可以开始入库";
}else if (WaitType == 10) }else if (WaitType.Equals(WaitEnum.W010_SW34NoTray))
{ {
return "等待横移34无托盘"; return "等待横移34无托盘";
}else if (WaitType.Equals(WaitEnum.W201_ProvidingCanOut))
{
return "移栽模块可移栽出库";
} }
else else
{ {
...@@ -382,6 +395,53 @@ namespace OnlineStore.DeviceLibrary ...@@ -382,6 +395,53 @@ namespace OnlineStore.DeviceLibrary
} }
internal class WaitEnum
{
/// <summary>
/// 伺服运动
/// </summary>
internal static int W001_AxisMove = 1;
/// <summary>
/// 信号到达
/// </summary>
internal static int W002_IOValue = 2;
/// <summary>
/// 时间等待
/// </summary>
internal static int W003_Time = 3;
/// <summary>
/// 电钢运动
/// </summary>
internal static int W004_StellMove = 4;
/// <summary>
/// 硕科电机
/// </summary>
internal static int W005_ShuoKe = 5;
/// <summary>
/// 轴原点信号
/// </summary>
internal static int W006_AxisOrg = 6;
/// <summary>
/// 料盘高度
/// </summary>
internal static int W007_ReelHeight = 7;
/// <summary>
/// 入库库位验证完成
/// </summary>
internal static int W008_InStoreCheckOK = 8;
/// <summary>
/// BOX可以开始入库
/// </summary>
internal static int W009_BoxCanInstore = 9;
/// <summary>
/// 等待横移34无托盘
/// </summary>
internal static int W010_SW34NoTray = 10;
/// <summary>
/// 移栽模块可移栽出库
/// </summary>
internal static int W201_ProvidingCanOut = 201;
}
public enum LineMoveType public enum LineMoveType
{ {
/// <summary> /// <summary>
......
source/DeviceLibrary/model/StoreStep.cs
...@@ -234,27 +234,27 @@ namespace OnlineStore.DeviceLibrary ...@@ -234,27 +234,27 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 移载（流水线）装置出库处理， 检测夹具编码并记忆,托盘 是空盘,并且BOX在出库等待中，开始移栽料盘 /// 移载（流水线）装置出库处理， 检测夹具编码并记忆,托盘 是空盘,并且BOX在出库等待中，开始移栽料盘
/// </summary> /// </summary>
MO_05_CodeRember = 3105, MO_11_CodeRember = 3101,
/// <summary> /// <summary>
/// 移载（流水线）装置出库处理 ，顶升气缸1下降 /// 移载（流水线）装置出库处理 ，顶升气缸1下降
/// </summary> /// </summary>
MO_06_TopCylinder_Down = 3106, MO_12_TopCylinder_Down = 3102,
/// <summary> /// <summary>
/// 如果是移栽2需要等待托盘是否可以走 /// 如果是移栽2需要等待托盘是否可以走
/// </summary> /// </summary>
MO_07_WaitCanGo=3107, MO_13_WaitCanGo=3103,
/// <summary> /// <summary>
/// 移载（流水线）装置出库处理， 阻挡气缸1-2下降 /// 移载（流水线）装置出库处理， 阻挡气缸1-2下降
/// </summary> /// </summary>
MO_10_StopCylinder2_Down = 3110, MO_14_StopCylinder2_Down = 3104,
/// <summary> /// <summary>
/// 移载（流水线）装置出库处理， 阻挡2托盘检测=0， /// 移载（流水线）装置出库处理， 阻挡2托盘检测=0，
/// </summary> /// </summary>
MO_11_Tray_Check = 3111, MO_15_Tray_Check = 3105,
/// <summary> /// <summary>
/// 移载（流水线）装置出库处理， 阻挡气缸1-1下降 阻挡气缸1-2上升 /// 移载（流水线）装置出库处理， 阻挡气缸1-1下降 阻挡气缸1-2上升
/// </summary> /// </summary>
MO_12_StopCylinder_Back = 3112, MO_16_StopCylinder_Back = 3106,
/// <summary> /// <summary>
/// 移栽装置出库处理，开始出库 /// 移栽装置出库处理，开始出库
......
source/LoadCVSLibrary/storeConfig/config/DischargeLine_Config.cs
...@@ -28,5 +28,12 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -28,5 +28,12 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("IsDebug")] [ConfigProAttribute("IsDebug")]
public int IsDebug { get; set; } public int IsDebug { get; set; }
/// <summary>
/// PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,Name1#Name1,,,,,
/// </summary>
[ConfigProAttribute("CameraNameList")]
public string CameraNameList { get; set; }
} }
} }
source/LoadCVSLibrary/storeConfig/config/FeedingEquip_Config.cs
...@@ -27,6 +27,12 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -27,6 +27,12 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("IsDebug")] [ConfigProAttribute("IsDebug")]
public int IsDebug { get; set; } public int IsDebug { get; set; }
/// <summary>
/// PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,Name1#Name1,,,,,
/// </summary>
[ConfigProAttribute("CameraNameList")]
public string CameraNameList { get; set; }
/// <summary> /// <summary>
/// PRO,0,对应的横移模块,SidesWayNum,3,,,,, /// PRO,0,对应的横移模块,SidesWayNum,3,,,,,
...@@ -162,6 +168,27 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -162,6 +168,27 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("IsCanOut", false)] [ConfigProAttribute("IsCanOut", false)]
public int IsCanOut { get; set; } public int IsCanOut { get; set; }
private List<string> CameraList = null;
public List<string> GetCameraList()
{
if (CameraList == null)
{
CameraList = new List<string>();
string[] arrayList = CameraNameList.Split('#');
foreach (string str in arrayList)
{
string camera = str.Trim();
if (string.IsNullOrEmpty(camera).Equals(false))
{
CameraList.Add(camera);
}
}
}
return CameraList;
}
private Dictionary<int, int> UpDownPositionMap = null; private Dictionary<int, int> UpDownPositionMap = null;
public int GetUpdownPosition(int trayHeight) public int GetUpdownPosition(int trayHeight)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!