Skip to content

李娜 / SO664-AssemblyLine

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

界面显示升降轴P2和p3的点位列表

1 个父辈 e2a1c41f
内嵌 并排
正在显示 9 个修改的文件 包含 147 行增加 和 67 行删除
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
......@@ -97,6 +97,7 @@
this.txtBP2 = new System.Windows.Forms.TextBox();
this.axisMoveControl1 = new OnlineStore.AssemblyLine.AxisMoveControl();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.lblP2List = new System.Windows.Forms.Label();
this.txtUpdownP3 = new System.Windows.Forms.TextBox();
this.btnUpdownP3 = new System.Windows.Forms.Button();
this.btnSave = new System.Windows.Forms.Button();
......@@ -936,7 +937,7 @@
this.groupBox5.Size = new System.Drawing.Size(557, 114);
this.groupBox5.TabIndex = 320;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "批量轴上料测试";
this.groupBox5.Text = "提升轴上料测试";
//
// lblTestMsg
//
......@@ -963,7 +964,7 @@
this.btnTestStop.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnTestStop.Size = new System.Drawing.Size(163, 34);
this.btnTestStop.TabIndex = 317;
this.btnTestStop.Text = "批量轴停止";
this.btnTestStop.Text = "提升轴停止";
this.btnTestStop.UseVisualStyleBackColor = true;
this.btnTestStop.Click += new System.EventHandler(this.btnTestStop_Click);
//
......@@ -991,7 +992,7 @@
this.btnStartTest.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnStartTest.Size = new System.Drawing.Size(163, 34);
this.btnStartTest.TabIndex = 307;
this.btnStartTest.Text = "批量轴入料运动开始";
this.btnStartTest.Text = "上料提升轴运动开始";
this.btnStartTest.UseVisualStyleBackColor = true;
this.btnStartTest.Click += new System.EventHandler(this.btnStartTest_Click);
//
......@@ -1005,9 +1006,9 @@
this.groupDetial.Controls.Add(this.label2);
this.groupDetial.Controls.Add(this.cmbDSize);
this.groupDetial.Controls.Add(this.label1);
this.groupDetial.Location = new System.Drawing.Point(587, 275);
this.groupDetial.Location = new System.Drawing.Point(587, 316);
this.groupDetial.Name = "groupDetial";
this.groupDetial.Size = new System.Drawing.Size(531, 204);
this.groupDetial.Size = new System.Drawing.Size(603, 204);
this.groupDetial.TabIndex = 319;
this.groupDetial.TabStop = false;
this.groupDetial.Text = "移栽位置P2详细配置";
......@@ -1118,7 +1119,7 @@
this.groupBox9.Controls.Add(this.txtBP2);
this.groupBox9.Location = new System.Drawing.Point(587, 6);
this.groupBox9.Name = "groupBox9";
this.groupBox9.Size = new System.Drawing.Size(531, 114);
this.groupBox9.Size = new System.Drawing.Size(603, 114);
this.groupBox9.TabIndex = 220;
this.groupBox9.TabStop = false;
this.groupBox9.Text = "上料提升轴位置配置";
......@@ -1235,6 +1236,7 @@
//
// groupBox2
//
this.groupBox2.Controls.Add(this.lblP2List);
this.groupBox2.Controls.Add(this.txtUpdownP3);
this.groupBox2.Controls.Add(this.btnUpdownP3);
this.groupBox2.Controls.Add(this.btnSave);
......@@ -1246,11 +1248,22 @@
this.groupBox2.Controls.Add(this.txtSizePosition);
this.groupBox2.Location = new System.Drawing.Point(587, 123);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(531, 149);
this.groupBox2.Size = new System.Drawing.Size(603, 188);
this.groupBox2.TabIndex = 218;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "移栽升降轴位置配置";
//
// lblP2List
//
this.lblP2List.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblP2List.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblP2List.Location = new System.Drawing.Point(12, 100);
this.lblP2List.Name = "lblP2List";
this.lblP2List.Size = new System.Drawing.Size(585, 35);
this.lblP2List.TabIndex = 313;
this.lblP2List.Text = "P2列表：";
this.lblP2List.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// txtUpdownP3
//
this.txtUpdownP3.BackColor = System.Drawing.SystemColors.Window;
......@@ -1286,7 +1299,7 @@
this.btnSave.BackColor = System.Drawing.SystemColors.Control;
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.ForeColor = System.Drawing.Color.Blue;
this.btnSave.Location = new System.Drawing.Point(152, 104);
this.btnSave.Location = new System.Drawing.Point(258, 141);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(163, 34);
this.btnSave.TabIndex = 310;
......@@ -1538,6 +1551,7 @@
private System.Windows.Forms.Label lblTargetP3;
internal System.Windows.Forms.Button btnStartTest;
private System.Windows.Forms.Label lblTestMsg;
private System.Windows.Forms.Label lblP2List;
}
}
source/AssemblyLineClient/FrmFeedingEquip.cs
......@@ -482,6 +482,7 @@ namespace OnlineStore.AssemblyLine
int sizePosition = FormUtil.GetIntValue(txtSizePosition);
equipBean.Config.UpdateUpdownP2(size, sizePosition);
LineManager.SaveFeedingEquipConfig(equipBean.Config);
lblP2List.Text = "P2列表：" + equipBean.Config.UpDownP2List;
MessageBox.Show("保存成功！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
......@@ -639,6 +640,7 @@ namespace OnlineStore.AssemblyLine
listDetitalP2.Items.Add(key + "=" + DP2Map[key]);
}
txtDP2.Text = txtSizePosition.Text;
lblP2List.Text = "P2列表：" + equipBean.Config.UpDownP2List;
}
......@@ -837,7 +839,7 @@ namespace OnlineStore.AssemblyLine
bool isStop = AxisManager.instance.GetBusyStatus(moveAxis.DeviceName, moveAxis.GetAxisValue()).Equals(0);
if (isServoOn && isStop)
{
//判断批量轴是否停止且到位
//判断提升轴是否停止且到位
TargetP3 = equipBean.Config.BatchAxisP3;
LogUtil.info(equipBean.Name + "点击：" + btnStartTest.Text + "，目标位置：" + equipBean.Config.BatchAxisP3);
equipBean.BatchAxisToP3(true, false, true);
......@@ -872,7 +874,7 @@ namespace OnlineStore.AssemblyLine
if (result)
{
isStop = true ;
LogUtil.info(equipBean.Name + "批量轴上料功能测试，发现批量轴已到达目标位置【" + TargetP3 + "】，停止上料测试 ");
LogUtil.info(equipBean.Name + "提升轴上料功能测试，发现提升轴已到达目标位置【" + TargetP3 + "】，停止上料测试 ");
}
else
{
......@@ -880,7 +882,7 @@ namespace OnlineStore.AssemblyLine
if (axisMoveIsEnd)
{
isStop = true;
LogUtil.info(equipBean.Name + "批量轴上料功能测试，发现批量轴已停止运动，停止上料测试");
LogUtil.info(equipBean.Name + "提升轴上料功能测试，发现提升轴已停止运动，停止上料测试");
}
}
if (isStop)
......
source/AssemblyLineClient/FrmHYEquip.Designer.cs
......@@ -72,6 +72,7 @@
this.cmbDSize = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.lblP2List = new System.Windows.Forms.Label();
this.btnP3 = new System.Windows.Forms.Button();
this.txtP3 = new System.Windows.Forms.TextBox();
this.btnSave = new System.Windows.Forms.Button();
......@@ -82,6 +83,7 @@
this.btnP2 = new System.Windows.Forms.Button();
this.txtP2 = new System.Windows.Forms.TextBox();
this.axisMoveControl1 = new OnlineStore.AssemblyLine.AxisMoveControl();
this.lblP3List = new System.Windows.Forms.Label();
this.panBase.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout();
......@@ -746,9 +748,9 @@
this.groupDetial.Controls.Add(this.label2);
this.groupDetial.Controls.Add(this.cmbDSize);
this.groupDetial.Controls.Add(this.label1);
this.groupDetial.Location = new System.Drawing.Point(577, 180);
this.groupDetial.Location = new System.Drawing.Point(577, 266);
this.groupDetial.Name = "groupDetial";
this.groupDetial.Size = new System.Drawing.Size(537, 205);
this.groupDetial.Size = new System.Drawing.Size(642, 205);
this.groupDetial.TabIndex = 318;
this.groupDetial.TabStop = false;
this.groupDetial.Text = "移栽位置P2详细配置";
......@@ -850,6 +852,8 @@
//
// groupBox2
//
this.groupBox2.Controls.Add(this.lblP3List);
this.groupBox2.Controls.Add(this.lblP2List);
this.groupBox2.Controls.Add(this.btnP3);
this.groupBox2.Controls.Add(this.txtP3);
this.groupBox2.Controls.Add(this.btnSave);
......@@ -861,11 +865,22 @@
this.groupBox2.Controls.Add(this.txtP2);
this.groupBox2.Location = new System.Drawing.Point(577, 6);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(538, 168);
this.groupBox2.Size = new System.Drawing.Size(643, 248);
this.groupBox2.TabIndex = 219;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "升降轴位置配置";
//
// lblP2List
//
this.lblP2List.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblP2List.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblP2List.Location = new System.Drawing.Point(8, 156);
this.lblP2List.Name = "lblP2List";
this.lblP2List.Size = new System.Drawing.Size(627, 40);
this.lblP2List.TabIndex = 313;
this.lblP2List.Text = "P2列表：";
this.lblP2List.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// btnP3
//
this.btnP3.BackColor = System.Drawing.SystemColors.Control;
......@@ -901,9 +916,9 @@
this.btnSave.BackColor = System.Drawing.SystemColors.Control;
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.ForeColor = System.Drawing.Color.Blue;
this.btnSave.Location = new System.Drawing.Point(204, 114);
this.btnSave.Location = new System.Drawing.Point(272, 106);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(110, 34);
this.btnSave.Size = new System.Drawing.Size(163, 34);
this.btnSave.TabIndex = 310;
this.btnSave.Text = "保存位置";
this.btnSave.UseVisualStyleBackColor = false;
......@@ -1000,6 +1015,17 @@
this.axisMoveControl1.Size = new System.Drawing.Size(566, 440);
this.axisMoveControl1.TabIndex = 0;
//
// lblP3List
//
this.lblP3List.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblP3List.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblP3List.Location = new System.Drawing.Point(8, 196);
this.lblP3List.Name = "lblP3List";
this.lblP3List.Size = new System.Drawing.Size(627, 40);
this.lblP3List.TabIndex = 315;
this.lblP3List.Text = "P3列表：";
this.lblP3List.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// FrmHYEquip
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
......@@ -1103,6 +1129,8 @@
private System.Windows.Forms.Button HY_LongL_StopDown;
private System.Windows.Forms.Button HY_ShortL_StopDown;
private System.Windows.Forms.Button HY_OL_StopDown;
private System.Windows.Forms.Label lblP2List;
private System.Windows.Forms.Label lblP3List;
}
}
source/AssemblyLineClient/FrmHYEquip.cs
......@@ -405,6 +405,8 @@ namespace OnlineStore.AssemblyLine
equipBean.Config.UpdateUpdownP2(size, sizePosition);
equipBean.Config.UpdateUpdownP3(size, sizeBoxP);
LineManager.SaveHYEquipConfig(equipBean.Config);
lblP2List.Text = "P2列表：" + equipBean.Config.UpDownP2List;
lblP3List.Text = "P3列表：" + equipBean.Config.UpDownP3List;
MessageBox.Show("保存成功！","提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
......@@ -429,6 +431,8 @@ namespace OnlineStore.AssemblyLine
listDetitalP2.Items.Add(key + "=" + DP2Map[key]);
}
txtDP2.Text = txtP2.Text;
lblP2List.Text = "P2列表：" + equipBean.Config.UpDownP2List;
lblP3List.Text = "P3列表：" + equipBean.Config.UpDownP3List;
}
private void btnDSave_Click(object sender, EventArgs e)
{
......@@ -444,7 +448,6 @@ namespace OnlineStore.AssemblyLine
LogUtil.info(equipBean.Name + "用户操作：尺寸：" + size + "，高度：" + height + "，P2值：" + position + "，保存成功");
MessageBox.Show("保存成功！", "提示",MessageBoxButtons.OK, MessageBoxIcon.Information);
listDetitalP2.Items.Clear();
Dictionary<string, int> DP2Map = equipBean.Config.LoadP2DetialMap();
foreach (string key in DP2Map.Keys)
......
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
......@@ -64,6 +64,8 @@
this.label1 = new System.Windows.Forms.Label();
this.axisMoveControl1 = new OnlineStore.AssemblyLine.AxisMoveControl();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.lblP3List = new System.Windows.Forms.Label();
this.lblP2 = new System.Windows.Forms.Label();
this.btnP3 = new System.Windows.Forms.Button();
this.txtP3 = new System.Windows.Forms.TextBox();
this.btnSave = new System.Windows.Forms.Button();
......@@ -602,9 +604,9 @@
this.groupDetial.Controls.Add(this.label2);
this.groupDetial.Controls.Add(this.cmbDSize);
this.groupDetial.Controls.Add(this.label1);
this.groupDetial.Location = new System.Drawing.Point(583, 175);
this.groupDetial.Location = new System.Drawing.Point(577, 254);
this.groupDetial.Name = "groupDetial";
this.groupDetial.Size = new System.Drawing.Size(537, 205);
this.groupDetial.Size = new System.Drawing.Size(581, 195);
this.groupDetial.TabIndex = 317;
this.groupDetial.TabStop = false;
this.groupDetial.Text = "移栽位置P2详细配置";
......@@ -613,7 +615,7 @@
//
this.btnDSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDSave.ForeColor = System.Drawing.Color.Blue;
this.btnDSave.Location = new System.Drawing.Point(108, 150);
this.btnDSave.Location = new System.Drawing.Point(108, 145);
this.btnDSave.Name = "btnDSave";
this.btnDSave.Size = new System.Drawing.Size(94, 34);
this.btnDSave.TabIndex = 322;
......@@ -626,7 +628,7 @@
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(9, 111);
this.label3.Location = new System.Drawing.Point(9, 106);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(94, 17);
this.label3.TabIndex = 321;
......@@ -639,7 +641,7 @@
this.txtDP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtDP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtDP2.Location = new System.Drawing.Point(108, 105);
this.txtDP2.Location = new System.Drawing.Point(108, 100);
this.txtDP2.MaxLength = 12;
this.txtDP2.Name = "txtDP2";
this.txtDP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -652,7 +654,7 @@
this.listDetitalP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listDetitalP2.FormattingEnabled = true;
this.listDetitalP2.ItemHeight = 20;
this.listDetitalP2.Location = new System.Drawing.Point(231, 27);
this.listDetitalP2.Location = new System.Drawing.Point(231, 22);
this.listDetitalP2.Name = "listDetitalP2";
this.listDetitalP2.Size = new System.Drawing.Size(270, 164);
this.listDetitalP2.TabIndex = 319;
......@@ -663,7 +665,7 @@
this.cmbDHeight.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDHeight.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbDHeight.FormattingEnabled = true;
this.cmbDHeight.Location = new System.Drawing.Point(108, 67);
this.cmbDHeight.Location = new System.Drawing.Point(108, 62);
this.cmbDHeight.Name = "cmbDHeight";
this.cmbDHeight.Size = new System.Drawing.Size(90, 28);
this.cmbDHeight.TabIndex = 318;
......@@ -674,7 +676,7 @@
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(9, 73);
this.label2.Location = new System.Drawing.Point(9, 68);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(68, 17);
this.label2.TabIndex = 317;
......@@ -686,7 +688,7 @@
this.cmbDSize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDSize.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbDSize.FormattingEnabled = true;
this.cmbDSize.Location = new System.Drawing.Point(108, 29);
this.cmbDSize.Location = new System.Drawing.Point(108, 24);
this.cmbDSize.Name = "cmbDSize";
this.cmbDSize.Size = new System.Drawing.Size(90, 28);
this.cmbDSize.TabIndex = 316;
......@@ -697,7 +699,7 @@
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(9, 35);
this.label1.Location = new System.Drawing.Point(9, 30);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(68, 17);
this.label1.TabIndex = 315;
......@@ -706,13 +708,15 @@
//
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(10, 7);
this.axisMoveControl1.Location = new System.Drawing.Point(3, 7);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(567, 440);
this.axisMoveControl1.Size = new System.Drawing.Size(567, 424);
this.axisMoveControl1.TabIndex = 219;
//
// groupBox2
//
this.groupBox2.Controls.Add(this.lblP3List);
this.groupBox2.Controls.Add(this.lblP2);
this.groupBox2.Controls.Add(this.btnP3);
this.groupBox2.Controls.Add(this.txtP3);
this.groupBox2.Controls.Add(this.btnSave);
......@@ -722,13 +726,35 @@
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.btnP2);
this.groupBox2.Controls.Add(this.txtP2);
this.groupBox2.Location = new System.Drawing.Point(583, 11);
this.groupBox2.Location = new System.Drawing.Point(577, 4);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(537, 158);
this.groupBox2.Size = new System.Drawing.Size(581, 241);
this.groupBox2.TabIndex = 218;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "升降轴位置配置";
//
// lblP3List
//
this.lblP3List.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblP3List.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblP3List.Location = new System.Drawing.Point(10, 193);
this.lblP3List.Name = "lblP3List";
this.lblP3List.Size = new System.Drawing.Size(560, 40);
this.lblP3List.TabIndex = 314;
this.lblP3List.Text = "P3列表：";
this.lblP3List.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// lblP2
//
this.lblP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblP2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblP2.Location = new System.Drawing.Point(10, 148);
this.lblP2.Name = "lblP2";
this.lblP2.Size = new System.Drawing.Size(560, 40);
this.lblP2.TabIndex = 313;
this.lblP2.Text = "P2列表：";
this.lblP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// btnP3
//
this.btnP3.BackColor = System.Drawing.SystemColors.Control;
......@@ -948,6 +974,8 @@
private System.Windows.Forms.Button BeforeAfterCylinder_After;
private System.Windows.Forms.Button UpDownCylinder_Down;
private System.Windows.Forms.Button TopCylinder_Down;
private System.Windows.Forms.Label lblP2;
private System.Windows.Forms.Label lblP3List;
}
}
source/AssemblyLineClient/FrmMoveEquip.cs
......@@ -457,7 +457,11 @@ namespace OnlineStore.AssemblyLine
equipBean.Config.UpdateUpdownP2(size, sizePosition);
equipBean.Config.UpdateUpdownP3(size, sizeBoxP);
LineManager.SaveMoveEquipConfig(equipBean.Config);
lblP2.Text = "P2列表：" + equipBean.Config.UpDownP2List;
lblP3List.Text = "P3列表：" + equipBean.Config.UpDownP3List;
MessageBox.Show("保存成功！");
}
private void btnBoxP_Click(object sender, EventArgs e)
......@@ -492,6 +496,8 @@ namespace OnlineStore.AssemblyLine
listDetitalP2.Items.Add(key + "=" + DP2Map[key]);
}
txtDP2.Text = txtP2.Text;
lblP2.Text = "P2列表：" + equipBean.Config.UpDownP2List;
lblP3List.Text = "P3列表：" + equipBean.Config.UpDownP3List;
}
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
......@@ -316,11 +316,15 @@ namespace OnlineStore.DeviceLibrary
//此处先对托盘号进行验证
preTrayNum = currTrayNum;
currTrayNum = RFIDManager.GetTrayNum(Name, DeviceID, true);
LogUtil.LOGGER.Info(Name+ " [" + trayCount + "] IP [" + RFIDManager.GetRFIP(DeviceID) + "] [" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]");
if (preTrayNum.Equals(currTrayNum) && currTrayNum > 0)
if (String.IsNullOrEmpty(RFIDIP)) { }
else
{
TrayManager.TrayErrorMsg = DateTime.Now.ToLongTimeString() + " " + Name + "托盘号出现错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，连续两个托盘号一样";
LogUtil.error(Name + "托盘号错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，连续两个托盘号一样");
LogUtil.LOGGER.Info(Name + " [" + trayCount + "] IP [" + RFIDManager.GetRFIP(DeviceID) + "] [" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]");
if (preTrayNum.Equals(currTrayNum) && currTrayNum > 0)
{
TrayManager.TrayErrorMsg = DateTime.Now.ToLongTimeString() + " " + Name + "托盘号出现错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，连续两个托盘号一样";
LogUtil.error(Name + "托盘号错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，连续两个托盘号一样");
}
}
//else if (!TrayManager.CheckIsRightNum(currTrayNum, preTrayNum))
//{
......
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs
......@@ -708,6 +708,13 @@ namespace OnlineStore.DeviceLibrary
}
else
{
//如果横移1和横移2都有托盘，需要横移
if (IOManager.IOValue(IO_Type.HY_TrayCheck, 202).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.HY_TrayCheck, 201).Equals(IO_VALUE.HIGH))
{
return true;
}
FeedingEquip feed1 = LineManager.Line.FeedingEquipMap[101];
FeedingEquip feed2 = LineManager.Line.FeedingEquipMap[102];
if ((!feed1.MoveInfo.MoveType.Equals(LineMoveType.InStore)) && (!feed2.MoveInfo.MoveType.Equals(LineMoveType.InStore)))
......
source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs
......@@ -330,13 +330,13 @@ namespace OnlineStore.DeviceLibrary
}
else if (MoveInfo.IsTimeOut(30))
{
MoveTimeOut(MoveInfo, "等待"+ feed .Name+ "开始出库超时");
MoveTimeOut(MoveInfo, "等待" + feed.Name + "开始出库超时");
//如果当前无料串，或者料串已离开，直接放行 托盘
TrayCanLeave();
}
else if (MoveInfo.IsTimeOut(20))
{
MoveTimeOut(MoveInfo, "等待" + feed.Name + "开始出库超时");
MoveTimeOut(MoveInfo, "等待" + feed.Name + "开始出库超时");
}
}
else
......@@ -358,22 +358,22 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(LineMoveStep.HY11_TopUpToHY))
{
MoveInfo.NextMoveStep(LineMoveStep.HY12_WaitHY2Free);
CheckLog("托盘横移" + MoveInfo.SLog + " ，等待HY"+ HyOutDeviceId + "空闲，可以开始横移 ");
CheckLog("托盘横移" + MoveInfo.SLog + " ，等待HY" + HyOutDeviceId + "空闲，可以开始横移 ");
}
else if (MoveInfo.IsStep(LineMoveStep.HY12_WaitHY2Free))
{
HYEquipBase hyOut = GetHyOutEquip();
if (hyOut.CanStartMove())
{
{
MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready);
CheckLog("托盘横移" + MoveInfo.SLog + " ，等待"+ hyOut.Name + "准备完成(顶升上升，定位下降) ");
CheckLog("托盘横移" + MoveInfo.SLog + " ，等待" + hyOut.Name + "准备完成(顶升上升，定位下降) ");
hyOut.MoveInfo.NewMove(LineMoveType.Fixture);
hyOut.MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree);
ClearTimeoutAlarm("等待"+ hyOut .Name+ "可以横移超时");
ClearTimeoutAlarm("等待" + hyOut.Name + "可以横移超时");
}
else if (MoveInfo.IsTimeOut())
{
MoveTimeOut(MoveInfo, "等待" + hyOut.Name + "可以横移超时");
MoveTimeOut(MoveInfo, "等待" + hyOut.Name + "可以横移超时");
}
}
else if (MoveInfo.IsStep(LineMoveStep.HY13_WaitHY2Ready))
......@@ -384,41 +384,26 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(LineMoveStep.HY14_HYLineRun);
CheckLog("托盘横移" + MoveInfo.SLog + " ，横移电机转动 ");
LineRun(MoveInfo);
LineRun(MoveInfo);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
ClearTimeoutAlarm("等待"+ hyOut + "顶升上升完成超时");
ClearTimeoutAlarm("等待" + hyOut + "顶升上升完成超时");
}
else if (MoveInfo.IsTimeOut())
{
MoveTimeOut(MoveInfo, "等待"+ hyOut + "顶升上升完成超时");
MoveTimeOut(MoveInfo, "等待" + hyOut + "顶升上升完成超时");
}
}
else if (MoveInfo.IsStep(LineMoveStep.HY14_HYLineRun))
{
{
MoveInfo.NextMoveStep(LineMoveStep.HY15_WaitOutCheck);
CheckLog("托盘横移" + MoveInfo.SLog + " ，等待托盘到达HY"+HyOutDeviceId+" ");
CheckLog("托盘横移" + MoveInfo.SLog + " ，等待托盘到达HY" + HyOutDeviceId + " ");
LineRun();
}
else if (MoveInfo.IsStep(LineMoveStep.HY15_WaitOutCheck))
{
// HYEquipBase hyOut = GetHyOutEquip();
// bool result = ((hyOut.MoveInfo.MoveStep >= LineMoveStep.HY55_WaitTrayCheck) || hyOut.MoveInfo.MoveType.Equals(LineMoveType.None));
// if (result)
// {
// MoveInfo.NextMoveStep(LineMoveStep.HY16_WatOutFixture2);
// CheckLog("托盘横移" + MoveInfo.SLog + " ，等待托盘到达" + hyOut.Name + " 持续一段时间 ");
// ClearTimeoutAlarm("等待托盘到达"+ hyOut .Name+ "超时");
// }
// else if (MoveInfo.IsTimeOut())
// {
// MoveTimeOut(MoveInfo, "等待托盘到达"+ hyOut .Name+ "超时");
// }
//}
//else if (MoveInfo.IsStep(LineMoveStep.HY16_WatOutFixture2))
//{
HYEquipBase hyOut = GetHyOutEquip();
bool result =( hyOut.MoveInfo.MoveStep >= LineMoveStep.HY56_CheckWait) || hyOut.MoveInfo.MoveType.Equals(LineMoveType.None);
bool result = (hyOut.MoveInfo.MoveStep >= LineMoveStep.HY56_CheckWait) || hyOut.MoveInfo.MoveType.Equals(LineMoveType.None);
if (result)
{
MoveInfo.NextMoveStep(LineMoveStep.HY17_TopDown);
......@@ -426,7 +411,7 @@ namespace OnlineStore.DeviceLibrary
LineStop(MoveInfo);
CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
LocationCylinderDown(MoveInfo);
ClearTimeoutAlarm("等待托盘到达"+ hyOut .Name+ "");
ClearTimeoutAlarm("等待托盘到达" + hyOut.Name + "");
}
else if (MoveInfo.IsTimeOut())
{
......@@ -447,7 +432,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(LineMoveStep.HY52_TopUp);
CheckLog("托盘阻挡" + MoveInfo.SLog + " 顶升上升，定位下降");
CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
LocationCylinderDown(MoveInfo);
LocationCylinderDown(MoveInfo);
}
else if (MoveInfo.IsStep(LineMoveStep.HY52_TopUp))
{
......@@ -456,7 +441,7 @@ namespace OnlineStore.DeviceLibrary
LineRun(MoveInfo);
}
else if (MoveInfo.IsStep(LineMoveStep.HY53_LineRun))
{
{
MoveInfo.NextMoveStep(LineMoveStep.HY54_HY2Ready);
CheckLog("托盘阻挡" + MoveInfo.SLog + " 准备接收横移托盘完成");
}
......@@ -466,7 +451,7 @@ namespace OnlineStore.DeviceLibrary
CheckLog("托盘阻挡" + MoveInfo.SLog + " 等待检测到托盘信号");
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH));
}
else if (MoveInfo.IsStep(LineMoveStep.HY55_WaitTrayCheck))
{
MoveInfo.NextMoveStep(LineMoveStep.HY56_CheckWait);
......@@ -505,6 +490,9 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(LineMoveStep.HY59_SL_WaitProcessReel);
CheckLog("托盘阻挡" + MoveInfo.SLog + " 等待料盘放入或料盘离开");
}
else if (MoveInfo.IsStep(LineMoveStep.HY59_SL_WaitProcessReel))
{
}
else if (MoveInfo.IsStep(LineMoveStep.HY60_SL_ReelProEnd))
{
MoveInfo.NextMoveStep(LineMoveStep.HY61_TopDown);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!