Skip to content

李娜 / AutoCountMachine

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

增加贴标Z轴旋转点P4

1 个父辈 1421e04c
内嵌 并排
正在显示 11 个修改的文件 包含 198 行增加 和 122 行删除
RC1266-AutoCountMachine/source/AutoCountClient/FrmOutputEquip.Designer.cs
......@@ -64,6 +64,7 @@
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.chbPrint = new System.Windows.Forms.CheckBox();
this.btnPrint = new System.Windows.Forms.Button();
this.label6 = new System.Windows.Forms.Label();
this.txtPringNum = new System.Windows.Forms.TextBox();
......@@ -83,6 +84,8 @@
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.groupBox10 = new System.Windows.Forms.GroupBox();
this.btnZP4 = new System.Windows.Forms.Button();
this.txtZP4 = new System.Windows.Forms.TextBox();
this.btnRP3 = new System.Windows.Forms.Button();
this.txtRP3 = new System.Windows.Forms.TextBox();
this.txtRP2 = new System.Windows.Forms.TextBox();
......@@ -142,7 +145,6 @@
this.lblName = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.chbMoveStop = new System.Windows.Forms.CheckBox();
this.chbPrint = new System.Windows.Forms.CheckBox();
this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout();
......@@ -801,6 +803,18 @@
this.groupBox6.TabStop = false;
this.groupBox6.Text = "消息";
//
// chbPrint
//
this.chbPrint.AutoSize = true;
this.chbPrint.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbPrint.Location = new System.Drawing.Point(1062, 25);
this.chbPrint.Name = "chbPrint";
this.chbPrint.Size = new System.Drawing.Size(112, 24);
this.chbPrint.TabIndex = 299;
this.chbPrint.Text = "启用标签打印";
this.chbPrint.UseVisualStyleBackColor = true;
this.chbPrint.CheckedChanged += new System.EventHandler(this.chbPrint_CheckedChanged);
//
// btnPrint
//
this.btnPrint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
......@@ -1035,6 +1049,8 @@
//
// groupBox10
//
this.groupBox10.Controls.Add(this.btnZP4);
this.groupBox10.Controls.Add(this.txtZP4);
this.groupBox10.Controls.Add(this.btnRP3);
this.groupBox10.Controls.Add(this.txtRP3);
this.groupBox10.Controls.Add(this.txtRP2);
......@@ -1059,13 +1075,43 @@
this.groupBox10.Controls.Add(this.btnYP2);
this.groupBox10.Controls.Add(this.btnYP1);
this.groupBox10.Controls.Add(this.txtYP1);
this.groupBox10.Location = new System.Drawing.Point(737, 205);
this.groupBox10.Location = new System.Drawing.Point(737, 183);
this.groupBox10.Name = "groupBox10";
this.groupBox10.Size = new System.Drawing.Size(559, 283);
this.groupBox10.Size = new System.Drawing.Size(559, 307);
this.groupBox10.TabIndex = 322;
this.groupBox10.TabStop = false;
this.groupBox10.Text = "贴标移栽机构 位置配置";
//
// btnZP4
//
this.btnZP4.BackColor = System.Drawing.SystemColors.Control;
this.btnZP4.Cursor = System.Windows.Forms.Cursors.Default;
this.btnZP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnZP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnZP4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
this.btnZP4.Location = new System.Drawing.Point(13, 267);
this.btnZP4.Name = "btnZP4";
this.btnZP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnZP4.Size = new System.Drawing.Size(150, 34);
this.btnZP4.TabIndex = 334;
this.btnZP4.Text = "贴标Z轴-旋转点P4";
this.btnZP4.UseVisualStyleBackColor = true;
this.btnZP4.Click += new System.EventHandler(this.btnZP4_Click);
//
// txtZP4
//
this.txtZP4.BackColor = System.Drawing.SystemColors.Window;
this.txtZP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtZP4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtZP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtZP4.Location = new System.Drawing.Point(168, 271);
this.txtZP4.MaxLength = 12;
this.txtZP4.Name = "txtZP4";
this.txtZP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtZP4.Size = new System.Drawing.Size(87, 26);
this.txtZP4.TabIndex = 333;
this.txtZP4.Text = "-1";
//
// btnRP3
//
this.btnRP3.BackColor = System.Drawing.SystemColors.Control;
......@@ -1073,7 +1119,7 @@
this.btnRP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnRP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRP3.ForeColor = System.Drawing.Color.BlueViolet;
this.btnRP3.Location = new System.Drawing.Point(272, 236);
this.btnRP3.Location = new System.Drawing.Point(272, 248);
this.btnRP3.Name = "btnRP3";
this.btnRP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnRP3.Size = new System.Drawing.Size(150, 34);
......@@ -1088,7 +1134,7 @@
this.txtRP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtRP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtRP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtRP3.Location = new System.Drawing.Point(427, 240);
this.txtRP3.Location = new System.Drawing.Point(427, 252);
this.txtRP3.MaxLength = 12;
this.txtRP3.Name = "txtRP3";
this.txtRP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1102,7 +1148,7 @@
this.txtRP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtRP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtRP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtRP2.Location = new System.Drawing.Point(427, 200);
this.txtRP2.Location = new System.Drawing.Point(427, 212);
this.txtRP2.MaxLength = 12;
this.txtRP2.Name = "txtRP2";
this.txtRP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1117,7 +1163,7 @@
this.btnRP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnRP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRP2.ForeColor = System.Drawing.Color.BlueViolet;
this.btnRP2.Location = new System.Drawing.Point(272, 196);
this.btnRP2.Location = new System.Drawing.Point(272, 208);
this.btnRP2.Name = "btnRP2";
this.btnRP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnRP2.Size = new System.Drawing.Size(150, 34);
......@@ -1133,7 +1179,7 @@
this.btnRP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnRP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRP1.ForeColor = System.Drawing.Color.BlueViolet;
this.btnRP1.Location = new System.Drawing.Point(272, 156);
this.btnRP1.Location = new System.Drawing.Point(272, 168);
this.btnRP1.Name = "btnRP1";
this.btnRP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnRP1.Size = new System.Drawing.Size(150, 34);
......@@ -1148,7 +1194,7 @@
this.txtRP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtRP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtRP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtRP1.Location = new System.Drawing.Point(427, 160);
this.txtRP1.Location = new System.Drawing.Point(427, 172);
this.txtRP1.MaxLength = 12;
this.txtRP1.Name = "txtRP1";
this.txtRP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1163,7 +1209,7 @@
this.btnZP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnZP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnZP3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
this.btnZP3.Location = new System.Drawing.Point(13, 236);
this.btnZP3.Location = new System.Drawing.Point(13, 228);
this.btnZP3.Name = "btnZP3";
this.btnZP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnZP3.Size = new System.Drawing.Size(150, 34);
......@@ -1178,7 +1224,7 @@
this.txtZP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtZP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtZP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtZP3.Location = new System.Drawing.Point(168, 240);
this.txtZP3.Location = new System.Drawing.Point(168, 232);
this.txtZP3.MaxLength = 12;
this.txtZP3.Name = "txtZP3";
this.txtZP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1192,7 +1238,7 @@
this.txtZP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtZP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtZP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtZP2.Location = new System.Drawing.Point(168, 200);
this.txtZP2.Location = new System.Drawing.Point(168, 193);
this.txtZP2.MaxLength = 12;
this.txtZP2.Name = "txtZP2";
this.txtZP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1207,7 +1253,7 @@
this.btnZP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnZP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnZP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
this.btnZP2.Location = new System.Drawing.Point(13, 196);
this.btnZP2.Location = new System.Drawing.Point(13, 189);
this.btnZP2.Name = "btnZP2";
this.btnZP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnZP2.Size = new System.Drawing.Size(150, 34);
......@@ -1223,7 +1269,7 @@
this.btnZP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnZP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnZP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
this.btnZP1.Location = new System.Drawing.Point(13, 156);
this.btnZP1.Location = new System.Drawing.Point(13, 150);
this.btnZP1.Name = "btnZP1";
this.btnZP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnZP1.Size = new System.Drawing.Size(150, 34);
......@@ -1238,7 +1284,7 @@
this.txtZP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtZP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtZP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtZP1.Location = new System.Drawing.Point(168, 160);
this.txtZP1.Location = new System.Drawing.Point(168, 154);
this.txtZP1.MaxLength = 12;
this.txtZP1.Name = "txtZP1";
this.txtZP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1253,7 +1299,7 @@
this.btnXP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnXP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnXP3.ForeColor = System.Drawing.Color.Green;
this.btnXP3.Location = new System.Drawing.Point(13, 107);
this.btnXP3.Location = new System.Drawing.Point(13, 101);
this.btnXP3.Name = "btnXP3";
this.btnXP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnXP3.Size = new System.Drawing.Size(150, 34);
......@@ -1268,7 +1314,7 @@
this.txtXP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtXP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtXP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtXP3.Location = new System.Drawing.Point(168, 111);
this.txtXP3.Location = new System.Drawing.Point(168, 105);
this.txtXP3.MaxLength = 12;
this.txtXP3.Name = "txtXP3";
this.txtXP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1282,7 +1328,7 @@
this.txtXP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtXP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtXP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtXP2.Location = new System.Drawing.Point(168, 71);
this.txtXP2.Location = new System.Drawing.Point(168, 65);
this.txtXP2.MaxLength = 12;
this.txtXP2.Name = "txtXP2";
this.txtXP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1297,7 +1343,7 @@
this.btnXP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnXP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnXP2.ForeColor = System.Drawing.Color.Green;
this.btnXP2.Location = new System.Drawing.Point(13, 67);
this.btnXP2.Location = new System.Drawing.Point(13, 61);
this.btnXP2.Name = "btnXP2";
this.btnXP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnXP2.Size = new System.Drawing.Size(150, 34);
......@@ -1313,7 +1359,7 @@
this.btnXP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnXP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnXP1.ForeColor = System.Drawing.Color.Green;
this.btnXP1.Location = new System.Drawing.Point(13, 27);
this.btnXP1.Location = new System.Drawing.Point(13, 21);
this.btnXP1.Name = "btnXP1";
this.btnXP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnXP1.Size = new System.Drawing.Size(150, 34);
......@@ -1328,7 +1374,7 @@
this.txtXP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtXP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtXP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtXP1.Location = new System.Drawing.Point(168, 31);
this.txtXP1.Location = new System.Drawing.Point(168, 25);
this.txtXP1.MaxLength = 12;
this.txtXP1.Name = "txtXP1";
this.txtXP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1343,7 +1389,7 @@
this.btnYP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnYP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnYP3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnYP3.Location = new System.Drawing.Point(272, 107);
this.btnYP3.Location = new System.Drawing.Point(272, 101);
this.btnYP3.Name = "btnYP3";
this.btnYP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnYP3.Size = new System.Drawing.Size(150, 34);
......@@ -1358,7 +1404,7 @@
this.txtYP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtYP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtYP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtYP3.Location = new System.Drawing.Point(427, 111);
this.txtYP3.Location = new System.Drawing.Point(427, 105);
this.txtYP3.MaxLength = 12;
this.txtYP3.Name = "txtYP3";
this.txtYP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1372,7 +1418,7 @@
this.txtYP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtYP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtYP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtYP2.Location = new System.Drawing.Point(427, 71);
this.txtYP2.Location = new System.Drawing.Point(427, 65);
this.txtYP2.MaxLength = 12;
this.txtYP2.Name = "txtYP2";
this.txtYP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1387,7 +1433,7 @@
this.btnYP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnYP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnYP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnYP2.Location = new System.Drawing.Point(272, 67);
this.btnYP2.Location = new System.Drawing.Point(272, 61);
this.btnYP2.Name = "btnYP2";
this.btnYP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnYP2.Size = new System.Drawing.Size(150, 34);
......@@ -1403,7 +1449,7 @@
this.btnYP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnYP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnYP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnYP1.Location = new System.Drawing.Point(272, 27);
this.btnYP1.Location = new System.Drawing.Point(272, 21);
this.btnYP1.Name = "btnYP1";
this.btnYP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnYP1.Size = new System.Drawing.Size(150, 34);
......@@ -1418,7 +1464,7 @@
this.txtYP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtYP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtYP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtYP1.Location = new System.Drawing.Point(427, 31);
this.txtYP1.Location = new System.Drawing.Point(427, 25);
this.txtYP1.MaxLength = 12;
this.txtYP1.Name = "txtYP1";
this.txtYP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1588,9 +1634,9 @@
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.btnMZP1);
this.groupBox2.Controls.Add(this.txtMZP1);
this.groupBox2.Location = new System.Drawing.Point(737, 9);
this.groupBox2.Location = new System.Drawing.Point(737, 0);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(559, 192);
this.groupBox2.Size = new System.Drawing.Size(559, 181);
this.groupBox2.TabIndex = 219;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "取料移栽机构 位置配置";
......@@ -1602,7 +1648,7 @@
this.btnMXP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMXP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMXP3.ForeColor = System.Drawing.Color.Blue;
this.btnMXP3.Location = new System.Drawing.Point(9, 141);
this.btnMXP3.Location = new System.Drawing.Point(9, 137);
this.btnMXP3.Name = "btnMXP3";
this.btnMXP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMXP3.Size = new System.Drawing.Size(150, 34);
......@@ -1617,7 +1663,7 @@
this.txtMXP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMXP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMXP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMXP3.Location = new System.Drawing.Point(164, 145);
this.txtMXP3.Location = new System.Drawing.Point(164, 141);
this.txtMXP3.MaxLength = 12;
this.txtMXP3.Name = "txtMXP3";
this.txtMXP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1631,7 +1677,7 @@
this.txtMXP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMXP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMXP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMXP2.Location = new System.Drawing.Point(164, 105);
this.txtMXP2.Location = new System.Drawing.Point(164, 101);
this.txtMXP2.MaxLength = 12;
this.txtMXP2.Name = "txtMXP2";
this.txtMXP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1646,7 +1692,7 @@
this.btnMXP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMXP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMXP2.ForeColor = System.Drawing.Color.Blue;
this.btnMXP2.Location = new System.Drawing.Point(9, 101);
this.btnMXP2.Location = new System.Drawing.Point(9, 97);
this.btnMXP2.Name = "btnMXP2";
this.btnMXP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMXP2.Size = new System.Drawing.Size(150, 34);
......@@ -1662,7 +1708,7 @@
this.btnMXP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMXP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMXP1.ForeColor = System.Drawing.Color.Blue;
this.btnMXP1.Location = new System.Drawing.Point(9, 61);
this.btnMXP1.Location = new System.Drawing.Point(9, 57);
this.btnMXP1.Name = "btnMXP1";
this.btnMXP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMXP1.Size = new System.Drawing.Size(150, 34);
......@@ -1677,7 +1723,7 @@
this.txtMXP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMXP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMXP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMXP1.Location = new System.Drawing.Point(164, 65);
this.txtMXP1.Location = new System.Drawing.Point(164, 61);
this.txtMXP1.MaxLength = 12;
this.txtMXP1.Name = "txtMXP1";
this.txtMXP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1721,7 +1767,7 @@
this.btnMZP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMZP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMZP3.ForeColor = System.Drawing.Color.Red;
this.btnMZP3.Location = new System.Drawing.Point(271, 141);
this.btnMZP3.Location = new System.Drawing.Point(271, 137);
this.btnMZP3.Name = "btnMZP3";
this.btnMZP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMZP3.Size = new System.Drawing.Size(165, 34);
......@@ -1736,7 +1782,7 @@
this.txtMZP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMZP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMZP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMZP3.Location = new System.Drawing.Point(441, 145);
this.txtMZP3.Location = new System.Drawing.Point(441, 141);
this.txtMZP3.MaxLength = 12;
this.txtMZP3.Name = "txtMZP3";
this.txtMZP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1750,7 +1796,7 @@
this.txtMZP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMZP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMZP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMZP2.Location = new System.Drawing.Point(441, 105);
this.txtMZP2.Location = new System.Drawing.Point(441, 101);
this.txtMZP2.MaxLength = 12;
this.txtMZP2.Name = "txtMZP2";
this.txtMZP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1765,7 +1811,7 @@
this.btnMZP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMZP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMZP2.ForeColor = System.Drawing.Color.Red;
this.btnMZP2.Location = new System.Drawing.Point(271, 101);
this.btnMZP2.Location = new System.Drawing.Point(271, 97);
this.btnMZP2.Name = "btnMZP2";
this.btnMZP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMZP2.Size = new System.Drawing.Size(165, 34);
......@@ -1804,7 +1850,7 @@
this.btnMZP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMZP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMZP1.ForeColor = System.Drawing.Color.Red;
this.btnMZP1.Location = new System.Drawing.Point(271, 61);
this.btnMZP1.Location = new System.Drawing.Point(271, 57);
this.btnMZP1.Name = "btnMZP1";
this.btnMZP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMZP1.Size = new System.Drawing.Size(165, 34);
......@@ -1819,7 +1865,7 @@
this.txtMZP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMZP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMZP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMZP1.Location = new System.Drawing.Point(441, 65);
this.txtMZP1.Location = new System.Drawing.Point(441, 61);
this.txtMZP1.MaxLength = 12;
this.txtMZP1.Name = "txtMZP1";
this.txtMZP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1925,18 +1971,6 @@
this.chbMoveStop.UseVisualStyleBackColor = true;
this.chbMoveStop.CheckedChanged += new System.EventHandler(this.chbMoveStop_CheckedChanged);
//
// chbPrint
//
this.chbPrint.AutoSize = true;
this.chbPrint.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbPrint.Location = new System.Drawing.Point(1062, 25);
this.chbPrint.Name = "chbPrint";
this.chbPrint.Size = new System.Drawing.Size(112, 24);
this.chbPrint.TabIndex = 299;
this.chbPrint.Text = "启用标签打印";
this.chbPrint.UseVisualStyleBackColor = true;
this.chbPrint.CheckedChanged += new System.EventHandler(this.chbPrint_CheckedChanged);
//
// FrmOutputEquip
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
......@@ -2104,6 +2138,8 @@
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox txtPrintCode;
private System.Windows.Forms.CheckBox chbPrint;
internal System.Windows.Forms.Button btnZP4;
internal System.Windows.Forms.TextBox txtZP4;
}
}
RC1266-AutoCountMachine/source/AutoCountClient/FrmOutputEquip.cs
......@@ -84,6 +84,7 @@ namespace OnlineStore.AutoCountClient
txtZP1.Text = equipBean.Config.LabelZ_P1.ToString();
txtZP2.Text = equipBean.Config.LabelZ_P2.ToString();
txtZP3.Text = equipBean.Config.LabelZ_P3.ToString();
txtZP4.Text = equipBean.Config.LabelZ_P4.ToString();
txtRP1.Text = equipBean.Config.LabelR_P1.ToString();
txtRP2.Text = equipBean.Config.LabelR_P2.ToString();
......@@ -571,9 +572,11 @@ namespace OnlineStore.AutoCountClient
int ZP1 = FormUtil.GetIntValue(txtZP1);
int ZP2 = FormUtil.GetIntValue(txtZP2);
int ZP3 = FormUtil.GetIntValue(txtZP3);
int ZP4 = FormUtil.GetIntValue(txtZP4);
equipBean.Config.LabelZ_P1 = ZP1;
equipBean.Config.LabelZ_P2 = ZP2;
equipBean.Config.LabelZ_P3 = ZP3;
equipBean.Config.LabelZ_P4 = ZP4;
int RP1 = FormUtil.GetIntValue(txtRP1);
int RP2 = FormUtil.GetIntValue(txtRP2);
......@@ -765,6 +768,11 @@ namespace OnlineStore.AutoCountClient
LogUtil.info(equipBean.Name + "用户切换 启用标签打印 =" + isCheck);
}
}
private void btnZP4_Click(object sender, EventArgs e)
{
AxisMove(equipBean.LabelZAxis, txtZP4, equipBean.Config.LabelZ_P4Speed);
}
}
}
......
RC1266-AutoCountMachine/source/AutoCountClient/FrmRobotMain.Designer.cs
......@@ -158,8 +158,8 @@
this.groupBox2.Controls.Add(this.chbBuzzer);
this.groupBox2.Controls.Add(this.chbAGV);
this.groupBox2.Controls.Add(this.chbAutoRun);
this.groupBox2.Controls.Add(this.chkDebug);
this.groupBox2.Controls.Add(this.btnClearLog);
this.groupBox2.Controls.Add(this.chkDebug);
this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox2.Location = new System.Drawing.Point(999, 4);
this.groupBox2.Name = "groupBox2";
......@@ -205,20 +205,23 @@
//
// chkDebug
//
this.chkDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chkDebug.AutoSize = true;
this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkDebug.Location = new System.Drawing.Point(189, 17);
this.chkDebug.Location = new System.Drawing.Point(249, 17);
this.chkDebug.Name = "chkDebug";
this.chkDebug.Size = new System.Drawing.Size(72, 24);
this.chkDebug.TabIndex = 194;
this.chkDebug.Text = "debug";
this.chkDebug.UseVisualStyleBackColor = true;
this.chkDebug.Visible = false;
//
// btnClearLog
//
this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Location = new System.Drawing.Point(189, 62);
this.btnClearLog.Location = new System.Drawing.Point(216, 66);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(105, 35);
this.btnClearLog.TabIndex = 190;
......@@ -323,50 +326,50 @@
// 启动AToolStripMenuItem
//
this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem";
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.启动AToolStripMenuItem.Text = "启动 ";
this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动AToolStripMenuItem_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(114, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(177, 6);
//
// 复位RToolStripMenuItem
//
this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem";
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.复位RToolStripMenuItem.Text = "复位";
this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(114, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6);
//
// 停止TToolStripMenuItem
//
this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem";
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.停止TToolStripMenuItem.Text = "停止";
this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止TToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(114, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6);
//
// 退出ToolStripMenuItem
//
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.退出ToolStripMenuItem.Text = "退出";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(114, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator2.Visible = false;
//
// 设置TToolStripMenuItem
......@@ -384,31 +387,31 @@
// 二维码学习ToolStripMenuItem
//
this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.二维码学习ToolStripMenuItem.Text = "二维码学习";
this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click);
//
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(157, 6);
this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
//
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(160, 26);
this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 26);
this.toolStripMenuItem2.Text = "AGV调试";
this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(157, 6);
this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6);
//
// 标签编辑ToolStripMenuItem
//
this.标签编辑ToolStripMenuItem.Name = "标签编辑ToolStripMenuItem";
this.标签编辑ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.标签编辑ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.标签编辑ToolStripMenuItem.Text = "标签编辑";
this.标签编辑ToolStripMenuItem.Click += new System.EventHandler(this.标签编辑ToolStripMenuItem_Click);
//
......@@ -427,31 +430,31 @@
// 清空日志ToolStripMenuItem
//
this.清空日志ToolStripMenuItem.Name = "清空日志ToolStripMenuItem";
this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.清空日志ToolStripMenuItem.Text = "清空日志";
this.清空日志ToolStripMenuItem.Click += new System.EventHandler(this.清空日志ToolStripMenuItem_Click);
//
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
this.toolStripSeparator10.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator10.Size = new System.Drawing.Size(177, 6);
//
// 复制日志ToolStripMenuItem
//
this.复制日志ToolStripMenuItem.Name = "复制日志ToolStripMenuItem";
this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.复制日志ToolStripMenuItem.Text = "复制日志";
this.复制日志ToolStripMenuItem.Click += new System.EventHandler(this.复制日志ToolStripMenuItem_Click);
//
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator11.Size = new System.Drawing.Size(177, 6);
//
// 版本号ToolStripMenuItem
//
this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem";
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.版本号ToolStripMenuItem.Text = "关于软件";
this.版本号ToolStripMenuItem.Click += new System.EventHandler(this.版本号ToolStripMenuItem_Click);
//
......
RC1266-AutoCountMachine/source/AutoCountClient/记录.txt
......@@ -60,4 +60,12 @@ Stop
设备启动时提示急停未开：改为未初始化完成
添加点料模块代码。。
贴标时，Z轴需要下降到指定的位置之后才能旋转。
\ No newline at end of file
贴标时，Z轴需要下降到指定的位置之后才能旋转。
20200602
增加配置
PRO,0,贴标机构Z轴旋转点P4,LabelZ_P4,2000,,,,,
PRO,0,贴标机构Z轴P4速度,LabelZ_P4Speed,4500,,,,,
\ No newline at end of file
RC1266-AutoCountMachine/source/DeviceLibrary/RobotConfig/Config_InputEquip.csv
......@@ -21,8 +21,8 @@ PRO,0,提升轴P3速度,BatchAxis_P3Speed,1000,,,,,
PRO,0,提升轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,10446,,,,,
,,,,,,,,,
PRO,0,取料升降轴待机点P1,UpdownAxis_P1,72000,,,,,
PRO,0,取料升降轴取料点P2_左侧,UpdownAxis_P2_L,203000,,,,,
PRO,0,取料升降轴取料点P2_右侧,UpdownAxis_P2_R,202000,,,,,
PRO,0,取料升降轴取料点P2_左侧,UpdownAxis_P2_L,200000,,,,,
PRO,0,取料升降轴取料点P2_右侧,UpdownAxis_P2_R,199000,,,,,
PRO,0,取料升降轴XRay入库放料点P3,UpdownAxis_P3,327986,,,,,
PRO,0,取料升降轴工位放料点P4_高,UpdownAxis_P4_H,190969,,,,,
PRO,0,取料升降轴工位放料点P4_低,UpdownAxis_P4_L,515085,,,,,
......
RC1266-AutoCountMachine/source/DeviceLibrary/RobotConfig/Config_OutputEquip.csv
......@@ -16,15 +16,15 @@ PRO,0,出料提升轴P3速度,BatchAxis_P3Speed,1700,,,,,
PRO,0,出料提升轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,10446,,,,,
,,,,,,,,,
PRO,0,取料X轴待机点-P1,MoveX_P1,2001,,,,,
PRO,0,取料X轴-取料点-P2集合,MoveX_P2List,0=15950;8=150000;12=150000;16=150000;24=150000;32=140000;44=120000;56=100000;13=4710;15=1350;11=10120;7=15950,,,,,
PRO,0,取料X轴-取料点-P2集合,MoveX_P2List,0=16000;8=150000;12=150000;16=150000;24=150000;32=140000;44=120000;56=100000;13=5150;15=1750;11=10520;7=16250,,,,,
PRO,0,取料X轴-放料点-P3,MoveX_P3,77300,,,,,
PRO,0,取料X轴P1速度,MoveX_P1Speed,700,,,,,
PRO,0,取料X轴P2速度,MoveX_P2Speed,700,,,,,
PRO,0,取料X轴P3速度,MoveX_P3Speed,700,,,,,
,,,,,,,,,
PRO,0,取料Z轴待机点-P1,MoveZ_P1,2000,,,,,
PRO,0,取料Z轴-取料点-P2集合,MoveZ_P2List,0=448700;8=448700;12=443900;16=440000;24=429900;32=420100;44=409000;56=398620,,,,,
PRO,0,取料Z轴-放料点-P3集合,MoveZ_P3List,0=108750;8=109700;12=100000;16=99000;24=93000;32=89000;44=74000;56=63500,,,,,
PRO,0,取料Z轴-取料点-P2集合,MoveZ_P2List,0=443700;8=443700;12=441900;16=438000;24=427900;32=418100;44=407000;56=397620,,,,,
PRO,0,取料Z轴-放料点-P3集合,MoveZ_P3List,0=100000;8=109700;12=100000;16=99000;24=93000;32=89000;44=74000;56=63500,,,,,
PRO,0,取料Z轴P1速度,MoveZ_P1Speed,4000,,,,,
PRO,0,取料Z轴P2速度,MoveZ_P2Speed,4000,,,,,
PRO,0,取料Z轴P3速度,MoveZ_P3Speed,4000,,,,,
......@@ -46,9 +46,11 @@ PRO,0,贴标机构Y轴P3速度,LabelY_P3Speed,4000,,,,,
PRO,0,贴标机构Z轴待机点-P1,LabelZ_P1,2000,,,,,
PRO,0,贴标机构Z轴取标签点P2,LabelZ_P2,35935,,,,,
PRO,0,贴标机构Z轴贴标点P3,LabelZ_P3,174174,,,,,
PRO,0,贴标机构Z轴旋转点P4,LabelZ_P4,2000,,,,,
PRO,0,贴标机构Z轴P1速度,LabelZ_P1Speed,4500,,,,,
PRO,0,贴标机构Z轴P2速度,LabelZ_P2Speed,4500,,,,,
PRO,0,贴标机构Z轴P3速度,LabelZ_P3Speed,4500,,,,,
PRO,0,贴标机构Z轴P4速度,LabelZ_P4Speed,4500,,,,,
,,,,,,,,,
PRO,0,贴标机构R轴待机点-P1,LabelR_P1,0,,,,,
PRO,0,贴标机构R轴取标签点P2,LabelR_P2,0,,,,,
......
RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip_Partial.cs
......@@ -62,7 +62,7 @@ namespace OnlineStore.DeviceLibrary
return false;
}
if(SecMoveInfo.MoveType.Equals(RobotMoveType.Labelling)&&SecMoveInfo.MoveStep<= StepEnum.OL12_XYToP3)
if(SecMoveInfo.MoveType.Equals(RobotMoveType.Labelling)&&SecMoveInfo.MoveStep<= StepEnum.OL11_XYToP3)
{
LogUtil.error(MoveInfo.Name + "StartWorking 失败 , SecMoveInfo 上个贴标还在等待中 " + SecMoveInfo.MoveType + "_" + SecMoveInfo.MoveStep);
return false;
......@@ -89,7 +89,8 @@ namespace OnlineStore.DeviceLibrary
WorkLog(" 检测到XRay出口料盘[" + reelInfo.ToStr() + "]，准备开始取料");
}
if (MoveInfo.MoveParam.PlateW <= 0 ||
MoveInfo.MoveParam.PlateH <= 0)
MoveInfo.MoveParam.PlateH <= 0 ||
String.IsNullOrEmpty(MoveInfo.MoveParam.WareCode))
{
MoveInfo.MoveParam.IsNgReel = true;
}
......@@ -371,7 +372,7 @@ namespace OnlineStore.DeviceLibrary
//{
SecMoveInfo.NextMoveStep(StepEnum.OL03_PrintLabel);
RobotManager.LastPrintStatus = Asa.PrintLabel.PrinterStatus.Unknown;
SecWorkLog("贴标: 重置状态=Unknown，开始打印标签["+NeedPrint+"] ，贴标XYR轴到取标签点P2, 等待1s");
SecWorkLog("贴标: 重置状态=Unknown，开始打印标签[" + NeedPrint + "] ，贴标XYR轴到取标签点P2, 等待1s");
SecMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
if (NeedPrint)
{
......@@ -427,36 +428,27 @@ namespace OnlineStore.DeviceLibrary
SecMoveInfo.OneWaitCanEndStep = true;
}
else if (SecMoveInfo.IsStep(StepEnum.OL08_Nozzle_Work))
{
// SecMoveInfo.NextMoveStep(StepEnum.OL09_WaitGetLabel);
// SecWorkLog("贴标: 等待吸盘信号到位");
// SecMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Nozzle_Work, IO_VALUE.HIGH));
// SecMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
// SecMoveInfo.OneWaitCanEndStep = true;
//}
//else if (SecMoveInfo.IsStep(StepEnum.OL09_WaitGetLabel))
//{
SecMoveInfo.NextMoveStep(StepEnum.OL10_ZToP1);
{
SecMoveInfo.NextMoveStep(StepEnum.OL09_ZToP1);
SecWorkLog("贴标: Z轴到P1点");
LabelZAxis.AbsMove(SecMoveInfo, Config.LabelZ_P1, Config.LabelZ_P1Speed);
}
else if (SecMoveInfo.IsStep(StepEnum.OL10_ZToP1))
else if (SecMoveInfo.IsStep(StepEnum.OL09_ZToP1))
{
SecMoveInfo.NextMoveStep(StepEnum.OL11_WaitCanLabel);
SecMoveInfo.NextMoveStep(StepEnum.OL10_WaitCanLabel);
SecWorkLog("贴标: 等待取料机构返回待机点并且空闲");
}
else if (SecMoveInfo.IsStep(StepEnum.OL11_WaitCanLabel))
else if (SecMoveInfo.IsStep(StepEnum.OL10_WaitCanLabel))
{
bool canLabel = MoveInfo.MoveType.Equals(RobotMoveType.None) ||
((MoveInfo.MoveType.Equals(RobotMoveType.Working) && MoveInfo.MoveStep <= StepEnum.OT05_GetImage));
bool isTest = ShelfMoveInfo.MoveType.Equals(RobotMoveType.None) && MoveInfo.MoveType.Equals(RobotMoveType.None) && SecMoveInfo.MoveParam.IsTest;
((MoveInfo.MoveType.Equals(RobotMoveType.Working) && MoveInfo.MoveStep <= StepEnum.OT05_GetImage));
bool isTest = ShelfMoveInfo.MoveType.Equals(RobotMoveType.None) && MoveInfo.MoveType.Equals(RobotMoveType.None) && SecMoveInfo.MoveParam.IsTest;
if (canLabel && ShelfMoveInfo.IsStep(StepEnum.OS_25_WaitLabel))
{
SecMoveInfo.NextMoveStep(StepEnum.OL12_XYToP3);
SecMoveInfo.NextMoveStep(StepEnum.OL11_XYToP3);
SecWorkLog("贴标: XY轴移动到P3点");
LabelXAxis.AbsMove(SecMoveInfo, Config.LabelX_P3, Config.LabelX_P3Speed);
......@@ -466,11 +458,17 @@ namespace OnlineStore.DeviceLibrary
else if (SecMoveInfo.IsTimeOut(120))
{
WarnMsg = SecMoveInfo.Name + "[" + SecMoveInfo.MoveStep + "]" + "等待 料盘可贴标(OS_25_WaitLabel) 超时[" + FormUtil.GetSpanStr(SecMoveInfo.StepSpan()) + "]";
LogUtil.error(WarnMsg,SecMoveInfo.ErrorLogType);
LogUtil.error(WarnMsg, SecMoveInfo.ErrorLogType);
Alarm(AlarmType.IoSingleTimeOut);
}
}
else if (SecMoveInfo.IsStep(StepEnum.OL12_XYToP3))
else if (SecMoveInfo.IsStep(StepEnum.OL11_XYToP3))
{
SecMoveInfo.NextMoveStep(StepEnum.OL12_ZToP4);
SecWorkLog("贴标: Z轴先走到旋转点P4");
LabelZAxis.AbsMove(SecMoveInfo, Config.LabelZ_P4, Config.LabelZ_P4Speed);
}
else if (SecMoveInfo.IsStep(StepEnum.OL12_ZToP4))
{
SecMoveInfo.NextMoveStep(StepEnum.OL13_RToP3);
SecWorkLog("贴标: R轴到P3点");
......
RC1266-AutoCountMachine/source/DeviceLibrary/bean/X_RAY_Equip.cs
......@@ -34,7 +34,7 @@ namespace OnlineStore.DeviceLibrary
this.Config = config;
baseConfig = config;
IsDebug = config.IsDebug.Equals(1);
Name = (" " + "XRay" + " ").ToUpper();
Name = (" " + "XRay" + "_Equip ");
Init();
ledProcessTimer.Elapsed += LedProcess;
......
RC1266-AutoCountMachine/source/DeviceLibrary/bean/X_RAY_Equip_Partial.cs
......@@ -138,11 +138,25 @@ namespace OnlineStore.DeviceLibrary
}
else if (MoveInfo.IsStep(StepEnum.XW07_InLineStop))
{
MoveInfo.NextMoveStep(StepEnum.XW08_DoorClose);
WorkLog("料盘处理：左侧门关闭，右侧门关闭，准备开始点料");
CylinderMove(MoveInfo, IO_Type.X_InDoor_Down, IO_Type.X_InDoor_Up);
CylinderMove(MoveInfo, IO_Type.X_OutDoor_Down, IO_Type.X_OutDoor_Up);
if(Work_ReelInfo.PlateH<=0||String.IsNullOrEmpty(Work_ReelInfo.WareCode))
{
Work_ReelInfo.IsNgReel = true;
MoveInfo.MoveParam.SetReelInfo(In_ReelInfo);
}
//判断是否需要点料
if (Work_ReelInfo.IsNgReel)
{
MoveInfo.NextMoveStep(StepEnum.XW21_WaitOutNoReel);
WorkLog("扫描区NG料 [" + Work_ReelInfo.ToStr() + "]，直接放行料盘");
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Out_TrayCheck, IO_VALUE.LOW));
}
else
{
MoveInfo.NextMoveStep(StepEnum.XW08_DoorClose);
WorkLog("料盘处理：左侧门关闭，右侧门关闭，准备开始点料");
CylinderMove(MoveInfo, IO_Type.X_InDoor_Down, IO_Type.X_InDoor_Up);
CylinderMove(MoveInfo, IO_Type.X_OutDoor_Down, IO_Type.X_OutDoor_Up);
}
// MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.X_DoorLimit_Down, IO_VALUE.HIGH));
// MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.X_DoorLimit_Up, IO_VALUE.HIGH));
}
......@@ -187,7 +201,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StepEnum.XW13_GetXRayImage);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(8000));
WorkLog("料盘处理：开始获取X射线图形 ");
WorkLog("点料：开始获取X射线图形 ");
string lastData = DateTime.Now.ToString("yyyy-MM-dd");
ConfigAppSettings.SaveValue(Setting_Init.XRay_Data, lastData);
......@@ -198,7 +212,7 @@ namespace OnlineStore.DeviceLibrary
Bitmap bmp = carerayImage.Get48bImage();
string fileP = Application.StartupPath + @"\XRAY\tif\" + DateTime.Now.ToString("HHmmss") + ".png";
bmp.Save(fileP, System.Drawing.Imaging.ImageFormat.Png);
WorkLog("料盘处理：获取X射线图形，并保存到： " + fileP + "，记录时间"+ lastData + "，停止X射线");
WorkLog("点料：获取X射线图形，并保存到： " + fileP + "，记录时间"+ lastData + "，停止X射线");
GetImageEvent?.Invoke(bmp);
bool result = xRay.Stop();
if (!result)
......@@ -208,14 +222,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.EndStepWait();
}
else if (MoveInfo.IsStep(StepEnum.XW13_GetXRayImage))
{
// MoveInfo.NextMoveStep(StepEnum.XW14_XRayStop);
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
// WorkLog("料盘处理：停止X射线");
// xRay.Stop();
//}
//else if (MoveInfo.IsStep(StepEnum.XW14_XRayStop))
//{
{
MoveInfo.NextMoveStep(StepEnum.XW15_GetResult);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
if (xRay.IsRayOpen)
......@@ -225,7 +232,7 @@ namespace OnlineStore.DeviceLibrary
int count = 99999;
countImage.GetCount(out count);
InXWork = false;
WorkLog("料盘处理：获取点料结果，【" + count + "】,保存并上传结果");
WorkLog("点料：获取点料结果，【" + count + "】,保存并上传结果");
if (Work_ReelInfo.WareCount <= 0)
{
MoveInfo.MoveParam.WareCount = count;
......
RC1266-AutoCountMachine/source/DeviceLibrary/model/MoveStep.cs
......@@ -698,15 +698,19 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 贴标: Z轴到P1点
/// </summary>
OL10_ZToP1,
OL09_ZToP1,
/// <summary>
/// 贴标: 等待取料机构返回待机点并且空闲
/// </summary>
OL11_WaitCanLabel,
OL10_WaitCanLabel,
/// <summary>
/// 贴标: XY轴移动到P3点
/// </summary>
OL12_XYToP3,
OL11_XYToP3,
/// <summary>
/// 贴标: Z轴先走到旋转点P4
/// </summary>
OL12_ZToP4,
/// <summary>
/// 贴标: R轴到P3点
......
RC1266-AutoCountMachine/source/LoadCVSLibrary/storeConfig/config/OutputEquip_Config.cs
......@@ -273,6 +273,16 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("LabelR_P3Speed")]
public int LabelR_P3Speed { get; set; }
/// <summary>
/// PRO,0,贴标机构Z轴旋转点P4,LabelZ_P4,2000,,,,,
/// </summary>
[ConfigProAttribute("LabelZ_P4")]
public int LabelZ_P4 { get; set; }
/// <summary>
/// PRO,0,贴标机构Z轴P4速度,LabelZ_P4Speed,4500,,,,,
/// </summary>
[ConfigProAttribute("LabelZ_P4Speed")]
public int LabelZ_P4Speed { get; set; }
private static string UpdateP(Dictionary<int, int> pMap, int key, int value)
{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!