Skip to content

刘韬 / SO815-AutoInOutStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit a0e18cdf 由 几米阳光
选项

进出轴仓门出库点改为P4

1 个父辈 9d2a7c0d
内嵌 并排
正在显示 6 个修改的文件 包含 203 行增加 和 94 行删除
source/ACSingleStore/FrmStoreBox.Designer.cs
......@@ -241,6 +241,10 @@
this.btnGetOutTray = new System.Windows.Forms.Button();
this.lblDoorStatus = new System.Windows.Forms.Label();
this.btnBatchInStore = new System.Windows.Forms.Button();
this.txtInoutP4 = new System.Windows.Forms.TextBox();
this.btnInOutP4 = new System.Windows.Forms.Button();
this.上料模块复位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator();
this.axis_5_Alarm = new UserFromControl.IOStatusControl();
this.axis_1_Alarm = new UserFromControl.IOStatusControl();
this.axis_3_Alarm = new UserFromControl.IOStatusControl();
......@@ -1167,19 +1171,17 @@
//
// groupBox2
//
this.groupBox2.Controls.Add(this.txtInoutP4);
this.groupBox2.Controls.Add(this.btnInOutP4);
this.groupBox2.Controls.Add(this.txtUpdownP8);
this.groupBox2.Controls.Add(this.btnBatchOutTest);
this.groupBox2.Controls.Add(this.btnUpdownP8);
this.groupBox2.Controls.Add(this.txtUpdownP2);
this.groupBox2.Controls.Add(this.btnUpdownP2);
this.groupBox2.Controls.Add(this.txtUpDownDoor);
this.groupBox2.Controls.Add(this.btnUpDownDoor);
this.groupBox2.Controls.Add(this.lblTemp);
this.groupBox2.Controls.Add(this.btnClearLog);
this.groupBox2.Controls.Add(this.lblMsg);
this.groupBox2.Controls.Add(this.btnSavePosition);
this.groupBox2.Controls.Add(this.btnStartAuTo);
this.groupBox2.Controls.Add(this.label9);
this.groupBox2.Controls.Add(this.txtJiange);
this.groupBox2.Controls.Add(this.txtComP1);
this.groupBox2.Controls.Add(this.txtInOutP2);
this.groupBox2.Controls.Add(this.txtInOutP1);
......@@ -1194,7 +1196,6 @@
this.groupBox2.Controls.Add(this.cmbPosition);
this.groupBox2.Controls.Add(this.label21);
this.groupBox2.Controls.Add(this.txtUpDownP3);
this.groupBox2.Controls.Add(this.btnInStore);
this.groupBox2.Controls.Add(this.btnOutStore);
this.groupBox2.Controls.Add(this.txtUpDownP4);
this.groupBox2.Controls.Add(this.btnComP1);
......@@ -1210,9 +1211,9 @@
this.groupBox2.Controls.Add(this.btnUpDownP6);
this.groupBox2.Controls.Add(this.btnUpDownP3);
this.groupBox2.Controls.Add(this.btnUpDownP4);
this.groupBox2.Location = new System.Drawing.Point(7, 354);
this.groupBox2.Location = new System.Drawing.Point(7, 324);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(496, 385);
this.groupBox2.Size = new System.Drawing.Size(496, 414);
this.groupBox2.TabIndex = 100;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "出入库操作";
......@@ -1224,7 +1225,7 @@
this.txtUpdownP8.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP8.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP8.Location = new System.Drawing.Point(153, 189);
this.txtUpdownP8.Location = new System.Drawing.Point(153, 165);
this.txtUpdownP8.MaxLength = 0;
this.txtUpdownP8.Name = "txtUpdownP8";
this.txtUpdownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1240,7 +1241,7 @@
this.btnUpdownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpdownP8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP8.Location = new System.Drawing.Point(10, 187);
this.btnUpdownP8.Location = new System.Drawing.Point(10, 163);
this.btnUpdownP8.Name = "btnUpdownP8";
this.btnUpdownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP8.Size = new System.Drawing.Size(140, 27);
......@@ -1257,7 +1258,7 @@
this.txtUpdownP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP2.Location = new System.Drawing.Point(153, 158);
this.txtUpdownP2.Location = new System.Drawing.Point(153, 134);
this.txtUpdownP2.MaxLength = 0;
this.txtUpdownP2.Name = "txtUpdownP2";
this.txtUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1273,7 +1274,7 @@
this.btnUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpdownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP2.Location = new System.Drawing.Point(10, 156);
this.btnUpdownP2.Location = new System.Drawing.Point(10, 132);
this.btnUpdownP2.Name = "btnUpdownP2";
this.btnUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP2.Size = new System.Drawing.Size(140, 27);
......@@ -1290,7 +1291,7 @@
this.txtUpDownDoor.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownDoor.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownDoor.Location = new System.Drawing.Point(153, 127);
this.txtUpDownDoor.Location = new System.Drawing.Point(153, 103);
this.txtUpDownDoor.MaxLength = 0;
this.txtUpDownDoor.Name = "txtUpDownDoor";
this.txtUpDownDoor.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1306,7 +1307,7 @@
this.btnUpDownDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownDoor.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownDoor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownDoor.Location = new System.Drawing.Point(10, 125);
this.btnUpDownDoor.Location = new System.Drawing.Point(10, 101);
this.btnUpDownDoor.Name = "btnUpDownDoor";
this.btnUpDownDoor.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownDoor.Size = new System.Drawing.Size(140, 27);
......@@ -1321,7 +1322,7 @@
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.ForeColor = System.Drawing.Color.Black;
this.lblTemp.Location = new System.Drawing.Point(18, 349);
this.lblTemp.Location = new System.Drawing.Point(20, 160);
this.lblTemp.Name = "lblTemp";
this.lblTemp.Size = new System.Drawing.Size(159, 20);
this.lblTemp.TabIndex = 270;
......@@ -1330,7 +1331,7 @@
// btnClearLog
//
this.btnClearLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearLog.Location = new System.Drawing.Point(369, 341);
this.btnClearLog.Location = new System.Drawing.Point(385, 333);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(105, 38);
this.btnClearLog.TabIndex = 224;
......@@ -1343,16 +1344,17 @@
this.lblMsg.AutoSize = true;
this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMsg.ForeColor = System.Drawing.Color.Green;
this.lblMsg.Location = new System.Drawing.Point(269, 61);
this.lblMsg.Location = new System.Drawing.Point(294, 353);
this.lblMsg.Name = "lblMsg";
this.lblMsg.Size = new System.Drawing.Size(135, 20);
this.lblMsg.TabIndex = 223;
this.lblMsg.Text = "没有开启自动出入库";
this.lblMsg.Visible = false;
//
// btnSavePosition
//
this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSavePosition.Location = new System.Drawing.Point(251, 341);
this.btnSavePosition.Location = new System.Drawing.Point(274, 333);
this.btnSavePosition.Name = "btnSavePosition";
this.btnSavePosition.Size = new System.Drawing.Size(105, 38);
this.btnSavePosition.TabIndex = 217;
......@@ -1364,31 +1366,34 @@
//
this.btnStartAuTo.Enabled = false;
this.btnStartAuTo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStartAuTo.Location = new System.Drawing.Point(158, 52);
this.btnStartAuTo.Location = new System.Drawing.Point(183, 344);
this.btnStartAuTo.Name = "btnStartAuTo";
this.btnStartAuTo.Size = new System.Drawing.Size(105, 38);
this.btnStartAuTo.TabIndex = 222;
this.btnStartAuTo.Text = "启动自动模式";
this.btnStartAuTo.UseVisualStyleBackColor = true;
this.btnStartAuTo.Visible = false;
this.btnStartAuTo.Click += new System.EventHandler(this.btnStartAuTo_Click);
//
// label9
//
this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.Location = new System.Drawing.Point(12, 63);
this.label9.Location = new System.Drawing.Point(37, 355);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(92, 17);
this.label9.TabIndex = 220;
this.label9.Text = "入库间隔仓位：";
this.label9.Visible = false;
//
// txtJiange
//
this.txtJiange.Location = new System.Drawing.Point(107, 58);
this.txtJiange.Location = new System.Drawing.Point(132, 350);
this.txtJiange.Name = "txtJiange";
this.txtJiange.Size = new System.Drawing.Size(37, 26);
this.txtJiange.Size = new System.Drawing.Size(37, 23);
this.txtJiange.TabIndex = 221;
this.txtJiange.Text = "0";
this.txtJiange.Visible = false;
//
// txtComP1
//
......@@ -1397,7 +1402,7 @@
this.txtComP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP1.Location = new System.Drawing.Point(153, 313);
this.txtComP1.Location = new System.Drawing.Point(153, 289);
this.txtComP1.MaxLength = 0;
this.txtComP1.Name = "txtComP1";
this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1412,7 +1417,7 @@
this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP2.Location = new System.Drawing.Point(153, 282);
this.txtInOutP2.Location = new System.Drawing.Point(153, 258);
this.txtInOutP2.MaxLength = 0;
this.txtInOutP2.Name = "txtInOutP2";
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1427,7 +1432,7 @@
this.txtInOutP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP1.Location = new System.Drawing.Point(153, 251);
this.txtInOutP1.Location = new System.Drawing.Point(153, 227);
this.txtInOutP1.MaxLength = 0;
this.txtInOutP1.Name = "txtInOutP1";
this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1442,7 +1447,7 @@
this.txtMiddleP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP1.Location = new System.Drawing.Point(153, 220);
this.txtMiddleP1.Location = new System.Drawing.Point(153, 196);
this.txtMiddleP1.MaxLength = 0;
this.txtMiddleP1.Name = "txtMiddleP1";
this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1457,7 +1462,7 @@
this.txtUpDownP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP1.Location = new System.Drawing.Point(153, 96);
this.txtUpDownP1.Location = new System.Drawing.Point(153, 72);
this.txtUpDownP1.MaxLength = 0;
this.txtUpDownP1.Name = "txtUpDownP1";
this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1472,7 +1477,7 @@
this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP3.Location = new System.Drawing.Point(395, 313);
this.txtComP3.Location = new System.Drawing.Point(395, 289);
this.txtComP3.MaxLength = 0;
this.txtComP3.Name = "txtComP3";
this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1487,7 +1492,7 @@
this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP2.Location = new System.Drawing.Point(395, 282);
this.txtComP2.Location = new System.Drawing.Point(153, 321);
this.txtComP2.MaxLength = 0;
this.txtComP2.Name = "txtComP2";
this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1502,7 +1507,7 @@
this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP3.Location = new System.Drawing.Point(395, 251);
this.txtInOutP3.Location = new System.Drawing.Point(395, 227);
this.txtInOutP3.MaxLength = 0;
this.txtInOutP3.Name = "txtInOutP3";
this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1517,7 +1522,7 @@
this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP2.Location = new System.Drawing.Point(395, 220);
this.txtMiddleP2.Location = new System.Drawing.Point(395, 196);
this.txtMiddleP2.MaxLength = 0;
this.txtMiddleP2.Name = "txtMiddleP2";
this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1532,7 +1537,7 @@
this.txtUpDownP5.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP5.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP5.Location = new System.Drawing.Point(395, 158);
this.txtUpDownP5.Location = new System.Drawing.Point(395, 134);
this.txtUpDownP5.MaxLength = 0;
this.txtUpDownP5.Name = "txtUpDownP5";
this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1547,7 +1552,7 @@
this.txtUpDownP6.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP6.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP6.Location = new System.Drawing.Point(395, 189);
this.txtUpDownP6.Location = new System.Drawing.Point(395, 165);
this.txtUpDownP6.MaxLength = 0;
this.txtUpDownP6.Name = "txtUpDownP6";
this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1563,7 +1568,7 @@
this.cmbPosition.Items.AddRange(new object[] {
"料仓0",
"料仓1"});
this.cmbPosition.Location = new System.Drawing.Point(76, 21);
this.cmbPosition.Location = new System.Drawing.Point(76, 27);
this.cmbPosition.Name = "cmbPosition";
this.cmbPosition.Size = new System.Drawing.Size(189, 28);
this.cmbPosition.TabIndex = 174;
......@@ -1575,7 +1580,7 @@
this.label21.Cursor = System.Windows.Forms.Cursors.Default;
this.label21.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label21.ForeColor = System.Drawing.SystemColors.ControlText;
this.label21.Location = new System.Drawing.Point(11, 27);
this.label21.Location = new System.Drawing.Point(11, 33);
this.label21.Name = "label21";
this.label21.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label21.Size = new System.Drawing.Size(68, 17);
......@@ -1590,7 +1595,7 @@
this.txtUpDownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP3.Location = new System.Drawing.Point(395, 96);
this.txtUpDownP3.Location = new System.Drawing.Point(395, 72);
this.txtUpDownP3.MaxLength = 0;
this.txtUpDownP3.Name = "txtUpDownP3";
this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1602,22 +1607,23 @@
//
this.btnInStore.Enabled = false;
this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInStore.Location = new System.Drawing.Point(271, 16);
this.btnInStore.Location = new System.Drawing.Point(390, 344);
this.btnInStore.Name = "btnInStore";
this.btnInStore.Size = new System.Drawing.Size(105, 38);
this.btnInStore.TabIndex = 102;
this.btnInStore.Text = "单个入库测试";
this.btnInStore.UseVisualStyleBackColor = true;
this.btnInStore.Visible = false;
this.btnInStore.Click += new System.EventHandler(this.btnInStore_Click);
//
// btnOutStore
//
this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutStore.Location = new System.Drawing.Point(379, 16);
this.btnOutStore.Location = new System.Drawing.Point(271, 22);
this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(105, 38);
this.btnOutStore.TabIndex = 101;
this.btnOutStore.Text = "单个出库测试";
this.btnOutStore.Text = "单盘出库测试";
this.btnOutStore.UseVisualStyleBackColor = true;
this.btnOutStore.Click += new System.EventHandler(this.btnOutStore_Click);
//
......@@ -1628,7 +1634,7 @@
this.txtUpDownP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP4.Location = new System.Drawing.Point(395, 127);
this.txtUpDownP4.Location = new System.Drawing.Point(395, 103);
this.txtUpDownP4.MaxLength = 0;
this.txtUpDownP4.Name = "txtUpDownP4";
this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1644,7 +1650,7 @@
this.btnComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP1.ForeColor = System.Drawing.Color.Purple;
this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnComP1.Location = new System.Drawing.Point(10, 311);
this.btnComP1.Location = new System.Drawing.Point(10, 287);
this.btnComP1.Name = "btnComP1";
this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP1.Size = new System.Drawing.Size(140, 27);
......@@ -1662,12 +1668,12 @@
this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP2.ForeColor = System.Drawing.Color.Green;
this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.Location = new System.Drawing.Point(10, 280);
this.btnInOutP2.Location = new System.Drawing.Point(10, 256);
this.btnInOutP2.Name = "btnInOutP2";
this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP2.Size = new System.Drawing.Size(140, 27);
this.btnInOutP2.TabIndex = 211;
this.btnInOutP2.Text = "进出轴取料点P2：";
this.btnInOutP2.Text = "进出轴吸盘取料点P2：";
this.btnInOutP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.UseVisualStyleBackColor = true;
this.btnInOutP2.Click += new System.EventHandler(this.btnInOutP2_Click);
......@@ -1680,7 +1686,7 @@
this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP1.ForeColor = System.Drawing.Color.Green;
this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.Location = new System.Drawing.Point(10, 249);
this.btnInOutP1.Location = new System.Drawing.Point(10, 225);
this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP1.Size = new System.Drawing.Size(140, 27);
......@@ -1698,7 +1704,7 @@
this.btnMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP1.Location = new System.Drawing.Point(10, 218);
this.btnMiddleP1.Location = new System.Drawing.Point(10, 194);
this.btnMiddleP1.Name = "btnMiddleP1";
this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP1.Size = new System.Drawing.Size(140, 27);
......@@ -1716,7 +1722,7 @@
this.btnUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP1.Location = new System.Drawing.Point(10, 94);
this.btnUpDownP1.Location = new System.Drawing.Point(10, 70);
this.btnUpDownP1.Name = "btnUpDownP1";
this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP1.Size = new System.Drawing.Size(140, 27);
......@@ -1733,7 +1739,7 @@
this.btnComP3.Cursor = System.Windows.Forms.Cursors.Default;
this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP3.ForeColor = System.Drawing.Color.Purple;
this.btnComP3.Location = new System.Drawing.Point(251, 311);
this.btnComP3.Location = new System.Drawing.Point(251, 287);
this.btnComP3.Name = "btnComP3";
this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP3.Size = new System.Drawing.Size(140, 27);
......@@ -1750,7 +1756,7 @@
this.btnComP2.Cursor = System.Windows.Forms.Cursors.Default;
this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP2.ForeColor = System.Drawing.Color.Purple;
this.btnComP2.Location = new System.Drawing.Point(251, 280);
this.btnComP2.Location = new System.Drawing.Point(9, 319);
this.btnComP2.Name = "btnComP2";
this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP2.Size = new System.Drawing.Size(140, 27);
......@@ -1767,12 +1773,12 @@
this.btnInOutP3.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP3.ForeColor = System.Drawing.Color.Green;
this.btnInOutP3.Location = new System.Drawing.Point(251, 249);
this.btnInOutP3.Location = new System.Drawing.Point(251, 225);
this.btnInOutP3.Name = "btnInOutP3";
this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP3.Size = new System.Drawing.Size(140, 27);
this.btnInOutP3.TabIndex = 193;
this.btnInOutP3.Text = "进出轴取料点P3：";
this.btnInOutP3.Text = "进出轴库位取料点P3：";
this.btnInOutP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP3.UseVisualStyleBackColor = true;
this.btnInOutP3.Click += new System.EventHandler(this.btnInOutP3_Click);
......@@ -1784,7 +1790,7 @@
this.btnMiddleP2.Cursor = System.Windows.Forms.Cursors.Default;
this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP2.Location = new System.Drawing.Point(251, 218);
this.btnMiddleP2.Location = new System.Drawing.Point(251, 194);
this.btnMiddleP2.Name = "btnMiddleP2";
this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP2.Size = new System.Drawing.Size(140, 27);
......@@ -1801,7 +1807,7 @@
this.btnUpDownP5.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP5.Location = new System.Drawing.Point(251, 156);
this.btnUpDownP5.Location = new System.Drawing.Point(251, 132);
this.btnUpDownP5.Name = "btnUpDownP5";
this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP5.Size = new System.Drawing.Size(140, 27);
......@@ -1818,7 +1824,7 @@
this.btnUpDownP6.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP6.Location = new System.Drawing.Point(251, 187);
this.btnUpDownP6.Location = new System.Drawing.Point(251, 163);
this.btnUpDownP6.Name = "btnUpDownP6";
this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP6.Size = new System.Drawing.Size(140, 27);
......@@ -1835,7 +1841,7 @@
this.btnUpDownP3.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP3.Location = new System.Drawing.Point(251, 94);
this.btnUpDownP3.Location = new System.Drawing.Point(251, 70);
this.btnUpDownP3.Name = "btnUpDownP3";
this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP3.Size = new System.Drawing.Size(140, 27);
......@@ -1852,7 +1858,7 @@
this.btnUpDownP4.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP4.Location = new System.Drawing.Point(251, 125);
this.btnUpDownP4.Location = new System.Drawing.Point(251, 101);
this.btnUpDownP4.Name = "btnUpDownP4";
this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP4.Size = new System.Drawing.Size(140, 27);
......@@ -1885,6 +1891,8 @@
this.停止ToolStripMenuItem,
this.toolStripSeparator2,
this.复位ToolStripMenuItem,
this.toolStripSeparator15,
this.上料模块复位ToolStripMenuItem,
this.toolStripSeparator3,
this.回待机点ToolStripMenuItem,
this.toolStripSeparator4,
......@@ -1896,55 +1904,55 @@
// 启动ToolStripMenuItem
//
this.启动ToolStripMenuItem.Name = "启动ToolStripMenuItem";
this.启动ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.启动ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.启动ToolStripMenuItem.Text = "启动";
this.启动ToolStripMenuItem.Click += new System.EventHandler(this.启动ToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(173, 6);
//
// 停止ToolStripMenuItem
//
this.停止ToolStripMenuItem.Name = "停止ToolStripMenuItem";
this.停止ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.停止ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.停止ToolStripMenuItem.Text = "停止";
this.停止ToolStripMenuItem.Click += new System.EventHandler(this.停止ToolStripMenuItem_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(173, 6);
//
// 复位ToolStripMenuItem
//
this.复位ToolStripMenuItem.Name = "复位ToolStripMenuItem";
this.复位ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.复位ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.复位ToolStripMenuItem.Text = "复位";
this.复位ToolStripMenuItem.Click += new System.EventHandler(this.复位ToolStripMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(173, 6);
//
// 回待机点ToolStripMenuItem
//
this.回待机点ToolStripMenuItem.Name = "回待机点ToolStripMenuItem";
this.回待机点ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.回待机点ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.回待机点ToolStripMenuItem.Text = "回待机点";
this.回待机点ToolStripMenuItem.Click += new System.EventHandler(this.回待机点ToolStripMenuItem_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(173, 6);
//
// 退出ToolStripMenuItem
//
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.退出ToolStripMenuItem.Text = "退出系统";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click);
//
......@@ -2480,6 +2488,13 @@
// tabPage1
//
this.tabPage1.Controls.Add(this.groupBox7);
this.tabPage1.Controls.Add(this.lblTemp);
this.tabPage1.Controls.Add(this.lblMsg);
this.tabPage1.Controls.Add(this.btnStartAuTo);
this.tabPage1.Controls.Add(this.btnInStore);
this.tabPage1.Controls.Add(this.btnBatchReset);
this.tabPage1.Controls.Add(this.txtJiange);
this.tabPage1.Controls.Add(this.label9);
this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(567, 416);
......@@ -2608,8 +2623,6 @@
this.groupBox6.Controls.Add(this.lblWaitTragGo);
this.groupBox6.Controls.Add(this.btnWaitTrgGo);
this.groupBox6.Controls.Add(this.lblBatchStatus);
this.groupBox6.Controls.Add(this.btnBatchOutTest);
this.groupBox6.Controls.Add(this.btnBatchReset);
this.groupBox6.Controls.Add(this.btnCloseDoor);
this.groupBox6.Controls.Add(this.btnGetOutTray);
this.groupBox6.Controls.Add(this.lblDoorStatus);
......@@ -2618,7 +2631,7 @@
this.groupBox6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox6.Location = new System.Drawing.Point(7, 124);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(497, 230);
this.groupBox6.Size = new System.Drawing.Size(497, 197);
this.groupBox6.TabIndex = 302;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "批量上下料操作";
......@@ -2691,23 +2704,24 @@
// btnBatchOutTest
//
this.btnBatchOutTest.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBatchOutTest.Location = new System.Drawing.Point(20, 184);
this.btnBatchOutTest.Location = new System.Drawing.Point(379, 22);
this.btnBatchOutTest.Name = "btnBatchOutTest";
this.btnBatchOutTest.Size = new System.Drawing.Size(237, 38);
this.btnBatchOutTest.Size = new System.Drawing.Size(105, 38);
this.btnBatchOutTest.TabIndex = 228;
this.btnBatchOutTest.Text = "对选中仓位进行批量出库测试";
this.btnBatchOutTest.Text = "批量出库测试";
this.btnBatchOutTest.UseVisualStyleBackColor = true;
this.btnBatchOutTest.Click += new System.EventHandler(this.btnBatchOutTest_Click);
//
// btnBatchReset
//
this.btnBatchReset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBatchReset.Location = new System.Drawing.Point(263, 184);
this.btnBatchReset.Location = new System.Drawing.Point(53, 300);
this.btnBatchReset.Name = "btnBatchReset";
this.btnBatchReset.Size = new System.Drawing.Size(175, 38);
this.btnBatchReset.TabIndex = 227;
this.btnBatchReset.Text = "批量上下料模块复位";
this.btnBatchReset.UseVisualStyleBackColor = true;
this.btnBatchReset.Visible = false;
this.btnBatchReset.Click += new System.EventHandler(this.btnBatchOutEnd_Click);
//
// btnCloseDoor
......@@ -2754,6 +2768,51 @@
this.btnBatchInStore.UseVisualStyleBackColor = true;
this.btnBatchInStore.Click += new System.EventHandler(this.btnBatchInStore_Click);
//
// txtInoutP4
//
this.txtInoutP4.AcceptsReturn = true;
this.txtInoutP4.BackColor = System.Drawing.SystemColors.Window;
this.txtInoutP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInoutP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInoutP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInoutP4.Location = new System.Drawing.Point(395, 258);
this.txtInoutP4.MaxLength = 0;
this.txtInoutP4.Name = "txtInoutP4";
this.txtInoutP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInoutP4.Size = new System.Drawing.Size(89, 23);
this.txtInoutP4.TabIndex = 278;
this.txtInoutP4.Text = "1000";
//
// btnInOutP4
//
this.btnInOutP4.AutoSize = true;
this.btnInOutP4.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutP4.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInOutP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP4.ForeColor = System.Drawing.Color.Green;
this.btnInOutP4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP4.Location = new System.Drawing.Point(252, 256);
this.btnInOutP4.Name = "btnInOutP4";
this.btnInOutP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP4.Size = new System.Drawing.Size(140, 27);
this.btnInOutP4.TabIndex = 277;
this.btnInOutP4.Text = "进出轴仓门出料点P4：";
this.btnInOutP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP4.UseVisualStyleBackColor = true;
this.btnInOutP4.Click += new System.EventHandler(this.btnInOutP4_Click);
//
// 上料模块复位ToolStripMenuItem
//
this.上料模块复位ToolStripMenuItem.Name = "上料模块复位ToolStripMenuItem";
this.上料模块复位ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.上料模块复位ToolStripMenuItem.Text = "上料模块复位";
this.上料模块复位ToolStripMenuItem.Click += new System.EventHandler(this.上料模块复位ToolStripMenuItem_Click);
//
// toolStripSeparator15
//
this.toolStripSeparator15.Name = "toolStripSeparator15";
this.toolStripSeparator15.Size = new System.Drawing.Size(173, 6);
//
// axis_5_Alarm
//
this.axis_5_Alarm.IOName = "";
......@@ -2832,6 +2891,7 @@
this.tabPage2.ResumeLayout(false);
this.tabPage3.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabPage1.PerformLayout();
this.groupBox7.ResumeLayout(false);
this.groupBox7.PerformLayout();
this.groupBox6.ResumeLayout(false);
......@@ -3064,6 +3124,10 @@
public System.Windows.Forms.Button btnUpdateSpeed;
private System.Windows.Forms.Label lblComMsg;
private System.Windows.Forms.Label lblOutInfo;
public System.Windows.Forms.TextBox txtInoutP4;
public System.Windows.Forms.Button btnInOutP4;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator15;
private System.Windows.Forms.ToolStripMenuItem 上料模块复位ToolStripMenuItem;
}
}
source/ACSingleStore/FrmStoreBox.cs
......@@ -83,8 +83,8 @@ namespace OnlineStore.AutoInOutStore
txtComP2.Text = Position.CompressAxis_Position_P2.ToString();
txtComP3.Text = Position.CompressAxis_CPosition_P3.ToString();
txtInOutP3.Text = Position.InOutAxis_Position_P3.ToString();
txtInOutP2.Text = Position.InOutAxis_DoorPosition_P2.ToString();
txtInOutP2.Text = Position.InOutAxis_Batch_P2.ToString();
txtInoutP4.Text = Position.InOutAxis_DoorOutPosition_P4.ToString();
//txtUpDownP1.Text = ktkPosition.UpDownAxis_DoorOPosition_P1.ToString();
}
txtSpeed.Text = store.Config.CompressAxis_EndSpeed.ToString();
......@@ -316,7 +316,7 @@ namespace OnlineStore.AutoInOutStore
}
lblOutInfo.Visible = !lblWaitTragGo.Visible;
lblOutInfo.Text ="累积处理 入库："+AutomaticBaiting.BatchInStoreCount+"盘共"+AutomaticBaiting.BatchInStoreHeight+"mm，"+
lblOutInfo.Text ="批量出入库信息： 入库："+AutomaticBaiting.BatchInStoreCount+"盘共"+AutomaticBaiting.BatchInStoreHeight+"mm，"+
"出库： " + AutomaticBaiting.BatchOutStoreCount + "盘共" + AutomaticBaiting.BatchOutStoreHeight + "mm";
if (HumitureController.IsRun)
{
......@@ -507,6 +507,7 @@ namespace OnlineStore.AutoInOutStore
ktk.ComPress_P3 = FormUtil.GetIntValue(txtComP3);
ktk.InOut_P1 = FormUtil.GetIntValue(txtInOutP1);
ktk.InOut_P2 = FormUtil.GetIntValue(txtInOutP2);
ktk.InOut_P4 = FormUtil.GetIntValue(txtInoutP4);
ktk.InOut_P3 = FormUtil.GetIntValue(txtInOutP3);
ktk.Middle_P1 = FormUtil.GetIntValue(txtMiddleP1);
ktk.Middle_P2 = FormUtil.GetIntValue(txtMiddleP2);
......@@ -552,7 +553,8 @@ namespace OnlineStore.AutoInOutStore
txtComP2.Text = ktkPosition.CompressAxis_Position_P2.ToString();
txtComP3.Text = ktkPosition.CompressAxis_CPosition_P3.ToString();
txtInOutP3.Text = ktkPosition.InOutAxis_Position_P3.ToString();
txtInOutP2.Text = ktkPosition.InOutAxis_DoorPosition_P2.ToString();
txtInOutP2.Text = ktkPosition.InOutAxis_Batch_P2.ToString();
txtInoutP4.Text = ktkPosition.InOutAxis_DoorOutPosition_P4.ToString();
txtUpDownP1.Text = store.Config.GetUpDownP1(ktkPosition.BagHeight).ToString();
//txtUpDownP2.Text = ktkPosition.UpDownAxis_DoorIPosition_P2.ToString();
//txtUpDownP7.Text = ktkPosition.UpDownAxis_DoorOBPosition_P7.ToString();
......@@ -695,8 +697,8 @@ namespace OnlineStore.AutoInOutStore
ktkPosition.UpDownAxis_OHPosition_P5 = FormUtil.GetIntValue(txtUpDownP5);
ktkPosition.UpDownAxis_OLPosition_P6 = FormUtil.GetIntValue(txtUpDownP6);
ktkPosition.CompressAxis_Position_P2 = FormUtil.GetIntValue(txtComP2);
ktkPosition.InOutAxis_DoorPosition_P2 = FormUtil.GetIntValue(txtInOutP2);
ktkPosition.InOutAxis_Batch_P2 = FormUtil.GetIntValue(txtInOutP2);
ktkPosition.InOutAxis_DoorOutPosition_P4 = FormUtil.GetIntValue(txtInoutP4);
//ktkPosition.UpDownAxis_DoorIPosition_P2 = FormUtil.GetIntValue(txtUpDownP2);
//ktkPosition.UpDownAxis_DoorOBPosition_P7 = FormUtil.GetIntValue(txtUpDownP7);
//ktkPosition.UpDownAxis_DoorIBPosition_P8 = FormUtil.GetIntValue(txtUpDownP8);
......@@ -1673,5 +1675,28 @@ namespace OnlineStore.AutoInOutStore
int speed = FormUtil.GetIntValue(txtASpeed);
ACServerManager.SetSpeed(portName, SlvAddr, speed);
}
private void btnInOutP4_Click(object sender, EventArgs e)
{
if (store.InOutAxisCanMove().Equals(false))
{
MessageBox.Show("定位气缸不在下降端，不能移动进出轴", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
int value = FormUtil.GetIntValue(txtInoutP4);
AxisABSMove(store.Config.InOut_Axis, value, store.Config.InOutAxis_P2_Speed);
}
private void 上料模块复位ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!AutomaticBaiting.DoorIsClose())
{
MessageBox.Show("请先关闭批量上下料门");
return;
}
AutomaticBaiting.BatchDoorClose(false);
bool result = AutomaticBaiting.Reset(false);
}
}
}
source/DeviceLibrary/StoreConfig/AC/linePositions.csv
位置,优先级,高度,宽度,料仓ID,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴仓门取料点P2,进出轴吸盘取料点P2
1#AC1_1_1_4,774,8,7,1,80750,407400,415100,415100,407400,73000,-22000,-10000,83600,5000
位置,优先级,高度,宽度,料仓ID,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴仓门出料点P4,进出轴吸盘取料点P2
1#AC1_1_1_4,774,8,7,1,80750,407400,415100,415100,407400,73000,-95000,-70000,83600,5000
1#AC1_1_1_5,773,12,7,s,211783,67807,71168,71168,67807,5000,-110000,-75000,5000,5000
1#AC1_1_1_6,772,8,7,,211783,83730,87091,87091,83730,68000,-110000,-75000,81000,81000
1#AC1_1_1_7,771,8,7,,211783,99653,103014,103014,99653,68000,-110000,-75000,81000,81000
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
......@@ -38,7 +38,11 @@ namespace OnlineStore.DeviceLibrary
{
return false;
}
int height = 8;
int height = 24;
if (Config.Default_TrayWidth.Equals(7))
{
height = 8;
}
//加载位置
if (param.MoveP == null)
{
......@@ -56,11 +60,12 @@ namespace OnlineStore.DeviceLibrary
p.UpDown_Door_P7 = Config.UpDownAxis_Door_P7;
p.UpDown_OutHigh_P2 = Config.UpDownAxis_OutHigh_P2;
p.UpDown_OutLow_P8 = Config.UpDownAxis_OutLow_P8;
p.InOut_P2 = position.InOutAxis_DoorPosition_P2;
if (IsBatch)
{
p.InOut_P2 = position.InOutAxis_Batch_P2;
}
p.InOut_P2 = position.InOutAxis_Batch_P2;
p.InOut_P4 = position.InOutAxis_DoorOutPosition_P4;
//if (IsBatch)
//{
// p.InOut_P2 = position.InOutAxis_Batch_P2;
//}
p.UpDown_P1 = Config.GetUpDownP1(position.BagHeight);
p.ComPress_P2 = position.CompressAxis_Position_P2;
......@@ -385,9 +390,10 @@ namespace OnlineStore.DeviceLibrary
{
if (!StoreMove.IsNeedInStore)
{
InStoreLog("送出料盘：SI_21 ，需要操作人员拿走料盘，进出轴（叉子）到门口位置P7 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_21_DeviceToDoor);
InStoreLog("送出料盘：SI_21 ，需要操作人员拿走料盘，进出轴（叉子）到仓门出料点P4，升降轴到门口位置P7 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_21_DeviceToDoor);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_Door_P7, Config.UpDownAxis_P7_Speed);
ACAxisMove(Config.InOut_Axis, moveP.InOut_P4, Config.InOutAxis_P2_Speed);
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SafetyLightCurtains, IO_VALUE.HIGH));
}
else
......@@ -876,8 +882,16 @@ namespace OnlineStore.DeviceLibrary
{
LineMoveP moveP = StoreMove.MoveParam.MoveP;
StoreMove.NextMoveStep(StoreMoveStep.SO_10_DeviceToDoor);
OutStoreLog("出库：SO_10 叉子进出料口，进出轴至P2(进料口取料点) ");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P2, Config.InOutAxis_P2_Speed);
if (StoreMove.IsBatchInOutStore)
{
OutStoreLog("出库：SO_10 叉子进出料口，进出轴至P2(进料口吸盘取料点) ");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P2, Config.InOutAxis_P2_Speed);
}
else
{
OutStoreLog("出库：SO_10 叉子进出料口，进出轴至P4(仓门出料点) ");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P4, Config.InOutAxis_P2_Speed);
}
}
#endregion
......
source/DeviceLibrary/store/LineMoveP.cs
......@@ -64,7 +64,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public int InOut_P1 { get; set; }
/// <summary>
/// 轴3进出轴 进料口取料点P2
/// 轴3进出轴 进料口吸盘取料点P2
/// </summary>
public int InOut_P2 { get; set; }
/// <summary>
......@@ -73,6 +73,12 @@ namespace OnlineStore.DeviceLibrary
public int InOut_P3 { get; set; }
/// <summary>
/// 轴3进出轴 仓门出库点P4
/// </summary>
public int InOut_P4 { get; set; }
/// <summary>
/// 轴4（ 压紧轴）待机原位点P1
/// </summary>
public int ComPress_P1 { get; set; }
......
source/LoadCVSLibrary/position/AutoStorePosition.cs
......@@ -59,10 +59,10 @@ namespace OnlineStore.LoadCSVLibrary
public int CompressAxis_CPosition_P3 { get; set; }
/// <summary>
/// 轴3(进出轴） 进料口取料点P2 ，料仓门口取料放料点
/// 轴3(进出轴） 进出轴仓门出料点P4 ，料仓门口取料放料点
/// </summary>
[CSVAttribute("进出轴仓门取料点P2")]
public int InOutAxis_DoorPosition_P2 { get; set; }
[CSVAttribute("进出轴仓门出料点P4")]
public int InOutAxis_DoorOutPosition_P4 { get; set; }
/// <summary>
/// 轴3(进出轴） 进出轴吸盘取料点P2 ，吸盘下方取放料点，批量出入库时使用
/// </summary>
......@@ -86,7 +86,7 @@ namespace OnlineStore.LoadCSVLibrary
{
int iMin = Config.InOut_Axis.PositionMin;
int iMax = Config.InOut_Axis.PositionMax;
if (iMin > position.InOutAxis_DoorPosition_P2 || iMax < position.InOutAxis_DoorPosition_P2)
if (iMin > position.InOutAxis_DoorOutPosition_P4 || iMax < position.InOutAxis_DoorOutPosition_P4)
{
LogUtil.error(position.PositionNum + " InOutAxis_DoorPosition_P2位置超出" + Config.InOut_Axis.Explain + "上下限（" + iMin + "-" + iMax + "）");
return false;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!