Skip to content

刘韬 / SO815-AutoInOutStore

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

未扫到码或者单盘出库时，需要等待操作人员拿走料盘

1 个父辈 b16c6142
内嵌 并排
正在显示 10 个修改的文件 包含 681 行增加 和 444 行删除
source/ACSingleStore/FrmStoreBox.Designer.cs
......@@ -49,7 +49,7 @@
this.button2 = new System.Windows.Forms.Button();
this.label10 = new System.Windows.Forms.Label();
this.txtBusyStatus = new System.Windows.Forms.TextBox();
this.button1 = new System.Windows.Forms.Button();
this.btnReadBusy = new System.Windows.Forms.Button();
this.label2 = new System.Windows.Forms.Label();
this.txtAlarmStatus = new System.Windows.Forms.TextBox();
this.btnGetAlarm = new System.Windows.Forms.Button();
......@@ -107,6 +107,8 @@
this.label43 = new System.Windows.Forms.Label();
this.label42 = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.txtUpDownDoor = new System.Windows.Forms.TextBox();
this.btnUpDownDoor = new System.Windows.Forms.Button();
this.lblTemp = new System.Windows.Forms.Label();
this.btnClearLog = new System.Windows.Forms.Button();
this.lblMsg = new System.Windows.Forms.Label();
......@@ -118,10 +120,7 @@
this.txtInOutP2 = new System.Windows.Forms.TextBox();
this.txtInOutP1 = new System.Windows.Forms.TextBox();
this.txtMiddleP1 = new System.Windows.Forms.TextBox();
this.txtUpDownP7 = new System.Windows.Forms.TextBox();
this.txtUpDownP8 = new System.Windows.Forms.TextBox();
this.txtUpDownP1 = new System.Windows.Forms.TextBox();
this.txtUpDownP2 = new System.Windows.Forms.TextBox();
this.txtComP3 = new System.Windows.Forms.TextBox();
this.txtComP2 = new System.Windows.Forms.TextBox();
this.txtInOutP3 = new System.Windows.Forms.TextBox();
......@@ -138,10 +137,7 @@
this.btnInOutP2 = new System.Windows.Forms.Button();
this.btnInOutP1 = new System.Windows.Forms.Button();
this.btnMiddleP1 = new System.Windows.Forms.Button();
this.btnUpDownP7 = new System.Windows.Forms.Button();
this.btnUpDownP8 = new System.Windows.Forms.Button();
this.btnUpDownP1 = new System.Windows.Forms.Button();
this.btnUpDownP2 = new System.Windows.Forms.Button();
this.btnComP3 = new System.Windows.Forms.Button();
this.btnComP2 = new System.Windows.Forms.Button();
this.btnInOutP3 = new System.Windows.Forms.Button();
......@@ -150,6 +146,12 @@
this.btnUpDownP6 = new System.Windows.Forms.Button();
this.btnUpDownP3 = new System.Windows.Forms.Button();
this.btnUpDownP4 = new System.Windows.Forms.Button();
this.txtUpDownP7 = new System.Windows.Forms.TextBox();
this.txtUpDownP8 = new System.Windows.Forms.TextBox();
this.txtUpDownP2 = new System.Windows.Forms.TextBox();
this.btnUpDownP7 = new System.Windows.Forms.Button();
this.btnUpDownP8 = new System.Windows.Forms.Button();
this.btnUpDownP2 = new System.Windows.Forms.Button();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.料仓操作ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.启动ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
......@@ -169,8 +171,12 @@
this.料仓运转OFFToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.打开舱门ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
this.关闭仓门ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.批量上下轴ONToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
this.批量上下轴OFFToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.设备调试ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.轴卡点动ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
......@@ -216,6 +222,8 @@
this.tabPage2 = new System.Windows.Forms.TabPage();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.lblWaitTragGo = new System.Windows.Forms.Label();
this.btnWaitTrgGo = new System.Windows.Forms.Button();
this.lblBatchStatus = new System.Windows.Forms.Label();
this.btnBatchOutTest = new System.Windows.Forms.Button();
this.btnBatchReset = new System.Windows.Forms.Button();
......@@ -223,10 +231,6 @@
this.btnGetOutTray = new System.Windows.Forms.Button();
this.lblDoorStatus = new System.Windows.Forms.Label();
this.btnBatchInStore = new System.Windows.Forms.Button();
this.批量上下轴ONToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.批量上下轴OFFToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
this.groupBox5.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
......@@ -281,7 +285,7 @@
this.groupBox5.Controls.Add(this.button2);
this.groupBox5.Controls.Add(this.label10);
this.groupBox5.Controls.Add(this.txtBusyStatus);
this.groupBox5.Controls.Add(this.button1);
this.groupBox5.Controls.Add(this.btnReadBusy);
this.groupBox5.Controls.Add(this.label2);
this.groupBox5.Controls.Add(this.txtAlarmStatus);
this.groupBox5.Controls.Add(this.btnGetAlarm);
......@@ -522,15 +526,15 @@
this.txtBusyStatus.Size = new System.Drawing.Size(25, 23);
this.txtBusyStatus.TabIndex = 288;
//
// button1
// btnReadBusy
//
this.button1.Location = new System.Drawing.Point(286, 228);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(105, 33);
this.button1.TabIndex = 287;
this.button1.Text = "读BUSY状态";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click_1);
this.btnReadBusy.Location = new System.Drawing.Point(286, 228);
this.btnReadBusy.Name = "btnReadBusy";
this.btnReadBusy.Size = new System.Drawing.Size(105, 33);
this.btnReadBusy.TabIndex = 287;
this.btnReadBusy.Text = "读BUSY状态";
this.btnReadBusy.UseVisualStyleBackColor = true;
this.btnReadBusy.Click += new System.EventHandler(this.button1_Click_1);
//
// label2
//
......@@ -1171,6 +1175,8 @@
//
// groupBox2
//
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);
......@@ -1182,10 +1188,7 @@
this.groupBox2.Controls.Add(this.txtInOutP2);
this.groupBox2.Controls.Add(this.txtInOutP1);
this.groupBox2.Controls.Add(this.txtMiddleP1);
this.groupBox2.Controls.Add(this.txtUpDownP7);
this.groupBox2.Controls.Add(this.txtUpDownP8);
this.groupBox2.Controls.Add(this.txtUpDownP1);
this.groupBox2.Controls.Add(this.txtUpDownP2);
this.groupBox2.Controls.Add(this.txtComP3);
this.groupBox2.Controls.Add(this.txtComP2);
this.groupBox2.Controls.Add(this.txtInOutP3);
......@@ -1202,10 +1205,7 @@
this.groupBox2.Controls.Add(this.btnInOutP2);
this.groupBox2.Controls.Add(this.btnInOutP1);
this.groupBox2.Controls.Add(this.btnMiddleP1);
this.groupBox2.Controls.Add(this.btnUpDownP7);
this.groupBox2.Controls.Add(this.btnUpDownP8);
this.groupBox2.Controls.Add(this.btnUpDownP1);
this.groupBox2.Controls.Add(this.btnUpDownP2);
this.groupBox2.Controls.Add(this.btnComP3);
this.groupBox2.Controls.Add(this.btnComP2);
this.groupBox2.Controls.Add(this.btnInOutP3);
......@@ -1221,6 +1221,39 @@
this.groupBox2.TabStop = false;
this.groupBox2.Text = "出入库操作";
//
// txtUpDownDoor
//
this.txtUpDownDoor.AcceptsReturn = true;
this.txtUpDownDoor.BackColor = System.Drawing.SystemColors.Window;
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, 132);
this.txtUpDownDoor.MaxLength = 0;
this.txtUpDownDoor.Name = "txtUpDownDoor";
this.txtUpDownDoor.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownDoor.Size = new System.Drawing.Size(89, 23);
this.txtUpDownDoor.TabIndex = 272;
this.txtUpDownDoor.Text = "1000";
//
// btnUpDownDoor
//
this.btnUpDownDoor.AutoSize = true;
this.btnUpDownDoor.BackColor = System.Drawing.SystemColors.Control;
this.btnUpDownDoor.Cursor = System.Windows.Forms.Cursors.Default;
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, 130);
this.btnUpDownDoor.Name = "btnUpDownDoor";
this.btnUpDownDoor.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownDoor.Size = new System.Drawing.Size(140, 27);
this.btnUpDownDoor.TabIndex = 271;
this.btnUpDownDoor.Text = "升降轴仓门位置：";
this.btnUpDownDoor.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownDoor.UseVisualStyleBackColor = true;
this.btnUpDownDoor.Click += new System.EventHandler(this.btnUpDownDoor_Click);
//
// lblTemp
//
this.lblTemp.AutoSize = true;
......@@ -1307,7 +1340,7 @@
this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP1.Size = new System.Drawing.Size(89, 23);
this.txtComP1.TabIndex = 214;
this.txtComP1.Text = "-12388";
this.txtComP1.Text = "1000";
//
// txtInOutP2
//
......@@ -1322,7 +1355,7 @@
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP2.Size = new System.Drawing.Size(89, 23);
this.txtInOutP2.TabIndex = 212;
this.txtInOutP2.Text = "-17000";
this.txtInOutP2.Text = "1000";
//
// txtInOutP1
//
......@@ -1337,7 +1370,7 @@
this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP1.Size = new System.Drawing.Size(89, 23);
this.txtInOutP1.TabIndex = 210;
this.txtInOutP1.Text = "3000";
this.txtInOutP1.Text = "1000";
//
// txtMiddleP1
//
......@@ -1352,37 +1385,7 @@
this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMiddleP1.Size = new System.Drawing.Size(89, 23);
this.txtMiddleP1.TabIndex = 208;
this.txtMiddleP1.Text = "-52388";
//
// txtUpDownP7
//
this.txtUpDownP7.AcceptsReturn = true;
this.txtUpDownP7.BackColor = System.Drawing.SystemColors.Window;
this.txtUpDownP7.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP7.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP7.Location = new System.Drawing.Point(153, 163);
this.txtUpDownP7.MaxLength = 0;
this.txtUpDownP7.Name = "txtUpDownP7";
this.txtUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP7.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP7.TabIndex = 204;
this.txtUpDownP7.Text = "-836025";
//
// txtUpDownP8
//
this.txtUpDownP8.AcceptsReturn = true;
this.txtUpDownP8.BackColor = System.Drawing.SystemColors.Window;
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, 194);
this.txtUpDownP8.MaxLength = 0;
this.txtUpDownP8.Name = "txtUpDownP8";
this.txtUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP8.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP8.TabIndex = 206;
this.txtUpDownP8.Text = "-816491";
this.txtMiddleP1.Text = "1000";
//
// txtUpDownP1
//
......@@ -1397,22 +1400,7 @@
this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP1.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP1.TabIndex = 200;
this.txtUpDownP1.Text = "-816491";
//
// txtUpDownP2
//
this.txtUpDownP2.AcceptsReturn = true;
this.txtUpDownP2.BackColor = System.Drawing.SystemColors.Window;
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, 132);
this.txtUpDownP2.MaxLength = 0;
this.txtUpDownP2.Name = "txtUpDownP2";
this.txtUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP2.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP2.TabIndex = 202;
this.txtUpDownP2.Text = "-836025";
this.txtUpDownP1.Text = "1000";
//
// txtComP3
//
......@@ -1427,7 +1415,7 @@
this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP3.Size = new System.Drawing.Size(89, 23);
this.txtComP3.TabIndex = 198;
this.txtComP3.Text = "-12388";
this.txtComP3.Text = "1000";
//
// txtComP2
//
......@@ -1442,7 +1430,7 @@
this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP2.Size = new System.Drawing.Size(89, 23);
this.txtComP2.TabIndex = 196;
this.txtComP2.Text = "-12388";
this.txtComP2.Text = "1000";
//
// txtInOutP3
//
......@@ -1457,7 +1445,7 @@
this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP3.Size = new System.Drawing.Size(89, 23);
this.txtInOutP3.TabIndex = 194;
this.txtInOutP3.Text = "-12388";
this.txtInOutP3.Text = "1000";
//
// txtMiddleP2
//
......@@ -1472,7 +1460,7 @@
this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMiddleP2.Size = new System.Drawing.Size(89, 23);
this.txtMiddleP2.TabIndex = 192;
this.txtMiddleP2.Text = "-12388";
this.txtMiddleP2.Text = "1000";
//
// txtUpDownP5
//
......@@ -1487,7 +1475,7 @@
this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP5.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP5.TabIndex = 188;
this.txtUpDownP5.Text = "-16388";
this.txtUpDownP5.Text = "1000";
//
// txtUpDownP6
//
......@@ -1502,7 +1490,7 @@
this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP6.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP6.TabIndex = 190;
this.txtUpDownP6.Text = "-12388";
this.txtUpDownP6.Text = "1000";
//
// cmbPosition
//
......@@ -1545,7 +1533,7 @@
this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP3.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP3.TabIndex = 162;
this.txtUpDownP3.Text = "-16388";
this.txtUpDownP3.Text = "1000";
//
// btnInStore
//
......@@ -1582,7 +1570,7 @@
this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP4.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP4.TabIndex = 166;
this.txtUpDownP4.Text = "-12388";
this.txtUpDownP4.Text = "1000";
//
// btnComP1
//
......@@ -1656,78 +1644,24 @@
this.btnMiddleP1.UseVisualStyleBackColor = true;
this.btnMiddleP1.Click += new System.EventHandler(this.btnMiddleP1_Click);
//
// btnUpDownP7
//
this.btnUpDownP7.AutoSize = true;
this.btnUpDownP7.BackColor = System.Drawing.SystemColors.Control;
this.btnUpDownP7.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpDownP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP7.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP7.Location = new System.Drawing.Point(10, 161);
this.btnUpDownP7.Name = "btnUpDownP7";
this.btnUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP7.Size = new System.Drawing.Size(140, 27);
this.btnUpDownP7.TabIndex = 203;
this.btnUpDownP7.Text = "升降轴入料缓冲点P7：";
this.btnUpDownP7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP7.UseVisualStyleBackColor = true;
this.btnUpDownP7.Click += new System.EventHandler(this.btnUpDownP7_Click);
//
// btnUpDownP8
//
this.btnUpDownP8.AutoSize = true;
this.btnUpDownP8.BackColor = System.Drawing.SystemColors.Control;
this.btnUpDownP8.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpDownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP8.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP8.Location = new System.Drawing.Point(10, 192);
this.btnUpDownP8.Name = "btnUpDownP8";
this.btnUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP8.Size = new System.Drawing.Size(140, 27);
this.btnUpDownP8.TabIndex = 205;
this.btnUpDownP8.Text = "升降轴出料缓冲点P8：";
this.btnUpDownP8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP8.UseVisualStyleBackColor = true;
this.btnUpDownP8.Click += new System.EventHandler(this.btnUpDownP8_Click);
//
// btnUpDownP1
//
this.btnUpDownP1.AutoSize = true;
this.btnUpDownP1.BackColor = System.Drawing.SystemColors.Control;
this.btnUpDownP1.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP1.ForeColor = System.Drawing.Color.Red;
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, 99);
this.btnUpDownP1.Name = "btnUpDownP1";
this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP1.Size = new System.Drawing.Size(140, 27);
this.btnUpDownP1.TabIndex = 199;
this.btnUpDownP1.Text = "升降轴入料点P1：";
this.btnUpDownP1.Text = "升降轴出入料点P1：";
this.btnUpDownP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP1.UseVisualStyleBackColor = true;
this.btnUpDownP1.Click += new System.EventHandler(this.btnUpDownP1_Click);
//
// btnUpDownP2
//
this.btnUpDownP2.AutoSize = true;
this.btnUpDownP2.BackColor = System.Drawing.SystemColors.Control;
this.btnUpDownP2.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP2.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP2.Location = new System.Drawing.Point(10, 130);
this.btnUpDownP2.Name = "btnUpDownP2";
this.btnUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP2.Size = new System.Drawing.Size(140, 27);
this.btnUpDownP2.TabIndex = 201;
this.btnUpDownP2.Text = "升降轴出料前点P2：";
this.btnUpDownP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP2.UseVisualStyleBackColor = true;
this.btnUpDownP2.Click += new System.EventHandler(this.btnUpDownP2_Click);
//
// btnComP3
//
this.btnComP3.AutoSize = true;
......@@ -1802,7 +1736,7 @@
this.btnUpDownP5.BackColor = System.Drawing.SystemColors.Control;
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.Red;
this.btnUpDownP5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP5.Location = new System.Drawing.Point(251, 161);
this.btnUpDownP5.Name = "btnUpDownP5";
this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1819,7 +1753,7 @@
this.btnUpDownP6.BackColor = System.Drawing.SystemColors.Control;
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.Red;
this.btnUpDownP6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP6.Location = new System.Drawing.Point(251, 192);
this.btnUpDownP6.Name = "btnUpDownP6";
this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1836,7 +1770,7 @@
this.btnUpDownP3.BackColor = System.Drawing.SystemColors.Control;
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.Red;
this.btnUpDownP3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP3.Location = new System.Drawing.Point(251, 99);
this.btnUpDownP3.Name = "btnUpDownP3";
this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1853,7 +1787,7 @@
this.btnUpDownP4.BackColor = System.Drawing.SystemColors.Control;
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.Red;
this.btnUpDownP4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP4.Location = new System.Drawing.Point(251, 130);
this.btnUpDownP4.Name = "btnUpDownP4";
this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1864,6 +1798,111 @@
this.btnUpDownP4.UseVisualStyleBackColor = true;
this.btnUpDownP4.Click += new System.EventHandler(this.btnUpDownP4_Click);
//
// txtUpDownP7
//
this.txtUpDownP7.AcceptsReturn = true;
this.txtUpDownP7.BackColor = System.Drawing.SystemColors.Window;
this.txtUpDownP7.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP7.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP7.Location = new System.Drawing.Point(287, 50);
this.txtUpDownP7.MaxLength = 0;
this.txtUpDownP7.Name = "txtUpDownP7";
this.txtUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP7.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP7.TabIndex = 204;
this.txtUpDownP7.Text = "-836025";
this.txtUpDownP7.Visible = false;
//
// txtUpDownP8
//
this.txtUpDownP8.AcceptsReturn = true;
this.txtUpDownP8.BackColor = System.Drawing.SystemColors.Window;
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(287, 81);
this.txtUpDownP8.MaxLength = 0;
this.txtUpDownP8.Name = "txtUpDownP8";
this.txtUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP8.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP8.TabIndex = 206;
this.txtUpDownP8.Text = "-816491";
this.txtUpDownP8.Visible = false;
//
// txtUpDownP2
//
this.txtUpDownP2.AcceptsReturn = true;
this.txtUpDownP2.BackColor = System.Drawing.SystemColors.Window;
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(287, 19);
this.txtUpDownP2.MaxLength = 0;
this.txtUpDownP2.Name = "txtUpDownP2";
this.txtUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP2.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP2.TabIndex = 202;
this.txtUpDownP2.Text = "-836025";
this.txtUpDownP2.Visible = false;
//
// btnUpDownP7
//
this.btnUpDownP7.AutoSize = true;
this.btnUpDownP7.BackColor = System.Drawing.SystemColors.Control;
this.btnUpDownP7.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpDownP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP7.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP7.Location = new System.Drawing.Point(144, 48);
this.btnUpDownP7.Name = "btnUpDownP7";
this.btnUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP7.Size = new System.Drawing.Size(140, 27);
this.btnUpDownP7.TabIndex = 203;
this.btnUpDownP7.Text = "升降轴入料缓冲点P7：";
this.btnUpDownP7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP7.UseVisualStyleBackColor = true;
this.btnUpDownP7.Visible = false;
this.btnUpDownP7.Click += new System.EventHandler(this.btnUpDownP7_Click);
//
// btnUpDownP8
//
this.btnUpDownP8.AutoSize = true;
this.btnUpDownP8.BackColor = System.Drawing.SystemColors.Control;
this.btnUpDownP8.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpDownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP8.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP8.Location = new System.Drawing.Point(144, 79);
this.btnUpDownP8.Name = "btnUpDownP8";
this.btnUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP8.Size = new System.Drawing.Size(140, 27);
this.btnUpDownP8.TabIndex = 205;
this.btnUpDownP8.Text = "升降轴出料缓冲点P8：";
this.btnUpDownP8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP8.UseVisualStyleBackColor = true;
this.btnUpDownP8.Visible = false;
this.btnUpDownP8.Click += new System.EventHandler(this.btnUpDownP8_Click);
//
// btnUpDownP2
//
this.btnUpDownP2.AutoSize = true;
this.btnUpDownP2.BackColor = System.Drawing.SystemColors.Control;
this.btnUpDownP2.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP2.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP2.Location = new System.Drawing.Point(144, 17);
this.btnUpDownP2.Name = "btnUpDownP2";
this.btnUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP2.Size = new System.Drawing.Size(140, 27);
this.btnUpDownP2.TabIndex = 201;
this.btnUpDownP2.Text = "升降轴出料前点P2：";
this.btnUpDownP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP2.UseVisualStyleBackColor = true;
this.btnUpDownP2.Visible = false;
this.btnUpDownP2.Click += new System.EventHandler(this.btnUpDownP2_Click);
//
// menuStrip1
//
this.menuStrip1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
......@@ -2013,10 +2052,10 @@
this.打开舱门ToolStripMenuItem.Text = "打开进料口仓门";
this.打开舱门ToolStripMenuItem.Click += new System.EventHandler(this.打开舱门ToolStripMenuItem_Click);
//
// toolStripSeparator8
// toolStripSeparator14
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(189, 6);
this.toolStripSeparator14.Name = "toolStripSeparator14";
this.toolStripSeparator14.Size = new System.Drawing.Size(189, 6);
//
// 关闭仓门ToolStripMenuItem
//
......@@ -2025,6 +2064,30 @@
this.关闭仓门ToolStripMenuItem.Text = "关闭进料口仓门";
this.关闭仓门ToolStripMenuItem.Click += new System.EventHandler(this.关闭仓门ToolStripMenuItem_Click);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(189, 6);
//
// 批量上下轴ONToolStripMenuItem
//
this.批量上下轴ONToolStripMenuItem.Name = "批量上下轴ONToolStripMenuItem";
this.批量上下轴ONToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.批量上下轴ONToolStripMenuItem.Text = "批量上下轴ON";
this.批量上下轴ONToolStripMenuItem.Click += new System.EventHandler(this.批量上下轴ONToolStripMenuItem_Click);
//
// toolStripSeparator13
//
this.toolStripSeparator13.Name = "toolStripSeparator13";
this.toolStripSeparator13.Size = new System.Drawing.Size(189, 6);
//
// 批量上下轴OFFToolStripMenuItem
//
this.批量上下轴OFFToolStripMenuItem.Name = "批量上下轴OFFToolStripMenuItem";
this.批量上下轴OFFToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.批量上下轴OFFToolStripMenuItem.Text = "批量上下轴OFF";
this.批量上下轴OFFToolStripMenuItem.Click += new System.EventHandler(this.批量上下轴OFFToolStripMenuItem_Click);
//
// 设备调试ToolStripMenuItem
//
this.设备调试ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
......@@ -2132,9 +2195,15 @@
//
// groupBox3
//
this.groupBox3.Controls.Add(this.lblWarnMsg);
this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Controls.Add(this.chbAuto);
this.groupBox3.Controls.Add(this.txtUpDownP2);
this.groupBox3.Controls.Add(this.btnUpDownP2);
this.groupBox3.Controls.Add(this.btnUpDownP8);
this.groupBox3.Controls.Add(this.btnUpDownP7);
this.groupBox3.Controls.Add(this.txtUpDownP8);
this.groupBox3.Controls.Add(this.txtUpDownP7);
this.groupBox3.Controls.Add(this.lblWarnMsg);
this.groupBox3.Location = new System.Drawing.Point(7, 32);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(496, 90);
......@@ -2444,6 +2513,8 @@
//
// groupBox6
//
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);
......@@ -2459,6 +2530,28 @@
this.groupBox6.TabStop = false;
this.groupBox6.Text = "批量上下料操作";
//
// lblWaitTragGo
//
this.lblWaitTragGo.AutoSize = true;
this.lblWaitTragGo.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWaitTragGo.ForeColor = System.Drawing.Color.Red;
this.lblWaitTragGo.Location = new System.Drawing.Point(167, 120);
this.lblWaitTragGo.Name = "lblWaitTragGo";
this.lblWaitTragGo.Size = new System.Drawing.Size(247, 20);
this.lblWaitTragGo.TabIndex = 231;
this.lblWaitTragGo.Text = "请手动拿出料盘，并点击左侧信号确认";
//
// btnWaitTrgGo
//
this.btnWaitTrgGo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWaitTrgGo.Location = new System.Drawing.Point(39, 112);
this.btnWaitTrgGo.Name = "btnWaitTrgGo";
this.btnWaitTrgGo.Size = new System.Drawing.Size(105, 38);
this.btnWaitTrgGo.TabIndex = 230;
this.btnWaitTrgGo.Text = "料盘已拿出";
this.btnWaitTrgGo.UseVisualStyleBackColor = true;
this.btnWaitTrgGo.Click += new System.EventHandler(this.btnWaitTrgGo_Click);
//
// lblBatchStatus
//
this.lblBatchStatus.AutoSize = true;
......@@ -2495,7 +2588,7 @@
// btnStartBatchInStore
//
this.btnStartBatchInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStartBatchInStore.Location = new System.Drawing.Point(171, 93);
this.btnStartBatchInStore.Location = new System.Drawing.Point(320, 68);
this.btnStartBatchInStore.Name = "btnStartBatchInStore";
this.btnStartBatchInStore.Size = new System.Drawing.Size(105, 38);
this.btnStartBatchInStore.TabIndex = 226;
......@@ -2506,7 +2599,7 @@
// btnGetOutTray
//
this.btnGetOutTray.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnGetOutTray.Location = new System.Drawing.Point(39, 113);
this.btnGetOutTray.Location = new System.Drawing.Point(171, 68);
this.btnGetOutTray.Name = "btnGetOutTray";
this.btnGetOutTray.Size = new System.Drawing.Size(105, 38);
this.btnGetOutTray.TabIndex = 225;
......@@ -2519,7 +2612,7 @@
this.lblDoorStatus.AutoSize = true;
this.lblDoorStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblDoorStatus.ForeColor = System.Drawing.Color.Green;
this.lblDoorStatus.Location = new System.Drawing.Point(333, 76);
this.lblDoorStatus.Location = new System.Drawing.Point(353, 31);
this.lblDoorStatus.Name = "lblDoorStatus";
this.lblDoorStatus.Size = new System.Drawing.Size(121, 20);
this.lblDoorStatus.TabIndex = 224;
......@@ -2536,30 +2629,6 @@
this.btnBatchInStore.UseVisualStyleBackColor = true;
this.btnBatchInStore.Click += new System.EventHandler(this.btnBatchInStore_Click);
//
// 批量上下轴ONToolStripMenuItem
//
this.批量上下轴ONToolStripMenuItem.Name = "批量上下轴ONToolStripMenuItem";
this.批量上下轴ONToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.批量上下轴ONToolStripMenuItem.Text = "批量上下轴ON";
this.批量上下轴ONToolStripMenuItem.Click += new System.EventHandler(this.批量上下轴ONToolStripMenuItem_Click);
//
// 批量上下轴OFFToolStripMenuItem
//
this.批量上下轴OFFToolStripMenuItem.Name = "批量上下轴OFFToolStripMenuItem";
this.批量上下轴OFFToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.批量上下轴OFFToolStripMenuItem.Text = "批量上下轴OFF";
this.批量上下轴OFFToolStripMenuItem.Click += new System.EventHandler(this.批量上下轴OFFToolStripMenuItem_Click);
//
// toolStripSeparator13
//
this.toolStripSeparator13.Name = "toolStripSeparator13";
this.toolStripSeparator13.Size = new System.Drawing.Size(189, 6);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
this.toolStripSeparator14.Size = new System.Drawing.Size(189, 6);
//
// FrmStoreBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......@@ -2727,7 +2796,7 @@
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.TextBox txtBusyStatus;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button btnReadBusy;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox txtAlarmStatus;
private System.Windows.Forms.Button btnGetAlarm;
......@@ -2809,6 +2878,10 @@
private System.Windows.Forms.ToolStripMenuItem 批量上下轴OFFToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator14;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator13;
private System.Windows.Forms.Label lblWaitTragGo;
private System.Windows.Forms.Button btnWaitTrgGo;
public System.Windows.Forms.TextBox txtUpDownDoor;
public System.Windows.Forms.Button btnUpDownDoor;
}
}
source/ACSingleStore/FrmStoreBox.cs
......@@ -65,11 +65,12 @@ namespace OnlineStore.AutoInOutStore
txtInOutP1.Text = store.Config.InOutAxis_P1_Position.ToString();
txtComP1.Text = store.Config.CompressAxis_P1_Position.ToString();
txtUpDownP2.Text = store.Config.UpDownAxis_DoorIPosition_P2.ToString();
txtUpDownP7.Text = store.Config.UpDownAxis_DoorOBPosition_P7.ToString();
txtUpDownP8.Text = store.Config.UpDownAxis_DoorIBPosition_P8.ToString();
//txtUpDownP2.Text = store.Config.UpDownAxis_DoorIPosition_P2.ToString();
//txtUpDownP7.Text = store.Config.UpDownAxis_DoorOBPosition_P7.ToString();
//txtUpDownP8.Text = store.Config.UpDownAxis_DoorIBPosition_P8.ToString();
//txtInOutP2.Text = store.Config.InOutAxis_DoorPosition_P2.ToString();
txtUpDownP1.Text = store.Config.GetDefaultUpDownP1().ToString();
txtUpDownDoor.Text = store.Config.UpDownAxis_DoorPosition.ToString();
if (Position != null)
{
txtUpDownP1.Text = store.Config.GetUpDownP1(Position.BagHeight).ToString();
......@@ -86,6 +87,7 @@ namespace OnlineStore.AutoInOutStore
//txtUpDownP7.Text = ktkPosition.UpDownAxis_DoorOBPosition_P7.ToString();
//txtUpDownP8.Text = ktkPosition.UpDownAxis_DoorIBPosition_P8.ToString();
txtInOutP2.Text = Position.InOutAxis_DoorPosition_P2.ToString();
//txtUpDownP1.Text = ktkPosition.UpDownAxis_DoorOPosition_P1.ToString();
}
......@@ -164,6 +166,7 @@ namespace OnlineStore.AutoInOutStore
{
return;
}
BatchInoutStatus();
//HumitureServer.RandomData(store.Config.GetTempAddrList());
lblTemp.Text = store.currTempStr;
//验证运动是否完成
......@@ -199,16 +202,7 @@ namespace OnlineStore.AutoInOutStore
//ReadPosistion();
if (store.storeRunStatus > StoreRunStatus.Wait)
{
if (AutomaticBaiting.DoorStatus.Equals(2))
{
lblDoorStatus.Text = "仓门状态：关闭";
UpdateFormDoorStats(false);
}
else
{
lblDoorStatus.Text = "仓门状态：打开";
UpdateFormDoorStats(true );
}
if (启动ToolStripMenuItem.Enabled.Equals(true))
{
......@@ -295,6 +289,46 @@ namespace OnlineStore.AutoInOutStore
}
}
private void BatchInoutStatus()
{
if (AutomaticBaiting.IsWaitTragGo && (AutomaticBaiting.IsGetTrayGo.Equals(false)))
{
btnWaitTrgGo.Visible = true;
lblWaitTragGo.Visible = true;
btnBatchInStore.Enabled = false;
btnBatchInStore.Enabled = false;
}
else
{
btnWaitTrgGo.Visible = false;
lblWaitTragGo.Visible = false;
if (AutomaticBaiting.DoorStatus.Equals(2))
{
lblDoorStatus.Text = "仓门状态：关闭";
UpdateFormDoorStats(false);
if (store.StoreMove.MoveType.Equals(StoreMoveType.None) && AutomaticBaiting.StoreMove.MoveType.Equals(StoreMoveType.None))
{
if (AutomaticBaiting.BatchOutStoreCount > 0)
{
btnGetOutTray.Enabled = true;
btnBatchInStore.Enabled = false;
}
else
{
btnGetOutTray.Enabled = false;
btnBatchInStore.Enabled = true;
}
}
}
else
{
lblDoorStatus.Text = "仓门状态：打开";
UpdateFormDoorStats(true);
}
}
}
private void UpdateFormDoorStats(bool dooIsOpen)
{
btnBatchInStore.Enabled = !dooIsOpen;
......@@ -453,13 +487,14 @@ namespace OnlineStore.AutoInOutStore
ktk.Middle_P2 = FormUtil.GetIntValue(txtMiddleP2);
ktk.UpDown_P1 = FormUtil.GetIntValue(txtUpDownP1);
ktk.UpDown_P2 = FormUtil.GetIntValue(txtUpDownP2);
ktk.UpDown_Door = FormUtil.GetIntValue(txtUpDownDoor);
//ktk.UpDown_P2 = FormUtil.GetIntValue(txtUpDownP2);
ktk.UpDown_P3 = FormUtil.GetIntValue(txtUpDownP3);
ktk.UpDown_P4 = FormUtil.GetIntValue(txtUpDownP4);
ktk.UpDown_P5 = FormUtil.GetIntValue(txtUpDownP5);
ktk.UpDown_P6 = FormUtil.GetIntValue(txtUpDownP6);
ktk.UpDown_P7 = FormUtil.GetIntValue(txtUpDownP7);
ktk.UpDown_P8 = FormUtil.GetIntValue(txtUpDownP8);
//ktk.UpDown_P7 = FormUtil.GetIntValue(txtUpDownP7);
//ktk.UpDown_P8 = FormUtil.GetIntValue(txtUpDownP8);
return ktk;
}
private void btnComAlarmClear_Click(object sender, EventArgs e)
......@@ -507,18 +542,6 @@ namespace OnlineStore.AutoInOutStore
txtAxisDeviceName.Text = SlvAddr.DeviceName;
txtAxisValue.Text = SlvAddr.GetAxisValue().ToString();
txtASpeed.Text = SlvAddr.TargetSpeed.ToString();
//if (SlvAddr.Equals(store.Config.InOut_Axis))
//{
// txtASpeed.Text = store.Config.InOutAxis_P1_Speed.ToString();
//}
//else if (SlvAddr.Equals(store.Config.Middle_Axis))
//{
// txtASpeed.Text = store.Config.MiddleAxis_P1_Speed.ToString();
//}
//else if (SlvAddr.Equals(store.Config.UpDown_Axis))
//{
// txtASpeed.Text = store.Config.UpDownAxis_P1_Speed.ToString();
//}
}
}
......@@ -645,6 +668,7 @@ namespace OnlineStore.AutoInOutStore
ktkPosition.UpDownAxis_OLPosition_P6 = FormUtil.GetIntValue(txtUpDownP6);
ktkPosition.CompressAxis_Position_P2 = FormUtil.GetIntValue(txtComP2);
ktkPosition.InOutAxis_DoorPosition_P2 = FormUtil.GetIntValue(txtInOutP2);
//ktkPosition.UpDownAxis_DoorIPosition_P2 = FormUtil.GetIntValue(txtUpDownP2);
//ktkPosition.UpDownAxis_DoorOBPosition_P7 = FormUtil.GetIntValue(txtUpDownP7);
//ktkPosition.UpDownAxis_DoorIBPosition_P8 = FormUtil.GetIntValue(txtUpDownP8);
......@@ -690,21 +714,26 @@ namespace OnlineStore.AutoInOutStore
store.Config.CompressAxis_P1_Position = FormUtil.GetIntValue(txtComP1);
needUpdate = true;
}
if (store.Config.UpDownAxis_DoorIPosition_P2 != FormUtil.GetIntValue(txtUpDownP2))
if (store.Config.UpDownAxis_DoorPosition != FormUtil.GetIntValue(txtUpDownDoor))
{
store.Config.UpDownAxis_DoorIPosition_P2 = FormUtil.GetIntValue(txtUpDownP2);
needUpdate = true;
}
if (store.Config.UpDownAxis_DoorOBPosition_P7 != FormUtil.GetIntValue(txtUpDownP7))
{
store.Config.UpDownAxis_DoorOBPosition_P7 = FormUtil.GetIntValue(txtUpDownP7);
needUpdate = true;
}
if (store.Config.UpDownAxis_DoorIBPosition_P8 != FormUtil.GetIntValue(txtUpDownP8))
{
store.Config.UpDownAxis_DoorIBPosition_P8 = FormUtil.GetIntValue(txtUpDownP8);
store.Config.UpDownAxis_DoorPosition = FormUtil.GetIntValue(txtUpDownDoor);
needUpdate = true;
}
//if (store.Config.UpDownAxis_DoorIPosition_P2 != FormUtil.GetIntValue(txtUpDownP2))
//{
// store.Config.UpDownAxis_DoorIPosition_P2 = FormUtil.GetIntValue(txtUpDownP2);
// needUpdate = true;
//}
//if (store.Config.UpDownAxis_DoorOBPosition_P7 != FormUtil.GetIntValue(txtUpDownP7))
//{
// store.Config.UpDownAxis_DoorOBPosition_P7 = FormUtil.GetIntValue(txtUpDownP7);
// needUpdate = true;
//}
//if (store.Config.UpDownAxis_DoorIBPosition_P8 != FormUtil.GetIntValue(txtUpDownP8))
//{
// store.Config.UpDownAxis_DoorIBPosition_P8 = FormUtil.GetIntValue(txtUpDownP8);
// needUpdate = true;
//}
//if (store.Config.InOutAxis_DoorPosition_P2 != FormUtil.GetIntValue(txtInOutP2))
//{
// store.Config.InOutAxis_DoorPosition_P2 = FormUtil.GetIntValue(txtInOutP2);
......@@ -776,28 +805,28 @@ namespace OnlineStore.AutoInOutStore
private void btnUpDownP2_Click(object sender, EventArgs e)
{
if (InOutIsIsP1())
{
int value = FormUtil.GetIntValue(txtUpDownP2);
AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P2_Speed);
}
//if (InOutIsIsP1())
//{
// int value = FormUtil.GetIntValue(txtUpDownP2);
// AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P2_Speed);
//}
}
private void btnUpDownP7_Click(object sender, EventArgs e)
{
if (InOutIsIsP1())
{
int value = FormUtil.GetIntValue(txtUpDownP7);
AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P7_Speed);
}
//if (InOutIsIsP1())
//{
// int value = FormUtil.GetIntValue(txtUpDownP7);
// AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P7_Speed);
//}
}
private void btnUpDownP8_Click(object sender, EventArgs e)
{
if (InOutIsIsP1())
{
int value = FormUtil.GetIntValue(txtUpDownP8);
AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P8_Speed);
}
//if (InOutIsIsP1())
//{
// int value = FormUtil.GetIntValue(txtUpDownP8);
// AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P8_Speed);
//}
}
private void btnUpDownP3_Click(object sender, EventArgs e)
......@@ -1081,14 +1110,14 @@ namespace OnlineStore.AutoInOutStore
private void FrmStoreBox_Shown(object sender, EventArgs e)
{
SetSkin(this);
this.btnUpDownP1.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP2.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP3.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP4.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP5.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP6.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP7.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP8.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
//this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
//this.lblThisSta.ForeColor = System.Drawing.Color.Red;
......@@ -1551,5 +1580,25 @@ namespace OnlineStore.AutoInOutStore
Thread.Sleep(100);
KND.IOMove(IO_Type.Run_Sign, IO_VALUE.LOW);
}
private void btnWaitTrgGo_Click(object sender, EventArgs e)
{
DialogResult result = MessageBox.Show("已经将料盘手动拿出？","确认提示",MessageBoxButtons.YesNo,MessageBoxIcon.Question);
if (result.Equals(DialogResult.Yes))
{
LogUtil.info("已确认料盘已手动拿出");
AutomaticBaiting.IsWaitTragGo = false;
AutomaticBaiting.IsGetTrayGo = true;
}
}
private void btnUpDownDoor_Click(object sender, EventArgs e)
{
if (InOutIsIsP1())
{
int value = FormUtil.GetIntValue(txtUpDownDoor);
AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_Door_Speed);
}
}
}
}
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
......@@ -45,11 +45,12 @@ AXIS,(轴三)进出轴,InOut_Axis,1,COM6,0,,,,,
AXIS,(轴五)批量上下料轴,Batch_Axis,1,COM3,0,,,,,
,,,,,,,,,,
,,,,,,,,,,
PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,403000,,,,,,,
PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,415000,,,,,,,
PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,415000,,,,,,,
PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,403000,,,,,,,
PRO,升降轴 待机点P1集合,UpDownAxis_P1_List,8#20000;12#22000,,,,,,,
PRO,升降轴 进料口仓门位置,UpDownAxis_DoorPosition,403000,,,,,,,
,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,403000,,,,,,,
,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,415000,,,,,,,
,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,415000,,,,,,,
,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,403000,,,,,,,
PRO,升降轴 出入料待机点P1集合,UpDownAxis_P1_List,8#20000;12#22000,,,,,,,
PRO,旋转轴(轴一)P1 待机原位点,MiddleAxis_P1_Position,268093,,,,,,,
PRO,进出轴(轴三)P1待机原位点,InOutAxis_P1_Position,1000,,,,,,,
PRO,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,-75000,,,,,,,
......@@ -79,14 +80,15 @@ PRO,(轴三)进出轴减速度,InoutAxis_DelSpeed,300,,,,,,,
PRO,(轴三)进出轴原点低速,InoutAxis_HomeLowSpeed,20,,,,,,,
PRO,(轴三)进出轴原点高速,InoutAxis_HomeHighSpeed,60,,,,,,,
PRO,(轴三)进出轴原点加速度,InoutAxis_HomeAddSpeed,200,,,,,,,
PRO,升降轴(轴二)到仓门速度,UpDownAxis_Door_Speed,500,,,,,,,
PRO,升降轴(轴二)P1速度,UpDownAxis_P1_Speed,2500,,,,,,,
PRO,升降轴(轴二)P2速度,UpDownAxis_P2_Speed,2500,,,,,,,
,升降轴(轴二)P2速度,UpDownAxis_P2_Speed,2500,,,,,,,
PRO,升降轴(轴二)P3速度,UpDownAxis_P3_Speed,2500,,,,,,,
PRO,升降轴(轴二)P4速度,UpDownAxis_P4_Speed,1500,,,,,,,
PRO,升降轴(轴二)P5速度,UpDownAxis_P5_Speed,2500,,,,,,,
PRO,升降轴(轴二)P6速度,UpDownAxis_P6_Speed,1000,,,,,,,
PRO,升降轴(轴二)P7速度,UpDownAxis_P7_Speed,1000,,,,,,,
PRO,升降轴(轴二)P8速度,UpDownAxis_P8_Speed,1000,,,,,,,
,升降轴(轴二)P7速度,UpDownAxis_P7_Speed,1000,,,,,,,
,升降轴(轴二)P8速度,UpDownAxis_P8_Speed,1000,,,,,,,
PRO,旋转轴(轴一)P1速度,MiddleAxis_P1_Speed,1200,,,,,,,
PRO,旋转轴(轴一)P2速度,MiddleAxis_P2_Speed,1200,,,,,,,
PRO,进出轴(轴三)P1速度,InOutAxis_P1_Speed,1000,,,,,,,
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
......@@ -52,7 +52,7 @@ namespace OnlineStore.DeviceLibrary
p.ComPress_P1 = Config.CompressAxis_P1_Position;
p.InOut_P1 = Config.InOutAxis_P1_Position;
p.Middle_P1 = Config.MiddleAxis_P1_Position;
p.UpDown_Door = Config.UpDownAxis_DoorPosition;
p.InOut_P2 = position.InOutAxis_DoorPosition_P2;
if (IsBatch)
{
......@@ -60,16 +60,16 @@ namespace OnlineStore.DeviceLibrary
}
p.UpDown_P1 = Config.GetUpDownP1(position.BagHeight);
p.UpDown_P8 = Config.UpDownAxis_DoorIBPosition_P8;
p.UpDown_P2 = Config.UpDownAxis_DoorIPosition_P2;
p.UpDown_P7 = Config.UpDownAxis_DoorOBPosition_P7;
if (IsBatch)
{
p.UpDown_P1 = Config.GetUpDownP1(position.BagHeight);
p.UpDown_P8 = p.UpDown_P1;
p.UpDown_P2 = p.UpDown_P1;
p.UpDown_P7 = p.UpDown_P1;
}
//p.UpDown_P8 = Config.UpDownAxis_DoorIBPosition_P8;
//p.UpDown_P2 = Config.UpDownAxis_DoorIPosition_P2;
//p.UpDown_P7 = Config.UpDownAxis_DoorOBPosition_P7;
//if (IsBatch)
//{
// p.UpDown_P1 = Config.GetUpDownP1(position.BagHeight);
//p.UpDown_P8 = p.UpDown_P1;
//p.UpDown_P2 = p.UpDown_P1;
//p.UpDown_P7 = p.UpDown_P1;
//}
p.ComPress_P2 = position.CompressAxis_Position_P2;
p.ComPress_P3 = position.CompressAxis_CPosition_P3;
......@@ -173,6 +173,9 @@ namespace OnlineStore.DeviceLibrary
}else if (wait.WaitType == 7)
{
//wait.IsEnd = (wait.HeightValue.Equals(GetHeight()));
}else if (wait.WaitType == 12)
{
wait.IsEnd = AutomaticBaiting.IsGetTrayGo;
}
else if (wait.WaitType == 5)
{
......@@ -244,10 +247,14 @@ namespace OnlineStore.DeviceLibrary
#region 入库
private Stopwatch InOutWatch = new Stopwatch();
public bool StartInStoreMove(InOutStoreParam param, bool IsBatchWork)
{
return StartInStoreMove(param, IsBatchWork, true);
}
/// <summary>
/// 开始入库移动移动
/// </summary>
public bool StartInStoreMove(InOutStoreParam param, bool IsBatchWork)
public bool StartInStoreMove(InOutStoreParam param, bool IsBatchWork,bool isNeedInStore)
{
InOutWatch.Reset();
string posId = param != null ? param.PositionNum : "";
......@@ -274,6 +281,7 @@ namespace OnlineStore.DeviceLibrary
storeStatus = StoreStatus.InStoreExecute;
StoreMove.NewMove(StoreMoveType.InStore, param);
StoreMove.IsBatchInOutStore = IsBatchWork;
StoreMove.IsNeedInStore = isNeedInStore;
if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0))
{
SI_02_Move(param.MoveP);
......@@ -305,7 +313,7 @@ namespace OnlineStore.DeviceLibrary
InStoreLog("入库：SI_05 叉子进入入料口，进出轴至P2(进料口取料点) ");
StoreMove.NextMoveStep(StoreMoveStep.SI_05_DeviceToDoor);
ACAxisMove(Config.InOut_Axis, StoreMove.MoveParam.MoveP.InOut_P2, Config.InOutAxis_P2_Speed);
NeedCheckSafetyLight = 1;
// NeedCheckSafetyLight = 1;
}
protected override void InStoreProcess()
{
......@@ -355,25 +363,36 @@ namespace OnlineStore.DeviceLibrary
{
InStoreLog("入库：SI_06 拿物品，批量入库， 等待吸盘放下物品");
StoreMove.NextMoveStep(StoreMoveStep.SI_06_DoorWarToDevice);
KND.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.LOW);
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1000));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SuckingDisc_Air, IO_VALUE.LOW));
}
else
{
NeedCheckSafetyLight = 0;
InStoreLog("入库：SI_06 拿物品，压紧轴至P2(压紧点)) 升降轴至P7(进料口取料缓冲点) ");
InStoreLog("入库：SI_06 拿物品，压紧轴至P2(压紧点)) ");
StoreMove.NextMoveStep(StoreMoveStep.SI_06_DoorWarToDevice);
ComMoveToPosition(moveP.ComPress_P2);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P7, Config.UpDownAxis_P7_Speed);
//ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P7, Config.UpDownAxis_P7_Speed);
}
}
else if (StoreMove.MoveStep == StoreMoveStep.SI_06_DoorWarToDevice)
{
if (StoreMove.IsBatchInOutStore && (!StoreMove.IsNeedInStore))
{
InStoreLog("入库：SI_21不需要入库，把料盘放在门口等待操作人员拿走料盘 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_21_DeviceToDoor);
OpenDoorAndWait();
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_Door, Config.UpDownAxis_Door_Speed);
}
else
{
InStoreLog("入库：SI_07 叉子 从入料口抽出，进出轴至P1(待机点) ");
StoreMove.NextMoveStep(StoreMoveStep.SI_07_DeviceBackFromDoor);
InOutBackToP1(moveP.InOut_P1);
}
}
else if (StoreMove.MoveStep == StoreMoveStep.SI_07_DeviceBackFromDoor)
{
if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0))
......@@ -383,8 +402,8 @@ namespace OnlineStore.DeviceLibrary
ACAxisMove(Config.Middle_Axis, moveP.Middle_P2, Config.MiddleAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P3, Config.UpDownAxis_P3_Speed);
//关闭舱门
KND.IOMove(IO_Type.Door_Down, IO_VALUE.HIGH);
KND.IOMove(IO_Type.Door_Up, IO_VALUE.LOW);
//KND.IOMove(IO_Type.Door_Down, IO_VALUE.HIGH);
//KND.IOMove(IO_Type.Door_Up, IO_VALUE.LOW);
}
else
{
......@@ -400,8 +419,8 @@ namespace OnlineStore.DeviceLibrary
ACAxisMove(Config.Middle_Axis, moveP.Middle_P2, Config.MiddleAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P3, Config.UpDownAxis_P3_Speed);
//关闭舱门
KND.IOMove(IO_Type.Door_Down, IO_VALUE.HIGH);
KND.IOMove(IO_Type.Door_Up, IO_VALUE.LOW);
//KND.IOMove(IO_Type.Door_Down, IO_VALUE.HIGH);
//KND.IOMove(IO_Type.Door_Up, IO_VALUE.LOW);
}
else if (StoreMove.MoveStep == StoreMoveStep.SI_09_MoveToBag)
{
......@@ -444,10 +463,10 @@ namespace OnlineStore.DeviceLibrary
//手动发给服务器状态，防止没有手动
//SendLineStatus(StoreID, posId, StoreStatus.InStoreEnd);
StoreMove.NextMoveStep(StoreMoveStep.SI_13_DeviceBackFromBag);
StoreMove.NextMoveStep(StoreMoveStep.SI_13_InoutBack);
InOutBackToP1(moveP.InOut_P1);
}
else if (StoreMove.MoveStep == StoreMoveStep.SI_13_DeviceBackFromBag)
else if (StoreMove.MoveStep == StoreMoveStep.SI_13_InoutBack)
{
InStoreLog("入库：SI_14 返回待机点，轴2/轴1/轴4动作至P1(待机点))，检测门关闭");
StoreMove.NextMoveStep(StoreMoveStep.SI_14_GoBack);
......@@ -467,6 +486,29 @@ namespace OnlineStore.DeviceLibrary
storeStatus = StoreStatus.StoreOnline;
InOutEndProcess(StoreMoveType.InStore);
}
#region 送出料盘处理
else if (StoreMove.MoveStep == StoreMoveStep.SI_21_DeviceToDoor)
{
InStoreLog("入库：SI_21不需要入库，等待操作人员拿走料盘 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_22_WaitTrayGo);
AutomaticBaiting.IsGetTrayGo = false;
AutomaticBaiting.IsWaitTragGo = true;
StoreMove.WaitList.Add(WaitResultInfo.WaitTakeTray());
}
else if (StoreMove.MoveStep == StoreMoveStep.SI_22_WaitTrayGo)
{
InStoreLog("入库：SI_13 叉子从库位中返回，进出轴动作至P1(待机点) ");
// 5= 入仓位完成(料仓Box把料盘放入对应的库位中，装置还未恢复原始状态)
string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
lastPosId = posId;
lastPosIdStatus = StoreStatus.InStoreEnd;
storeStatus = StoreStatus.InStoreEnd;
StoreMove.NextMoveStep(StoreMoveStep.SI_13_InoutBack);
InOutBackToP1(moveP.InOut_P1);
}
#endregion
else
{
LogUtil.info(LOGGER, StoreName + " 入库，moveStatus=" + StoreMove.MoveStep + "，没有对应的处理！");
......@@ -526,11 +568,11 @@ namespace OnlineStore.DeviceLibrary
if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0))
{
StoreMove.NextMoveStep(StoreMoveStep.SO_02_DeviceBack);
OutStoreLog("出库：SO_02 叉子先运动到P1 ，打开舱门 开始");
OutStoreLog("出库：SO_02 叉子先运动到P1 ， 开始");
//ACAxisMove(Config.InOut_Axis, StoreMove.MoveParam.MoveP.InOut_P1, Config.InOutAxis_P1_Speed);
InOutBackToP1(StoreMove.MoveParam.MoveP.InOut_P1);
OpenDoorAndWait();
//OpenDoorAndWait();
}
else
{
......@@ -630,7 +672,7 @@ namespace OnlineStore.DeviceLibrary
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_08_ToDoorPosition)
{
if (IsHasCompress_Axis|| Config.IsHasLocationCylinder.Equals(0))
if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0))
{
SO_10_DeviceToDoorPro();
}
......@@ -648,54 +690,36 @@ namespace OnlineStore.DeviceLibrary
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_10_DeviceToDoor)
{
OutStoreLog("出库：SO_11 放下物品，升降轴至P8(进料口出料缓冲点) ");
StoreMove.NextMoveStep(StoreMoveStep.SO_11_DevicePutWare);
NeedCheckSafetyLight = 0;
ComMoveToPosition(moveP.ComPress_P1);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P8, Config.UpDownAxis_P8_Speed);
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_11_DevicePutWare)
{
StoreMove.NextMoveStep(StoreMoveStep.SO_12_DeviceOutFromDoor);
OutStoreLog("出库：SO_12 叉子从出料口返回，，进出轴动作至P1(待机点) ");
InOutBackToP1(moveP.InOut_P1);
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_12_DeviceOutFromDoor)
{
StoreMove.NextMoveStep(StoreMoveStep.SO_13_GoBack);
if (StoreMove.IsBatchInOutStore)
{
StoreMove.NextMoveStep(StoreMoveStep.SO_11_PutTray);
BatchAxisUpTrayHeight();
}
else
{
OutStoreLog("出库：SO_13 升降轴返回，轴2至P1(待机点) ,关闭舱门");
StoreMove.NextMoveStep(StoreMoveStep.SO_21_OpenDoor);
OutStoreLog("出库：SO_21打开仓门 ,定位气缸下降");
OpenDoorAndWait();
LocationDownAndWait();
}
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
CloseDoorAndWait();
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_13_GoBack)
{
if (StoreMove.IsBatchInOutStore)
else if (StoreMove.MoveStep == StoreMoveStep.SO_21_OpenDoor)
{
string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
storeStatus = StoreStatus.StoreOnline;
LogUtil.info(LOGGER, StoreName + " 【" + posId + "】 整个出库流程结束，耗时【" + FormUtil.GetSpanStr(InOutWatch.Elapsed) + "】！");
StoreMove.EndMove();
storeRunStatus = StoreRunStatus.Runing;
InOutEndProcess(StoreMoveType.OutStore);
StoreMove.NextMoveStep(StoreMoveStep.SO_22_WaitTrayGo);
OutStoreLog("出库：SO_22等待操作人员拿走料盘 ");
AutomaticBaiting.IsWaitTragGo = true;
AutomaticBaiting.IsGetTrayGo = false;
StoreMove.WaitList.Add(WaitResultInfo.WaitTakeTray());
}
else
else if (StoreMove.MoveStep.Equals(StoreMoveStep.SO_22_WaitTrayGo))
{
StoreMove.NextMoveStep(StoreMoveStep.SO_14_WaitTake);
OutStoreLog("出库：SO_14_WaitTake 等待拿走物品，最多等待10000");
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(10000));
//StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
StoreMove.OneWaitCanEndStep = true;
SO_13_InoutBack();
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_11_PutTray)
{
SO_13_InoutBack();
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_14_WaitTake)
else if (StoreMove.MoveStep.Equals(StoreMoveStep.SO_13_InoutBack))
{
string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
storeStatus = StoreStatus.StoreOnline;
......@@ -713,13 +737,12 @@ namespace OnlineStore.DeviceLibrary
private void BatchAxisUpTrayHeight()
{
//上料轴需要向下走
int currPosition = ACServerManager.GetActualtPosition(StoreManager.Config.Batch_Axis.DeviceName, StoreManager.Config.Batch_Axis.GetAxisValue());
int targetValue = currPosition - StoreMove.MoveParam.MoveP.BatchAxis_DownValue;
//记录高度
AutomaticBaiting.BatchOutStoreCount++;
AutomaticBaiting.BatchOutStoreHeight += StoreMove.MoveParam.GetACPosition().BagHeight;
OutStoreLog("出库：SO_13 升降轴返回，批量上下料轴下降【"+ StoreMove.MoveParam.MoveP.BatchAxis_DownValue + "】，目标位置【"+targetValue+"】");
OutStoreLog("出库：SO_13 升降轴返回，将物品放下，批量上下料轴下降【"+ StoreMove.MoveParam.MoveP.BatchAxis_DownValue + "】，目标位置【"+targetValue+"】");
//判断盘满后，需要报警?
if (targetValue < 0)
{
......@@ -731,7 +754,17 @@ namespace OnlineStore.DeviceLibrary
ACAxisMove(StoreManager.Config.Batch_Axis, StoreManager.Config.Batch_Axis.TargetSpeed, targetValue);
}
}
private void SO_13_InoutBack()
{
StoreMove.NextMoveStep(StoreMoveStep.SO_13_InoutBack);
OutStoreLog("出库：SO_13 叉子返回");
ACAxisMove(Config.InOut_Axis, StoreMove.MoveParam.MoveP.InOut_P1, Config.InOutAxis_P1_Speed);
if (IsHasCompress_Axis)
{
ComMoveToPosition(StoreMove.MoveParam.MoveP.ComPress_P1);
}
CloseDoorAndWait();
}
/// <summary>
/// 出库：SO_08 走到料门口，旋转轴至P1(待机点)升降轴至P2(进料口出料前点)
/// </summary>
......@@ -748,12 +781,11 @@ namespace OnlineStore.DeviceLibrary
else
{
OutStoreLog("出库：SO_08 走到料门口，旋转轴至P1(待机点)升降轴至P2(进料口出料前点) ");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P2, Config.UpDownAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_Door, Config.UpDownAxis_Door_Speed);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
//此处需要等待box门口没有盘
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
//打开舱门
OpenDoorAndWait();
}
}
private void SO_10_DeviceToDoorPro()
......@@ -765,6 +797,8 @@ namespace OnlineStore.DeviceLibrary
NeedCheckSafetyLight = 1;
}
#endregion
public bool InOutAxisCanMove()
{
if (StoreManager.Store.Config.IsHasLocationCylinder.Equals(0))
......@@ -783,7 +817,7 @@ namespace OnlineStore.DeviceLibrary
}
private void LocationUpAndWait()
{
if (Config.IsHasLocationCylinder>=1)
if (Config.IsHasLocationCylinder >= 1)
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Up, IO_VALUE.HIGH));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Down, IO_VALUE.LOW));
......@@ -795,7 +829,7 @@ namespace OnlineStore.DeviceLibrary
}
private void LocationDownAndWait()
{
if (Config.IsHasLocationCylinder>=1)
if (Config.IsHasLocationCylinder >= 1)
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Down, IO_VALUE.HIGH));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Up, IO_VALUE.LOW));
......@@ -805,8 +839,6 @@ namespace OnlineStore.DeviceLibrary
KND.IOMove(IO_Type.LocationCylinder_Up, IO_VALUE.LOW);
}
}
#endregion
public List<FixtureCodeInfo> waitOutStoreList = new List<FixtureCodeInfo>();
public object waitOutListLock = "";
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
......@@ -10,6 +10,11 @@ namespace OnlineStore.DeviceLibrary
public partial class AutomaticBaiting
{
/// <summary>
/// 操作人员是否拿走料盘
/// </summary>
public static bool IsGetTrayGo = false;
public static bool IsWaitTragGo = false;
/// <summary>
/// 0=未知。1=门打开，2=门关闭
/// </summary>
public static int DoorStatus = 2;
......@@ -243,13 +248,16 @@ namespace OnlineStore.DeviceLibrary
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_I04_SuckingDisc_Up))
{
if (StoreManager.Store.CanStarInOut())
{
if (LastCode.Equals(""))
{
StoreMove.NextMoveStep(StoreMoveStep.AUTO_I07_OpenDoor);
LogUtil.info(Name + "入料: 未扫到二维码，打开仓门");
CylinderMove(IO_Type.Door_Up, IO_Type.Door_Down, true);
StoreMove.NextMoveStep(StoreMoveStep.AUTO_I10_WaitTrayGo);
LogUtil.info(Name + "入料: 未扫到二维码，叉子过来拿料盘");
string posId = StoreManager.Store.PositionNumList[0];
StoreManager.Store.StartInStoreMove(new InOutStoreParam("", posId), true, false);
}
else if (StoreManager.Store.CanStarInOut())
else
{
StoreMove.NextMoveStep(StoreMoveStep.AUTO_I05_GetPosId);
//计算高度
......@@ -263,23 +271,23 @@ namespace OnlineStore.DeviceLibrary
StoreMove.OneWaitCanEndStep = true;
}
}
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_I05_GetPosId))
{
//判断是否开始入库
if (StoreManager.Store.StoreMove.MoveType.Equals(StoreMoveType.InStore))
if (StoreManager.Store.StoreMove.MoveType.Equals(StoreMoveType.InStore) || (!LastPosId.Equals("")))
{
StoreMove.NextMoveStep(StoreMoveStep.AUTO_I06_WaitTrayLeave);
LogUtil.info(Name + "入料: 开始入料，等待料盘拿走");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SuckingDisc_Work, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.WidthCheck1, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.WidthCheck2, IO_VALUE.LOW));
LogUtil.info(Name + "入料: 开始入料【" + LastPosId + "】，等待料盘拿走");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SuckingDisc_Air, IO_VALUE.LOW));
}
else
{
StoreMove.NextMoveStep(StoreMoveStep.AUTO_I07_OpenDoor);
LogUtil.info(Name + "入料: 没有PosID，打开仓门等待拿走料盘");
CylinderMove(IO_Type.Door_Up, IO_Type.Door_Down, true);
StoreMove.NextMoveStep(StoreMoveStep.AUTO_I10_WaitTrayGo);
LogUtil.info(Name + "入料: 未扫到二维码，叉子过来拿料盘");
string posId = StoreManager.Store.PositionNumList[0];
StoreManager.Store.StartInStoreMove(new InOutStoreParam("", posId), true, false);
}
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_I06_WaitTrayLeave))
......@@ -289,31 +297,29 @@ namespace OnlineStore.DeviceLibrary
IsNeedScanCode();
}
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_I07_OpenDoor))
else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_I10_WaitTrayGo))
{
StoreMove.NextMoveStep(StoreMoveStep.AUTO_I08_WaitTakeTray);
LogUtil.info(Name + "入料: 未扫到二维码，等待拿走料盘");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SuckingDisc_Work, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.WidthCheck1, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.WidthCheck2, IO_VALUE.LOW));
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_I08_WaitTakeTray))
{
StoreMove.NextMoveStep(StoreMoveStep.AUTO_I09_TrayLeaveWaitTime);
LogUtil.info(Name + "入料: 未扫到二维码，料盘已拿走，等待1秒后关门");
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1000));
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_I09_TrayLeaveWaitTime))
{
StoreMove.NextMoveStep(StoreMoveStep.AUTO_I10_CloseDoor);
LogUtil.info(Name + "入料: 未扫到二维码，料盘已拿走，关闭仓门");
CylinderMove(IO_Type.Door_Down, IO_Type.Door_Up, true);
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_I10_CloseDoor))
if (StoreManager.Store.CanStarInOut())
{
IsNeedScanCode();
}
}
//else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_I011_WaitTakeTray))
//{
// StoreMove.NextMoveStep(StoreMoveStep.AUTO_I09_TrayLeaveWaitTime);
// LogUtil.info(Name + "入料: 未扫到二维码，料盘已拿走，等待1秒后关门");
// StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1000));
//}
//else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_I09_TrayLeaveWaitTime))
//{
// StoreMove.NextMoveStep(StoreMoveStep.AUTO_I10_CloseDoor);
// LogUtil.info(Name + "入料: 未扫到二维码，料盘已拿走，关闭仓门");
// CylinderMove(IO_Type.Door_Down, IO_Type.Door_Up, true);
//}
//else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_I10_CloseDoor))
//{
// IsNeedScanCode();
//}
else
{
LogUtil.error(Name + "未找到步骤：" + StoreMove.MoveType);
......@@ -321,6 +327,7 @@ namespace OnlineStore.DeviceLibrary
}
private static void SuckingDiscWork()
{
KND.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.LOW);
StoreMove.NextMoveStep(StoreMoveStep.AUTO_I03_SuckingDisc_Work);
SuckingDisc_WorkCount++;
LogUtil.info(Name + "入料: 吸盘开始第" + SuckingDisc_WorkCount + "次工作");
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs
......@@ -23,7 +23,7 @@ namespace OnlineStore.DeviceLibrary
ACServerManager.SpeedMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetSpeed);
}
private static void ACAxisRelMove(ConfigMoveAxis moveAxis, int targetPosition, int targetSpeed)
private static void ACAxisAbsMove(ConfigMoveAxis moveAxis, int targetPosition, int targetSpeed)
{
StoreMove.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, targetPosition, targetSpeed));
moveAxis.TargetPosition = targetPosition;
......
source/DeviceLibrary/store/LineMoveP.cs
......@@ -13,13 +13,17 @@ namespace OnlineStore.DeviceLibrary
public class LineMoveP
{
/// <summary>
/// 轴2（ 升降轴） 进料口取料点 P1
/// 轴2（升降轴）门口位置，需要等待拿走料盘的位置
/// </summary>
public int UpDown_P1 { get; set; }
public int UpDown_Door { get; set; }
/// <summary>
/// 轴2（ 升降轴） 进料口出料前点P2
/// 轴2（ 升降轴） 进料口取料点 P1
/// </summary>
public int UpDown_P2 { get; set; }
public int UpDown_P1 { get; set; }
///// <summary>
///// 轴2（ 升降轴） 进料口出料前点P2
///// </summary>
//public int UpDown_P2 { get; set; }
/// <summary>
/// 轴2（ 升降轴） 库位入料前点P3
/// </summary>
......@@ -36,14 +40,14 @@ namespace OnlineStore.DeviceLibrary
/// 轴2（ 升降轴） 库位出料缓冲点P6
/// </summary>
public int UpDown_P6 { get; set; }
/// <summary>
/// 轴2（ 升降轴） 进料口取料缓冲点P7
/// </summary>
public int UpDown_P7 { get; set; }
/// <summary>
/// 轴2（ 升降轴） 进料口出料缓冲点P8
/// </summary>
public int UpDown_P8 { get; set; }
///// <summary>
///// 轴2（ 升降轴） 进料口取料缓冲点P7
///// </summary>
//public int UpDown_P7 { get; set; }
///// <summary>
///// 轴2（ 升降轴） 进料口出料缓冲点P8
///// </summary>
//public int UpDown_P8 { get; set; }
/// <summary>
/// 轴1旋转轴 待机原位点 P1
......@@ -78,7 +82,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 轴4（ 压紧轴） 压紧前点P3
/// </summary>
public int ComPress_P3{ get; set; }
public int ComPress_P3 { get; set; }
/// <summary>
......
source/DeviceLibrary/store/StoreMoveStep.cs
......@@ -223,52 +223,64 @@ namespace OnlineStore.DeviceLibrary
/// 料仓出库，，叉子进出料口，，轴3（ 叉子） 至P2（ 进料口取料点）
/// /// </summary>
SO_10_DeviceToDoor = 110,
/// <summary>
/// 料仓出库，，把物品放下，，轴2（ 上下） 至P8（ 进料口出料缓冲点）轴4（ 压紧） 至P1（ 待机点)
/// </summary>
SO_11_DevicePutWare = 111,
/// <summary>
/// 料仓出库，，叉子从出料口返回，，轴3（ 叉子） 动作至P1（ 待机点）
/// </summary>
SO_12_DeviceOutFromDoor = 112,
///// <summary>
///// 料仓出库，，把物品放下，，轴2（ 上下） 至P8（ 进料口出料缓冲点）轴4（ 压紧） 至P1（ 待机点)
///// </summary>
//SO_11_DevicePutWare = 111,
///// <summary>
///// 料仓出库，，叉子从出料口返回，，轴3（ 叉子） 动作至P1（ 待机点）
///// </summary>
//SO_12_DeviceOutFromDoor = 112,
/// <summary>
/// 料仓出库，，升降轴返回，， 轴2至P1（ 待机点）
/// </summary>
SO_13_GoBack = 113,
SO_11_PutTray = 111,
/// <summary>
/// 叉子返回待机位
/// </summary>
SO_13_InoutBack=112,
/// <summary>
/// 等待拿走物品
/// </summary>
SO_14_WaitTake=114,
/// <summary>
/// 料仓出库，批量出库，所有轴运行到吸盘下方，，轴1（ 转盘） 至P1（ 待机点）轴2（ 上下） 至P1
/// 升降轴走到门口位置
/// </summary>
SO_58_ToBatchDoorPosition = 158,
SO_21_OpenDoor=121,
/// <summary>
/// 料仓出库，定位气缸退回（有压紧轴的不需要此步骤
/// 等待操作人员拿走料盘
/// </summary>
SO_59_LocationCylinder_Down = 159,
SO_22_WaitTrayGo=122,
/// <summary>
/// 料仓出库，，叉子进出料口，，轴3（ 叉子） 至P2（ 进料口取料点）
/// /// </summary>
SO_60_DeviceToDoor = 160,
/// <summary>
/// 料仓出库，，把物品放下，，轴2（ 上下） 至P8（ 进料口出料缓冲点）轴4（ 压紧） 至P1（ 待机点)
/// </summary>
SO_61_DevicePutWare = 161,
/// <summary>
/// 料仓出库，，叉子从出料口返回，，轴3（ 叉子） 动作至P1（ 待机点）
/// 批量轴需要下降对应的高度
/// </summary>
SO_62_DeviceOutFromDoor = 162,
/// <summary>
/// 料仓出库，，升降轴返回，， 轴2至P1（ 待机点）
/// </summary>
SO_63_GoBack = 163,
///// <summary>
///// 料仓出库，批量出库，所有轴运行到吸盘下方，，轴1（ 转盘） 至P1（ 待机点）轴2（ 上下） 至P1
///// </summary>
//SO_58_ToBatchDoorPosition = 158,
///// <summary>
///// 料仓出库，定位气缸退回（有压紧轴的不需要此步骤
///// </summary>
//SO_59_LocationCylinder_Down = 159,
///// <summary>
///// 料仓出库，，叉子进出料口，，轴3（ 叉子） 至P2（ 进料口取料点）
///// /// </summary>
//SO_60_DeviceToDoor = 160,
///// <summary>
///// 料仓出库，，把物品放下，，轴2（ 上下） 至P8（ 进料口出料缓冲点）轴4（ 压紧） 至P1（ 待机点)
///// </summary>
//SO_61_DevicePutWare = 161,
///// <summary>
///// 料仓出库，，叉子从出料口返回，，轴3（ 叉子） 动作至P1（ 待机点）
///// 批量轴需要下降对应的高度
///// </summary>
//SO_62_DeviceOutFromDoor = 162,
///// <summary>
///// 料仓出库，，升降轴返回，， 轴2至P1（ 待机点）
///// </summary>
//SO_63_GoBack = 163,
#endregion
#region 料仓内部入库步骤
......@@ -329,12 +341,33 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 入库。。叉子从库位中返回，轴3（ 叉子） 动作至P1（ 待机点）
/// </summary>
SI_13_DeviceBackFromBag = 213,
SI_13_InoutBack = 213,
/// <summary>
/// 入库。。返回待机点，轴2/轴1/轴4动作至P1（ 待机点）)开始
/// </summary>
SI_14_GoBack = 214,
/// <summary>
/// 入库未取到PosID，，叉子走到门口位置， 打开仓门
/// </summary>
SI_21_DeviceToDoor= 221,
/// <summary>
/// 入库未取到PosID，，等待料盘拿走
/// </summary>
SI_22_WaitTrayGo = 222,
///// <summary>
///// 料仓出库，，升降轴返回，， 轴2至P1（ 待机点）
///// </summary>
//SI_23_GoBack = 233,
///// <summary>
///// 等待拿走物品
///// </summary>
//SI_24_WaitTake = 234,
#endregion
......@@ -342,7 +375,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 关闭门锁
/// </summary>
AUTO_R01_CloseDoor =1101,
AUTO_R01_CloseDoor = 1101,
/// <summary>
/// 自动轴原点返回
/// </summary>
......@@ -397,22 +430,34 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
AUTO_I06_WaitTrayLeave,
/// <summary>
/// 打开仓门
/// </summary>
AUTO_I07_OpenDoor,
/// <summary>
/// 等待拿走料盘
/// </summary>
AUTO_I08_WaitTakeTray,
/// <summary>
/// 料盘已手动拿走，需要等一秒钟后关闭仓门
/// 未扫到码：等待操作人员拿走料盘
/// </summary>
AUTO_I09_TrayLeaveWaitTime,
AUTO_I10_WaitTrayGo,
///// <summary>
/////未扫到码： 把料盘放到叉子上
///// </summary>
//AUTO_I11_PutTrayToInout,
///// <summary>
///// 未扫到码：叉子进入门槛
///// </summary>
//AUTO_I12_InoutToDoor,
///// <summary>
///// 未扫到码：把料盘放到门口
///// </summary>
//AUTO_I13_PutTrayToDoor,
///// <summary>
///// 未扫到码：等待拿走料盘
///// </summary>
//AUTO_I14_WaitTakeTray,
///// <summary>
///// 未扫到码：料盘已手动拿走，需要等一秒钟后关闭仓门
///// </summary>
//AUTO_I15_TrayLeaveWaitTime,
/// <summary>
/// 关闭仓门
/// </summary>
AUTO_I10_CloseDoor,
///// <summary>
///// 未扫到码：关闭仓门
///// </summary>
//AUTO_I16_CloseDoor,
#endregion
......
source/DeviceLibrary/store/model/StoreMoveInfo.cs
......@@ -84,7 +84,10 @@ namespace OnlineStore.DeviceLibrary
/// 是否是批量出入库
/// </summary>
public bool IsBatchInOutStore=true ;
/// <summary>
/// 是否需要入库，不需要入库把料盘放在门口即可
/// </summary>
public bool IsNeedInStore = true;
public List<WaitResultInfo> WaitList = new List<WaitResultInfo>();
public void NextMoveStep(StoreMoveStep step)
{
......@@ -294,6 +297,16 @@ namespace OnlineStore.DeviceLibrary
wait.WaitType = 11;
return wait;
}
/// <summary>
/// 12=等待操作人员拿走料盘
/// </summary>
/// <returns></returns>
public static WaitResultInfo WaitTakeTray()
{
WaitResultInfo wait = new WaitResultInfo();
wait.WaitType = 12;
return wait;
}
public string ToStr()
{
if (WaitType == 1)
......@@ -359,6 +372,7 @@ namespace OnlineStore.DeviceLibrary
/// 等待结果，1=轴运动，2=IO运动，3=时间,4=电钢,5=硕科电机,6=等待轴原点信号
/// 7=等待高度为0，8=等待轴的负限位，9=等待轴的正限位。10=上料轴运动停止
/// 11=扫码结束。
/// 12=操作人员拿走料盘，并点击确定。
/// </summary>
public int WaitType { get; set; }
/// <summary>
......
source/LoadCVSLibrary/storeConfig/config/AUTO_SA_Config.cs
......@@ -159,11 +159,11 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary>
[ConfigProAttribute("UpDownAxis_P1_Speed")]
public int UpDownAxis_P1_Speed { get; set; }
/// <summary>
/// PRO 升降轴（轴2）P2速度 UpDownAxis_P2_Speed
/// </summary>
[ConfigProAttribute("UpDownAxis_P2_Speed")]
public int UpDownAxis_P2_Speed { get; set; }
///// <summary>
///// PRO 升降轴（轴2）P2速度 UpDownAxis_P2_Speed
///// </summary>
//[ConfigProAttribute("UpDownAxis_P2_Speed")]
//public int UpDownAxis_P2_Speed { get; set; }
/// <summary>
/// PRO 升降轴（轴2）P3速度 UpDownAxis_P3_Speed
/// </summary>
......@@ -186,18 +186,18 @@ namespace OnlineStore.LoadCSVLibrary
public int UpDownAxis_P6_Speed { get; set; }
/// <summary>
/// PRO 升降轴（轴2）P7速度 UpDownAxis_P7_Speed
/// </summary>
[ConfigProAttribute("UpDownAxis_P7_Speed")]
public int UpDownAxis_P7_Speed { get; set; }
///// <summary>
///// PRO 升降轴（轴2）P7速度 UpDownAxis_P7_Speed
///// </summary>
//[ConfigProAttribute("UpDownAxis_P7_Speed")]
//public int UpDownAxis_P7_Speed { get; set; }
/// <summary>
/// PRO 升降轴（轴2）P8速度 UpDownAxis_P8_Speed
/// </summary>
[ConfigProAttribute("UpDownAxis_P8_Speed")]
public int UpDownAxis_P8_Speed { get; set; }
///// <summary>
///// PRO 升降轴（轴2）P8速度 UpDownAxis_P8_Speed
///// </summary>
//[ConfigProAttribute("UpDownAxis_P8_Speed")]
//public int UpDownAxis_P8_Speed { get; set; }
/// <summary>
/// PRO 旋转轴（轴1）P1速度 MiddleAxis_P1_Speed
......@@ -284,28 +284,39 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("UpDownAxis_P1_List")]
public string UpDownAxis_P1_List { get; set; }
/// <summary>
/// PRO,升降轴 进料口位置, UpDownAxis_DoorPosition,403000,,,,,,,
/// </summary>
[ConfigProAttribute("UpDownAxis_DoorPosition")]
public int UpDownAxis_DoorPosition { get; set; }
/// <summary>
/// 升降轴(轴二)到仓门速度 UpDownAxis_Door_Speed 2500
/// </summary>
[ConfigProAttribute("UpDownAxis_Door_Speed")]
public int UpDownAxis_Door_Speed { get; set; }
///// <summary>
///// 升降轴 进料口取料点 P1
///// </summary>
//[ConfigProAttribute("UpDownAxis_DoorOPosition_P1")]
//public int UpDownAxis_DoorOPosition_P1 { get; set; }
/// <summary>
/// 升降轴 进料口出料前点 P2
/// </summary>
[ConfigProAttribute("UpDownAxis_DoorIPosition_P2")]
public int UpDownAxis_DoorIPosition_P2 { get; set; }
///// <summary>
///// 升降轴 进料口出料前点 P2
///// </summary>
//[ConfigProAttribute("UpDownAxis_DoorIPosition_P2")]
//public int UpDownAxis_DoorIPosition_P2 { get; set; }
/// <summary>
/// 升降轴 进料口取料缓冲点 P7
/// </summary>
[ConfigProAttribute("UpDownAxis_DoorOBPosition_P7")]
public int UpDownAxis_DoorOBPosition_P7 { get; set; }
///// <summary>
///// 升降轴 进料口取料缓冲点 P7
///// </summary>
//[ConfigProAttribute("UpDownAxis_DoorOBPosition_P7")]
//public int UpDownAxis_DoorOBPosition_P7 { get; set; }
/// <summary>
/// 升降轴 进料口出料缓冲点 P8
/// </summary>
[ConfigProAttribute("UpDownAxis_DoorIBPosition_P8")]
public int UpDownAxis_DoorIBPosition_P8 { get; set; }
///// <summary>
///// 升降轴 进料口出料缓冲点 P8
///// </summary>
//[ConfigProAttribute("UpDownAxis_DoorIBPosition_P8")]
//public int UpDownAxis_DoorIBPosition_P8 { get; set; }
///// <summary>
///// 进出轴进料口取料点 P2
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!