Skip to content

李娜 / SO664-AssemblyLine

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

接驳台bug修改

1 个父辈 126a4466
内嵌 并排
正在显示 17 个修改的文件 包含 160 行增加 和 117 行删除
source/AssemblyLineClient/FrmLineStore.Designer.cs
...@@ -53,7 +53,8 @@ ...@@ -53,7 +53,8 @@
this.panel2 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.label8 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.lblOpText = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label();
this.lblCID = new System.Windows.Forms.Label(); this.lblCID = new System.Windows.Forms.Label();
...@@ -63,7 +64,8 @@ ...@@ -63,7 +64,8 @@
this.panel3 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.panel4 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel();
this.label9 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
this.lblOpText2 = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label();
this.label12 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label();
...@@ -165,7 +167,7 @@ ...@@ -165,7 +167,7 @@
this.tabControl1.Multiline = true; this.tabControl1.Multiline = true;
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1336, 642); this.tabControl1.Size = new System.Drawing.Size(1336, 674);
this.tabControl1.TabIndex = 0; this.tabControl1.TabIndex = 0;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
// //
...@@ -176,7 +178,7 @@ ...@@ -176,7 +178,7 @@
this.tabPage1.Controls.Add(this.logBox); this.tabPage1.Controls.Add(this.logBox);
this.tabPage1.Location = new System.Drawing.Point(4, 29); this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(1328, 609); this.tabPage1.Size = new System.Drawing.Size(1328, 641);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 运行日志 "; this.tabPage1.Text = " 运行日志 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
...@@ -194,7 +196,7 @@ ...@@ -194,7 +196,7 @@
this.groupBox2.Controls.Add(this.chbRightDis); this.groupBox2.Controls.Add(this.chbRightDis);
this.groupBox2.Location = new System.Drawing.Point(10, 3); this.groupBox2.Location = new System.Drawing.Point(10, 3);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(302, 598); this.groupBox2.Size = new System.Drawing.Size(302, 630);
this.groupBox2.TabIndex = 200; this.groupBox2.TabIndex = 200;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
// //
...@@ -371,7 +373,7 @@ ...@@ -371,7 +373,7 @@
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(318, 3); this.logBox.Location = new System.Drawing.Point(318, 3);
this.logBox.Name = "logBox"; this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(1002, 598); this.logBox.Size = new System.Drawing.Size(1002, 630);
this.logBox.TabIndex = 106; this.logBox.TabIndex = 106;
this.logBox.Text = ""; this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged); this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
...@@ -381,7 +383,7 @@ ...@@ -381,7 +383,7 @@
this.tabPage2.Controls.Add(this.panel2); this.tabPage2.Controls.Add(this.panel2);
this.tabPage2.Location = new System.Drawing.Point(4, 29); this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(1328, 609); this.tabPage2.Size = new System.Drawing.Size(1328, 641);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 进仓移栽 "; this.tabPage2.Text = " 进仓移栽 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
...@@ -392,7 +394,7 @@ ...@@ -392,7 +394,7 @@
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2"; this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(1328, 609); this.panel2.Size = new System.Drawing.Size(1328, 641);
this.panel2.TabIndex = 98; this.panel2.TabIndex = 98;
// //
// tableLayoutPanel1 // tableLayoutPanel1
...@@ -413,39 +415,51 @@ ...@@ -413,39 +415,51 @@
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(1328, 609); this.tableLayoutPanel1.Size = new System.Drawing.Size(1328, 641);
this.tableLayoutPanel1.TabIndex = 10; this.tableLayoutPanel1.TabIndex = 10;
// //
// panel1 // panel1
// //
this.panel1.Controls.Add(this.label8); this.panel1.Controls.Add(this.label3);
this.panel1.Controls.Add(this.lblOpText);
this.panel1.Controls.Add(this.label1); this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.label7); this.panel1.Controls.Add(this.label7);
this.panel1.Controls.Add(this.lblCID); this.panel1.Controls.Add(this.lblCID);
this.panel1.Controls.Add(this.label6); this.panel1.Controls.Add(this.label6);
this.panel1.Controls.Add(this.label5); this.panel1.Controls.Add(this.label5);
this.panel1.Location = new System.Drawing.Point(1063, 487); this.panel1.Location = new System.Drawing.Point(1063, 515);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(262, 119); this.panel1.Size = new System.Drawing.Size(262, 119);
this.panel1.TabIndex = 202; this.panel1.TabIndex = 202;
// //
// label8 // label3
// //
this.label8.BackColor = System.Drawing.Color.White; this.label3.BackColor = System.Drawing.Color.LightGray;
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label8.Location = new System.Drawing.Point(150, 97); this.label3.Location = new System.Drawing.Point(7, 98);
this.label8.Name = "label8"; this.label3.Name = "label3";
this.label8.Size = new System.Drawing.Size(109, 18); this.label3.Size = new System.Drawing.Size(109, 18);
this.label8.TabIndex = 201; this.label3.TabIndex = 202;
this.label8.Text = "双击进入详情界面"; this.label3.Text = "灰色：暂未启用";
//
// lblOpText
//
this.lblOpText.BackColor = System.Drawing.Color.White;
this.lblOpText.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblOpText.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblOpText.Location = new System.Drawing.Point(122, 98);
this.lblOpText.Name = "lblOpText";
this.lblOpText.Size = new System.Drawing.Size(109, 18);
this.lblOpText.TabIndex = 201;
this.lblOpText.Text = "双击进入详情界面";
// //
// label1 // label1
// //
this.label1.BackColor = System.Drawing.Color.LightBlue; this.label1.BackColor = System.Drawing.Color.LightBlue;
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label1.Location = new System.Drawing.Point(7, 4); this.label1.Location = new System.Drawing.Point(7, 3);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(109, 18); this.label1.Size = new System.Drawing.Size(109, 18);
this.label1.TabIndex = 197; this.label1.TabIndex = 197;
...@@ -456,7 +470,7 @@ ...@@ -456,7 +470,7 @@
this.label7.BackColor = System.Drawing.Color.Red; this.label7.BackColor = System.Drawing.Color.Red;
this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.label7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label7.Location = new System.Drawing.Point(7, 84); this.label7.Location = new System.Drawing.Point(7, 79);
this.label7.Name = "label7"; this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(109, 18); this.label7.Size = new System.Drawing.Size(109, 18);
this.label7.TabIndex = 200; this.label7.TabIndex = 200;
...@@ -467,7 +481,7 @@ ...@@ -467,7 +481,7 @@
this.lblCID.BackColor = System.Drawing.Color.Orange; this.lblCID.BackColor = System.Drawing.Color.Orange;
this.lblCID.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblCID.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCID.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblCID.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblCID.Location = new System.Drawing.Point(7, 44); this.lblCID.Location = new System.Drawing.Point(7, 41);
this.lblCID.Name = "lblCID"; this.lblCID.Name = "lblCID";
this.lblCID.Size = new System.Drawing.Size(109, 18); this.lblCID.Size = new System.Drawing.Size(109, 18);
this.lblCID.TabIndex = 95; this.lblCID.TabIndex = 95;
...@@ -478,7 +492,7 @@ ...@@ -478,7 +492,7 @@
this.label6.BackColor = System.Drawing.Color.LightCoral; this.label6.BackColor = System.Drawing.Color.LightCoral;
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label6.Location = new System.Drawing.Point(7, 64); this.label6.Location = new System.Drawing.Point(7, 60);
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(109, 18); this.label6.Size = new System.Drawing.Size(109, 18);
this.label6.TabIndex = 199; this.label6.TabIndex = 199;
...@@ -489,7 +503,7 @@ ...@@ -489,7 +503,7 @@
this.label5.BackColor = System.Drawing.Color.LightGreen; this.label5.BackColor = System.Drawing.Color.LightGreen;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label5.Location = new System.Drawing.Point(7, 24); this.label5.Location = new System.Drawing.Point(7, 22);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(109, 18); this.label5.Size = new System.Drawing.Size(109, 18);
this.label5.TabIndex = 198; this.label5.TabIndex = 198;
...@@ -500,7 +514,7 @@ ...@@ -500,7 +514,7 @@
this.tabPage3.Controls.Add(this.panel3); this.tabPage3.Controls.Add(this.panel3);
this.tabPage3.Location = new System.Drawing.Point(4, 29); this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Name = "tabPage3"; this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(1328, 609); this.tabPage3.Size = new System.Drawing.Size(1328, 641);
this.tabPage3.TabIndex = 2; this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 入料/横移 "; this.tabPage3.Text = " 入料/横移 ";
this.tabPage3.UseVisualStyleBackColor = true; this.tabPage3.UseVisualStyleBackColor = true;
...@@ -511,7 +525,7 @@ ...@@ -511,7 +525,7 @@
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel3.Location = new System.Drawing.Point(0, 0); this.panel3.Location = new System.Drawing.Point(0, 0);
this.panel3.Name = "panel3"; this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(1328, 609); this.panel3.Size = new System.Drawing.Size(1328, 641);
this.panel3.TabIndex = 0; this.panel3.TabIndex = 0;
// //
// tableLayoutPanel2 // tableLayoutPanel2
...@@ -533,32 +547,44 @@ ...@@ -533,32 +547,44 @@
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(1328, 609); this.tableLayoutPanel2.Size = new System.Drawing.Size(1328, 641);
this.tableLayoutPanel2.TabIndex = 11; this.tableLayoutPanel2.TabIndex = 11;
// //
// panel4 // panel4
// //
this.panel4.Controls.Add(this.label9); this.panel4.Controls.Add(this.label4);
this.panel4.Controls.Add(this.lblOpText2);
this.panel4.Controls.Add(this.label10); this.panel4.Controls.Add(this.label10);
this.panel4.Controls.Add(this.label11); this.panel4.Controls.Add(this.label11);
this.panel4.Controls.Add(this.label12); this.panel4.Controls.Add(this.label12);
this.panel4.Controls.Add(this.label13); this.panel4.Controls.Add(this.label13);
this.panel4.Controls.Add(this.label14); this.panel4.Controls.Add(this.label14);
this.panel4.Location = new System.Drawing.Point(1063, 508); this.panel4.Location = new System.Drawing.Point(1063, 533);
this.panel4.Name = "panel4"; this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(262, 98); this.panel4.Size = new System.Drawing.Size(262, 104);
this.panel4.TabIndex = 203; this.panel4.TabIndex = 203;
// //
// label9 // label4
//
this.label4.BackColor = System.Drawing.Color.LightGray;
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label4.Location = new System.Drawing.Point(7, 89);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(109, 17);
this.label4.TabIndex = 203;
this.label4.Text = "灰色：暂未启用";
//
// lblOpText2
// //
this.label9.BackColor = System.Drawing.Color.White; this.lblOpText2.BackColor = System.Drawing.Color.White;
this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblOpText2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblOpText2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label9.Location = new System.Drawing.Point(144, 72); this.lblOpText2.Location = new System.Drawing.Point(122, 86);
this.label9.Name = "label9"; this.lblOpText2.Name = "lblOpText2";
this.label9.Size = new System.Drawing.Size(109, 18); this.lblOpText2.Size = new System.Drawing.Size(109, 18);
this.label9.TabIndex = 201; this.lblOpText2.TabIndex = 201;
this.label9.Text = "双击进入详情界面"; this.lblOpText2.Text = "双击进入详情界面";
// //
// label10 // label10
// //
...@@ -567,7 +593,7 @@ ...@@ -567,7 +593,7 @@
this.label10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.label10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label10.Location = new System.Drawing.Point(7, 4); this.label10.Location = new System.Drawing.Point(7, 4);
this.label10.Name = "label10"; this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(109, 17); this.label10.Size = new System.Drawing.Size(109, 16);
this.label10.TabIndex = 197; this.label10.TabIndex = 197;
this.label10.Text = "蓝色：正常待机中"; this.label10.Text = "蓝色：正常待机中";
// //
...@@ -576,9 +602,9 @@ ...@@ -576,9 +602,9 @@
this.label11.BackColor = System.Drawing.Color.Red; this.label11.BackColor = System.Drawing.Color.Red;
this.label11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.label11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label11.Location = new System.Drawing.Point(7, 76); this.label11.Location = new System.Drawing.Point(7, 72);
this.label11.Name = "label11"; this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(109, 17); this.label11.Size = new System.Drawing.Size(109, 16);
this.label11.TabIndex = 200; this.label11.TabIndex = 200;
this.label11.Text = "红色：严重报警"; this.label11.Text = "红色：严重报警";
// //
...@@ -587,9 +613,9 @@ ...@@ -587,9 +613,9 @@
this.label12.BackColor = System.Drawing.Color.Orange; this.label12.BackColor = System.Drawing.Color.Orange;
this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.label12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label12.Location = new System.Drawing.Point(7, 40); this.label12.Location = new System.Drawing.Point(7, 38);
this.label12.Name = "label12"; this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(109, 17); this.label12.Size = new System.Drawing.Size(109, 16);
this.label12.TabIndex = 95; this.label12.TabIndex = 95;
this.label12.Text = "橘色：复位中"; this.label12.Text = "橘色：复位中";
// //
...@@ -598,9 +624,9 @@ ...@@ -598,9 +624,9 @@
this.label13.BackColor = System.Drawing.Color.LightCoral; this.label13.BackColor = System.Drawing.Color.LightCoral;
this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.label13.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label13.Location = new System.Drawing.Point(7, 58); this.label13.Location = new System.Drawing.Point(7, 55);
this.label13.Name = "label13"; this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(109, 17); this.label13.Size = new System.Drawing.Size(109, 16);
this.label13.TabIndex = 199; this.label13.TabIndex = 199;
this.label13.Text = "珊瑚色：信号超时报警"; this.label13.Text = "珊瑚色：信号超时报警";
// //
...@@ -609,9 +635,9 @@ ...@@ -609,9 +635,9 @@
this.label14.BackColor = System.Drawing.Color.LightGreen; this.label14.BackColor = System.Drawing.Color.LightGreen;
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label14.Location = new System.Drawing.Point(7, 22); this.label14.Location = new System.Drawing.Point(7, 21);
this.label14.Name = "label14"; this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(109, 17); this.label14.Size = new System.Drawing.Size(109, 16);
this.label14.TabIndex = 198; this.label14.TabIndex = 198;
this.label14.Text = "绿色：忙碌中"; this.label14.Text = "绿色：忙碌中";
// //
...@@ -620,7 +646,7 @@ ...@@ -620,7 +646,7 @@
this.tabPage5.Controls.Add(this.panel5); this.tabPage5.Controls.Add(this.panel5);
this.tabPage5.Location = new System.Drawing.Point(4, 29); this.tabPage5.Location = new System.Drawing.Point(4, 29);
this.tabPage5.Name = "tabPage5"; this.tabPage5.Name = "tabPage5";
this.tabPage5.Size = new System.Drawing.Size(1328, 609); this.tabPage5.Size = new System.Drawing.Size(1328, 641);
this.tabPage5.TabIndex = 4; this.tabPage5.TabIndex = 4;
this.tabPage5.Text = "设备位置示意图"; this.tabPage5.Text = "设备位置示意图";
this.tabPage5.UseVisualStyleBackColor = true; this.tabPage5.UseVisualStyleBackColor = true;
...@@ -633,7 +659,7 @@ ...@@ -633,7 +659,7 @@
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel5.Location = new System.Drawing.Point(0, 0); this.panel5.Location = new System.Drawing.Point(0, 0);
this.panel5.Name = "panel5"; this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(1328, 609); this.panel5.Size = new System.Drawing.Size(1328, 641);
this.panel5.TabIndex = 108; this.panel5.TabIndex = 108;
// //
// picLine // picLine
...@@ -641,7 +667,7 @@ ...@@ -641,7 +667,7 @@
this.picLine.Dock = System.Windows.Forms.DockStyle.Fill; this.picLine.Dock = System.Windows.Forms.DockStyle.Fill;
this.picLine.Location = new System.Drawing.Point(0, 0); this.picLine.Location = new System.Drawing.Point(0, 0);
this.picLine.Name = "picLine"; this.picLine.Name = "picLine";
this.picLine.Size = new System.Drawing.Size(1328, 609); this.picLine.Size = new System.Drawing.Size(1328, 641);
this.picLine.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.picLine.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picLine.TabIndex = 107; this.picLine.TabIndex = 107;
this.picLine.TabStop = false; this.picLine.TabStop = false;
...@@ -731,54 +757,54 @@ ...@@ -731,54 +757,54 @@
// toolStripSeparator1 // toolStripSeparator1
// //
this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator1.Size = new System.Drawing.Size(114, 6);
// //
// 启动AToolStripMenuItem // 启动AToolStripMenuItem
// //
this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem"; this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem";
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.启动AToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.启动AToolStripMenuItem.Text = "启动 "; this.启动AToolStripMenuItem.Text = "启动 ";
this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click); this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click);
// //
// toolStripSeparator4 // toolStripSeparator4
// //
this.toolStripSeparator4.Name = "toolStripSeparator4"; this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator4.Size = new System.Drawing.Size(114, 6);
// //
// 复位RToolStripMenuItem // 复位RToolStripMenuItem
// //
this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem"; this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem";
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.复位RToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.复位RToolStripMenuItem.Text = "复位"; this.复位RToolStripMenuItem.Text = "复位";
this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click); this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click);
// //
// toolStripSeparator3 // toolStripSeparator3
// //
this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator3.Size = new System.Drawing.Size(114, 6);
// //
// 停止TToolStripMenuItem // 停止TToolStripMenuItem
// //
this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem"; this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem";
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.停止TToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.停止TToolStripMenuItem.Text = "停止"; this.停止TToolStripMenuItem.Text = "停止";
this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click); this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click);
// //
// toolStripSeparator5 // toolStripSeparator5
// //
this.toolStripSeparator5.Name = "toolStripSeparator5"; this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator5.Size = new System.Drawing.Size(114, 6);
// //
// toolStripSeparator2 // toolStripSeparator2
// //
this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator2.Size = new System.Drawing.Size(114, 6);
this.toolStripSeparator2.Visible = false; this.toolStripSeparator2.Visible = false;
// //
// 退出ToolStripMenuItem // 退出ToolStripMenuItem
// //
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem"; this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.退出ToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.退出ToolStripMenuItem.Text = "退出"; this.退出ToolStripMenuItem.Text = "退出";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1); this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1);
// //
...@@ -1085,7 +1111,7 @@ ...@@ -1085,7 +1111,7 @@
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.White; this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1350, 729); this.ClientSize = new System.Drawing.Size(1350, 761);
this.Controls.Add(this.tabControl1); this.Controls.Add(this.tabControl1);
this.Controls.Add(this.lblStatus); this.Controls.Add(this.lblStatus);
this.Controls.Add(this.lblWarnMsg); this.Controls.Add(this.lblWarnMsg);
...@@ -1207,11 +1233,11 @@ ...@@ -1207,11 +1233,11 @@
private System.Windows.Forms.Label lblCID; private System.Windows.Forms.Label lblCID;
private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label8; private System.Windows.Forms.Label lblOpText;
private System.Windows.Forms.ToolStripMenuItem toolName; private System.Windows.Forms.ToolStripMenuItem toolName;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator23; private System.Windows.Forms.ToolStripSeparator toolStripSeparator23;
private System.Windows.Forms.Panel panel4; private System.Windows.Forms.Panel panel4;
private System.Windows.Forms.Label label9; private System.Windows.Forms.Label lblOpText2;
private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label10;
private System.Windows.Forms.Label label11; private System.Windows.Forms.Label label11;
private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label12;
...@@ -1231,6 +1257,8 @@ ...@@ -1231,6 +1257,8 @@
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label2;
private System.Windows.Forms.CheckBox chbDisMove; private System.Windows.Forms.CheckBox chbDisMove;
private System.Windows.Forms.CheckBox chbDisHy; private System.Windows.Forms.CheckBox chbDisHy;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4;
} }
} }
source/AssemblyLineClient/FrmLineStore.cs
...@@ -118,6 +118,11 @@ namespace OnlineStore.AssemblyLine ...@@ -118,6 +118,11 @@ namespace OnlineStore.AssemblyLine
{ {
cmbBoxIndex.SelectedIndex = 0; cmbBoxIndex.SelectedIndex = 0;
} }
string opStr = "双击进入详情界面";
lblOpText.Text = opStr;
lblOpText2.Text = opStr;
LogUtil.logBox = this.logBox; LogUtil.logBox = this.logBox;
lastLogTime = DateTime.Now.AddMinutes(-10); lastLogTime = DateTime.Now.AddMinutes(-10);
this.Opacity = 100; this.Opacity = 100;
......
source/AssemblyLineClient/useControl/EquipControl.Designer.cs
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.lblBox = new System.Windows.Forms.Label(); this.lblBox = new System.Windows.Forms.Label();
this.panName = new System.Windows.Forms.Panel(); this.panName = new System.Windows.Forms.Panel();
this.lblWarn = new System.Windows.Forms.Label();
this.panName.SuspendLayout(); this.panName.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -128,7 +129,7 @@ ...@@ -128,7 +129,7 @@
this.lblBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblBox.ForeColor = System.Drawing.Color.Black; this.lblBox.ForeColor = System.Drawing.Color.Black;
this.lblBox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblBox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblBox.Location = new System.Drawing.Point(2, 73); this.lblBox.Location = new System.Drawing.Point(2, 94);
this.lblBox.Name = "lblBox"; this.lblBox.Name = "lblBox";
this.lblBox.Size = new System.Drawing.Size(245, 24); this.lblBox.Size = new System.Drawing.Size(245, 24);
this.lblBox.TabIndex = 6; this.lblBox.TabIndex = 6;
...@@ -151,6 +152,20 @@ ...@@ -151,6 +152,20 @@
this.panName.DoubleClick += new System.EventHandler(this.panName_DoubleClick); this.panName.DoubleClick += new System.EventHandler(this.panName_DoubleClick);
this.panName.MouseEnter += new System.EventHandler(this.panName_MouseEnter); this.panName.MouseEnter += new System.EventHandler(this.panName_MouseEnter);
// //
// lblWarn
//
this.lblWarn.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.lblWarn.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarn.ForeColor = System.Drawing.Color.Red;
this.lblWarn.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
this.lblWarn.Location = new System.Drawing.Point(3, 72);
this.lblWarn.Name = "lblWarn";
this.lblWarn.Size = new System.Drawing.Size(242, 45);
this.lblWarn.TabIndex = 8;
this.lblWarn.Text = "暂无报警";
//
// EquipControl // EquipControl
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
...@@ -162,8 +177,9 @@ ...@@ -162,8 +177,9 @@
this.Controls.Add(this.lblMoveInfo); this.Controls.Add(this.lblMoveInfo);
this.Controls.Add(this.lblStatus); this.Controls.Add(this.lblStatus);
this.Controls.Add(this.lblTrayNum); this.Controls.Add(this.lblTrayNum);
this.Controls.Add(this.lblWarn);
this.Name = "EquipControl"; this.Name = "EquipControl";
this.Size = new System.Drawing.Size(250, 100); this.Size = new System.Drawing.Size(250, 121);
this.Load += new System.EventHandler(this.EquipControl_Load); this.Load += new System.EventHandler(this.EquipControl_Load);
this.panName.ResumeLayout(false); this.panName.ResumeLayout(false);
this.panName.PerformLayout(); this.panName.PerformLayout();
...@@ -182,5 +198,6 @@ ...@@ -182,5 +198,6 @@
private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.ToolTip toolTip1;
private System.Windows.Forms.Label lblBox; private System.Windows.Forms.Label lblBox;
private System.Windows.Forms.Panel panName; private System.Windows.Forms.Panel panName;
private System.Windows.Forms.Label lblWarn;
} }
} }
source/AssemblyLineClient/useControl/EquipControl.cs
...@@ -82,6 +82,7 @@ namespace OnlineStore.AssemblyLine ...@@ -82,6 +82,7 @@ namespace OnlineStore.AssemblyLine
lblStatus.Text = equip.GetRunStr(); lblStatus.Text = equip.GetRunStr();
toolTip1.ToolTipTitle = ""+equip.Name+"：双击进入"; toolTip1.ToolTipTitle = ""+equip.Name+"：双击进入";
lblDebug.Text = "启用：" + (equip.IsDebug ? "✘" : "✔"); lblDebug.Text = "启用：" + (equip.IsDebug ? "✘" : "✔");
lblWarn.Text = equip.WarnMsg;
if (equip.DeviceID < 100) if (equip.DeviceID < 100)
{ {
if (equip.MoveInfo.MoveType.Equals(LineMoveType.InStore)) if (equip.MoveInfo.MoveType.Equals(LineMoveType.InStore))
...@@ -92,7 +93,7 @@ namespace OnlineStore.AssemblyLine ...@@ -92,7 +93,7 @@ namespace OnlineStore.AssemblyLine
{ {
lblMoveInfo.Text = "出库中：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode; lblMoveInfo.Text = "出库中：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode;
} }
else if (equip.SecondMoveInfo.MoveType.Equals(LineMoveType.CheckFixture)) else if (equip.SecondMoveInfo.MoveType.Equals(LineMoveType.Fixture))
{ {
lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]处理中"; lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]处理中";
} }
...@@ -138,7 +139,7 @@ namespace OnlineStore.AssemblyLine ...@@ -138,7 +139,7 @@ namespace OnlineStore.AssemblyLine
{ {
lblMoveInfo.Text = "料架"+equip.CurrShelfId+"，出库：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode; lblMoveInfo.Text = "料架"+equip.CurrShelfId+"，出库：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode;
} }
else if (equip.SecondMoveInfo.MoveType.Equals(LineMoveType.CheckFixture)) else if (equip.SecondMoveInfo.MoveType.Equals(LineMoveType.Fixture))
{ {
lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]处理中"; lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]处理中";
} }
...@@ -153,11 +154,11 @@ namespace OnlineStore.AssemblyLine ...@@ -153,11 +154,11 @@ namespace OnlineStore.AssemblyLine
{ {
lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]送料：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode; lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]送料：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode;
} }
else if (equip.MoveInfo.MoveType.Equals(LineMoveType.CheckFixture)) else if (equip.MoveInfo.MoveType.Equals(LineMoveType.Fixture))
{ {
lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]处理中"; lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]处理中";
} }
else if (equip.SecondMoveInfo.MoveType.Equals(LineMoveType.CheckFixture)) else if (equip.SecondMoveInfo.MoveType.Equals(LineMoveType.Fixture))
{ {
lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]处理中"; lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]处理中";
} }
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -139,7 +139,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -139,7 +139,7 @@ namespace OnlineStore.DeviceLibrary
return; return;
} }
if (SecondMoveInfo.MoveType.Equals(LineMoveType.CheckFixture)) if (SecondMoveInfo.MoveType.Equals(LineMoveType.Fixture))
{ {
FixtureProcess(); FixtureProcess();
} }
...@@ -151,7 +151,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -151,7 +151,7 @@ namespace OnlineStore.DeviceLibrary
{ {
OutStoreProcess(); OutStoreProcess();
} }
else if (MoveInfo.MoveType.Equals(LineMoveType.ReturnHome)) else if (MoveInfo.MoveType.Equals(LineMoveType.RHome))
{ {
ResetProcess(); ResetProcess();
} }
...@@ -551,7 +551,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -551,7 +551,7 @@ namespace OnlineStore.DeviceLibrary
{ {
//托盘卡的信号不报警，只提示 //托盘卡的信号不报警，只提示
// [_进仓_14-SMove] [CheckFixture] [MO_17_Stop2Check] 等待[X462 - 进仓14阻挡2托盘检测 - StopCylinder_Check2 = LOW] 超时[181.7]秒 // [_进仓_14-SMove] [CheckFixture] [MO_17_Stop2Check] 等待[X462 - 进仓14阻挡2托盘检测 - StopCylinder_Check2 = LOW] 超时[181.7]秒
if (moveInfo.MoveType.Equals(LineMoveType.CheckFixture) && if (moveInfo.MoveType.Equals(LineMoveType.Fixture) &&
(moveInfo.IsStep(LineMoveStep.MIO_00_Stop1Down) || (moveInfo.IsStep(LineMoveStep.MIO_00_Stop1Down) ||
moveInfo.IsStep(LineMoveStep.MIO_01_TrayCheck) || moveInfo.IsStep(LineMoveStep.MIO_01_TrayCheck) ||
moveInfo.IsStep(LineMoveStep.MO_17_Stop2Check))) moveInfo.IsStep(LineMoveStep.MO_17_Stop2Check)))
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
...@@ -63,7 +63,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -63,7 +63,7 @@ namespace OnlineStore.DeviceLibrary
runStatus = LineRunStatus.HomeMoving; runStatus = LineRunStatus.HomeMoving;
LogInfo("开始原点返回： "); LogInfo("开始原点返回： ");
MoveInfo.NewMove(LineMoveType.ReturnHome); MoveInfo.NewMove(LineMoveType.RHome);
StartReset(); StartReset();
......
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs
...@@ -34,7 +34,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -34,7 +34,7 @@ namespace OnlineStore.DeviceLibrary
mainTimer.Enabled = false; mainTimer.Enabled = false;
MoveInfo.EndMove(); MoveInfo.EndMove();
runStatus = LineRunStatus.HomeMoving; runStatus = LineRunStatus.HomeMoving;
MoveInfo.NewMove(LineMoveType.ReturnHome); MoveInfo.NewMove(LineMoveType.RHome);
StartReset(); StartReset();
if (isDebug) if (isDebug)
{ {
...@@ -168,7 +168,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -168,7 +168,7 @@ namespace OnlineStore.DeviceLibrary
{ {
CheckStopWatch(trayCheck2LowWait, 30000, false); CheckStopWatch(trayCheck2LowWait, 30000, false);
} }
if (MoveInfo.MoveType.Equals(LineMoveType.ReturnHome) || MoveInfo.MoveType.Equals(LineMoveType.Reset)) if (MoveInfo.MoveType.Equals(LineMoveType.RHome) || MoveInfo.MoveType.Equals(LineMoveType.Reset))
{ {
ResetProcess(); ResetProcess();
} }
...@@ -203,7 +203,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -203,7 +203,7 @@ namespace OnlineStore.DeviceLibrary
if (CheckStopWatch(trayCheckWait, TrayWaitTime, true)) if (CheckStopWatch(trayCheckWait, TrayWaitTime, true))
{ {
//托盘在工位阻挡处 //托盘在工位阻挡处
MoveInfo.NewMove(LineMoveType.CheckFixture); MoveInfo.NewMove(LineMoveType.Fixture);
runStatus = LineRunStatus.Busy; runStatus = LineRunStatus.Busy;
MoveInfo.NextMoveStep(LineMoveStep.HY03_FrontStopUp); MoveInfo.NextMoveStep(LineMoveStep.HY03_FrontStopUp);
LogInfo("检测托盘，" + MoveInfo.SLog + " ，阻挡上升"); LogInfo("检测托盘，" + MoveInfo.SLog + " ，阻挡上升");
...@@ -225,7 +225,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -225,7 +225,7 @@ namespace OnlineStore.DeviceLibrary
//托盘在前阻挡处 //托盘在前阻挡处
trayCheckWait.Stop(); trayCheckWait.Stop();
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
MoveInfo.NewMove(LineMoveType.CheckFixture); MoveInfo.NewMove(LineMoveType.Fixture);
runStatus = LineRunStatus.Busy; runStatus = LineRunStatus.Busy;
MoveInfo.NextMoveStep(LineMoveStep.HY02_FrontStopDown); MoveInfo.NextMoveStep(LineMoveStep.HY02_FrontStopDown);
LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到前阻挡托盘 ，前阻挡下降，清理托盘RFID，顶升气缸下降"); LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到前阻挡托盘 ，前阻挡下降，清理托盘RFID，顶升气缸下降");
...@@ -246,7 +246,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -246,7 +246,7 @@ namespace OnlineStore.DeviceLibrary
//托盘在前阻挡处 //托盘在前阻挡处
trayCheckWait.Stop(); trayCheckWait.Stop();
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
MoveInfo.NewMove(LineMoveType.CheckFixture); MoveInfo.NewMove(LineMoveType.Fixture);
runStatus = LineRunStatus.Busy; runStatus = LineRunStatus.Busy;
MoveInfo.NextMoveStep(LineMoveStep.HY71_OL_Wait); MoveInfo.NextMoveStep(LineMoveStep.HY71_OL_Wait);
LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到出料线托盘 "); LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到出料线托盘 ");
...@@ -398,7 +398,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -398,7 +398,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready); MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready);
CheckLog("托盘横移" + MoveInfo.SLog + " ，等待" + hyout.Name + " 准备完成(顶升上升，定位下降) "); CheckLog("托盘横移" + MoveInfo.SLog + " ，等待" + hyout.Name + " 准备完成(顶升上升，定位下降) ");
hyout.MoveInfo.NewMove(LineMoveType.CheckFixture); hyout.MoveInfo.NewMove(LineMoveType.Fixture);
hyout.runStatus = LineRunStatus.Busy; hyout.runStatus = LineRunStatus.Busy;
hyout.MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree); hyout.MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree);
ClearTimeoutAlarm("等待" + hyout.Name + "可以横移超时"); ClearTimeoutAlarm("等待" + hyout.Name + "可以横移超时");
......
source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs
...@@ -32,7 +32,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -32,7 +32,7 @@ namespace OnlineStore.DeviceLibrary
mainTimer.Enabled = false; mainTimer.Enabled = false;
MoveInfo.EndMove(); MoveInfo.EndMove();
runStatus = LineRunStatus.HomeMoving; runStatus = LineRunStatus.HomeMoving;
MoveInfo.NewMove(LineMoveType.ReturnHome); MoveInfo.NewMove(LineMoveType.RHome);
StartReset(); StartReset();
if (isDebug) if (isDebug)
{ {
...@@ -164,7 +164,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -164,7 +164,7 @@ namespace OnlineStore.DeviceLibrary
{ {
CheckStopWatch(trayCheck2LowWait, 30000, false); CheckStopWatch(trayCheck2LowWait, 30000, false);
} }
if (MoveInfo.MoveType.Equals(LineMoveType.ReturnHome) || MoveInfo.MoveType.Equals(LineMoveType.Reset)) if (MoveInfo.MoveType.Equals(LineMoveType.RHome) || MoveInfo.MoveType.Equals(LineMoveType.Reset))
{ {
ResetProcess(); ResetProcess();
} }
...@@ -198,7 +198,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -198,7 +198,7 @@ namespace OnlineStore.DeviceLibrary
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
if (CheckStopWatch(trayCheckWait, TrayWaitTime, true)) if (CheckStopWatch(trayCheckWait, TrayWaitTime, true))
{ {
MoveInfo.NewMove(LineMoveType.CheckFixture); MoveInfo.NewMove(LineMoveType.Fixture);
runStatus = LineRunStatus.Busy; runStatus = LineRunStatus.Busy;
if (Config.IsSideWayIn) if (Config.IsSideWayIn)
{ {
...@@ -231,7 +231,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -231,7 +231,7 @@ namespace OnlineStore.DeviceLibrary
trayCheckWait.Stop(); trayCheckWait.Stop();
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
//托盘在第一个阻挡处 //托盘在第一个阻挡处
MoveInfo.NewMove(LineMoveType.CheckFixture); MoveInfo.NewMove(LineMoveType.Fixture);
runStatus = LineRunStatus.Busy; runStatus = LineRunStatus.Busy;
MoveInfo.NextMoveStep(LineMoveStep.HY02_FrontStopDown); MoveInfo.NextMoveStep(LineMoveStep.HY02_FrontStopDown);
LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到前阻挡托盘检测，前阻挡下降，清理托盘RFID"); LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到前阻挡托盘检测，前阻挡下降，清理托盘RFID");
...@@ -367,7 +367,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -367,7 +367,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready); MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready);
CheckLog("托盘横移" + MoveInfo.SLog + " ，等待"+ hyOut.Name + "准备完成(顶升上升，定位下降) "); CheckLog("托盘横移" + MoveInfo.SLog + " ，等待"+ hyOut.Name + "准备完成(顶升上升，定位下降) ");
hyOut.MoveInfo.NewMove(LineMoveType.CheckFixture); hyOut.MoveInfo.NewMove(LineMoveType.Fixture);
hyOut.MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree); hyOut.MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree);
ClearTimeoutAlarm("等待"+ hyOut .Name+ "可以横移超时"); ClearTimeoutAlarm("等待"+ hyOut .Name+ "可以横移超时");
} }
...@@ -587,14 +587,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -587,14 +587,14 @@ namespace OnlineStore.DeviceLibrary
{ {
if (Config.IsSideWayIn) if (Config.IsSideWayIn)
{ {
if (MoveInfo.MoveType.Equals(LineMoveType.CheckFixture) && MoveInfo.IsStep(LineMoveStep.HY08_SL_WaitProcessReel)) if (MoveInfo.MoveType.Equals(LineMoveType.Fixture) && MoveInfo.IsStep(LineMoveStep.HY08_SL_WaitProcessReel))
{ {
return true; return true;
} }
} }
else else
{ {
if (MoveInfo.MoveType.Equals(LineMoveType.CheckFixture) && MoveInfo.IsStep(LineMoveStep.HY59_SL_WaitProcessReel)) if (MoveInfo.MoveType.Equals(LineMoveType.Fixture) && MoveInfo.IsStep(LineMoveStep.HY59_SL_WaitProcessReel))
{ {
return true; return true;
} }
......
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor.cs
...@@ -46,7 +46,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -46,7 +46,7 @@ namespace OnlineStore.DeviceLibrary
mainTimer.Enabled = false; mainTimer.Enabled = false;
MoveInfo.EndMove(); MoveInfo.EndMove();
runStatus = LineRunStatus.HomeMoving; runStatus = LineRunStatus.HomeMoving;
MoveInfo.NewMove(LineMoveType.ReturnHome); MoveInfo.NewMove(LineMoveType.RHome);
StartReset(); StartReset();
if (isDebug) if (isDebug)
{ {
...@@ -173,7 +173,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -173,7 +173,7 @@ namespace OnlineStore.DeviceLibrary
} }
IOTimeOutProcess(); IOTimeOutProcess();
BusyMoveProcess(); BusyMoveProcess();
if (MoveInfo.MoveType.Equals(LineMoveType.None) && (!MoveStop)) if (SecondMoveInfo.MoveType.Equals(LineMoveType.None) && (!MoveStop))
{ {
if (LineManager.Line.OutHyCanProLine()) if (LineManager.Line.OutHyCanProLine())
{ {
...@@ -181,9 +181,5 @@ namespace OnlineStore.DeviceLibrary ...@@ -181,9 +181,5 @@ namespace OnlineStore.DeviceLibrary
} }
} }
} }
} }
} }
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs
...@@ -45,7 +45,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -45,7 +45,7 @@ namespace OnlineStore.DeviceLibrary
trayCheckLowWait.Stop(); trayCheckLowWait.Stop();
if (canpro && CheckStopWatch(trayCheckWait, TrayWaitTime, true)) if (canpro && CheckStopWatch(trayCheckWait, TrayWaitTime, true))
{ {
SecondMoveInfo.NewMove(LineMoveType.CheckFixture); SecondMoveInfo.NewMove(LineMoveType.Fixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_05_TrayCheck); SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_05_TrayCheck);
CheckLog("接驳台托盘" + SecondMoveInfo.SLog + "前阻挡上升，等待托盘到位 "); CheckLog("接驳台托盘" + SecondMoveInfo.SLog + "前阻挡上升，等待托盘到位 ");
...@@ -64,7 +64,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -64,7 +64,7 @@ namespace OnlineStore.DeviceLibrary
trayCheckWait.Stop(); trayCheckWait.Stop();
trayCheckLowWait.Stop(); trayCheckLowWait.Stop();
//托盘在第一个阻挡处 //托盘在第一个阻挡处
SecondMoveInfo.NewMove(LineMoveType.CheckFixture); SecondMoveInfo.NewMove(LineMoveType.Fixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_01_TrayCheck); SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_01_TrayCheck);
CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：前阻挡检测到托盘"); CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：前阻挡检测到托盘");
ClearTrayRFID(); ClearTrayRFID();
...@@ -228,9 +228,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -228,9 +228,9 @@ namespace OnlineStore.DeviceLibrary
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
} }
else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_14_TopDown)) else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_13_TrayLeave))
{ {
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_11_TopDown); SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_14_TopDown);
CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：顶升气缸下降"); CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：顶升气缸下降");
CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down); CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
} }
......
source/DeviceLibrary/assemblyLine/HY/HY_OutLine.cs
...@@ -27,7 +27,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -27,7 +27,7 @@ namespace OnlineStore.DeviceLibrary
mainTimer.Enabled = false; mainTimer.Enabled = false;
MoveInfo.EndMove(); MoveInfo.EndMove();
runStatus = LineRunStatus.HomeMoving; runStatus = LineRunStatus.HomeMoving;
MoveInfo.NewMove(LineMoveType.ReturnHome); MoveInfo.NewMove(LineMoveType.RHome);
StartReset(); StartReset();
if (isDebug) if (isDebug)
{ {
...@@ -131,7 +131,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -131,7 +131,7 @@ namespace OnlineStore.DeviceLibrary
{ {
CheckStopWatch(trayCheck2LowWait, 30000, false); CheckStopWatch(trayCheck2LowWait, 30000, false);
} }
if (MoveInfo.MoveType.Equals(LineMoveType.ReturnHome) || MoveInfo.MoveType.Equals(LineMoveType.Reset)) if (MoveInfo.MoveType.Equals(LineMoveType.RHome) || MoveInfo.MoveType.Equals(LineMoveType.Reset))
{ {
ResetProcess(); ResetProcess();
} }
...@@ -177,7 +177,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -177,7 +177,7 @@ namespace OnlineStore.DeviceLibrary
//托盘在前阻挡处 //托盘在前阻挡处
trayCheckWait.Stop(); trayCheckWait.Stop();
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
MoveInfo.NewMove(LineMoveType.CheckFixture); MoveInfo.NewMove(LineMoveType.Fixture);
MoveInfo.NextMoveStep(LineMoveStep.OHY01_LongLCheck); MoveInfo.NextMoveStep(LineMoveStep.OHY01_LongLCheck);
LogInfo(" 出料线横移(长线)：" + MoveInfo.SLog + "，长线阻挡检测到托盘"); LogInfo(" 出料线横移(长线)：" + MoveInfo.SLog + "，长线阻挡检测到托盘");
ClearTrayRFID(); ClearTrayRFID();
...@@ -192,7 +192,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -192,7 +192,7 @@ namespace OnlineStore.DeviceLibrary
//托盘在前阻挡处 //托盘在前阻挡处
trayCheckWait.Stop(); trayCheckWait.Stop();
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
MoveInfo.NewMove(LineMoveType.CheckFixture); MoveInfo.NewMove(LineMoveType.Fixture);
MoveInfo.NextMoveStep(LineMoveStep.OHY11_ShortLCheck); MoveInfo.NextMoveStep(LineMoveStep.OHY11_ShortLCheck);
LogInfo(" 出料线横移(长线)：" + MoveInfo.SLog + "，短线阻挡检测到托盘"); LogInfo(" 出料线横移(长线)：" + MoveInfo.SLog + "，短线阻挡检测到托盘");
ClearTrayRFID(); ClearTrayRFID();
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
...@@ -299,7 +299,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -299,7 +299,7 @@ namespace OnlineStore.DeviceLibrary
{ {
//如果移栽已拦截到自己入库的托盘，不能出库 //如果移栽已拦截到自己入库的托盘，不能出库
if(move.SecondMoveInfo.MoveType.Equals(LineMoveType.CheckFixture)&& if(move.SecondMoveInfo.MoveType.Equals(LineMoveType.Fixture)&&
move.SecondMoveInfo.MoveStep>=LineMoveStep.MIO_05_WaitTime && move.SecondMoveInfo.MoveStep>=LineMoveStep.MIO_05_WaitTime &&
move.SecondMoveInfo.MoveStep<= LineMoveStep.MO_14_TopDown move.SecondMoveInfo.MoveStep<= LineMoveStep.MO_14_TopDown
) )
......
source/DeviceLibrary/assemblyLine/LineBean_T3-C1.cs
...@@ -93,7 +93,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -93,7 +93,7 @@ namespace OnlineStore.DeviceLibrary
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
if ( CheckStopWatch(trayCheckWait, TrayWaitTime, true)) if ( CheckStopWatch(trayCheckWait, TrayWaitTime, true))
{ {
T3C1_MoveInfo.NewMove(LineMoveType.CheckFixture); T3C1_MoveInfo.NewMove(LineMoveType.Fixture);
T3C1_MoveInfo.NextMoveStep(LineMoveStep.MIO_03_StopUp); T3C1_MoveInfo.NextMoveStep(LineMoveStep.MIO_03_StopUp);
T3C1_Log("检测到阻挡托盘，" + T3C1_MoveInfo.SLog + " ，前阻挡上升，阻挡上升"); T3C1_Log("检测到阻挡托盘，" + T3C1_MoveInfo.SLog + " ，前阻挡上升，阻挡上升");
...@@ -114,7 +114,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -114,7 +114,7 @@ namespace OnlineStore.DeviceLibrary
trayCheckWait.Stop(); trayCheckWait.Stop();
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
//托盘在第一个阻挡处 //托盘在第一个阻挡处
T3C1_MoveInfo.NewMove(LineMoveType.CheckFixture); T3C1_MoveInfo.NewMove(LineMoveType.Fixture);
T3C1_MoveInfo.NextMoveStep(LineMoveStep.MIO_00_Stop1Down); T3C1_MoveInfo.NextMoveStep(LineMoveStep.MIO_00_Stop1Down);
T3C1_Log(" 托盘检测：" + T3C1_MoveInfo.SLog + "，检测到HY_FrontStopCheck，前阻挡下降 ， 等待 HY_FrontStopCheck=0，清理托盘RFID"); T3C1_Log(" 托盘检测：" + T3C1_MoveInfo.SLog + "，检测到HY_FrontStopCheck，前阻挡下降 ， 等待 HY_FrontStopCheck=0，清理托盘RFID");
T3C1_TrayNum = 0; T3C1_TrayNum = 0;
...@@ -304,7 +304,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -304,7 +304,7 @@ namespace OnlineStore.DeviceLibrary
internal bool T3C1TrayIsReady() internal bool T3C1TrayIsReady()
{ {
if (T3C1_MoveInfo.MoveType.Equals(LineMoveType.CheckFixture) && T3C1_MoveInfo.IsStep(LineMoveStep.MO_11_CodeRember)) if (T3C1_MoveInfo.MoveType.Equals(LineMoveType.Fixture) && T3C1_MoveInfo.IsStep(LineMoveStep.MO_11_CodeRember))
{ {
return true; return true;
} }
......
source/DeviceLibrary/assemblyLine/MoveEquip.cs
...@@ -75,7 +75,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -75,7 +75,7 @@ namespace OnlineStore.DeviceLibrary
SecondMoveInfo.EndMove(); SecondMoveInfo.EndMove();
runStatus = LineRunStatus.HomeMoving; runStatus = LineRunStatus.HomeMoving;
LogInfo("开始 原点返回： 升降轴回原点，阻挡气缸上升 "); LogInfo("开始 原点返回： 升降轴回原点，阻挡气缸上升 ");
MoveInfo.NewMove(LineMoveType.ReturnHome); MoveInfo.NewMove(LineMoveType.RHome);
StartReset(); StartReset();
if (isDebug) if (isDebug)
{ {
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -201,7 +201,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -201,7 +201,7 @@ namespace OnlineStore.DeviceLibrary
// 减去需要的盘数 // 减去需要的盘数
// TrayManager.DelNeedEmptyTrayNum(); // TrayManager.DelNeedEmptyTrayNum();
OutLog("出库 ：移栽完成，放行托盘"); OutLog("出库 ：移栽完成，放行托盘");
SecondMoveInfo.NewMove(LineMoveType.CheckFixture); SecondMoveInfo.NewMove(LineMoveType.Fixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_TopDown); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_TopDown);
CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down); CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down);
...@@ -647,7 +647,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -647,7 +647,7 @@ namespace OnlineStore.DeviceLibrary
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
if (canpro && CheckStopWatch(trayCheckWait, TrayWaitTime, true)) if (canpro && CheckStopWatch(trayCheckWait, TrayWaitTime, true))
{ {
SecondMoveInfo.NewMove(LineMoveType.CheckFixture); SecondMoveInfo.NewMove(LineMoveType.Fixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_03_StopUp); SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_03_StopUp);
CheckLog("托盘阻挡" + SecondMoveInfo.SLog + " 阻挡气缸1-1上升）"); CheckLog("托盘阻挡" + SecondMoveInfo.SLog + " 阻挡气缸1-1上升）");
...@@ -665,7 +665,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -665,7 +665,7 @@ namespace OnlineStore.DeviceLibrary
trayCheckWait.Stop(); trayCheckWait.Stop();
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
//托盘在第一个阻挡处 //托盘在第一个阻挡处
SecondMoveInfo.NewMove(LineMoveType.CheckFixture); SecondMoveInfo.NewMove(LineMoveType.Fixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_00_Stop1Down); SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_00_Stop1Down);
CheckLog(" 托盘检测：料盘检测StopCylinder_Check1 " + SecondMoveInfo.SLog + "阻挡气缸1-1下降 ， 等待 StopCylinder_Check1=0，清理托盘RFID"); CheckLog(" 托盘检测：料盘检测StopCylinder_Check1 " + SecondMoveInfo.SLog + "阻挡气缸1-1下降 ， 等待 StopCylinder_Check1=0，清理托盘RFID");
ClearTrayRFID(); ClearTrayRFID();
...@@ -923,7 +923,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -923,7 +923,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (DeviceID.Equals(5)) if (DeviceID.Equals(5))
{ {
if (SecondMoveInfo.MoveType.Equals(LineMoveType.CheckFixture) && SecondMoveInfo.MoveStep <= LineMoveStep.MIO_04_Wait) if (SecondMoveInfo.MoveType.Equals(LineMoveType.Fixture) && SecondMoveInfo.MoveStep <= LineMoveStep.MIO_04_Wait)
{ {
UpdateTrayNum(); UpdateTrayNum();
LogUtil.info(Name + " EndProcessTray ,结束当前托盘[" + currTrayNum + "]处理【" + SecondMoveInfo.MoveType + "】【" + SecondMoveInfo.MoveStep + "】 "); LogUtil.info(Name + " EndProcessTray ,结束当前托盘[" + currTrayNum + "]处理【" + SecondMoveInfo.MoveType + "】【" + SecondMoveInfo.MoveStep + "】 ");
......
source/DeviceLibrary/model/KTK_Store.cs
...@@ -101,7 +101,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -101,7 +101,7 @@ namespace OnlineStore.DeviceLibrary
OutStoreProcess(); OutStoreProcess();
isInPro = false; isInPro = false;
break; break;
case LineMoveType.ReturnHome: case LineMoveType.RHome:
ResetProcess(); ResetProcess();
isInPro = false; isInPro = false;
break; break;
...@@ -488,10 +488,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -488,10 +488,6 @@ namespace OnlineStore.DeviceLibrary
} }
public void IOMove(string IoType, IO_VALUE value, int msTime = 0) public void IOMove(string IoType, IO_VALUE value, int msTime = 0)
{ {
if (baseConfig.DType.Equals(DeviceType.HYEquip))
{
//需要判断是否包含此DO
}
if (msTime <= 0) if (msTime <= 0)
{ {
IOManager.IOMove(IoType, value, baseConfig.Id); IOManager.IOMove(IoType, value, baseConfig.Id);
......
source/DeviceLibrary/model/LineMoveInfo.cs
...@@ -542,7 +542,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -542,7 +542,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 原点返回 /// 原点返回
/// </summary> /// </summary>
ReturnHome = 3, RHome = 3,
/// <summary> /// <summary>
/// 重置 /// 重置
/// </summary> /// </summary>
...@@ -550,6 +550,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -550,6 +550,6 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 夹具检测处理 /// 夹具检测处理
/// </summary> /// </summary>
CheckFixture = 5, Fixture = 5,
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!