Skip to content

孙克 / RC1250-ACPackingStore

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

1

1 个父辈 bc45c7da
内嵌 并排
正在显示 15 个修改的文件 包含 263 行增加 和 240 行删除
source/ACPackingStore/FrmBox.Designer.cs
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
this.button2 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button();
this.label10 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label();
this.txtBusyStatus = new System.Windows.Forms.TextBox(); this.txtBusyStatus = new System.Windows.Forms.TextBox();
this.btnMPA = new System.Windows.Forms.Button(); this.btnMP101 = new System.Windows.Forms.Button();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.txtAlarmStatus = new System.Windows.Forms.TextBox(); this.txtAlarmStatus = new System.Windows.Forms.TextBox();
this.btnGetAlarm = new System.Windows.Forms.Button(); this.btnGetAlarm = new System.Windows.Forms.Button();
...@@ -170,14 +170,14 @@ ...@@ -170,14 +170,14 @@
this.groupShelf = new System.Windows.Forms.GroupBox(); this.groupShelf = new System.Windows.Forms.GroupBox();
this.btnSaveShelf = new System.Windows.Forms.Button(); this.btnSaveShelf = new System.Windows.Forms.Button();
this.label13 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label();
this.txtInoutPA = new System.Windows.Forms.TextBox(); this.txtInoutP101 = new System.Windows.Forms.TextBox();
this.btnInoutPA = new System.Windows.Forms.Button(); this.btnInoutP101 = new System.Windows.Forms.Button();
this.txtMPA = new System.Windows.Forms.TextBox(); this.txtMP101 = new System.Windows.Forms.TextBox();
this.button5 = new System.Windows.Forms.Button(); this.button5 = new System.Windows.Forms.Button();
this.txtUpdownPA1 = new System.Windows.Forms.TextBox(); this.txtUpdownP101 = new System.Windows.Forms.TextBox();
this.txtUpdownPA2 = new System.Windows.Forms.TextBox(); this.txtUpdownP102 = new System.Windows.Forms.TextBox();
this.btnUpdownPA1 = new System.Windows.Forms.Button(); this.btnUpdownP101 = new System.Windows.Forms.Button();
this.btnUpdownPA2 = new System.Windows.Forms.Button(); this.btnUpdownP102 = new System.Windows.Forms.Button();
this.groupAxis.SuspendLayout(); this.groupAxis.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupInout.SuspendLayout(); this.groupInout.SuspendLayout();
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
this.groupAxis.Controls.Add(this.button2); this.groupAxis.Controls.Add(this.button2);
this.groupAxis.Controls.Add(this.label10); this.groupAxis.Controls.Add(this.label10);
this.groupAxis.Controls.Add(this.txtBusyStatus); this.groupAxis.Controls.Add(this.txtBusyStatus);
this.groupAxis.Controls.Add(this.btnMPA); this.groupAxis.Controls.Add(this.btnMP101);
this.groupAxis.Controls.Add(this.label2); this.groupAxis.Controls.Add(this.label2);
this.groupAxis.Controls.Add(this.txtAlarmStatus); this.groupAxis.Controls.Add(this.txtAlarmStatus);
this.groupAxis.Controls.Add(this.btnGetAlarm); this.groupAxis.Controls.Add(this.btnGetAlarm);
...@@ -379,15 +379,15 @@ ...@@ -379,15 +379,15 @@
this.txtBusyStatus.Size = new System.Drawing.Size(25, 23); this.txtBusyStatus.Size = new System.Drawing.Size(25, 23);
this.txtBusyStatus.TabIndex = 288; this.txtBusyStatus.TabIndex = 288;
// //
// btnMPA // btnMP101
// //
this.btnMPA.Location = new System.Drawing.Point(278, 228); this.btnMP101.Location = new System.Drawing.Point(278, 228);
this.btnMPA.Name = "btnMPA"; this.btnMP101.Name = "btnMP101";
this.btnMPA.Size = new System.Drawing.Size(105, 33); this.btnMP101.Size = new System.Drawing.Size(105, 33);
this.btnMPA.TabIndex = 287; this.btnMP101.TabIndex = 287;
this.btnMPA.Text = "读BUSY状态"; this.btnMP101.Text = "读BUSY状态";
this.btnMPA.UseVisualStyleBackColor = true; this.btnMP101.UseVisualStyleBackColor = true;
this.btnMPA.Click += new System.EventHandler(this.button1_Click_1); this.btnMP101.Click += new System.EventHandler(this.button1_Click_1);
// //
// label2 // label2
// //
...@@ -2007,14 +2007,14 @@ ...@@ -2007,14 +2007,14 @@
// //
this.groupShelf.Controls.Add(this.btnSaveShelf); this.groupShelf.Controls.Add(this.btnSaveShelf);
this.groupShelf.Controls.Add(this.label13); this.groupShelf.Controls.Add(this.label13);
this.groupShelf.Controls.Add(this.txtInoutPA); this.groupShelf.Controls.Add(this.txtInoutP101);
this.groupShelf.Controls.Add(this.btnInoutPA); this.groupShelf.Controls.Add(this.btnInoutP101);
this.groupShelf.Controls.Add(this.txtMPA); this.groupShelf.Controls.Add(this.txtMP101);
this.groupShelf.Controls.Add(this.button5); this.groupShelf.Controls.Add(this.button5);
this.groupShelf.Controls.Add(this.txtUpdownPA1); this.groupShelf.Controls.Add(this.txtUpdownP101);
this.groupShelf.Controls.Add(this.txtUpdownPA2); this.groupShelf.Controls.Add(this.txtUpdownP102);
this.groupShelf.Controls.Add(this.btnUpdownPA1); this.groupShelf.Controls.Add(this.btnUpdownP101);
this.groupShelf.Controls.Add(this.btnUpdownPA2); this.groupShelf.Controls.Add(this.btnUpdownP102);
this.groupShelf.Controls.Add(this.cmbShelfPosition); this.groupShelf.Controls.Add(this.cmbShelfPosition);
this.groupShelf.Enabled = false; this.groupShelf.Enabled = false;
this.groupShelf.Location = new System.Drawing.Point(517, 201); this.groupShelf.Location = new System.Drawing.Point(517, 201);
...@@ -2049,51 +2049,51 @@ ...@@ -2049,51 +2049,51 @@
this.label13.Text = "请选择料架位置："; this.label13.Text = "请选择料架位置：";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtInoutPA // txtInoutP101
// //
this.txtInoutPA.AcceptsReturn = true; this.txtInoutP101.AcceptsReturn = true;
this.txtInoutPA.BackColor = System.Drawing.SystemColors.Window; this.txtInoutP101.BackColor = System.Drawing.SystemColors.Window;
this.txtInoutPA.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtInoutP101.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInoutPA.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtInoutP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInoutPA.ForeColor = System.Drawing.SystemColors.WindowText; this.txtInoutP101.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInoutPA.Location = new System.Drawing.Point(136, 294); this.txtInoutP101.Location = new System.Drawing.Point(136, 294);
this.txtInoutPA.MaxLength = 0; this.txtInoutP101.MaxLength = 0;
this.txtInoutPA.Name = "txtInoutPA"; this.txtInoutP101.Name = "txtInoutP101";
this.txtInoutPA.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInoutP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInoutPA.Size = new System.Drawing.Size(89, 23); this.txtInoutP101.Size = new System.Drawing.Size(89, 23);
this.txtInoutPA.TabIndex = 280; this.txtInoutP101.TabIndex = 280;
this.txtInoutPA.Text = "999"; this.txtInoutP101.Text = "999";
// //
// btnInoutPA // btnInoutP101
// //
this.btnInoutPA.AutoSize = true; this.btnInoutP101.AutoSize = true;
this.btnInoutPA.BackColor = System.Drawing.SystemColors.Control; this.btnInoutP101.BackColor = System.Drawing.SystemColors.Control;
this.btnInoutPA.Cursor = System.Windows.Forms.Cursors.Default; this.btnInoutP101.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInoutPA.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInoutP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInoutPA.ForeColor = System.Drawing.Color.Green; this.btnInoutP101.ForeColor = System.Drawing.Color.Green;
this.btnInoutPA.Location = new System.Drawing.Point(18, 289); this.btnInoutP101.Location = new System.Drawing.Point(18, 289);
this.btnInoutPA.Name = "btnInoutPA"; this.btnInoutP101.Name = "btnInoutP101";
this.btnInoutPA.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInoutP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInoutPA.Size = new System.Drawing.Size(114, 33); this.btnInoutP101.Size = new System.Drawing.Size(114, 33);
this.btnInoutPA.TabIndex = 279; this.btnInoutP101.TabIndex = 279;
this.btnInoutPA.Text = "进出轴位置PA："; this.btnInoutP101.Text = "进出轴位置P101：";
this.btnInoutPA.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInoutP101.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInoutPA.UseVisualStyleBackColor = true; this.btnInoutP101.UseVisualStyleBackColor = true;
// //
// txtMPA // txtMP101
// //
this.txtMPA.AcceptsReturn = true; this.txtMP101.AcceptsReturn = true;
this.txtMPA.BackColor = System.Drawing.SystemColors.Window; this.txtMP101.BackColor = System.Drawing.SystemColors.Window;
this.txtMPA.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtMP101.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMPA.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMPA.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMP101.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMPA.Location = new System.Drawing.Point(136, 244); this.txtMP101.Location = new System.Drawing.Point(136, 244);
this.txtMPA.MaxLength = 0; this.txtMP101.MaxLength = 0;
this.txtMPA.Name = "txtMPA"; this.txtMP101.Name = "txtMP101";
this.txtMPA.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMPA.Size = new System.Drawing.Size(89, 23); this.txtMP101.Size = new System.Drawing.Size(89, 23);
this.txtMPA.TabIndex = 278; this.txtMP101.TabIndex = 278;
this.txtMPA.Text = "999"; this.txtMP101.Text = "999";
// //
// button5 // button5
// //
...@@ -2108,71 +2108,71 @@ ...@@ -2108,71 +2108,71 @@
this.button5.RightToLeft = System.Windows.Forms.RightToLeft.No; this.button5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.button5.Size = new System.Drawing.Size(114, 33); this.button5.Size = new System.Drawing.Size(114, 33);
this.button5.TabIndex = 277; this.button5.TabIndex = 277;
this.button5.Text = "旋转轴位置PA："; this.button5.Text = "旋转轴位置P101：";
this.button5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.button5.UseVisualStyleBackColor = true; this.button5.UseVisualStyleBackColor = true;
// //
// txtUpdownPA1 // txtUpdownP101
// //
this.txtUpdownPA1.AcceptsReturn = true; this.txtUpdownP101.AcceptsReturn = true;
this.txtUpdownPA1.BackColor = System.Drawing.SystemColors.Window; this.txtUpdownP101.BackColor = System.Drawing.SystemColors.Window;
this.txtUpdownPA1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP101.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownPA1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownPA1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP101.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownPA1.Location = new System.Drawing.Point(136, 144); this.txtUpdownP101.Location = new System.Drawing.Point(136, 144);
this.txtUpdownPA1.MaxLength = 0; this.txtUpdownP101.MaxLength = 0;
this.txtUpdownPA1.Name = "txtUpdownPA1"; this.txtUpdownP101.Name = "txtUpdownP101";
this.txtUpdownPA1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpdownPA1.Size = new System.Drawing.Size(89, 23); this.txtUpdownP101.Size = new System.Drawing.Size(89, 23);
this.txtUpdownPA1.TabIndex = 274; this.txtUpdownP101.TabIndex = 274;
this.txtUpdownPA1.Text = "999"; this.txtUpdownP101.Text = "999";
// //
// txtUpdownPA2 // txtUpdownP102
// //
this.txtUpdownPA2.AcceptsReturn = true; this.txtUpdownP102.AcceptsReturn = true;
this.txtUpdownPA2.BackColor = System.Drawing.SystemColors.Window; this.txtUpdownP102.BackColor = System.Drawing.SystemColors.Window;
this.txtUpdownPA2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP102.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownPA2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP102.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownPA2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP102.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownPA2.Location = new System.Drawing.Point(136, 194); this.txtUpdownP102.Location = new System.Drawing.Point(136, 194);
this.txtUpdownPA2.MaxLength = 0; this.txtUpdownP102.MaxLength = 0;
this.txtUpdownPA2.Name = "txtUpdownPA2"; this.txtUpdownP102.Name = "txtUpdownP102";
this.txtUpdownPA2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP102.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpdownPA2.Size = new System.Drawing.Size(89, 23); this.txtUpdownP102.Size = new System.Drawing.Size(89, 23);
this.txtUpdownPA2.TabIndex = 276; this.txtUpdownP102.TabIndex = 276;
this.txtUpdownPA2.Text = "999"; this.txtUpdownP102.Text = "999";
// //
// btnUpdownPA1 // btnUpdownP101
// //
this.btnUpdownPA1.AutoSize = true; this.btnUpdownP101.AutoSize = true;
this.btnUpdownPA1.BackColor = System.Drawing.SystemColors.Control; this.btnUpdownP101.BackColor = System.Drawing.SystemColors.Control;
this.btnUpdownPA1.Cursor = System.Windows.Forms.Cursors.Default; this.btnUpdownP101.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdownPA1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownPA1.ForeColor = System.Drawing.Color.Red; this.btnUpdownP101.ForeColor = System.Drawing.Color.Red;
this.btnUpdownPA1.Location = new System.Drawing.Point(18, 139); this.btnUpdownP101.Location = new System.Drawing.Point(18, 139);
this.btnUpdownPA1.Name = "btnUpdownPA1"; this.btnUpdownP101.Name = "btnUpdownP101";
this.btnUpdownPA1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownPA1.Size = new System.Drawing.Size(114, 33); this.btnUpdownP101.Size = new System.Drawing.Size(114, 33);
this.btnUpdownPA1.TabIndex = 273; this.btnUpdownP101.TabIndex = 273;
this.btnUpdownPA1.Text = "升降轴低点PA1:"; this.btnUpdownP101.Text = "升降轴低点P101:";
this.btnUpdownPA1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP101.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownPA1.UseVisualStyleBackColor = true; this.btnUpdownP101.UseVisualStyleBackColor = true;
// //
// btnUpdownPA2 // btnUpdownP102
// //
this.btnUpdownPA2.AutoSize = true; this.btnUpdownP102.AutoSize = true;
this.btnUpdownPA2.BackColor = System.Drawing.SystemColors.Control; this.btnUpdownP102.BackColor = System.Drawing.SystemColors.Control;
this.btnUpdownPA2.Cursor = System.Windows.Forms.Cursors.Default; this.btnUpdownP102.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdownPA2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP102.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownPA2.ForeColor = System.Drawing.Color.Red; this.btnUpdownP102.ForeColor = System.Drawing.Color.Red;
this.btnUpdownPA2.Location = new System.Drawing.Point(18, 189); this.btnUpdownP102.Location = new System.Drawing.Point(18, 189);
this.btnUpdownPA2.Name = "btnUpdownPA2"; this.btnUpdownP102.Name = "btnUpdownP102";
this.btnUpdownPA2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP102.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownPA2.Size = new System.Drawing.Size(114, 33); this.btnUpdownP102.Size = new System.Drawing.Size(114, 33);
this.btnUpdownPA2.TabIndex = 275; this.btnUpdownP102.TabIndex = 275;
this.btnUpdownPA2.Text = "升降轴高点PA2："; this.btnUpdownP102.Text = "升降轴高点P102：";
this.btnUpdownPA2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP102.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownPA2.UseVisualStyleBackColor = true; this.btnUpdownP102.UseVisualStyleBackColor = true;
// //
// FrmBox // FrmBox
// //
...@@ -2310,7 +2310,7 @@ ...@@ -2310,7 +2310,7 @@
private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button2;
private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label10;
private System.Windows.Forms.TextBox txtBusyStatus; private System.Windows.Forms.TextBox txtBusyStatus;
private System.Windows.Forms.Button btnMPA; private System.Windows.Forms.Button btnMP101;
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox txtAlarmStatus; private System.Windows.Forms.TextBox txtAlarmStatus;
private System.Windows.Forms.Button btnGetAlarm; private System.Windows.Forms.Button btnGetAlarm;
...@@ -2360,14 +2360,14 @@ ...@@ -2360,14 +2360,14 @@
private System.Windows.Forms.Button btnScanTest; private System.Windows.Forms.Button btnScanTest;
private System.Windows.Forms.ComboBox cmbShelfPosition; private System.Windows.Forms.ComboBox cmbShelfPosition;
private System.Windows.Forms.GroupBox groupShelf; private System.Windows.Forms.GroupBox groupShelf;
public System.Windows.Forms.TextBox txtInoutPA; public System.Windows.Forms.TextBox txtInoutP101;
public System.Windows.Forms.Button btnInoutPA; public System.Windows.Forms.Button btnInoutP101;
public System.Windows.Forms.TextBox txtMPA; public System.Windows.Forms.TextBox txtMP101;
public System.Windows.Forms.Button button5; public System.Windows.Forms.Button button5;
public System.Windows.Forms.TextBox txtUpdownPA1; public System.Windows.Forms.TextBox txtUpdownP101;
public System.Windows.Forms.TextBox txtUpdownPA2; public System.Windows.Forms.TextBox txtUpdownP102;
public System.Windows.Forms.Button btnUpdownPA1; public System.Windows.Forms.Button btnUpdownP101;
public System.Windows.Forms.Button btnUpdownPA2; public System.Windows.Forms.Button btnUpdownP102;
public System.Windows.Forms.Label label13; public System.Windows.Forms.Label label13;
private System.Windows.Forms.Button btnSaveShelf; private System.Windows.Forms.Button btnSaveShelf;
} }
......
source/ACPackingStore/FrmBox.cs
...@@ -71,10 +71,10 @@ namespace OnlineStore.ACPackingStore ...@@ -71,10 +71,10 @@ namespace OnlineStore.ACPackingStore
} }
if (shelrfP != null) if (shelrfP != null)
{ {
txtInoutPA.Text = shelrfP.InoutAxis_PA.ToString(); txtInoutP101.Text = shelrfP.InoutAxis_P101.ToString();
txtUpdownPA1.Text = shelrfP.UpDownAxis_LPA1.ToString(); txtUpdownP101.Text = shelrfP.UpDownAxis_LP101.ToString();
txtUpdownPA2.Text = shelrfP.UpDownAxis_HPA2.ToString(); txtUpdownP102.Text = shelrfP.UpDownAxis_HP102.ToString();
txtMPA.Text = shelrfP.MiddleAxis_PA.ToString(); txtMP101.Text = shelrfP.MiddleAxis_P101.ToString();
} }
txtMiddleP1.Text = BoxBean.Config.MiddleAxis_P1.ToString(); txtMiddleP1.Text = BoxBean.Config.MiddleAxis_P1.ToString();
...@@ -396,10 +396,10 @@ namespace OnlineStore.ACPackingStore ...@@ -396,10 +396,10 @@ namespace OnlineStore.ACPackingStore
//ktk.UpDown_P7 = FormUtil.GetIntValue(txtUpDownP7); //ktk.UpDown_P7 = FormUtil.GetIntValue(txtUpDownP7);
//ktk.UpDown_P8 = FormUtil.GetIntValue(txtUpDownP8); //ktk.UpDown_P8 = FormUtil.GetIntValue(txtUpDownP8);
ktk.InOut_PA = FormUtil.GetIntValue(txtInoutPA); ktk.InOut_P101 = FormUtil.GetIntValue(txtInoutP101);
ktk.UpDown_LPA1 = FormUtil.GetIntValue(txtUpdownPA1); ktk.UpDown_LP101 = FormUtil.GetIntValue(txtUpdownP101);
ktk.UpDown_HPA2 = FormUtil.GetIntValue(txtUpdownPA2); ktk.UpDown_HP102 = FormUtil.GetIntValue(txtUpdownP102);
ktk.Middle_PA = FormUtil.GetIntValue(txtMPA); ktk.Middle_P101 = FormUtil.GetIntValue(txtMP101);
return ktk; return ktk;
} }
private void btnComAlarmClear_Click(object sender, EventArgs e) private void btnComAlarmClear_Click(object sender, EventArgs e)
...@@ -1107,10 +1107,10 @@ namespace OnlineStore.ACPackingStore ...@@ -1107,10 +1107,10 @@ namespace OnlineStore.ACPackingStore
if (shelrfP != null) if (shelrfP != null)
{ {
txtInoutPA.Text = shelrfP.InoutAxis_PA.ToString(); txtInoutP101.Text = shelrfP.InoutAxis_P101.ToString();
txtUpdownPA1.Text = shelrfP.UpDownAxis_LPA1.ToString(); txtUpdownP101.Text = shelrfP.UpDownAxis_LP101.ToString();
txtUpdownPA2.Text = shelrfP.UpDownAxis_HPA2.ToString(); txtUpdownP102.Text = shelrfP.UpDownAxis_HP102.ToString();
txtMPA.Text = shelrfP.MiddleAxis_PA.ToString(); txtMP101.Text = shelrfP.MiddleAxis_P101.ToString();
} }
} }
} }
...@@ -1122,10 +1122,10 @@ namespace OnlineStore.ACPackingStore ...@@ -1122,10 +1122,10 @@ namespace OnlineStore.ACPackingStore
ShelfPosition pso = CSVPositionReader<ShelfPosition>.GetPositon(selectPositionNum); ShelfPosition pso = CSVPositionReader<ShelfPosition>.GetPositon(selectPositionNum);
if (pso != null) if (pso != null)
{ {
pso.InoutAxis_PA = FormUtil.GetIntValue(txtInoutPA); pso.InoutAxis_P101 = FormUtil.GetIntValue(txtInoutP101);
pso.MiddleAxis_PA = FormUtil.GetIntValue(txtMPA); pso.MiddleAxis_P101 = FormUtil.GetIntValue(txtMP101);
pso.UpDownAxis_LPA1 = FormUtil.GetIntValue(txtUpdownPA1); pso.UpDownAxis_LP101 = FormUtil.GetIntValue(txtUpdownP101);
pso.UpDownAxis_HPA2 = FormUtil.GetIntValue(txtUpdownPA2); pso.UpDownAxis_HP102 = FormUtil.GetIntValue(txtUpdownP102);
} }
//位置配置 //位置配置
string positionConfigFile = Application.StartupPath + ConfigAppSettings.GetValue(Setting_Init.Shelf_Position_Config); string positionConfigFile = Application.StartupPath + ConfigAppSettings.GetValue(Setting_Init.Shelf_Position_Config);
......
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean.cs
...@@ -30,6 +30,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -30,6 +30,10 @@ namespace OnlineStore.DeviceLibrary
private Dictionary<string, AxisAlarmInfo> AxisAlarmCodeMap = new Dictionary<string, AxisAlarmInfo>(); private Dictionary<string, AxisAlarmInfo> AxisAlarmCodeMap = new Dictionary<string, AxisAlarmInfo>();
public List<string> PositionNumList = new List<string>(); public List<string> PositionNumList = new List<string>();
public List<string> ShelfPosList = new List<string>(); public List<string> ShelfPosList = new List<string>();
/// <summary>
/// 料架未放料盘的位置列表
/// </summary>
public Queue<string> EmprtShelfList = new Queue<string>();
private System.Timers.Timer serverConnectTimer = new System.Timers.Timer(); private System.Timers.Timer serverConnectTimer = new System.Timers.Timer();
private System.Timers.Timer IoCheckTimer = new System.Timers.Timer(); private System.Timers.Timer IoCheckTimer = new System.Timers.Timer();
...@@ -1264,11 +1268,20 @@ namespace OnlineStore.DeviceLibrary ...@@ -1264,11 +1268,20 @@ namespace OnlineStore.DeviceLibrary
{ {
LogUtil.error("验证出库【" + currInOutFixture.ToStr() + "】是否重复出错：" + ex.ToString()); LogUtil.error("验证出库【" + currInOutFixture.ToStr() + "】是否重复出错：" + ex.ToString());
} }
string shelfPosId = "";
if (CanStarInOut()) if (EmprtShelfList.Count > 0)
{
shelfPosId = EmprtShelfList.Dequeue();
}
else
{
LogUtil.error(Name + "执行出库【" + currInOutFixture.ToStr() + "】失败，料架没有空位置");
}
if (CanStarInOut() && String.IsNullOrEmpty(shelfPosId).Equals(false))
//if (CanStarInOut() &&( LineConnect.CanStartOut()||IsDebug)) //if (CanStarInOut() &&( LineConnect.CanStartOut()||IsDebug))
{ {
bool result = StartOutStoreMove(new InOutParam("", posId, plateW, plateH));
bool result = StartOutStoreMove(new InOutParam("", posId, plateW, plateH,shelfPosId));
if (!result) if (!result)
{ {
LogInfo(" 执行出库【" + currInOutFixture.ToStr() + "】失败，加入等待队列"); LogInfo(" 执行出库【" + currInOutFixture.ToStr() + "】失败，加入等待队列");
......
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Partial.cs
...@@ -12,22 +12,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -12,22 +12,6 @@ namespace OnlineStore.DeviceLibrary
{ {
#region 出入库结果验证 #region 出入库结果验证
private void InOutBackToP1(int InOut_P1)
{
//判断是否在P1，如果是，不需要运行
int outCount = ACServerManager.GetActualtPosition(Config.InOut_Axis.DeviceName, Config.InOut_Axis.GetAxisValue());
int errorCount = Math.Abs(outCount - InOut_P1);
if (errorCount <= Config.InOut_Axis.CanErrorCountMin)
{
LogInfo("进出轴当前位置：" + outCount + "，已经在P1，不需要再回P1");
}
else
{
ACAxisMove(Config.InOut_Axis, InOut_P1, Config.InOutAxis_P1_Speed);
}
//StoreMove.WaitList.Add(WaitResultInfo.WaitAxisOrg(Config.InOut_Axis,IO_VALUE.HIGH));
}
private void CheckWait() private void CheckWait()
{ {
List<WaitResultInfo> list = MoveInfo.WaitList; List<WaitResultInfo> list = MoveInfo.WaitList;
...@@ -121,7 +105,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -121,7 +105,8 @@ namespace OnlineStore.DeviceLibrary
} }
wait.IsEnd = result; wait.IsEnd = result;
} }
}else if (wait.WaitType.Equals(9)) }
else if (wait.WaitType.Equals(9))
{ {
wait.IsEnd = (LastScanCodes.Count > 0); wait.IsEnd = (LastScanCodes.Count > 0);
} }
...@@ -155,6 +140,23 @@ namespace OnlineStore.DeviceLibrary ...@@ -155,6 +140,23 @@ namespace OnlineStore.DeviceLibrary
} }
} }
private static DateTime lastComRHomeTime = DateTime.Now; private static DateTime lastComRHomeTime = DateTime.Now;
private void InOutBackToP1(int InOut_P1)
{
//判断是否在P1，如果是，不需要运行
int outCount = ACServerManager.GetActualtPosition(Config.InOut_Axis.DeviceName, Config.InOut_Axis.GetAxisValue());
int errorCount = Math.Abs(outCount - InOut_P1);
if (errorCount <= Config.InOut_Axis.CanErrorCountMin)
{
LogInfo("进出轴当前位置：" + outCount + "，已经在P1，不需要再回P1");
}
else
{
ACAxisMove(Config.InOut_Axis, InOut_P1, Config.InOutAxis_P1_Speed);
}
//StoreMove.WaitList.Add(WaitResultInfo.WaitAxisOrg(Config.InOut_Axis,IO_VALUE.HIGH));
}
#endregion #endregion
......
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Shelf.cs
...@@ -39,6 +39,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -39,6 +39,7 @@ namespace OnlineStore.DeviceLibrary
LogInfo(" 空闲中，检测到入料口有信号，料架入库：入料口移门打开，"); LogInfo(" 空闲中，检测到入料口有信号，料架入库：入料口移门打开，");
storeRunStatus = StoreRunStatus.Busy; storeRunStatus = StoreRunStatus.Busy;
storeStatus = StoreStatus.InStoreExecute; storeStatus = StoreStatus.InStoreExecute;
EmprtShelfList = new Queue<string>();
MoveInfo.NewMove(StoreMoveType.InStore, new InOutParam()); MoveInfo.NewMove(StoreMoveType.InStore, new InOutParam());
MoveInfo.MoveParam.MoveP = new LineMoveP(); MoveInfo.MoveParam.MoveP = new LineMoveP();
...@@ -55,6 +56,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -55,6 +56,13 @@ namespace OnlineStore.DeviceLibrary
} }
} }
} }
private void ShelfInStoreEnd()
{
MoveInfo.EndMove();
EmprtShelfList = new Queue<string>(ShelfPosList);
storeRunStatus = StoreRunStatus.Runing;
storeStatus = StoreStatus.StoreOnline;
}
private void ShelfInStoreProcess() private void ShelfInStoreProcess()
{ {
LineMoveP moveP = MoveInfo.MoveParam.MoveP; LineMoveP moveP = MoveInfo.MoveParam.MoveP;
...@@ -127,24 +135,24 @@ namespace OnlineStore.DeviceLibrary ...@@ -127,24 +135,24 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_11_InoutToP1)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_11_InoutToP1))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BI_12_MoveToShelf); MoveInfo.NextMoveStep(StoreMoveStep.BI_12_MoveToShelf);
InOutStoreLog("料架取料：升降轴移动到PA1低点，旋转轴移动到PA1点，压紧轴到压紧前点"); InOutStoreLog("料架取料：升降轴移动到P101低点，旋转轴移动到P101点，压紧轴到压紧前点");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_LPA1, Config.UpDownAxis_PA1_Speed); ACAxisMove(Config.UpDown_Axis, moveP.UpDown_LP101, Config.UpDownAxis_P101_Speed);
ACAxisMove(Config.Middle_Axis, moveP.Middle_PA, Config.MiddleAxis_PA_Speed); ACAxisMove(Config.Middle_Axis, moveP.Middle_P101, Config.MiddleAxis_P101_Speed);
ACAxisMove(Config.Comp_Axis, Config.CompAxis_P3_Position, Config.CompAxis_P3_Speed); ACAxisMove(Config.Comp_Axis, Config.CompAxis_P3_Position, Config.CompAxis_P3_Speed);
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_12_MoveToShelf)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_12_MoveToShelf))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BI_13_InoutToPA); MoveInfo.NextMoveStep(StoreMoveStep.BI_13_InoutToP101);
InOutStoreLog("料架取料：叉子前进到PA点"); InOutStoreLog("料架取料：叉子前进到P101点");
ACAxisMove(Config.InOut_Axis, moveP.InOut_PA, Config.InOutAxis_PA_Speed); ACAxisMove(Config.InOut_Axis, moveP.InOut_P101, Config.InOutAxis_P101_Speed);
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_13_InoutToPA)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_13_InoutToP101))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BI_14_UpdownToPA2); MoveInfo.NextMoveStep(StoreMoveStep.BI_14_UpdownToP102);
InOutStoreLog("料架取料：升降轴上升到PA2点"); InOutStoreLog("料架取料：升降轴上升到P102点");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_HPA2, Config.UpDownAxis_PA2_Speed); ACAxisMove(Config.UpDown_Axis, moveP.UpDown_HP102, Config.UpDownAxis_P102_Speed);
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_14_UpdownToPA2)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_14_UpdownToP102))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BI_15_StartCompress); MoveInfo.NextMoveStep(StoreMoveStep.BI_15_StartCompress);
InOutStoreLog("料架取料：压紧轴开始缓慢压紧到P4"); InOutStoreLog("料架取料：压紧轴开始缓慢压紧到P4");
...@@ -332,7 +340,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -332,7 +340,6 @@ namespace OnlineStore.DeviceLibrary
ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P1, Config.MiddleAxis_P1_Speed); ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P1, Config.MiddleAxis_P1_Speed);
} }
private void StartSendShelfOut() private void StartSendShelfOut()
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BS_01_TopCylinder_Down); MoveInfo.NextMoveStep(StoreMoveStep.BS_01_TopCylinder_Down);
...@@ -386,6 +393,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -386,6 +393,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
#region 扫码获取库位 #region 扫码获取库位
private string ProcessCode() private string ProcessCode()
......
source/DeviceLibrary/ACPackingStore/StoreManager.cs
...@@ -177,10 +177,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -177,10 +177,10 @@ namespace OnlineStore.DeviceLibrary
return false; return false;
} }
p.InOut_PA = sp.InoutAxis_PA; p.InOut_P101 = sp.InoutAxis_P101;
p.UpDown_LPA1 = sp.UpDownAxis_LPA1; p.UpDown_LP101 = sp.UpDownAxis_LP101;
p.UpDown_HPA2 = sp.UpDownAxis_HPA2; p.UpDown_HP102 = sp.UpDownAxis_HP102;
p.Middle_PA = sp.MiddleAxis_PA; p.Middle_P101 = sp.MiddleAxis_P101;
p.ComPress_P1 = box.Config.CompAxis_P1_Position; p.ComPress_P1 = box.Config.CompAxis_P1_Position;
p.InOut_P1 = box.Config.InOutAxis_P1_Position; p.InOut_P1 = box.Config.InOutAxis_P1_Position;
......
source/DeviceLibrary/StoreConfig/BoxConfig_1.csv
...@@ -95,10 +95,10 @@ PRO,压紧轴（轴4）P1速度,CompAxis_P1_Speed,100,,,,,,, ...@@ -95,10 +95,10 @@ PRO,压紧轴（轴4）P1速度,CompAxis_P1_Speed,100,,,,,,,
PRO,压紧轴（轴4）P2速度,CompAxis_P2_Speed,100,,,,,,, PRO,压紧轴（轴4）P2速度,CompAxis_P2_Speed,100,,,,,,,
PRO,压紧轴（轴4）P3速度,CompAxis_P3_Speed,100,,,,,,, PRO,压紧轴（轴4）P3速度,CompAxis_P3_Speed,100,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,升降轴（轴2）PA1速度,UpDownAxis_PA1_Speed,100,,,,,, , PRO,升降轴（轴2）P101速度,UpDownAxis_P101_Speed,100,,,,,, ,
PRO,升降轴（轴2）PA2速度,UpDownAxis_PA2_Speed,100,,,,,,, PRO,升降轴（轴2）P102速度,UpDownAxis_P102_Speed,100,,,,,,,
PRO,进出轴（轴3）PA速度,InOutAxis_PA_Speed,100,,,,,,, PRO,进出轴（轴3）P101速度,InOutAxis_P101_Speed,100,,,,,,,
PRO,旋转轴（轴1）PA速度,MiddleAxis_PA_Speed,120,,,,,,, PRO,旋转轴（轴1）P101速度,MiddleAxis_P101_Speed,120,,,,,,,
PRO,压紧轴（轴4）P4速度,CompAxis_P4_Speed,100,,,,,,, PRO,压紧轴（轴4）P4速度,CompAxis_P4_Speed,100,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,（轴一）旋转轴停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,, PRO,（轴一）旋转轴停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,,
......
source/DeviceLibrary/StoreConfig/BoxConfig_2.csv
...@@ -95,10 +95,10 @@ PRO,压紧轴（轴4）P1速度,CompAxis_P1_Speed,100,,,,,,, ...@@ -95,10 +95,10 @@ PRO,压紧轴（轴4）P1速度,CompAxis_P1_Speed,100,,,,,,,
PRO,压紧轴（轴4）P2速度,CompAxis_P2_Speed,100,,,,,,, PRO,压紧轴（轴4）P2速度,CompAxis_P2_Speed,100,,,,,,,
PRO,压紧轴（轴4）P3速度,CompAxis_P3_Speed,100,,,,,,, PRO,压紧轴（轴4）P3速度,CompAxis_P3_Speed,100,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,升降轴（轴2）PA1速度,UpDownAxis_PA1_Speed,100,,,,,, , PRO,升降轴（轴2）P101速度,UpDownAxis_P101_Speed,100,,,,,, ,
PRO,升降轴（轴2）PA2速度,UpDownAxis_PA2_Speed,100,,,,,,, PRO,升降轴（轴2）P102速度,UpDownAxis_P102_Speed,100,,,,,,,
PRO,进出轴（轴3）PA速度,InOutAxis_PA_Speed,100,,,,,,, PRO,进出轴（轴3）P101速度,InOutAxis_P101_Speed,100,,,,,,,
PRO,旋转轴（轴1）PA速度,MiddleAxis_PA_Speed,120,,,,,,, PRO,旋转轴（轴1）P101速度,MiddleAxis_P101_Speed,120,,,,,,,
PRO,压紧轴（轴4）P4速度,CompAxis_P4_Speed,100,,,,,,, PRO,压紧轴（轴4）P4速度,CompAxis_P4_Speed,100,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,（轴一）旋转轴停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,, PRO,（轴一）旋转轴停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,,
......
source/DeviceLibrary/StoreConfig/shelfPosition.csv
位置,优先级,高度,宽度,料仓ID,旋转轴位置PA,升降轴低点PA1,升降轴高点PA2,进出轴位置PA 位置,优先级,高度,宽度,料仓ID,旋转轴位置P101,升降轴低点P101,升降轴高点P102,进出轴位置P101
1#S_1_4,1,8,7,1,211783,51884,55245,81000 1#S_1_4,1,8,7,1,211783,51884,55245,81000
1#S_1_5,2,8,7,1,211783,67807,71168,81000 1#S_1_5,2,8,7,1,211783,67807,71168,81000
1#S_1_6,3,8,7,1,211783,83730,87091,81000 1#S_1_6,3,8,7,1,211783,83730,87091,81000
......
source/DeviceLibrary/store/InOutParam.cs
...@@ -113,10 +113,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -113,10 +113,10 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error( "GetPositon[" + ShelfPosID + "]=null,没有库位不能执行出入库"); LogUtil.error( "GetPositon[" + ShelfPosID + "]=null,没有库位不能执行出入库");
} }
MoveP.InOut_PA = sp.InoutAxis_PA; MoveP.InOut_P101 = sp.InoutAxis_P101;
MoveP.UpDown_LPA1 = sp.UpDownAxis_LPA1; MoveP.UpDown_LP101 = sp.UpDownAxis_LP101;
MoveP.UpDown_HPA2 = sp.UpDownAxis_HPA2; MoveP.UpDown_HP102 = sp.UpDownAxis_HP102;
MoveP.Middle_PA = sp.MiddleAxis_PA; MoveP.Middle_P101 = sp.MiddleAxis_P101;
} }
......
source/DeviceLibrary/store/LineMoveP.cs
...@@ -83,18 +83,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -83,18 +83,18 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 料架进出轴取料点 /// 料架进出轴取料点
/// </summary> /// </summary>
public int InOut_PA = 0; public int InOut_P101 = 0;
/// <summary> /// <summary>
/// 料架旋转轴位置 /// 料架旋转轴位置
/// </summary> /// </summary>
public int Middle_PA = 0; public int Middle_P101 = 0;
/// <summary> /// <summary>
/// 料架升降轴低点PA1 /// 料架升降轴低点P101
/// </summary> /// </summary>
public int UpDown_LPA1 = 0; public int UpDown_LP101 = 0;
/// <summary> /// <summary>
/// 料架升降轴高点PA2 /// 料架升降轴高点P102
/// </summary> /// </summary>
public int UpDown_HPA2 = 0; public int UpDown_HP102 = 0;
} }
} }
source/DeviceLibrary/store/StoreStep.cs
...@@ -354,17 +354,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -354,17 +354,17 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
BI_11_InoutToP1 = 20111, BI_11_InoutToP1 = 20111,
/// <summary> /// <summary>
/// 料架取料：升降轴移动到PA1低点，旋转轴移动到PA1点，压紧轴到压紧前点 /// 料架取料：升降轴移动到P101低点，旋转轴移动到P101点，压紧轴到压紧前点
/// </summary> /// </summary>
BI_12_MoveToShelf = 20112, BI_12_MoveToShelf = 20112,
/// <summary> /// <summary>
/// 料架取料：叉子前进到PA点 /// 料架取料：叉子前进到P101点
/// </summary> /// </summary>
BI_13_InoutToPA = 20113, BI_13_InoutToP101 = 20113,
/// <summary> /// <summary>
/// 料架取料：升降轴上升到PA2点 /// 料架取料：升降轴上升到P102点
/// </summary> /// </summary>
BI_14_UpdownToPA2 = 20114, BI_14_UpdownToP102 = 20114,
/// <summary> /// <summary>
/// 料架取料：压紧轴开始缓慢压紧 /// 料架取料：压紧轴开始缓慢压紧
/// </summary> /// </summary>
......
source/LoadCVSLibrary/position/ShelfPosition.cs
...@@ -14,25 +14,25 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -14,25 +14,25 @@ namespace OnlineStore.LoadCSVLibrary
public int StoreId { get; set; } public int StoreId { get; set; }
/// <summary> /// <summary>
/// 旋转轴位置PA /// 旋转轴位置P101
/// </summary> /// </summary>
[CSVAttribute("旋转轴位置PA")] [CSVAttribute("旋转轴位置P101")]
public int MiddleAxis_PA{ get; set; } public int MiddleAxis_P101{ get; set; }
/// <summary> /// <summary>
/// 升降轴低点PA1 /// 升降轴低点P101
/// </summary> /// </summary>
[CSVAttribute("升降轴低点PA1")] [CSVAttribute("升降轴低点P101")]
public int UpDownAxis_LPA1 { get; set; } public int UpDownAxis_LP101 { get; set; }
/// <summary> /// <summary>
/// 升降轴高点PA2 /// 升降轴高点P102
/// /// </summary> /// /// </summary>
[CSVAttribute("升降轴高点PA2")] [CSVAttribute("升降轴高点P102")]
public int UpDownAxis_HPA2{ get; set; } public int UpDownAxis_HP102{ get; set; }
/// <summary> /// <summary>
/// 进出轴位置PA /// 进出轴位置P101
/// </summary> /// </summary>
[CSVAttribute("进出轴位置PA")] [CSVAttribute("进出轴位置P101")]
public int InoutAxis_PA { get; set; } public int InoutAxis_P101 { get; set; }
} }
} }
source/LoadCVSLibrary/storeConfig/config/AC_Box_Config.cs
...@@ -358,25 +358,25 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -358,25 +358,25 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("CompAxis_P4_Position")] [ConfigProAttribute("CompAxis_P4_Position")]
public int CompAxis_P4_Position { get; set; } public int CompAxis_P4_Position { get; set; }
/// <summary> /// <summary>
/// PRO,升降轴（轴2）PA1速度,UpDownAxis_PA1_Speed,100,,,,,, , /// PRO,升降轴（轴2）P101速度,UpDownAxis_P101_Speed,100,,,,,, ,
/// </summary> /// </summary>
[ConfigProAttribute("UpDownAxis_PA1_Speed")] [ConfigProAttribute("UpDownAxis_P101_Speed")]
public int UpDownAxis_PA1_Speed { get; set; } public int UpDownAxis_P101_Speed { get; set; }
/// <summary> /// <summary>
/// PRO,升降轴（轴2）PA2速度,UpDownAxis_PA2_Speed,100,,,,,,, /// PRO,升降轴（轴2）P102速度,UpDownAxis_P102_Speed,100,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("UpDownAxis_PA2_Speed")] [ConfigProAttribute("UpDownAxis_P102_Speed")]
public int UpDownAxis_PA2_Speed { get; set; } public int UpDownAxis_P102_Speed { get; set; }
/// <summary> /// <summary>
/// PRO,进出轴（轴3）PA速度,InOutAxis_PA_Speed,100,,,,,,, /// PRO,进出轴（轴3）P101速度,InOutAxis_P101_Speed,100,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("InOutAxis_PA_Speed")] [ConfigProAttribute("InOutAxis_P101_Speed")]
public int InOutAxis_PA_Speed { get; set; } public int InOutAxis_P101_Speed { get; set; }
/// <summary> /// <summary>
/// PRO,旋转轴（轴1）PA速度,MiddleAxis_PA_Speed,120,,,,,,, /// PRO,旋转轴（轴1）P101速度,MiddleAxis_P101_Speed,120,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("MiddleAxis_PA_Speed")] [ConfigProAttribute("MiddleAxis_P101_Speed")]
public int MiddleAxis_PA_Speed { get; set; } public int MiddleAxis_P101_Speed { get; set; }
/// <summary> /// <summary>
......
source/LoadCVSLibrary/storeConfig/config/StoreType.cs
...@@ -42,6 +42,6 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -42,6 +42,6 @@ namespace OnlineStore.LoadCSVLibrary
/// <summary> /// <summary>
/// 松下伺服控制的包装料料仓 /// 松下伺服控制的包装料料仓
/// </summary> /// </summary>
public static string RC_AC_PA = "RC_AC_PA"; public static string RC_AC_PA = "RC_AC_P101";
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!