Skip to content

孙克 / RC1250-ACPackingStore

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

扫码流程修改

1 个父辈 61eb4022
内嵌 并排
正在显示 13 个修改的文件 包含 484 行增加 和 270 行删除
source/ACPackingStore/FrmBox.Designer.cs
......@@ -51,9 +51,13 @@
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.groupInout = new System.Windows.Forms.GroupBox();
this.txtUpdownP11 = new System.Windows.Forms.TextBox();
this.txtUpdownP12 = new System.Windows.Forms.TextBox();
this.txtInoutP11 = new System.Windows.Forms.TextBox();
this.btnInoutP11 = new System.Windows.Forms.Button();
this.btnUpdownP12 = new System.Windows.Forms.Button();
this.txtMiddleP11 = new System.Windows.Forms.TextBox();
this.btnUpdownP11 = new System.Windows.Forms.Button();
this.btnMiddleP11 = new System.Windows.Forms.Button();
this.lblMsg = new System.Windows.Forms.Label();
this.btnSavePosition = new System.Windows.Forms.Button();
......@@ -92,13 +96,9 @@
this.btnUpDownP3 = new System.Windows.Forms.Button();
this.btnUpDownP4 = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.txtUpdownP11 = new System.Windows.Forms.TextBox();
this.btnSaveCom = new System.Windows.Forms.Button();
this.txtUpdownP12 = new System.Windows.Forms.TextBox();
this.txtComMax = new System.Windows.Forms.TextBox();
this.btnUpdownP11 = new System.Windows.Forms.Button();
this.label47 = new System.Windows.Forms.Label();
this.btnUpdownP12 = new System.Windows.Forms.Button();
this.txtComMin = new System.Windows.Forms.TextBox();
this.label48 = new System.Windows.Forms.Label();
this.btnCMove = new System.Windows.Forms.Button();
......@@ -535,6 +535,36 @@
this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作";
//
// txtUpdownP11
//
this.txtUpdownP11.AcceptsReturn = true;
this.txtUpdownP11.BackColor = System.Drawing.SystemColors.Window;
this.txtUpdownP11.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP11.Location = new System.Drawing.Point(641, 313);
this.txtUpdownP11.MaxLength = 0;
this.txtUpdownP11.Name = "txtUpdownP11";
this.txtUpdownP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpdownP11.Size = new System.Drawing.Size(89, 23);
this.txtUpdownP11.TabIndex = 227;
this.txtUpdownP11.Text = "999";
//
// txtUpdownP12
//
this.txtUpdownP12.AcceptsReturn = true;
this.txtUpdownP12.BackColor = System.Drawing.SystemColors.Window;
this.txtUpdownP12.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP12.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP12.Location = new System.Drawing.Point(891, 313);
this.txtUpdownP12.MaxLength = 0;
this.txtUpdownP12.Name = "txtUpdownP12";
this.txtUpdownP12.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpdownP12.Size = new System.Drawing.Size(89, 23);
this.txtUpdownP12.TabIndex = 229;
this.txtUpdownP12.Text = "999";
//
// txtInoutP11
//
this.txtInoutP11.AcceptsReturn = true;
......@@ -542,7 +572,7 @@
this.txtInoutP11.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInoutP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInoutP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInoutP11.Location = new System.Drawing.Point(391, 313);
this.txtInoutP11.Location = new System.Drawing.Point(395, 312);
this.txtInoutP11.MaxLength = 0;
this.txtInoutP11.Name = "txtInoutP11";
this.txtInoutP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -559,7 +589,7 @@
this.btnInoutP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInoutP11.ForeColor = System.Drawing.Color.Green;
this.btnInoutP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInoutP11.Location = new System.Drawing.Point(248, 308);
this.btnInoutP11.Location = new System.Drawing.Point(252, 307);
this.btnInoutP11.Name = "btnInoutP11";
this.btnInoutP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInoutP11.Size = new System.Drawing.Size(140, 33);
......@@ -568,6 +598,24 @@
this.btnInoutP11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInoutP11.UseVisualStyleBackColor = false;
//
// btnUpdownP12
//
this.btnUpdownP12.AutoSize = true;
this.btnUpdownP12.BackColor = System.Drawing.SystemColors.Control;
this.btnUpdownP12.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdownP12.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdownP12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP12.ForeColor = System.Drawing.Color.Red;
this.btnUpdownP12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP12.Location = new System.Drawing.Point(738, 308);
this.btnUpdownP12.Name = "btnUpdownP12";
this.btnUpdownP12.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP12.Size = new System.Drawing.Size(147, 33);
this.btnUpdownP12.TabIndex = 228;
this.btnUpdownP12.Text = "升降轴NG放料高点P12:";
this.btnUpdownP12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP12.UseVisualStyleBackColor = false;
//
// txtMiddleP11
//
this.txtMiddleP11.AcceptsReturn = true;
......@@ -583,6 +631,24 @@
this.txtMiddleP11.TabIndex = 225;
this.txtMiddleP11.Text = "999";
//
// btnUpdownP11
//
this.btnUpdownP11.AutoSize = true;
this.btnUpdownP11.BackColor = System.Drawing.SystemColors.Control;
this.btnUpdownP11.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdownP11.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdownP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP11.ForeColor = System.Drawing.Color.Red;
this.btnUpdownP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP11.Location = new System.Drawing.Point(492, 308);
this.btnUpdownP11.Name = "btnUpdownP11";
this.btnUpdownP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP11.Size = new System.Drawing.Size(147, 33);
this.btnUpdownP11.TabIndex = 226;
this.btnUpdownP11.Text = "升降轴NG放料低点P11:";
this.btnUpdownP11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP11.UseVisualStyleBackColor = false;
//
// btnMiddleP11
//
this.btnMiddleP11.AutoSize = true;
......@@ -678,7 +744,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(394, 235);
this.txtInOutP2.Location = new System.Drawing.Point(395, 235);
this.txtInOutP2.MaxLength = 0;
this.txtInOutP2.Name = "txtInOutP2";
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -693,7 +759,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(394, 193);
this.txtInOutP1.Location = new System.Drawing.Point(395, 193);
this.txtInOutP1.MaxLength = 0;
this.txtInOutP1.Name = "txtInOutP1";
this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -783,7 +849,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(394, 273);
this.txtInOutP3.Location = new System.Drawing.Point(395, 273);
this.txtInOutP3.MaxLength = 0;
this.txtInOutP3.Name = "txtInOutP3";
this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -912,7 +978,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(493, 268);
this.btnComP1.Location = new System.Drawing.Point(492, 268);
this.btnComP1.Name = "btnComP1";
this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP1.Size = new System.Drawing.Size(140, 33);
......@@ -931,7 +997,7 @@
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(251, 230);
this.btnInOutP2.Location = new System.Drawing.Point(252, 230);
this.btnInOutP2.Name = "btnInOutP2";
this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP2.Size = new System.Drawing.Size(140, 33);
......@@ -950,7 +1016,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(251, 188);
this.btnInOutP1.Location = new System.Drawing.Point(252, 188);
this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP1.Size = new System.Drawing.Size(140, 33);
......@@ -993,7 +1059,7 @@
this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP1.Size = new System.Drawing.Size(140, 33);
this.btnUpDownP1.TabIndex = 199;
this.btnUpDownP1.Text = "升降轴扫码放料点P1:";
this.btnUpDownP1.Text = "升降轴扫码低点P1:";
this.btnUpDownP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP1.UseVisualStyleBackColor = false;
this.btnUpDownP1.Click += new System.EventHandler(this.btnUpDownP1_Click);
......@@ -1012,7 +1078,7 @@
this.btnUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP2.Size = new System.Drawing.Size(140, 33);
this.btnUpDownP2.TabIndex = 201;
this.btnUpDownP2.Text = "升降轴扫码缓冲点P2:";
this.btnUpDownP2.Text = "升降轴扫码高点P2:";
this.btnUpDownP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP2.UseVisualStyleBackColor = false;
this.btnUpDownP2.Click += new System.EventHandler(this.btnUpDownP2_Click);
......@@ -1061,7 +1127,7 @@
this.btnInOutP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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(250, 268);
this.btnInOutP3.Location = new System.Drawing.Point(252, 268);
this.btnInOutP3.Name = "btnInOutP3";
this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP3.Size = new System.Drawing.Size(140, 33);
......@@ -1079,7 +1145,7 @@
this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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(9, 230);
this.btnMiddleP2.Location = new System.Drawing.Point(10, 230);
this.btnMiddleP2.Name = "btnMiddleP2";
this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP2.Size = new System.Drawing.Size(140, 33);
......@@ -1133,7 +1199,7 @@
this.btnUpDownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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.Location = new System.Drawing.Point(251, 105);
this.btnUpDownP3.Location = new System.Drawing.Point(252, 105);
this.btnUpDownP3.Name = "btnUpDownP3";
this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP3.Size = new System.Drawing.Size(140, 33);
......@@ -1151,7 +1217,7 @@
this.btnUpDownP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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.Location = new System.Drawing.Point(251, 145);
this.btnUpDownP4.Location = new System.Drawing.Point(252, 145);
this.btnUpDownP4.Name = "btnUpDownP4";
this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP4.Size = new System.Drawing.Size(140, 33);
......@@ -1173,28 +1239,13 @@
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Enabled = false;
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(1001, 117);
this.groupBox1.Location = new System.Drawing.Point(1006, 117);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(288, 361);
this.groupBox1.Size = new System.Drawing.Size(283, 361);
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "压紧轴位置配置";
//
// txtUpdownP11
//
this.txtUpdownP11.AcceptsReturn = true;
this.txtUpdownP11.BackColor = System.Drawing.SystemColors.Window;
this.txtUpdownP11.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP11.Location = new System.Drawing.Point(641, 313);
this.txtUpdownP11.MaxLength = 0;
this.txtUpdownP11.Name = "txtUpdownP11";
this.txtUpdownP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpdownP11.Size = new System.Drawing.Size(89, 23);
this.txtUpdownP11.TabIndex = 227;
this.txtUpdownP11.Text = "999";
//
// btnSaveCom
//
this.btnSaveCom.BackColor = System.Drawing.SystemColors.Control;
......@@ -1208,21 +1259,6 @@
this.btnSaveCom.UseVisualStyleBackColor = false;
this.btnSaveCom.Click += new System.EventHandler(this.btnSaveCom_Click);
//
// txtUpdownP12
//
this.txtUpdownP12.AcceptsReturn = true;
this.txtUpdownP12.BackColor = System.Drawing.SystemColors.Window;
this.txtUpdownP12.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP12.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP12.Location = new System.Drawing.Point(891, 313);
this.txtUpdownP12.MaxLength = 0;
this.txtUpdownP12.Name = "txtUpdownP12";
this.txtUpdownP12.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpdownP12.Size = new System.Drawing.Size(89, 23);
this.txtUpdownP12.TabIndex = 229;
this.txtUpdownP12.Text = "999";
//
// txtComMax
//
this.txtComMax.AcceptsReturn = true;
......@@ -1238,24 +1274,6 @@
this.txtComMax.TabIndex = 255;
this.txtComMax.Text = "1000";
//
// btnUpdownP11
//
this.btnUpdownP11.AutoSize = true;
this.btnUpdownP11.BackColor = System.Drawing.SystemColors.Control;
this.btnUpdownP11.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdownP11.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdownP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP11.ForeColor = System.Drawing.Color.Red;
this.btnUpdownP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP11.Location = new System.Drawing.Point(492, 308);
this.btnUpdownP11.Name = "btnUpdownP11";
this.btnUpdownP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP11.Size = new System.Drawing.Size(147, 33);
this.btnUpdownP11.TabIndex = 226;
this.btnUpdownP11.Text = "升降轴NG放料低点P11:";
this.btnUpdownP11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP11.UseVisualStyleBackColor = false;
//
// label47
//
this.label47.AutoSize = true;
......@@ -1270,24 +1288,6 @@
this.label47.Text = "-";
this.label47.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnUpdownP12
//
this.btnUpdownP12.AutoSize = true;
this.btnUpdownP12.BackColor = System.Drawing.SystemColors.Control;
this.btnUpdownP12.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdownP12.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdownP12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP12.ForeColor = System.Drawing.Color.Red;
this.btnUpdownP12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP12.Location = new System.Drawing.Point(738, 308);
this.btnUpdownP12.Name = "btnUpdownP12";
this.btnUpdownP12.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP12.Size = new System.Drawing.Size(147, 33);
this.btnUpdownP12.TabIndex = 228;
this.btnUpdownP12.Text = "升降轴NG放料高点P12:";
this.btnUpdownP12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP12.UseVisualStyleBackColor = false;
//
// txtComMin
//
this.txtComMin.BackColor = System.Drawing.SystemColors.Window;
......
source/ACPackingStore/FrmIOStatus.Designer.cs
......@@ -19,7 +19,7 @@
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.button1 = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.btnCloseCyDo = new System.Windows.Forms.Button();
this.btnDoorStop = new System.Windows.Forms.Button();
this.btnBlow = new System.Windows.Forms.Button();
this.btnStoreOn = new System.Windows.Forms.Button();
this.btnStopMove = new System.Windows.Forms.Button();
......@@ -73,7 +73,7 @@
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox1.Controls.Add(this.btnCloseCyDo);
this.groupBox1.Controls.Add(this.btnDoorStop);
this.groupBox1.Controls.Add(this.btnBlow);
this.groupBox1.Controls.Add(this.btnStoreOn);
this.groupBox1.Controls.Add(this.btnStopMove);
......@@ -106,23 +106,23 @@
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
//
// btnCloseCyDo
// btnDoorStop
//
this.btnCloseCyDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseCyDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseCyDo.Location = new System.Drawing.Point(31, 328);
this.btnCloseCyDo.Name = "btnCloseCyDo";
this.btnCloseCyDo.Size = new System.Drawing.Size(259, 34);
this.btnCloseCyDo.TabIndex = 295;
this.btnCloseCyDo.Text = "关闭气缸IO";
this.btnCloseCyDo.UseVisualStyleBackColor = false;
this.btnCloseCyDo.Click += new System.EventHandler(this.btnCloseCyDo_Click);
this.btnDoorStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDoorStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDoorStop.Location = new System.Drawing.Point(208, 168);
this.btnDoorStop.Name = "btnDoorStop";
this.btnDoorStop.Size = new System.Drawing.Size(92, 34);
this.btnDoorStop.TabIndex = 296;
this.btnDoorStop.Text = "移门停止";
this.btnDoorStop.UseVisualStyleBackColor = false;
this.btnDoorStop.Click += new System.EventHandler(this.btnDoorStop_Click);
//
// btnBlow
//
this.btnBlow.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBlow.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBlow.Location = new System.Drawing.Point(165, 461);
this.btnBlow.Location = new System.Drawing.Point(175, 472);
this.btnBlow.Name = "btnBlow";
this.btnBlow.Size = new System.Drawing.Size(125, 34);
this.btnBlow.TabIndex = 294;
......@@ -134,7 +134,7 @@
//
this.btnStoreOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreOn.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStoreOn.Location = new System.Drawing.Point(165, 375);
this.btnStoreOn.Location = new System.Drawing.Point(175, 386);
this.btnStoreOn.Name = "btnStoreOn";
this.btnStoreOn.Size = new System.Drawing.Size(125, 34);
this.btnStoreOn.TabIndex = 293;
......@@ -146,7 +146,7 @@
//
this.btnStopMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStopMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStopMove.Location = new System.Drawing.Point(165, 418);
this.btnStopMove.Location = new System.Drawing.Point(175, 429);
this.btnStopMove.Name = "btnStopMove";
this.btnStopMove.Size = new System.Drawing.Size(125, 34);
this.btnStopMove.TabIndex = 292;
......@@ -158,7 +158,7 @@
//
this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button4.Location = new System.Drawing.Point(31, 418);
this.button4.Location = new System.Drawing.Point(12, 429);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(125, 34);
this.button4.TabIndex = 291;
......@@ -170,7 +170,7 @@
//
this.btnCamerLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCamerLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCamerLed.Location = new System.Drawing.Point(31, 461);
this.btnCamerLed.Location = new System.Drawing.Point(12, 472);
this.btnCamerLed.Name = "btnCamerLed";
this.btnCamerLed.Size = new System.Drawing.Size(125, 34);
this.btnCamerLed.TabIndex = 290;
......@@ -182,7 +182,7 @@
//
this.btnTopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTopDown.Location = new System.Drawing.Point(165, 248);
this.btnTopDown.Location = new System.Drawing.Point(175, 272);
this.btnTopDown.Name = "btnTopDown";
this.btnTopDown.Size = new System.Drawing.Size(125, 34);
this.btnTopDown.TabIndex = 289;
......@@ -194,7 +194,7 @@
//
this.btnTopUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTopUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTopUp.Location = new System.Drawing.Point(31, 248);
this.btnTopUp.Location = new System.Drawing.Point(12, 272);
this.btnTopUp.Name = "btnTopUp";
this.btnTopUp.Size = new System.Drawing.Size(125, 34);
this.btnTopUp.TabIndex = 288;
......@@ -206,7 +206,7 @@
//
this.btnNGDoorDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNGDoorDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNGDoorDown.Location = new System.Drawing.Point(165, 208);
this.btnNGDoorDown.Location = new System.Drawing.Point(175, 227);
this.btnNGDoorDown.Name = "btnNGDoorDown";
this.btnNGDoorDown.Size = new System.Drawing.Size(125, 34);
this.btnNGDoorDown.TabIndex = 287;
......@@ -218,7 +218,7 @@
//
this.btnNGDoorUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNGDoorUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNGDoorUp.Location = new System.Drawing.Point(31, 208);
this.btnNGDoorUp.Location = new System.Drawing.Point(12, 227);
this.btnNGDoorUp.Name = "btnNGDoorUp";
this.btnNGDoorUp.Size = new System.Drawing.Size(125, 34);
this.btnNGDoorUp.TabIndex = 286;
......@@ -298,7 +298,7 @@
//
this.btnOpenAxisBreak.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenAxisBreak.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenAxisBreak.Location = new System.Drawing.Point(31, 375);
this.btnOpenAxisBreak.Location = new System.Drawing.Point(12, 386);
this.btnOpenAxisBreak.Name = "btnOpenAxisBreak";
this.btnOpenAxisBreak.Size = new System.Drawing.Size(125, 34);
this.btnOpenAxisBreak.TabIndex = 252;
......@@ -332,7 +332,7 @@
//
this.btnLocationDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLocationDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLocationDown.Location = new System.Drawing.Point(165, 288);
this.btnLocationDown.Location = new System.Drawing.Point(175, 317);
this.btnLocationDown.Name = "btnLocationDown";
this.btnLocationDown.Size = new System.Drawing.Size(125, 34);
this.btnLocationDown.TabIndex = 251;
......@@ -356,7 +356,7 @@
//
this.btnLocationUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLocationUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLocationUp.Location = new System.Drawing.Point(31, 288);
this.btnLocationUp.Location = new System.Drawing.Point(12, 317);
this.btnLocationUp.Name = "btnLocationUp";
this.btnLocationUp.Size = new System.Drawing.Size(125, 34);
this.btnLocationUp.TabIndex = 250;
......@@ -383,11 +383,11 @@
//
this.btnCloseDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDoor.Location = new System.Drawing.Point(165, 167);
this.btnCloseDoor.Location = new System.Drawing.Point(110, 168);
this.btnCloseDoor.Name = "btnCloseDoor";
this.btnCloseDoor.Size = new System.Drawing.Size(125, 34);
this.btnCloseDoor.Size = new System.Drawing.Size(92, 34);
this.btnCloseDoor.TabIndex = 249;
this.btnCloseDoor.Text = "入料口移门关闭";
this.btnCloseDoor.Text = "入口移门关闭";
this.btnCloseDoor.UseVisualStyleBackColor = false;
this.btnCloseDoor.Click += new System.EventHandler(this.btnCloseDoor_Click);
//
......@@ -395,11 +395,11 @@
//
this.btnOpenDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDoor.Location = new System.Drawing.Point(31, 167);
this.btnOpenDoor.Location = new System.Drawing.Point(12, 168);
this.btnOpenDoor.Name = "btnOpenDoor";
this.btnOpenDoor.Size = new System.Drawing.Size(125, 34);
this.btnOpenDoor.Size = new System.Drawing.Size(92, 34);
this.btnOpenDoor.TabIndex = 248;
this.btnOpenDoor.Text = "入料口移门打开";
this.btnOpenDoor.Text = "入口移门打开";
this.btnOpenDoor.UseVisualStyleBackColor = false;
this.btnOpenDoor.Click += new System.EventHandler(this.btnOpenDoor_Click);
//
......@@ -514,7 +514,7 @@
private System.Windows.Forms.Button btnCamerLed;
private System.Windows.Forms.Button btnStoreOn;
private System.Windows.Forms.Button btnBlow;
private System.Windows.Forms.Button btnCloseCyDo;
private System.Windows.Forms.Button btnDoorStop;
}
}
source/ACPackingStore/FrmIOStatus.cs
......@@ -212,14 +212,6 @@ namespace OnlineStore.ACPackingStore
}
}
private void btnOpenDoor_Click(object sender, EventArgs e)
{
boxBean.CylinderMove(null, IO_Type.EntranceDoor_Close, IO_Type.EntranceDoor_Open);
}
private void btnCloseDoor_Click(object sender, EventArgs e)
{
boxBean.CylinderMove(null, IO_Type.EntranceDoor_Open, IO_Type.EntranceDoor_Close);
}
private void btnLocationUp_Click(object sender, EventArgs e)
{
......@@ -325,6 +317,7 @@ namespace OnlineStore.ACPackingStore
private void btnCloseCyDo_Click(object sender, EventArgs e)
{
boxBean.DoorBean.Stop();
boxBean.IOMove(IO_Type.EntranceDoor_Open, IO_VALUE.LOW);
boxBean.IOMove(IO_Type.EntranceDoor_Close, IO_VALUE.LOW);
boxBean.IOMove(IO_Type.TopCylinder_Down, IO_VALUE.LOW);
......@@ -334,5 +327,26 @@ namespace OnlineStore.ACPackingStore
boxBean.IOMove(IO_Type.LocationCylinder_Down, IO_VALUE.LOW);
boxBean.IOMove(IO_Type.LocationCylinder_Up, IO_VALUE.LOW);
}
private void btnOpenDoor_Click(object sender, EventArgs e)
{
// boxBean.CylinderMove(null, IO_Type.EntranceDoor_Close, IO_Type.EntranceDoor_Open);
if (!boxBean.DoorBean.StartOpen(null))
{
MessageBox.Show("打开移门失败");
}
}
private void btnCloseDoor_Click(object sender, EventArgs e)
{
if (!boxBean.DoorBean.StartClose(null))
{
MessageBox.Show("关闭移门失败");
}
// boxBean.CylinderMove(null, IO_Type.EntranceDoor_Open, IO_Type.EntranceDoor_Close);
}
private void btnDoorStop_Click(object sender, EventArgs e)
{
boxBean.DoorBean.Stop();
}
}
}
source/ACPackingStore/FrmStore.cs
......@@ -132,6 +132,7 @@ namespace OnlineStore.ACPackingStore
IOManager.instance.CloseAllConnection();
HumitureController.CloseAllPort();
ACServerManager.CloseAllPort();
//this.Close();
System.Environment.Exit(System.Environment.ExitCode);
}
......
source/ACPackingStore/Program.cs
......@@ -112,7 +112,7 @@ namespace OnlineStore.ACPackingStore
static void LogUnhandledException(object exceptionobj)
{
//这里可以进一步地写日志
LOGGER.Error(exceptionobj.ToString());
LOGGER.Error("LogUnhandledException："+exceptionobj.ToString());
}
}
}
source/ACPackingStore/记录.txt
......@@ -45,3 +45,7 @@
升降轴低点P101
升降轴高点P102
进出轴位置P101
20191220移门操作修改：移门到位后需要马上关闭DO.
扫码入库逻辑修改，先去扫码库位点，放下料盘后扫码，扫码后再把料盘拿走。
\ No newline at end of file
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean.cs
......@@ -18,7 +18,8 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public partial class AC_BOX_Bean : KTK_Store
{
private static bool IsIntSlvBlock = false;
public EnteryDoorBean DoorBean = null;
private bool IsIntSlvBlock = false;
public AutoInoutInfo AutoInout = new AutoInoutInfo();
public string CID = "";
public AC_BOX_Config Config;
......@@ -53,13 +54,13 @@ namespace OnlineStore.DeviceLibrary
//添加调试
IsDebug = config.IsInDebug.Equals(1);
Name = ("料仓BOX_" + config.DeviceID + " ").ToUpper();
this.DeviceID = config.DeviceID;
this.Config = config;
DoorBean = new EnteryDoorBean(DeviceID);
//温湿度
humBean = new HumitureBean(config.Humiture_Port, Name);
humBean.Init();
// humBean.Init();
moveAxisList = new List<ConfigMoveAxis>();
MoveAxisConfig();
List<ACBoxPosition> positionList = CSVPositionReader<ACBoxPosition>.getPositionList();
......@@ -254,6 +255,7 @@ namespace OnlineStore.DeviceLibrary
isInSuddenDown = false;
isNoAirCheck = false;
alarmType = StoreAlarmType.None;
DoorBean.Stop();
//开始复位动作
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H01_DoorClose);
......@@ -261,7 +263,7 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.Line_BackRun, IO_VALUE.LOW);
IOMove(IO_Type.Line_Run, IO_VALUE.LOW);
CylinderMove(MoveInfo, IO_Type.NGDoowCylinder_Up, IO_Type.NGDoorCylinder_Down);
CylinderMove(null, IO_Type.EntranceDoor_Open, IO_Type.EntranceDoor_Close);
//CylinderMove(null, IO_Type.EntranceDoor_Open, IO_Type.EntranceDoor_Close);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
}
/// <summary>
......@@ -450,11 +452,6 @@ namespace OnlineStore.DeviceLibrary
storeRunStatus = StoreRunStatus.Wait;
mainTimer.Enabled = false;
TimeSpan span = DateTime.Now - StartTime;
//LineConnect.StopConnect();
// IOManager.instance.CloseAllDO();
LogInfo(",停止运行，总运行时间：" + span.ToString());
}
......@@ -786,6 +783,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public override void StopMove()
{
DoorBean.Stop();
IOMove(IO_Type.Axis_Brake, IO_VALUE.LOW);
MoveInfo.EndMove();
IOMove(IO_Type.Axis_Brake, IO_VALUE.LOW);
......
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Partial.cs
......@@ -157,8 +157,6 @@ namespace OnlineStore.DeviceLibrary
private int LastHeight = 0;
private RFIDData LastShelfData = new RFIDData(0,0);
#region 入库
private void ClearLastTrayInfo()
{
......@@ -201,7 +199,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NewMove(StoreMoveType.InStore, param);
//新的料架库位
MoveInfo.NextMoveStep(StoreMoveStep.BI_11_InoutToP1);
MoveInfo.NextMoveStep(StoreMoveStep.BI_17_InoutBack);
MoveInfo.SingleInstore = true;
InOutStoreLog("料架取料：叉子后退到待机点P1, 重置盘信息");
ACAxisMove(Config.InOut_Axis, Config.InOutAxis_P1_Position, Config.InOutAxis_P1_Speed);
......@@ -240,29 +238,30 @@ namespace OnlineStore.DeviceLibrary
storeRunStatus = StoreRunStatus.Busy;
storeStatus = StoreStatus.InStoreExecute;
EmprtShelfList = new ConcurrentQueue<string>();
LogInfo(" 空闲中，读取到料架" + data.ToStr() + "，料架入库：入料口移门打开，");
LogInfo(" 空闲中，读取到料架" + data.ToStr() + "，料架入库 " + MoveInfo.SLog + "：入料口移门打开，");
MoveInfo.NewMove(StoreMoveType.InStore, new InOutParam());
MoveInfo.MoveParam.MoveP = new LineMoveP(Config);
MoveInfo.ShelfPositionList = new List<string>(ShelfPosList);
MoveInfo.NextMoveStep(StoreMoveStep.BI_02_DoorOpen);
CylinderMove(MoveInfo, IO_Type.EntranceDoor_Close, IO_Type.EntranceDoor_Open);
// CylinderMove(MoveInfo, IO_Type.EntranceDoor_Close, IO_Type.EntranceDoor_Open);
DoorBean.StartOpen(MoveInfo);
}
private void StartMoveToBag()
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_21_MoveToBag);
InOutStoreLog("入库：移动到库位点，轴1（ 转盘） 至P2（ 库位点）轴2(上下） 至P3(库位入库前点）");
MoveInfo.NextMoveStep(StoreMoveStep.BI_51_MoveToBag);
InOutStoreLog("入库 " + MoveInfo.SLog + "：移动到库位点，轴1（ 转盘） 至P2（ 库位点）轴2(上下） 至P3(库位入库前点）");
ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P2, Config.MiddleAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P3, Config.UpDownAxis_P3_Speed);
}
private void StartSendTray(string str = "扫码失败")
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_31_ToNGDoor);
InOutStoreLog("送出料盘：" + str + "，升降轴移动到NG料门口上端，旋转轴移动到NG料门口");
MoveInfo.NextMoveStep(StoreMoveStep.BI_71_ToNGDoor);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：" + str + "，升降轴移动到NG料门口上端，旋转轴移动到NG料门口");
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P12, Config.UpDownAxis_P1_Speed);
ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P11, Config.MiddleAxis_P1_Speed);
......@@ -289,7 +288,7 @@ namespace OnlineStore.DeviceLibrary
//新的料架库位
startInStoreTime = DateTime.Now;
MoveInfo.NextMoveStep(StoreMoveStep.BI_11_InoutToP1);
InOutStoreLog("料架取料：叉子后退到待机点P1, 重置盘信息");
InOutStoreLog("料架取料 " + MoveInfo.SLog + "：叉子后退到待机点P1, 重置盘信息");
ACAxisMove(Config.InOut_Axis, Config.InOutAxis_P1_Position, Config.InOutAxis_P1_Speed);
ClearLastTrayInfo();
}
......@@ -302,7 +301,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_11_InoutToP1))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_12_MoveToShelf);
InOutStoreLog("料架取料：升降轴移动到P101低点，旋转轴移动到P101点，压紧轴到压紧前点");
InOutStoreLog("料架取料 " + MoveInfo.SLog + "：升降轴移动到P101低点，旋转轴移动到P101点，压紧轴到压紧前点");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_LP101, Config.UpDownAxis_P101_Speed);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P101, Config.MiddleAxis_P101_Speed);
ACAxisMove(Config.Comp_Axis, Config.CompAxis_P3_Position, Config.CompAxis_P3_Speed);
......@@ -310,19 +309,19 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_12_MoveToShelf))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_13_InoutToP101);
InOutStoreLog("料架取料：叉子前进到P101点");
InOutStoreLog("料架取料 " + MoveInfo.SLog + "：叉子前进到P101点");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P101, Config.InOutAxis_P101_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_13_InoutToP101))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_14_UpdownToP102);
InOutStoreLog("料架取料：升降轴上升到P102点");
InOutStoreLog("料架取料 " + MoveInfo.SLog + "：升降轴上升到P102点");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_HP102, Config.UpDownAxis_P102_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_14_UpdownToP102))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_15_StartCompress);
InOutStoreLog("料架取料：压紧轴开始缓慢压紧到P4");
InOutStoreLog("料架取料 " + MoveInfo.SLog + "：压紧轴开始缓慢压紧到P4");
MoveInfo.WaitList.Add(WaitResultInfo.WaitComAxis(Config.Comp_Axis, Config.CompAxis_P4_Position, Config.CompAxis_P4_Speed));
Config.Comp_Axis.TargetPosition = Config.CompAxis_P4_Position;
ACServerManager.AbsMove(Config.Comp_Axis.DeviceName, Config.Comp_Axis.GetAxisValue(), Config.CompAxis_P4_Position, Config.CompAxis_P4_Speed);
......@@ -335,18 +334,53 @@ namespace OnlineStore.DeviceLibrary
ComTargetPosition = currPosition;
int targetP = currPosition + Config.CompAxis_Down_Position;
LastHeight = Config.GetComP2PlateH(targetP);
InOutStoreLog("料架取料：检测到料叉压紧确认信号，向下压紧【" + ComTargetPosition + "】目标【" + targetP + "】，记录料盘高度【" + LastHeight + "】");
InOutStoreLog("料架取料 " + MoveInfo.SLog + "：检测到料叉压紧确认信号，向下压紧【" + ComTargetPosition + "】目标【" + targetP + "】，记录料盘高度【" + LastHeight + "】");
ACAxisMove(Config.Comp_Axis, targetP, Config.CompAxis_P1_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_16_ComAxisDownMove))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_17_InoutBack);
InOutStoreLog("料架取料：记录压紧高度，叉子后退到扫码点");
ACAxisMove(Config.InOut_Axis, Config.InOutAxis_P1_Position, Config.CompAxis_P1_Speed);
InOutStoreLog("料架取料 " + MoveInfo.SLog + "：记录压紧高度，叉子后退到扫码点");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.CompAxis_P1_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_17_InoutBack))
{
if (MoveInfo.SingleInstore)
{
//单盘入库，不需要扫码
StartMoveToBag();
}
else
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_21_ToScanPosition);
InOutStoreLog("扫码 " + MoveInfo.SLog + "：升降轴移动到P2,旋转轴移动到P1");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P2, Config.UpDownAxis_P2_Speed);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
}
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_21_ToScanPosition))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_22_InOutToP2);
InOutStoreLog("扫码 " + MoveInfo.SLog + "：进出轴到P2");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P2, Config.InOutAxis_P2_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_22_InOutToP2))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_23_PutTrayDown);
InOutStoreLog("扫码 " + MoveInfo.SLog + "：升降轴缓慢下降到P1，压紧轴返回压紧前点");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
ACAxisMove(Config.Comp_Axis, moveP.ComPress_P3, Config.CompAxis_P3_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_23_PutTrayDown))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_24_InOutToP1);
InOutStoreLog("扫码 " + MoveInfo.SLog + "：进出轴返回待机点");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.CompAxis_P1_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_24_InOutToP1))
{
if (IOValue(IO_Type.TrayCheck_3).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.TrayCheck_4).Equals(IO_VALUE.HIGH))
{
LastWidth = 13;
......@@ -360,15 +394,8 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info("未检测到识别区料盘检测信号， 默认高度为7");
}
if (MoveInfo.SingleInstore)
{
//单盘入库，不需要扫码
StartMoveToBag();
}
else
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_18_ScanCode);
InOutStoreLog("料架取料：记录宽度，开始扫码");
MoveInfo.NextMoveStep(StoreMoveStep.BI_25_ScanCode);
InOutStoreLog("扫码 " + MoveInfo.SLog + "：记录宽度，开始扫码");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
MoveInfo.WaitList.Add(WaitResultInfo.WaitCode());
Task.Factory.StartNew(delegate
......@@ -378,9 +405,26 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.Camera_Led, IO_VALUE.LOW);
});
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_25_ScanCode))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_27_InoutToP2);
InOutStoreLog("扫码 " + MoveInfo.SLog + "：进出轴到P2");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P2, Config.InOutAxis_P2_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_27_InoutToP2))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_28_GetScanPTray);
InOutStoreLog("扫码 " + MoveInfo.SLog + "：升降轴到P1,压紧轴压紧");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
ACAxisMove(Config.Comp_Axis, moveP.ComPress_P2, Config.CompAxis_P2_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_28_GetScanPTray))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_29_InoutBackP1);
InOutStoreLog("扫码 " + MoveInfo.SLog + "：进出轴返回");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_18_ScanCode))
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_29_InoutBackP1))
{
if (LastScanCodes.Count <= 0)
{
......@@ -388,44 +432,36 @@ namespace OnlineStore.DeviceLibrary
}
else
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_19_GetPosId);
InOutStoreLog("料架取料：扫码成功，从服务器获取库位号");
MoveInfo.NextMoveStep(StoreMoveStep.BI_30_SetInstoreParam);
InOutStoreLog("扫码 " + MoveInfo.SLog + ": 获取库位号");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000));
bool result = GetPosIdByCode();
if (result)
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_20_SetInstoreParam);
InOutStoreLog("料架取料: 获取库位号完成，设置位置参数，开始入库");
}
else
if (!result)
{
MoveInfo.MoveParam.PosID = "";
StartSendTray("获取入库库位失败");
}
}
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_19_GetPosId))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_20_SetInstoreParam);
InOutStoreLog("料架取料: 获取库位号完成，设置位置参数，开始入库");
}
#endregion
#region 入库逻辑
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_20_SetInstoreParam))
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_30_SetInstoreParam))
{
StartMoveToBag();
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_21_MoveToBag))
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_51_MoveToBag))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_22_DeviceToBag);
InOutStoreLog("入库：叉子进入库位中，轴3（ 叉子） 至P3(库位取放料点）");
MoveInfo.NextMoveStep(StoreMoveStep.BI_52_DeviceToBag);
InOutStoreLog("入库 " + MoveInfo.SLog + "：叉子进入库位中，轴3（ 叉子） 至P3(库位取放料点）");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P3, Config.InOutAxis_P3_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_22_DeviceToBag))
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_52_DeviceToBag))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_23_PutWareToBag);
InOutStoreLog("入库：放下物品，轴2（ 上下） 至P4（ 库位入料缓冲点）轴4（ 压紧） 至P3（ 压紧前点）");
MoveInfo.NextMoveStep(StoreMoveStep.BI_53_PutWareToBag);
InOutStoreLog("入库 " + MoveInfo.SLog + "：放下物品，轴2（ 上下） 至P4（ 库位入料缓冲点）轴4（ 压紧） 至P3（ 压紧前点）");
// 5= 入仓位完成(料仓Box把料盘放入对应的库位中，装置还未恢复原始状态)
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosID : "";
......@@ -438,21 +474,21 @@ namespace OnlineStore.DeviceLibrary
ACAxisMove(Config.Comp_Axis, moveP.ComPress_P3, Config.CompAxis_P3_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P4, Config.UpDownAxis_P4_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_23_PutWareToBag))
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_53_PutWareToBag))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_24_DeviceBackFromBag);
InOutStoreLog("入库：叉子从库位中返回，轴3（ 叉子） 动作至P1（ 待机点）");
ACAxisMove(Config.InOut_Axis, Config.InOutAxis_P1_Position, Config.InOutAxis_P1_Speed);
MoveInfo.NextMoveStep(StoreMoveStep.BI_54_DeviceBackFromBag);
InOutStoreLog("入库 " + MoveInfo.SLog + "：叉子从库位中返回，轴3（ 叉子） 动作至P1（ 待机点）");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_24_DeviceBackFromBag))
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_54_DeviceBackFromBag))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_25_GoBack);
InOutStoreLog("入库：返回待机点，轴2/轴1/轴4动作至P1（ 待机点）)开始");
MoveInfo.NextMoveStep(StoreMoveStep.BI_55_GoBack);
InOutStoreLog("入库 " + MoveInfo.SLog + "：返回待机点，轴2/轴1/轴4动作至P1（ 待机点）)开始");
ACAxisMove(Config.Comp_Axis, moveP.ComPress_P1, Config.CompAxis_P1_Speed);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_25_GoBack))
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_55_GoBack))
{
TimeSpan span = DateTime.Now - startInStoreTime;
if (MoveInfo.SingleInstore)
......@@ -465,49 +501,48 @@ namespace OnlineStore.DeviceLibrary
else
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_08_StartGetTray);
InOutStoreLog("料架入库：上一盘入库结束， 耗时【" + FormUtil.GetSpanStr(span) + "】判断是否有下个料盘，扫码入库");
InOutStoreLog("料架入库 " + MoveInfo.SLog + "：上一盘入库结束， 耗时【" + FormUtil.GetSpanStr(span) + "】判断是否有下个料盘，扫码入库");
}
}
#endregion
#region 把料盘送到NG逻辑
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_31_ToNGDoor))
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_71_ToNGDoor))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_32_NGDoorUp);
InOutStoreLog("送出料盘：NG料口升降门上升");
MoveInfo.NextMoveStep(StoreMoveStep.BI_72_NGDoorUp);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：NG料口升降门上升");
CylinderMove(MoveInfo, IO_Type.NGDoorCylinder_Down, IO_Type.NGDoowCylinder_Up);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_32_NGDoorUp))
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_72_NGDoorUp))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_33_InoutToNGDoor);
InOutStoreLog("送出料盘：进出轴前进到NG料门口位置");
MoveInfo.NextMoveStep(StoreMoveStep.BI_73_InoutToNGDoor);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：进出轴前进到NG料门口位置");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P11, Config.InOutAxis_P2_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_33_InoutToNGDoor))
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_73_InoutToNGDoor))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_34_UpdownDown);
InOutStoreLog("送出料盘：升降轴缓慢下降，放下料盘");
MoveInfo.NextMoveStep(StoreMoveStep.BI_74_UpdownDown);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：升降轴缓慢下降，放下料盘");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P12, Config.UpDownAxis_P2_Speed);
ACAxisMove(Config.Comp_Axis, moveP.ComPress_P3, Config.CompAxis_P3_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_34_UpdownDown))
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_74_UpdownDown))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_35_InoutToP1);
InOutStoreLog("送出料盘：叉子后退到P1");
MoveInfo.NextMoveStep(StoreMoveStep.BI_75_InoutToP1);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：叉子后退到P1");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_35_InoutToP1))
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_75_InoutToP1))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_36_NGDoorDown);
InOutStoreLog("送出料盘：关门NG料门，送出料盘结束");
MoveInfo.NextMoveStep(StoreMoveStep.BI_76_NGDoorDown);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：关门NG料门，送出料盘结束");
CylinderMove(MoveInfo, IO_Type.NGDoowCylinder_Up, IO_Type.NGDoorCylinder_Down);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_36_NGDoorDown))
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_76_NGDoorDown))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_08_StartGetTray);
InOutStoreLog("料架入库：开始循环逐个取料盘，扫码入库");
InOutStoreLog("料架入库 " + MoveInfo.SLog + "：开始循环逐个取料盘，扫码入库");
}
#endregion
......@@ -664,14 +699,16 @@ namespace OnlineStore.DeviceLibrary
if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_01_ReadyShelf))
{
MoveInfo.ShelfPositionList = new List<string>(ShelfPosList);
InOutStoreLog(moveName + "调用AgvClient.MayEnter，小车已到达，打开入料口移门");
InOutStoreLog(moveName + MoveInfo.SLog + "调用AgvClient.MayEnter，小车已到达，打开入料口移门");
MoveInfo.NextMoveStep(StoreMoveStep.BI_02_DoorOpen);
CylinderMove(MoveInfo, IO_Type.EntranceDoor_Close, IO_Type.EntranceDoor_Open);
DoorBean.StartOpen(MoveInfo);
//CylinderMove(MoveInfo, IO_Type.EntranceDoor_Close, IO_Type.EntranceDoor_Open);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_02_DoorOpen))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_03_LineRun);
InOutStoreLog(moveName + "调用AgvClient.MayEnter，线体正转，等待取料位检测到信号");
InOutStoreLog(moveName + MoveInfo.SLog + "调用AgvClient.MayEnter，线体正转，等待取料位检测到信号");
AgvClient.MayEnter(Config.AgvNodeName);
IOMove(IO_Type.Line_BackRun, IO_VALUE.LOW);
IOMove(IO_Type.Line_Run, IO_VALUE.HIGH);
......@@ -682,7 +719,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_03_LineRun))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_04_LineStop);
InOutStoreLog(moveName + "调用AgvClient.FinishEnter，取料位检测到信号，停止线体正转");
InOutStoreLog(moveName + MoveInfo.SLog + "调用AgvClient.FinishEnter，取料位检测到信号，停止线体正转");
IOMove(IO_Type.Line_Run, IO_VALUE.LOW);
AgvClient.FinishEnter(Config.AgvNodeName);
......@@ -696,12 +733,12 @@ namespace OnlineStore.DeviceLibrary
if (result)
{
MoveInfo.MoveParam.UpdateShelfPosId(shelfPosId);
InOutStoreLog("出库：重置EmprtShelfList列表，设置料架位置：" + MoveInfo.MoveParam.ShelfPosID);
InOutStoreLog("出库 " + MoveInfo.SLog + "：重置EmprtShelfList列表，设置料架位置：" + MoveInfo.MoveParam.ShelfPosID);
}
else
{
waitOutStoreList.Enqueue(MoveInfo.MoveParam);
InOutStoreLog("出库：重置EmprtShelfList列表，获取料架位置失败！结束出库，并将"+MoveInfo.MoveParam.ToStr()+"放入等待列表" );
InOutStoreLog("出库 " + MoveInfo.SLog + "：重置EmprtShelfList列表，获取料架位置失败！结束出库，并将" + MoveInfo.MoveParam.ToStr() + "放入等待列表");
MoveEndToRuningStatus();
}
......@@ -712,12 +749,12 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_04_LineStop))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_05_DoorClose);
InOutStoreLog(moveName + "入料口移门关闭");
CylinderMove(MoveInfo, IO_Type.EntranceDoor_Open, IO_Type.EntranceDoor_Close);
InOutStoreLog(moveName + MoveInfo.SLog + "入料口移门关闭");
// CylinderMove(MoveInfo, IO_Type.EntranceDoor_Open, IO_Type.EntranceDoor_Close);
DoorBean.StartClose(MoveInfo);
if (!instoreShelf)
{
InOutStoreLog("出库：SO_03 走到库位，压紧轴至P3(压紧前点) ,旋转轴至P2(库位点),升降轴至P5(库位出库前点)");
InOutStoreLog("出库 " + MoveInfo.SLog + "： 走到库位，压紧轴至P3(压紧前点) ,旋转轴至P2(库位点),升降轴至P5(库位出库前点)");
ACAxisMove(Config.Comp_Axis, MoveInfo.MoveParam.MoveP.ComPress_P3, Config.CompAxis_P3_Speed);
ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P2, Config.MiddleAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P5, Config.UpDownAxis_P5_Speed);
......@@ -726,24 +763,24 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_05_DoorClose))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_06_LocationUp);
InOutStoreLog(moveName + "定位装置上升");
CylinderMove(MoveInfo, IO_Type.LocationCylinder_Down, IO_Type.LocationCylinder_Up);
InOutStoreLog(moveName + MoveInfo.SLog + MoveInfo.SLog + "定位装置上升");
// CylinderMove(MoveInfo, IO_Type.LocationCylinder_Down, IO_Type.LocationCylinder_Up);
if (!instoreShelf)
{
InOutStoreLog("出库：SO_04 叉子进入库位中， 进出轴至P3(库位取放料点) ");
InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子进入库位中， 进出轴至P3(库位取放料点) ");
ACAxisMove(Config.InOut_Axis, MoveInfo.MoveParam.MoveP.InOut_P3, Config.InOutAxis_P3_Speed);
}
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_06_LocationUp))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_07_TopCylinderUp);
InOutStoreLog(moveName + "顶升装置上升");
InOutStoreLog(moveName + MoveInfo.SLog + "顶升装置上升");
CylinderMove(MoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_Up);
if (!instoreShelf)
{
InOutStoreLog("出库：SO_05 拿起物品，升降轴至P6(库位出料缓冲点)，压紧轴至P2(压紧点) ");
InOutStoreLog("出库 " + MoveInfo.SLog + "： 拿起物品，升降轴至P6(库位出料缓冲点)，压紧轴至P2(压紧点) ");
ACAxisMove(Config.Comp_Axis, MoveInfo.MoveParam.MoveP.ComPress_P2, Config.CompAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P6, Config.UpDownAxis_P6_Speed);
}
......@@ -753,12 +790,12 @@ namespace OnlineStore.DeviceLibrary
if (instoreShelf)
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_08_StartGetTray);
InOutStoreLog(moveName + "开始循环从第一个空位逐个取料盘，扫码入库");
InOutStoreLog(moveName + MoveInfo.SLog + "开始循环从第一个空位逐个取料盘，扫码入库");
}
else
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_06_BagDeviceBack);
InOutStoreLog("出库：SO_06 叉子从库位返回，进出轴至P1(待机点) ");
InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子从库位返回，进出轴至P1(待机点) ");
//ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
InOutBackToP1(MoveInfo.MoveParam.MoveP.InOut_P1);
//把库位的物品放到取到叉子上之后是出仓完成
......@@ -797,14 +834,15 @@ namespace OnlineStore.DeviceLibrary
if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_01_TopCylinder_Down))
{
MoveInfo.NextMoveStep(StoreMoveStep.BS_02_LocatinCylinder_Down);
InOutStoreLog(moveName + " ：定位气缸下降");
CylinderMove(MoveInfo, IO_Type.LocationCylinder_Up, IO_Type.LocationCylinder_Down);
InOutStoreLog(moveName + MoveInfo.SLog + " ：定位气缸下降");
// CylinderMove(MoveInfo, IO_Type.LocationCylinder_Up, IO_Type.LocationCylinder_Down);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_02_LocatinCylinder_Down))
{
MoveInfo.NextMoveStep(StoreMoveStep.BS_03_DoorOpen);
InOutStoreLog(moveName + "：打开仓门，调用AgvClient.ReadyEmpty，等待Agv小车到达");
CylinderMove(MoveInfo, IO_Type.EntranceDoor_Close, IO_Type.EntranceDoor_Open);
InOutStoreLog(moveName + MoveInfo.SLog + "：打开仓门，调用AgvClient.ReadyEmpty，等待Agv小车到达");
// CylinderMove(MoveInfo, IO_Type.EntranceDoor_Close, IO_Type.EntranceDoor_Open);
DoorBean.StartOpen(MoveInfo);
AgvClient.ReadyEmpty(Config.AgvNodeName);
//等待小车到达
MoveInfo.WaitList.Add(WaitResultInfo.WaitAgvAction((int)Asa.Actions.Arrive));
......@@ -815,13 +853,13 @@ namespace OnlineStore.DeviceLibrary
if (instoreShelf)
{
InOutStoreLog(moveName + "：调用AgvClient.SendRFID【" + LastShelfData.ToData() + "】,调用AgvClient.MayOut，线体开始反转");
InOutStoreLog(moveName + MoveInfo.SLog + "：调用AgvClient.SendRFID【" + LastShelfData.ToData() + "】,调用AgvClient.MayOut，线体开始反转");
//TODO AGV到达，发送料架信息，是否需要重新读取?
AgvClient.SendRFID(Config.AgvNodeName, LastShelfData.ToData());
}
else
{
InOutStoreLog(moveName + "： 调用AgvClient.MayOut，线体开始反转");
InOutStoreLog(moveName + MoveInfo.SLog + "： 调用AgvClient.MayOut，线体开始反转");
}
AgvClient.MayOut(Config.AgvNodeName);
IOMove(IO_Type.Line_Run, IO_VALUE.LOW);
......@@ -830,14 +868,14 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_04_LineBack))
{
MoveInfo.NextMoveStep(StoreMoveStep.BS_05_WaitInLineSingle);
InOutStoreLog(moveName + "：等待取料工位无信号，入料口有信号");
InOutStoreLog(moveName + MoveInfo.SLog + "：等待取料工位无信号，入料口有信号");
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineTake_Check, IO_VALUE.LOW));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineIn_Check, IO_VALUE.HIGH));
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_05_WaitInLineSingle))
{
MoveInfo.NextMoveStep(StoreMoveStep.BS_06_WaitTime);
InOutStoreLog(moveName + "：再转动300时间，同时等待收到FinishOut");
InOutStoreLog(moveName + MoveInfo.SLog + "：再转动300时间，同时等待收到FinishOut");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
//等到小车离开
MoveInfo.WaitList.Add(WaitResultInfo.WaitAgvAction((int)Asa.Actions.FinishOut));
......@@ -849,7 +887,7 @@ namespace OnlineStore.DeviceLibrary
MoveEndToRuningStatus();
EmprtShelfList = new ConcurrentQueue<string>();
InOutStoreLog(moveName + "：停止转动，料架入料结束");
InOutStoreLog(moveName + MoveInfo.SLog + "：停止转动，料架入料结束");
IOMove(IO_Type.Line_Run, IO_VALUE.LOW);
IOMove(IO_Type.Line_BackRun, IO_VALUE.LOW);
}
......@@ -951,7 +989,7 @@ namespace OnlineStore.DeviceLibrary
if ((IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.LOW) && MoveInfo.MoveParam.NeedEnterShelf) || MoveInfo.MoveParam.ShelfPosID.Equals(""))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_01_ReadyShelf);
InOutStoreLog("出库：ReadyShelf：通知agv调度准备带料架的小车，等待小车到达，进出轴到P1");
InOutStoreLog("出库 " + MoveInfo.SLog + "：ReadyShelf：通知agv调度准备带料架的小车，等待小车到达，进出轴到P1");
InOutBackToP1(MoveInfo.MoveParam.MoveP.InOut_P1);
//需要先叫小车到达
AgvClient.ReadyShelf(Config.AgvNodeName);
......@@ -959,9 +997,8 @@ namespace OnlineStore.DeviceLibrary
}
else
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_02_DeviceBack);
InOutStoreLog("出库：SO_02 进出轴到P1 开始");
InOutStoreLog("出库 " + MoveInfo.SLog + "：进出轴到P1 开始");
InOutBackToP1(MoveInfo.MoveParam.MoveP.InOut_P1);
}
return true;
......@@ -984,13 +1021,13 @@ namespace OnlineStore.DeviceLibrary
if (MoveInfo.MoveStep == StoreMoveStep.SO_01_LocationCylinderDown)
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_02_DeviceBack);
InOutStoreLog("出库：SO_02 进出轴到P1 ");
InOutStoreLog("出库 " + MoveInfo.SLog + "：进出轴到P1 ");
InOutBackToP1(MoveInfo.MoveParam.MoveP.InOut_P1);
}
else if (MoveInfo.MoveStep == StoreMoveStep.SO_02_DeviceBack)
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_03_ToBagPosition);
InOutStoreLog("出库：SO_03 走到库位，压紧轴至P3(压紧前点) ,旋转轴至P2(库位点),升降轴至P5(库位出库前点)");
InOutStoreLog("出库 " + MoveInfo.SLog + "：走到库位，压紧轴至P3(压紧前点) ,旋转轴至P2(库位点),升降轴至P5(库位出库前点)");
ACAxisMove(Config.Comp_Axis, moveP.ComPress_P3, Config.CompAxis_P3_Speed);
ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P2, Config.MiddleAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P5, Config.UpDownAxis_P5_Speed);
......@@ -998,13 +1035,13 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep == StoreMoveStep.SO_03_ToBagPosition)
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_04_DeviceToBag);
InOutStoreLog("出库：SO_04 叉子进入库位中， 进出轴至P3(库位取放料点) ");
InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子进入库位中， 进出轴至P3(库位取放料点) ");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P3, Config.InOutAxis_P3_Speed);
}
else if (MoveInfo.MoveStep == StoreMoveStep.SO_04_DeviceToBag)
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_05_BagWareToDevice);
InOutStoreLog("出库：SO_05 拿起物品，升降轴至P6(库位出料缓冲点)，压紧轴至P2(压紧点) ");
InOutStoreLog("出库 " + MoveInfo.SLog + "： 拿起物品，升降轴至P6(库位出料缓冲点)，压紧轴至P2(压紧点) ");
ACAxisMove(Config.Comp_Axis, moveP.ComPress_P2, Config.CompAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P6, Config.UpDownAxis_P6_Speed);
......@@ -1012,7 +1049,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep == StoreMoveStep.SO_05_BagWareToDevice)
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_06_BagDeviceBack);
InOutStoreLog("出库：SO_06 叉子从库位返回，进出轴至P1(待机点) ");
InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子从库位返回，进出轴至P1(待机点) ");
//ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
InOutBackToP1(moveP.InOut_P1);
//把库位的物品放到取到叉子上之后是出仓完成
......@@ -1032,7 +1069,7 @@ namespace OnlineStore.DeviceLibrary
}
MoveInfo.NextMoveStep(StoreMoveStep.SO_08_ToShelfPosition);
InOutStoreLog("出库：SO_08 走到料架位置，旋转轴至P101，升降轴至P102, ");
InOutStoreLog("出库 " + MoveInfo.SLog + "：走到料架位置，旋转轴至P101，升降轴至P102, ");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_HP102, Config.UpDownAxis_P102_Speed);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P101, Config.MiddleAxis_P101_Speed);
......@@ -1040,7 +1077,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep == StoreMoveStep.SO_07_LocationCylinder_Up)
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_08_ToShelfPosition);
InOutStoreLog("出库：SO_08 走到料架位置，旋转轴至P101，升降轴至P102, ");
InOutStoreLog("出库 " + MoveInfo.SLog + "：走到料架位置，旋转轴至P101，升降轴至P102, ");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_HP102, Config.UpDownAxis_P102_Speed);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P101, Config.MiddleAxis_P101_Speed);
......@@ -1058,27 +1095,27 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep == StoreMoveStep.SO_10_WaitNoTray)
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_11_DeviceToShelf);
InOutStoreLog("出库：SO_10 叉子进出料口，进出轴至P101");
InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子进出料口，进出轴至P101");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P101, Config.InOutAxis_P101_Speed);
}
else if (MoveInfo.MoveStep == StoreMoveStep.SO_11_DeviceToShelf)
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_12_DevicePutWare);
InOutStoreLog("出库：SO_11 放下物品，压紧轴到P1，升降轴至P101 ");
InOutStoreLog("出库 " + MoveInfo.SLog + "：放下物品，压紧轴到P1，升降轴至P101 ");
ACAxisMove(Config.Comp_Axis, moveP.ComPress_P1, Config.CompAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_LP101, Config.UpDownAxis_P101_Speed);
}
else if (MoveInfo.MoveStep == StoreMoveStep.SO_12_DevicePutWare)
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_13_DeviceOutFromDoor);
InOutStoreLog("出库：SO_12 叉子从出料口返回，，进出轴动作至P1(待机点) ");
InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子从出料口返回，，进出轴动作至P1(待机点) ");
InOutBackToP1(moveP.InOut_P1);
}
else if (MoveInfo.MoveStep == StoreMoveStep.SO_13_DeviceOutFromDoor)
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_14_GoBack);
InOutStoreLog("出库：SO_13 升降轴返回，轴2至P1(待机点) ,");
InOutStoreLog("出库 " + MoveInfo.SLog + "： 升降轴返回，轴2至P1(待机点) ,");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
//发送消息给流水线
// SendOutStoreEnd(MoveInfo);
......
source/DeviceLibrary/ACPackingStore/EnteryDoorBean.cs 0 → 100644
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
public class EnteryDoorBean
{
public bool IsRun = false;
private string LastMoveDO = "";
private string LastCheckDI = "";
private int subType = 0;
internal DateTime LastEndTime = DateTime.Now;
public EnteryDoorBean(int subType)
{
this.subType = subType;
}
public void Stop()
{
if (IsRun)
{
IsRun = false;
}
}
private bool Start(string moveDO, string checkDI, int timeOutMS = 30000)
{
if (IsRun)
{
return false;
}
IsRun = true;
Task.Factory.StartNew(delegate
{
WriteAndWait(moveDO, checkDI, timeOutMS);
});
return true;
}
private string WriteAndWait(string moveDO, string checkDI, int timeOutMS = 30000)
{
LastMoveDO = moveDO;
LastCheckDI = checkDI;
LogUtil.debug("写入信号：" + moveDO + "，等待信号：" + checkDI + "");
IOManager.IOMove(moveDO, IO_VALUE.HIGH, subType);
Thread.Sleep(50);
IsRun = true;
DateTime startTime = DateTime.Now;
string result = "";
bool isStop = false;
while (true)
{
Thread.Sleep(50);
TimeSpan span = DateTime.Now - startTime;
if (!IsRun)
{
isStop = true;
result = "手动停止";
}
else if (span.TotalMilliseconds > timeOutMS)
{
isStop = true;
result = "转动超时";
}
//判断Buzy及位置是否结束
else if (IOManager.IOValue(checkDI, subType).Equals(IO_VALUE.HIGH))
{
isStop = true;
}
if (isStop)
{
if (result.Equals(""))
{
LogUtil.debug("停止运动：" + result + " " + moveDO);
}
else
{
LogUtil.info("[" + moveDO + "] [" + checkDI + "] 停止运动：" + result + " " + moveDO);
}
LastEndTime = DateTime.Now;
IOManager.IOMove(moveDO, IO_VALUE.LOW, subType);
IsRun = false;
return result;
}
}
}
public bool StartOpen(StoreMoveInfo moveInfo)
{
return false;
if (moveInfo != null)
{
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.EntranceDoor_Open, IO_VALUE.HIGH));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.EntranceDoor_Close, IO_VALUE.LOW));
}
return Start(IO_Type.EntranceDoor_Open, IO_Type.EntranceDoor_Open);
}
public bool StartClose(StoreMoveInfo moveInfo)
{
return false;
if (moveInfo != null)
{
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.EntranceDoor_Close, IO_VALUE.HIGH));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.EntranceDoor_Open, IO_VALUE.LOW));
}
return Start(IO_Type.EntranceDoor_Close, IO_Type.EntranceDoor_Close);
}
}
}
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -68,6 +68,7 @@
<ItemGroup>
<Compile Include="ACPackingStore\AC_BOX_Bean.cs" />
<Compile Include="ACPackingStore\AC_BOX_Bean_Partial.cs" />
<Compile Include="ACPackingStore\EnteryDoorBean.cs" />
<Compile Include="ACPackingStore\HumitureBean.cs" />
<Compile Include="ACPackingStore\PackingStoreBean.cs" />
<Compile Include="ACPackingStore\StoreManager.cs" />
......
source/DeviceLibrary/store/StoreStep.cs
......@@ -291,67 +291,104 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
BI_16_ComAxisDownMove = 3016,
/// <summary>
/// 料架取料：记录压紧高度，叉子后退到扫码点
/// 料架取料：记录压紧高度，叉子后退到P1
/// </summary>
BI_17_InoutBack = 3017,
//TODO 后退到待机点，然后去扫码点，放下料盘，扫码，扫码后再拿起料盘
/// <summary>
/// 扫码：升降轴移动到P2,旋转轴移动到P1
/// </summary>
BI_21_ToScanPosition = 3021,
/// <summary>
/// 扫码：进出轴到P2
/// </summary>
BI_22_InOutToP2,
/// <summary>
/// 扫码：升降轴缓慢下降到P1，压紧轴返回压紧前点
/// </summary>
BI_23_PutTrayDown,
/// <summary>
/// 扫码：进出轴返回待机点
/// </summary>
BI_24_InOutToP1,
/// <summary>
/// 扫码：记录宽度，开始扫码
/// </summary>
BI_25_ScanCode,
/// <summary>
/// 料架取料：记录宽度，开始扫码
/// 扫码：扫码成功，从服务器获取库位号，设置位置参数
/// </summary>
BI_18_ScanCode = 3018,
BI_26_GetPosId,
/// <summary>
/// 料架取料：扫码成功，从服务器获取库位号
/// 扫码：获取库位号成功，进出轴到P2
/// </summary>
BI_19_GetPosId = 3019,
BI_27_InoutToP2,
/// <summary>
/// 扫码：升降轴到P1,压紧轴压紧
/// </summary>
BI_28_GetScanPTray,
/// <summary>
/// 扫码：进出轴返回
/// </summary>
BI_29_InoutBackP1,
/// <summary>
/// 料架取料: 获取库位号完成，设置位置参数，开始入库
/// 料架取料: 获取库位号完成，设置位置参数， 准备入库
/// </summary>
BI_20_SetInstoreParam= 3020,
BI_30_SetInstoreParam = 3030,
/// <summary>
/// 入库。。移动到库位点，轴1（ 转盘） 至P2（ 库位点）轴2(上下） 至P3(库位入库前点）
/// </summary>
BI_21_MoveToBag = 3021,
BI_51_MoveToBag = 3051,
/// <summary>
/// 入库。。叉子进入库位中，轴3（ 叉子） 至P3(库位取放料点）
/// </summary>
BI_22_DeviceToBag = 3022,
BI_52_DeviceToBag = 3052,
/// <summary>
/// 入库。。放下物品，轴2（ 上下） 至P4（ 库位入料缓冲点）轴4（ 压紧） 至P3（ 压紧前点）
/// </summary>
BI_23_PutWareToBag = 3023,
BI_53_PutWareToBag = 3053,
/// <summary>
/// 入库。。叉子从库位中返回，轴3（ 叉子） 动作至P1（ 待机点）
/// </summary>
BI_24_DeviceBackFromBag = 3024,
BI_54_DeviceBackFromBag = 3054,
/// <summary>
/// 入库。。返回待机点，轴2/轴1/轴4动作至P1（ 待机点）)开始
/// </summary>
BI_25_GoBack = 3025,
BI_55_GoBack = 3055,
/// <summary>
/// 送出料盘：扫码或获取库位失败，升降轴移动到NG料门口上端，旋转轴移动到NG料门口
/// </summary>
BI_31_ToNGDoor=3031,
BI_71_ToNGDoor=3071,
/// <summary>
/// 送出料盘：NG料口升降门上升
/// </summary>
BI_32_NGDoorUp = 3032,
BI_72_NGDoorUp = 3072,
/// <summary>
/// 送出料盘：进出轴前进到NG料门口位置
/// </summary>
BI_33_InoutToNGDoor = 3033,
BI_73_InoutToNGDoor = 3073,
/// <summary>
/// 送出料盘：升降轴缓慢下降，放下料盘
/// </summary>
BI_34_UpdownDown= 3034,
BI_74_UpdownDown= 3074,
/// <summary>
/// 送出料盘：叉子后退到P1
/// </summary>
BI_35_InoutToP1 = 3035,
BI_75_InoutToP1 = 3075,
/// <summary>
/// 送出料盘：关门NG料门，送出料盘结束
/// </summary>
BI_36_NGDoorDown = 3036,
BI_76_NGDoorDown = 3076,
#endregion
#region 把料架送出步骤 4000开始
......
source/DeviceLibrary/store/model/StoreMoveInfo.cs
......@@ -38,6 +38,12 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public bool OneWaitCanEndStep = false;
public string SLog
{
get { return " " + MoveStep + " "; }
}
/// <summary>
/// 操作类型
/// </summary>
......
source/LoadCVSLibrary/storeConfig/config/AC_Box_Config.cs
......@@ -249,7 +249,7 @@ namespace OnlineStore.LoadCSVLibrary
public int UpDownAxis_P11 { get; set; }
/// <summary>
/// PRO 升降轴（轴2）P11-NG放料低点 UpDownAxis_P11 403000
/// PRO 升降轴（轴2）P12-NG放料高点 UpDownAxis_P12 403000
/// </summary>
[ConfigProAttribute("UpDownAxis_P12")]
public int UpDownAxis_P12 { get; set; }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!