Skip to content

孙克 / RC1250-ACPackingStore

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

日志修改

1 个父辈 f720347f
内嵌 并排
正在显示 5 个修改的文件 包含 78 行增加 和 82 行删除
source/ACPackingStore/FrmBox.Designer.cs
...@@ -169,9 +169,9 @@ ...@@ -169,9 +169,9 @@
this.groupShelf.Controls.Add(this.btnUpdownP102); this.groupShelf.Controls.Add(this.btnUpdownP102);
this.groupShelf.Controls.Add(this.cmbShelfPosition); this.groupShelf.Controls.Add(this.cmbShelfPosition);
this.groupShelf.Enabled = false; this.groupShelf.Enabled = false;
this.groupShelf.Location = new System.Drawing.Point(743, 8); this.groupShelf.Location = new System.Drawing.Point(754, 18);
this.groupShelf.Name = "groupShelf"; this.groupShelf.Name = "groupShelf";
this.groupShelf.Size = new System.Drawing.Size(226, 293); this.groupShelf.Size = new System.Drawing.Size(226, 276);
this.groupShelf.TabIndex = 274; this.groupShelf.TabIndex = 274;
this.groupShelf.TabStop = false; this.groupShelf.TabStop = false;
this.groupShelf.Text = "料架位置"; this.groupShelf.Text = "料架位置";
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
this.btnSaveShelf.BackColor = System.Drawing.SystemColors.Control; this.btnSaveShelf.BackColor = System.Drawing.SystemColors.Control;
this.btnSaveShelf.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSaveShelf.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveShelf.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSaveShelf.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSaveShelf.Location = new System.Drawing.Point(113, 236); this.btnSaveShelf.Location = new System.Drawing.Point(113, 229);
this.btnSaveShelf.Name = "btnSaveShelf"; this.btnSaveShelf.Name = "btnSaveShelf";
this.btnSaveShelf.Size = new System.Drawing.Size(105, 38); this.btnSaveShelf.Size = new System.Drawing.Size(105, 38);
this.btnSaveShelf.TabIndex = 282; this.btnSaveShelf.TabIndex = 282;
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
this.label13.Cursor = System.Windows.Forms.Cursors.Default; this.label13.Cursor = System.Windows.Forms.Cursors.Default;
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.ForeColor = System.Drawing.SystemColors.ControlText; this.label13.ForeColor = System.Drawing.SystemColors.ControlText;
this.label13.Location = new System.Drawing.Point(7, 40); this.label13.Location = new System.Drawing.Point(7, 33);
this.label13.Name = "label13"; this.label13.Name = "label13";
this.label13.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label13.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label13.Size = new System.Drawing.Size(59, 17); this.label13.Size = new System.Drawing.Size(59, 17);
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
this.txtInoutP101.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtInoutP101.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInoutP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtInoutP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInoutP101.ForeColor = System.Drawing.SystemColors.WindowText; this.txtInoutP101.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInoutP101.Location = new System.Drawing.Point(129, 199); this.txtInoutP101.Location = new System.Drawing.Point(129, 192);
this.txtInoutP101.MaxLength = 0; this.txtInoutP101.MaxLength = 0;
this.txtInoutP101.Name = "txtInoutP101"; this.txtInoutP101.Name = "txtInoutP101";
this.txtInoutP101.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInoutP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
this.btnInoutP101.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnInoutP101.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInoutP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInoutP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInoutP101.ForeColor = System.Drawing.Color.Green; this.btnInoutP101.ForeColor = System.Drawing.Color.Green;
this.btnInoutP101.Location = new System.Drawing.Point(6, 194); this.btnInoutP101.Location = new System.Drawing.Point(6, 187);
this.btnInoutP101.Name = "btnInoutP101"; this.btnInoutP101.Name = "btnInoutP101";
this.btnInoutP101.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInoutP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInoutP101.Size = new System.Drawing.Size(118, 33); this.btnInoutP101.Size = new System.Drawing.Size(118, 33);
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
this.txtMP101.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtMP101.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMP101.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMP101.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMP101.Location = new System.Drawing.Point(129, 162); this.txtMP101.Location = new System.Drawing.Point(129, 155);
this.txtMP101.MaxLength = 0; this.txtMP101.MaxLength = 0;
this.txtMP101.Name = "txtMP101"; this.txtMP101.Name = "txtMP101";
this.txtMP101.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
this.button5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.button5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.button5.Location = new System.Drawing.Point(6, 157); this.button5.Location = new System.Drawing.Point(6, 150);
this.button5.Name = "button5"; this.button5.Name = "button5";
this.button5.RightToLeft = System.Windows.Forms.RightToLeft.No; this.button5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.button5.Size = new System.Drawing.Size(118, 33); this.button5.Size = new System.Drawing.Size(118, 33);
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
this.txtUpdownP101.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP101.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP101.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP101.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP101.Location = new System.Drawing.Point(129, 86); this.txtUpdownP101.Location = new System.Drawing.Point(129, 79);
this.txtUpdownP101.MaxLength = 0; this.txtUpdownP101.MaxLength = 0;
this.txtUpdownP101.Name = "txtUpdownP101"; this.txtUpdownP101.Name = "txtUpdownP101";
this.txtUpdownP101.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
this.txtUpdownP102.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP102.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP102.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP102.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP102.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP102.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP102.Location = new System.Drawing.Point(129, 124); this.txtUpdownP102.Location = new System.Drawing.Point(129, 117);
this.txtUpdownP102.MaxLength = 0; this.txtUpdownP102.MaxLength = 0;
this.txtUpdownP102.Name = "txtUpdownP102"; this.txtUpdownP102.Name = "txtUpdownP102";
this.txtUpdownP102.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP102.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
this.btnUpdownP101.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpdownP101.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdownP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP101.ForeColor = System.Drawing.Color.Red; this.btnUpdownP101.ForeColor = System.Drawing.Color.Red;
this.btnUpdownP101.Location = new System.Drawing.Point(6, 81); this.btnUpdownP101.Location = new System.Drawing.Point(6, 74);
this.btnUpdownP101.Name = "btnUpdownP101"; this.btnUpdownP101.Name = "btnUpdownP101";
this.btnUpdownP101.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP101.Size = new System.Drawing.Size(118, 33); this.btnUpdownP101.Size = new System.Drawing.Size(118, 33);
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
this.btnUpdownP102.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpdownP102.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdownP102.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP102.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP102.ForeColor = System.Drawing.Color.Red; this.btnUpdownP102.ForeColor = System.Drawing.Color.Red;
this.btnUpdownP102.Location = new System.Drawing.Point(6, 119); this.btnUpdownP102.Location = new System.Drawing.Point(6, 112);
this.btnUpdownP102.Name = "btnUpdownP102"; this.btnUpdownP102.Name = "btnUpdownP102";
this.btnUpdownP102.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP102.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP102.Size = new System.Drawing.Size(118, 33); this.btnUpdownP102.Size = new System.Drawing.Size(118, 33);
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
this.cmbShelfPosition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbShelfPosition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbShelfPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbShelfPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbShelfPosition.FormattingEnabled = true; this.cmbShelfPosition.FormattingEnabled = true;
this.cmbShelfPosition.Location = new System.Drawing.Point(72, 34); this.cmbShelfPosition.Location = new System.Drawing.Point(72, 27);
this.cmbShelfPosition.Name = "cmbShelfPosition"; this.cmbShelfPosition.Name = "cmbShelfPosition";
this.cmbShelfPosition.Size = new System.Drawing.Size(146, 28); this.cmbShelfPosition.Size = new System.Drawing.Size(146, 28);
this.cmbShelfPosition.TabIndex = 272; this.cmbShelfPosition.TabIndex = 272;
...@@ -488,7 +488,6 @@ ...@@ -488,7 +488,6 @@
// tabPage4 // tabPage4
// //
this.tabPage4.Controls.Add(this.groupInout); this.tabPage4.Controls.Add(this.groupInout);
this.tabPage4.Controls.Add(this.groupBox1);
this.tabPage4.Controls.Add(this.groupBox3); this.tabPage4.Controls.Add(this.groupBox3);
this.tabPage4.Location = new System.Drawing.Point(4, 29); this.tabPage4.Location = new System.Drawing.Point(4, 29);
this.tabPage4.Name = "tabPage4"; this.tabPage4.Name = "tabPage4";
...@@ -501,6 +500,7 @@ ...@@ -501,6 +500,7 @@
// //
this.groupInout.Controls.Add(this.lblSize); this.groupInout.Controls.Add(this.lblSize);
this.groupInout.Controls.Add(this.txtUpdownP11); this.groupInout.Controls.Add(this.txtUpdownP11);
this.groupInout.Controls.Add(this.groupBox1);
this.groupInout.Controls.Add(this.txtUpdownP12); this.groupInout.Controls.Add(this.txtUpdownP12);
this.groupInout.Controls.Add(this.txtInoutP11); this.groupInout.Controls.Add(this.txtInoutP11);
this.groupInout.Controls.Add(this.btnInoutP11); this.groupInout.Controls.Add(this.btnInoutP11);
...@@ -546,9 +546,9 @@ ...@@ -546,9 +546,9 @@
this.groupInout.Controls.Add(this.btnUpDownP3); this.groupInout.Controls.Add(this.btnUpDownP3);
this.groupInout.Controls.Add(this.btnUpDownP4); this.groupInout.Controls.Add(this.btnUpDownP4);
this.groupInout.Enabled = false; this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(12, 114); this.groupInout.Location = new System.Drawing.Point(12, 127);
this.groupInout.Name = "groupInout"; this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(988, 370); this.groupInout.Size = new System.Drawing.Size(1282, 353);
this.groupInout.TabIndex = 100; this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false; this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作"; this.groupInout.Text = "料仓操作";
...@@ -1277,9 +1277,9 @@ ...@@ -1277,9 +1277,9 @@
this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Enabled = false; this.groupBox1.Enabled = false;
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(1006, 114); this.groupBox1.Location = new System.Drawing.Point(986, 18);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(283, 370); this.groupBox1.Size = new System.Drawing.Size(283, 329);
this.groupBox1.TabIndex = 1; this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "压紧轴位置配置"; this.groupBox1.Text = "压紧轴位置配置";
...@@ -1384,7 +1384,7 @@ ...@@ -1384,7 +1384,7 @@
this.btnSaveCom.BackColor = System.Drawing.SystemColors.Control; this.btnSaveCom.BackColor = System.Drawing.SystemColors.Control;
this.btnSaveCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSaveCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveCom.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSaveCom.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSaveCom.Location = new System.Drawing.Point(81, 313); this.btnSaveCom.Location = new System.Drawing.Point(80, 282);
this.btnSaveCom.Name = "btnSaveCom"; this.btnSaveCom.Name = "btnSaveCom";
this.btnSaveCom.Size = new System.Drawing.Size(105, 38); this.btnSaveCom.Size = new System.Drawing.Size(105, 38);
this.btnSaveCom.TabIndex = 256; this.btnSaveCom.TabIndex = 256;
...@@ -1399,7 +1399,7 @@ ...@@ -1399,7 +1399,7 @@
this.txtComMax.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComMax.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComMax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComMax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComMax.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComMax.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMax.Location = new System.Drawing.Point(195, 216); this.txtComMax.Location = new System.Drawing.Point(194, 194);
this.txtComMax.MaxLength = 12; this.txtComMax.MaxLength = 12;
this.txtComMax.Name = "txtComMax"; this.txtComMax.Name = "txtComMax";
this.txtComMax.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComMax.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1413,7 +1413,7 @@ ...@@ -1413,7 +1413,7 @@
this.label47.Cursor = System.Windows.Forms.Cursors.Default; this.label47.Cursor = System.Windows.Forms.Cursors.Default;
this.label47.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label47.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label47.ForeColor = System.Drawing.SystemColors.ControlText; this.label47.ForeColor = System.Drawing.SystemColors.ControlText;
this.label47.Location = new System.Drawing.Point(180, 219); this.label47.Location = new System.Drawing.Point(179, 197);
this.label47.Name = "label47"; this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(13, 17); this.label47.Size = new System.Drawing.Size(13, 17);
...@@ -1427,7 +1427,7 @@ ...@@ -1427,7 +1427,7 @@
this.txtComMin.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComMin.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComMin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComMin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComMin.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComMin.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMin.Location = new System.Drawing.Point(96, 216); this.txtComMin.Location = new System.Drawing.Point(95, 194);
this.txtComMin.MaxLength = 12; this.txtComMin.MaxLength = 12;
this.txtComMin.Name = "txtComMin"; this.txtComMin.Name = "txtComMin";
this.txtComMin.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComMin.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1441,7 +1441,7 @@ ...@@ -1441,7 +1441,7 @@
this.label48.Cursor = System.Windows.Forms.Cursors.Default; this.label48.Cursor = System.Windows.Forms.Cursors.Default;
this.label48.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label48.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label48.ForeColor = System.Drawing.SystemColors.ControlText; this.label48.ForeColor = System.Drawing.SystemColors.ControlText;
this.label48.Location = new System.Drawing.Point(11, 219); this.label48.Location = new System.Drawing.Point(10, 197);
this.label48.Name = "label48"; this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(83, 17); this.label48.Size = new System.Drawing.Size(83, 17);
...@@ -1458,7 +1458,7 @@ ...@@ -1458,7 +1458,7 @@
this.btnCMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCMove.ForeColor = System.Drawing.Color.Purple; this.btnCMove.ForeColor = System.Drawing.Color.Purple;
this.btnCMove.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnCMove.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnCMove.Location = new System.Drawing.Point(80, 264); this.btnCMove.Location = new System.Drawing.Point(79, 233);
this.btnCMove.Name = "btnCMove"; this.btnCMove.Name = "btnCMove";
this.btnCMove.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnCMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnCMove.Size = new System.Drawing.Size(197, 33); this.btnCMove.Size = new System.Drawing.Size(197, 33);
...@@ -1473,7 +1473,7 @@ ...@@ -1473,7 +1473,7 @@
this.cmbPlateH.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbPlateH.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbPlateH.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbPlateH.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbPlateH.FormattingEnabled = true; this.cmbPlateH.FormattingEnabled = true;
this.cmbPlateH.Location = new System.Drawing.Point(81, 169); this.cmbPlateH.Location = new System.Drawing.Point(80, 147);
this.cmbPlateH.Name = "cmbPlateH"; this.cmbPlateH.Name = "cmbPlateH";
this.cmbPlateH.Size = new System.Drawing.Size(197, 28); this.cmbPlateH.Size = new System.Drawing.Size(197, 28);
this.cmbPlateH.TabIndex = 176; this.cmbPlateH.TabIndex = 176;
...@@ -1485,7 +1485,7 @@ ...@@ -1485,7 +1485,7 @@
this.label1.Cursor = System.Windows.Forms.Cursors.Default; this.label1.Cursor = System.Windows.Forms.Cursors.Default;
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.ForeColor = System.Drawing.SystemColors.ControlText; this.label1.ForeColor = System.Drawing.SystemColors.ControlText;
this.label1.Location = new System.Drawing.Point(15, 175); this.label1.Location = new System.Drawing.Point(14, 153);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label1.Size = new System.Drawing.Size(62, 17); this.label1.Size = new System.Drawing.Size(62, 17);
...@@ -1495,9 +1495,6 @@ ...@@ -1495,9 +1495,6 @@
// //
// groupBox3 // groupBox3
// //
this.groupBox3.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.groupBox3.Controls.Add(this.lblMoveInfo); this.groupBox3.Controls.Add(this.lblMoveInfo);
this.groupBox3.Controls.Add(this.lblTemp); this.groupBox3.Controls.Add(this.lblTemp);
this.groupBox3.Controls.Add(this.lblMoveEquipInfo); this.groupBox3.Controls.Add(this.lblMoveEquipInfo);
...@@ -1506,7 +1503,7 @@ ...@@ -1506,7 +1503,7 @@
this.groupBox3.Controls.Add(this.chbDebug); this.groupBox3.Controls.Add(this.chbDebug);
this.groupBox3.Location = new System.Drawing.Point(3, 3); this.groupBox3.Location = new System.Drawing.Point(3, 3);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(1295, 110); this.groupBox3.Size = new System.Drawing.Size(1291, 121);
this.groupBox3.TabIndex = 268; this.groupBox3.TabIndex = 268;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态"; this.groupBox3.Text = "设备状态";
...@@ -1517,7 +1514,7 @@ ...@@ -1517,7 +1514,7 @@
this.lblTemp.AutoSize = true; this.lblTemp.AutoSize = true;
this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTemp.ForeColor = System.Drawing.Color.Black; this.lblTemp.ForeColor = System.Drawing.Color.Black;
this.lblTemp.Location = new System.Drawing.Point(629, 15); this.lblTemp.Location = new System.Drawing.Point(639, 14);
this.lblTemp.Name = "lblTemp"; this.lblTemp.Name = "lblTemp";
this.lblTemp.Size = new System.Drawing.Size(159, 20); this.lblTemp.Size = new System.Drawing.Size(159, 20);
this.lblTemp.TabIndex = 270; this.lblTemp.TabIndex = 270;
...@@ -1528,7 +1525,7 @@ ...@@ -1528,7 +1525,7 @@
this.lblMoveEquipInfo.AutoSize = true; this.lblMoveEquipInfo.AutoSize = true;
this.lblMoveEquipInfo.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMoveEquipInfo.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveEquipInfo.ForeColor = System.Drawing.Color.Blue; this.lblMoveEquipInfo.ForeColor = System.Drawing.Color.Blue;
this.lblMoveEquipInfo.Location = new System.Drawing.Point(221, 21); this.lblMoveEquipInfo.Location = new System.Drawing.Point(221, 14);
this.lblMoveEquipInfo.Name = "lblMoveEquipInfo"; this.lblMoveEquipInfo.Name = "lblMoveEquipInfo";
this.lblMoveEquipInfo.Size = new System.Drawing.Size(65, 19); this.lblMoveEquipInfo.Size = new System.Drawing.Size(65, 19);
this.lblMoveEquipInfo.TabIndex = 272; this.lblMoveEquipInfo.TabIndex = 272;
...@@ -1540,9 +1537,9 @@ ...@@ -1540,9 +1537,9 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red; this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(5, 50); this.lblWarnMsg.Location = new System.Drawing.Point(5, 38);
this.lblWarnMsg.Name = "lblWarnMsg"; this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(896, 53); this.lblWarnMsg.Size = new System.Drawing.Size(892, 67);
this.lblWarnMsg.TabIndex = 224; this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
...@@ -1551,7 +1548,7 @@ ...@@ -1551,7 +1548,7 @@
this.lblThisSta.AutoSize = true; this.lblThisSta.AutoSize = true;
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Green; this.lblThisSta.ForeColor = System.Drawing.Color.Green;
this.lblThisSta.Location = new System.Drawing.Point(14, 21); this.lblThisSta.Location = new System.Drawing.Point(14, 14);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(65, 19); this.lblThisSta.Size = new System.Drawing.Size(65, 19);
this.lblThisSta.TabIndex = 216; this.lblThisSta.TabIndex = 216;
...@@ -1562,7 +1559,7 @@ ...@@ -1562,7 +1559,7 @@
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDebug.AutoSize = true; this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(808, 15); this.chbDebug.Location = new System.Drawing.Point(855, 12);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(93, 25); this.chbDebug.Size = new System.Drawing.Size(93, 25);
this.chbDebug.TabIndex = 271; this.chbDebug.TabIndex = 271;
...@@ -1798,10 +1795,9 @@ ...@@ -1798,10 +1795,9 @@
// //
// lblMoveInfo // lblMoveInfo
// //
this.lblMoveInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.lblMoveInfo.AutoSize = true; this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.Location = new System.Drawing.Point(922, 15); this.lblMoveInfo.Location = new System.Drawing.Point(975, 12);
this.lblMoveInfo.Name = "lblMoveInfo"; this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(56, 17); this.lblMoveInfo.Size = new System.Drawing.Size(56, 17);
this.lblMoveInfo.TabIndex = 269; this.lblMoveInfo.TabIndex = 269;
......
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean.cs
...@@ -223,7 +223,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -223,7 +223,7 @@ namespace OnlineStore.DeviceLibrary
{ {
//压紧轴回原点，叉子回到P1,关闭门旋转轴和升降轴回到P1 //压紧轴回原点，叉子回到P1,关闭门旋转轴和升降轴回到P1
MoveInfo.NewMove(StoreMoveType.StoreReset); MoveInfo.NewMove(StoreMoveType.StoreReset);
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H54_TOP1_InOutToP1); MoveInfo.NextMoveStep(StoreMoveStep.BOX_H54_InOutToP1);
LogInfo("到待机状态，进出轴到P1，判断叉子没有料盘"); LogInfo("到待机状态，进出轴到P1，判断叉子没有料盘");
ACAxisMove(Config.InOut_Axis, Config.InOutAxis_P1_Position, Config.InOutAxis_P1_Speed); ACAxisMove(Config.InOut_Axis, Config.InOutAxis_P1_Position, Config.InOutAxis_P1_Speed);
} }
...@@ -283,7 +283,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -283,7 +283,7 @@ namespace OnlineStore.DeviceLibrary
{ {
case StoreMoveStep.BOX_H01_InOutBack: case StoreMoveStep.BOX_H01_InOutBack:
Thread.Sleep(200); Thread.Sleep(200);
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H02_InoutTOP1_TopDown); MoveInfo.NextMoveStep(StoreMoveStep.BOX_H02_TopDown);
LogInfo(MoveInfo.MoveType + ": 线体停止，进出轴到待机点P1，顶升气缸下降，NG门下降，入料移门关闭"); LogInfo(MoveInfo.MoveType + ": 线体停止，进出轴到待机点P1，顶升气缸下降，NG门下降，入料移门关闭");
LineStop(); LineStop();
AxisCountClear(Config.InOut_Axis); AxisCountClear(Config.InOut_Axis);
...@@ -292,7 +292,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -292,7 +292,7 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(MoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down); CylinderMove(MoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down);
DoorBean.StartClose(MoveInfo); DoorBean.StartClose(MoveInfo);
break; break;
case StoreMoveStep.BOX_H02_InoutTOP1_TopDown: case StoreMoveStep.BOX_H02_TopDown:
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H03_LineRun); MoveInfo.NextMoveStep(StoreMoveStep.BOX_H03_LineRun);
if (IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.HIGH)) if (IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.HIGH))
{ {
...@@ -338,19 +338,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -338,19 +338,19 @@ namespace OnlineStore.DeviceLibrary
MoveEndToRuningStatus(); MoveEndToRuningStatus();
break; break;
case StoreMoveStep.BOX_H54_TOP1_InOutToP1: case StoreMoveStep.BOX_H54_InOutToP1:
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H55_TOP1_CompressHome); MoveInfo.NextMoveStep(StoreMoveStep.BOX_H55_CompHome);
LogInfo("到待机状态，压紧轴回原点，关闭舱门"); LogInfo("到待机状态，压紧轴回原点，关闭舱门");
ACAxisHomeMove(Config.Comp_Axis); ACAxisHomeMove(Config.Comp_Axis);
break; break;
case StoreMoveStep.BOX_H55_TOP1_CompressHome: case StoreMoveStep.BOX_H55_CompHome:
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H56_TOP1_OtherAxisToP1); MoveInfo.NextMoveStep(StoreMoveStep.BOX_H56_OtherAxisToP1);
LogInfo(MoveInfo.MoveType + ": 旋转轴运动到P1，上下轴走到P1，压紧轴到P1 "); LogInfo(MoveInfo.MoveType + ": 旋转轴运动到P1，上下轴走到P1，压紧轴到P1 ");
ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1, Config.MiddleAxis_P1_Speed); ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1, Config.MiddleAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_P1, Config.UpDownAxis_P1_Speed); ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_P1, Config.UpDownAxis_P1_Speed);
ACAxisMove(Config.Comp_Axis, Config.CompAxis_P1_Position, Config.CompAxis_P1_Speed); ACAxisMove(Config.Comp_Axis, Config.CompAxis_P1_Position, Config.CompAxis_P1_Speed);
break; break;
case StoreMoveStep.BOX_H56_TOP1_OtherAxisToP1: case StoreMoveStep.BOX_H56_OtherAxisToP1:
LogInfo("到待机状态完成"); LogInfo("到待机状态完成");
MoveEndToRuningStatus(); MoveEndToRuningStatus();
break; break;
......
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Partial.cs
...@@ -297,7 +297,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -297,7 +297,7 @@ namespace OnlineStore.DeviceLibrary
private void StartMoveToBag() private void StartMoveToBag()
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BI_51_MoveToBag); MoveInfo.NextMoveStep(StoreMoveStep.BI_51_MoveToBag);
InOutStoreLog("入库 " + MoveInfo.SLog + "：移动到库位点，轴1（ 转盘） 至P2（ 库位点）轴2(上下） 至P3(库位入库前点）"); InOutStoreLog("入库 " + MoveInfo.SLog + "：移动到库位点，旋转轴至P2（ 库位点）轴2(上下） 至P3(库位入库前点）");
ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P2, Config.MiddleAxis_P2_Speed); ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P2, Config.MiddleAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P3, Config.UpDownAxis_P3_Speed); ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P3, Config.UpDownAxis_P3_Speed);
} }
...@@ -366,7 +366,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -366,7 +366,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (MoveInfo.SingleInstore) if (MoveInfo.SingleInstore)
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BI_16_ComAxisDownMove); MoveInfo.NextMoveStep(StoreMoveStep.BI_16_ComDownMove);
InOutStoreLog("单盘入库，料架取料 " + MoveInfo.SLog + "：压紧轴走到压紧点P2： "+MoveInfo.MoveParam.MoveP.ComPress_P2); InOutStoreLog("单盘入库，料架取料 " + MoveInfo.SLog + "：压紧轴走到压紧点P2： "+MoveInfo.MoveParam.MoveP.ComPress_P2);
ACAxisMove(Config.Comp_Axis, MoveInfo.MoveParam.MoveP.ComPress_P2, Config.CompAxis_P2_Speed); ACAxisMove(Config.Comp_Axis, MoveInfo.MoveParam.MoveP.ComPress_P2, Config.CompAxis_P2_Speed);
} }
...@@ -382,7 +382,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -382,7 +382,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_15_StartCompress)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_15_StartCompress))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BI_16_ComAxisDownMove); MoveInfo.NextMoveStep(StoreMoveStep.BI_16_ComDownMove);
int currPosition = ACServerManager.GetActualtPosition(Config.Comp_Axis); int currPosition = ACServerManager.GetActualtPosition(Config.Comp_Axis);
ComTargetPosition = currPosition; ComTargetPosition = currPosition;
int targetP = currPosition + Config.CompAxis_Down_Position; int targetP = currPosition + Config.CompAxis_Down_Position;
...@@ -395,7 +395,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -395,7 +395,7 @@ namespace OnlineStore.DeviceLibrary
ACAxisMove(Config.Comp_Axis, targetP, Config.CompAxis_P1_Speed); ACAxisMove(Config.Comp_Axis, targetP, Config.CompAxis_P1_Speed);
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_16_ComAxisDownMove)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_16_ComDownMove))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BI_17_InoutBack); MoveInfo.NextMoveStep(StoreMoveStep.BI_17_InoutBack);
InOutStoreLog("料架取料 " + MoveInfo.SLog + "：叉子后退到扫码点"); InOutStoreLog("料架取料 " + MoveInfo.SLog + "：叉子后退到扫码点");
...@@ -518,13 +518,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -518,13 +518,13 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_51_MoveToBag)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_51_MoveToBag))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BI_52_DeviceToBag); MoveInfo.NextMoveStep(StoreMoveStep.BI_52_DeviceToBag);
InOutStoreLog("入库 " + MoveInfo.SLog + "：叉子进入库位中，轴3（ 叉子） 至P3(库位取放料点）"); InOutStoreLog("入库 " + MoveInfo.SLog + "：叉子进入库位中，进出轴到库位P3");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P3, Config.InOutAxis_P3_Speed); ACAxisMove(Config.InOut_Axis, moveP.InOut_P3, Config.InOutAxis_P3_Speed);
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_52_DeviceToBag)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_52_DeviceToBag))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BI_53_PutWareToBag); MoveInfo.NextMoveStep(StoreMoveStep.BI_53_PutWareToBag);
InOutStoreLog("入库 " + MoveInfo.SLog + "：放下物品，轴2（ 上下） 至P4（ 库位入料缓冲点）轴4（ 压紧） 至P3（ 压紧前点）"); InOutStoreLog("入库 " + MoveInfo.SLog + "：放下物品，升降轴到库位缓冲点P4，压紧轴到P3");
// 5= 入仓位完成(料仓Box把料盘放入对应的库位中，装置还未恢复原始状态) // 5= 入仓位完成(料仓Box把料盘放入对应的库位中，装置还未恢复原始状态)
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosID : ""; string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosID : "";
...@@ -540,7 +540,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -540,7 +540,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_53_PutWareToBag)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_53_PutWareToBag))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BI_54_DeviceBackFromBag); MoveInfo.NextMoveStep(StoreMoveStep.BI_54_DeviceBackFromBag);
InOutStoreLog("入库 " + MoveInfo.SLog + "：叉子从库位中返回，轴3（ 叉子） 动作至P1（ 待机点）"); InOutStoreLog("入库 " + MoveInfo.SLog + "：叉子从库位中返回，进出轴到P1");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed); ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_54_DeviceBackFromBag)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_54_DeviceBackFromBag))
...@@ -624,7 +624,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -624,7 +624,7 @@ namespace OnlineStore.DeviceLibrary
ShelfEnterProcess(); ShelfEnterProcess();
} }
//料架送出逻辑 //料架送出逻辑
else if (MoveInfo.MoveStep >= StoreMoveStep.BS_01_TopCylinder_Down) else if (MoveInfo.MoveStep >= StoreMoveStep.BS_01_TopDown)
{ {
ShelfOutProcess(); ShelfOutProcess();
} }
...@@ -758,7 +758,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -758,7 +758,7 @@ namespace OnlineStore.DeviceLibrary
} }
#region 出入库步骤 #region 出入库步骤
if (MoveInfo.MoveStep == StoreMoveStep.SO_01_LocationCylinderDown) if (MoveInfo.MoveStep == StoreMoveStep.SO_01_LocationDown)
{ {
MoveInfo.NextMoveStep(StoreMoveStep.SO_02_DeviceBack); MoveInfo.NextMoveStep(StoreMoveStep.SO_02_DeviceBack);
InOutStoreLog("出库 " + MoveInfo.SLog + "：进出轴到P1 "); InOutStoreLog("出库 " + MoveInfo.SLog + "：进出轴到P1 ");
...@@ -807,7 +807,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -807,7 +807,7 @@ namespace OnlineStore.DeviceLibrary
ACAxisMove(Config.Middle_Axis, moveP.Middle_P101, Config.MiddleAxis_P101_Speed); ACAxisMove(Config.Middle_Axis, moveP.Middle_P101, Config.MiddleAxis_P101_Speed);
} }
else if (MoveInfo.MoveStep == StoreMoveStep.SO_07_LocationCylinder_Up) else if (MoveInfo.MoveStep == StoreMoveStep.SO_07_LocationUp)
{ {
MoveInfo.NextMoveStep(StoreMoveStep.SO_08_ToShelfPosition); MoveInfo.NextMoveStep(StoreMoveStep.SO_08_ToShelfPosition);
InOutStoreLog("出库 " + MoveInfo.SLog + "：走到料架位置，旋转轴至P101，升降轴至P102, "); InOutStoreLog("出库 " + MoveInfo.SLog + "：走到料架位置，旋转轴至P101，升降轴至P102, ");
...@@ -821,7 +821,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -821,7 +821,7 @@ namespace OnlineStore.DeviceLibrary
} }
//此处需要等待移栽没有工作，才能把盘放入出料口 //此处需要等待移栽没有工作，才能把盘放入出料口
else if (MoveInfo.MoveStep == StoreMoveStep.SO_09_LocationCylinder_Down) else if (MoveInfo.MoveStep == StoreMoveStep.SO_09_LocationDown)
{ {
MoveInfo.NextMoveStep(StoreMoveStep.SO_10_WaitNoTray); MoveInfo.NextMoveStep(StoreMoveStep.SO_10_WaitNoTray);
} }
...@@ -853,13 +853,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -853,13 +853,13 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep == StoreMoveStep.SO_12_DevicePutWare) else if (MoveInfo.MoveStep == StoreMoveStep.SO_12_DevicePutWare)
{ {
MoveInfo.NextMoveStep(StoreMoveStep.SO_13_DeviceOutFromDoor); MoveInfo.NextMoveStep(StoreMoveStep.SO_13_DeviceOutFromDoor);
InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子从出料口返回，，进出轴动作至P1(待机点) "); InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子从出料口返回， 进出轴到P1 ");
InOutBackToP1(moveP.InOut_P1); InOutBackToP1(moveP.InOut_P1);
} }
else if (MoveInfo.MoveStep == StoreMoveStep.SO_13_DeviceOutFromDoor) else if (MoveInfo.MoveStep == StoreMoveStep.SO_13_DeviceOutFromDoor)
{ {
MoveInfo.NextMoveStep(StoreMoveStep.SO_14_GoBack); MoveInfo.NextMoveStep(StoreMoveStep.SO_14_GoBack);
InOutStoreLog("出库 " + MoveInfo.SLog + "： 升降轴返回，轴2至P1(待机点) ,"); InOutStoreLog("出库 " + MoveInfo.SLog + "： 升降轴返回，升降轴到P1");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed); ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
//发送消息给流水线 //发送消息给流水线
// SendOutStoreEnd(MoveInfo); // SendOutStoreEnd(MoveInfo);
...@@ -909,9 +909,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -909,9 +909,9 @@ namespace OnlineStore.DeviceLibrary
} }
#endregion #endregion
else if ( MoveInfo.MoveStep <= StoreMoveStep.SO_01_LocationCylinderDown) { else if ( MoveInfo.MoveStep <= StoreMoveStep.SO_01_LocationDown) {
ShelfEnterProcess(); ShelfEnterProcess();
}else if (MoveInfo.MoveStep >= StoreMoveStep.BS_01_TopCylinder_Down) }else if (MoveInfo.MoveStep >= StoreMoveStep.BS_01_TopDown)
{ {
ShelfOutProcess(); ShelfOutProcess();
} }
......
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Shelf.cs
...@@ -161,7 +161,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -161,7 +161,7 @@ namespace OnlineStore.DeviceLibrary
private void StartShelfOut() private void StartShelfOut()
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BS_01_TopCylinder_Down); MoveInfo.NextMoveStep(StoreMoveStep.BS_01_TopDown);
if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore)) if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore))
{ {
InOutStoreLog("送出出库料架：顶升气缸下降"); InOutStoreLog("送出出库料架：顶升气缸下降");
...@@ -182,13 +182,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -182,13 +182,13 @@ namespace OnlineStore.DeviceLibrary
moveName = "送出出库料架"; moveName = "送出出库料架";
} }
if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_01_TopCylinder_Down)) if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_01_TopDown))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BS_02_LocatinCylinder_Down); MoveInfo.NextMoveStep(StoreMoveStep.BS_02_LocatinDown);
InOutStoreLog(moveName + MoveInfo.SLog + " ：定位气缸下降"); InOutStoreLog(moveName + MoveInfo.SLog + " ：定位气缸下降");
// CylinderMove(MoveInfo, IO_Type.LocationCylinder_Up, IO_Type.LocationCylinder_Down); // CylinderMove(MoveInfo, IO_Type.LocationCylinder_Up, IO_Type.LocationCylinder_Down);
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_02_LocatinCylinder_Down)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_02_LocatinDown))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BS_03_DoorOpen); MoveInfo.NextMoveStep(StoreMoveStep.BS_03_DoorOpen);
InOutStoreLog(moveName + MoveInfo.SLog + "：打开入料口移门"); InOutStoreLog(moveName + MoveInfo.SLog + "：打开入料口移门");
......
source/DeviceLibrary/store/StoreStep.cs
...@@ -125,7 +125,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -125,7 +125,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 顶升下降 /// 顶升下降
/// </summary> /// </summary>
BOX_H02_InoutTOP1_TopDown = 012, BOX_H02_TopDown = 012,
/// <summary> /// <summary>
/// BOX复位：线体停止， ，流水线先转动3000 /// BOX复位：线体停止， ，流水线先转动3000
/// </summary> /// </summary>
...@@ -148,15 +148,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -148,15 +148,15 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// BOX回待机点：叉子走到P1 /// BOX回待机点：叉子走到P1
/// </summary> /// </summary>
BOX_H54_TOP1_InOutToP1 = 54, BOX_H54_InOutToP1 = 54,
/// <summary> /// <summary>
/// BOX回待机点：压紧轴回原点 /// BOX回待机点：压紧轴回原点
/// </summary> /// </summary>
BOX_H55_TOP1_CompressHome = 55, BOX_H55_CompHome = 55,
/// <summary> /// <summary>
///BOX回待机点： 关闭门，旋转轴到P1,升降轴到P1 ///BOX回待机点： 关闭门，旋转轴到P1,升降轴到P1
/// </summary> /// </summary>
BOX_H56_TOP1_OtherAxisToP1 = 56, BOX_H56_OtherAxisToP1 = 56,
#endregion #endregion
#region 料架进入料仓步骤 1000开始 #region 料架进入料仓步骤 1000开始
...@@ -207,18 +207,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -207,18 +207,18 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
///料仓出库，，定位气缸下降 ///料仓出库，，定位气缸下降
/// </summary> /// </summary>
SO_01_LocationCylinderDown = 2001, SO_01_LocationDown = 2001,
/// <summary> /// <summary>
///料仓出库：叉子先运动到P1 ///料仓出库：叉子先运动到P1
/// </summary> /// </summary>
SO_02_DeviceBack = 2002, SO_02_DeviceBack = 2002,
/// <summary> /// <summary>
/// 料仓出库，，所有轴运行到库位， 轴4（ 压紧） 至P3(压紧前点) ,轴1（ 转盘） 至P2（ 库位点）,轴2(上下） 至P5(库位出库前点） /// 料仓出库，，所有轴运行到库位,压紧轴到压紧前点P3 ，旋转轴到库位点P2,轴2(上下） 至P5(库位出库前点）
/// </summary> /// </summary>
SO_03_ToBagPosition = 2003, SO_03_ToBagPosition = 2003,
/// <summary> /// <summary>
/// 料仓出库，，叉子进入库位中， 轴3（ 叉子） 至P3(库位取放料点） /// 料仓出库，，叉子进入库位中， 进出轴到库位P3
/// </summary> /// </summary>
SO_04_DeviceToBag = 2004, SO_04_DeviceToBag = 2004,
...@@ -235,7 +235,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -235,7 +235,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 料仓出库，定位气缸伸出（有压紧轴的不需要此步骤 ） /// 料仓出库，定位气缸伸出（有压紧轴的不需要此步骤 ）
/// </summary> /// </summary>
SO_07_LocationCylinder_Up = 2007, SO_07_LocationUp = 2007,
/// <summary> /// <summary>
/// 料仓出库，走到料架位置，旋转轴至P20，升降轴至P102, /// 料仓出库，走到料架位置，旋转轴至P20，升降轴至P102,
...@@ -245,7 +245,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -245,7 +245,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 料仓出库，定位气缸退回（有压紧轴的不需要此步骤），，定位气缸退回(Y104-1/PCI5O1-84) (Y104-2/PCI5O1-91) (Y104-2/PCI5O1-96) 退回到位 /// 料仓出库，定位气缸退回（有压紧轴的不需要此步骤），，定位气缸退回(Y104-1/PCI5O1-84) (Y104-2/PCI5O1-91) (Y104-2/PCI5O1-96) 退回到位
/// </summary> /// </summary>
SO_09_LocationCylinder_Down = 2009, SO_09_LocationDown = 2009,
/// <summary> /// <summary>
/// 等待门口无料盘 /// 等待门口无料盘
/// </summary> /// </summary>
...@@ -260,7 +260,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -260,7 +260,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
SO_12_DevicePutWare = 2012, SO_12_DevicePutWare = 2012,
/// <summary> /// <summary>
/// 料仓出库，，叉子从出料口返回，，轴3（ 叉子） 动作至P1（ 待机点） /// 料仓出库，，叉子从出料口返回，，进出轴到P1
/// </summary> /// </summary>
SO_13_DeviceOutFromDoor = 2013, SO_13_DeviceOutFromDoor = 2013,
...@@ -302,7 +302,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -302,7 +302,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 料架取料：检测到料叉压紧确认信号，再次向下压紧指定的值 /// 料架取料：检测到料叉压紧确认信号，再次向下压紧指定的值
/// </summary> /// </summary>
BI_16_ComAxisDownMove = 3016, BI_16_ComDownMove = 3016,
/// <summary> /// <summary>
/// 料架取料：记录压紧高度，叉子后退到P1 /// 料架取料：记录压紧高度，叉子后退到P1
/// </summary> /// </summary>
...@@ -358,19 +358,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -358,19 +358,19 @@ namespace OnlineStore.DeviceLibrary
BI_30_SetInstoreParam = 3030, BI_30_SetInstoreParam = 3030,
/// <summary> /// <summary>
/// 入库。。移动到库位点，轴1（ 转盘） 至P2（ 库位点）轴2(上下） 至P3(库位入库前点） /// 入库。。移动到库位点，旋转轴至P2（ 库位点）轴2(上下） 至P3(库位入库前点）
/// </summary> /// </summary>
BI_51_MoveToBag = 3051, BI_51_MoveToBag = 3051,
/// <summary> /// <summary>
/// 入库。。叉子进入库位中，轴3（ 叉子） 至P3(库位取放料点） /// 入库。。叉子进入库位中，进出轴到库位P3
/// </summary> /// </summary>
BI_52_DeviceToBag = 3052, BI_52_DeviceToBag = 3052,
/// <summary> /// <summary>
/// 入库。。放下物品，轴2（ 上下） 至P4（ 库位入料缓冲点）轴4（ 压紧） 至P3（ 压紧前点） /// 入库。。放下物品，升降轴到库位缓冲点P4，压紧轴到P3
/// </summary> /// </summary>
BI_53_PutWareToBag = 3053, BI_53_PutWareToBag = 3053,
/// <summary> /// <summary>
/// 入库。。叉子从库位中返回，轴3（ 叉子） 动作至P1（ 待机点） /// 入库。。叉子从库位中返回，进出轴到P1
/// </summary> /// </summary>
BI_54_DeviceBackFromBag = 3054, BI_54_DeviceBackFromBag = 3054,
/// <summary> /// <summary>
...@@ -413,11 +413,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -413,11 +413,11 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 送出空料架：顶升气缸下降 /// 送出空料架：顶升气缸下降
/// </summary> /// </summary>
BS_01_TopCylinder_Down=4001, BS_01_TopDown=4001,
/// <summary> /// <summary>
/// 送出空料架：定位气缸下降 /// 送出空料架：定位气缸下降
/// </summary> /// </summary>
BS_02_LocatinCylinder_Down = 4002, BS_02_LocatinDown = 4002,
/// <summary> /// <summary>
/// 送出空料架：打开仓门 /// 送出空料架：打开仓门
/// </summary> /// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!