Skip to content

李娜 / SO664-HCSingleStore

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

点位调试可以左右侧料仓同时打开

1 个父辈 98c296df
内嵌 并排
正在显示 5 个修改的文件 包含 36 行增加 和 21 行删除
source/DeviceLibrary/acSingleStore/BoxAutoPoint.cs
...@@ -91,7 +91,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -91,7 +91,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsTimeOut(60)) else if (MoveInfo.IsTimeOut(60))
{ {
WarnMsg = LogName + "[" + MoveInfo.MoveStep + "]等待进出轴原点返回 超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒 "; WarnMsg = LogName + "[" + MoveInfo.MoveStep + "]等待进出轴原点返回 超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒 ";
LogUtil.error(WarnMsg); LogUtil.error(WarnMsg,(int)MoveInfo.MoveStep);
} }
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.AP_02_UpdownHome)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.AP_02_UpdownHome))
...@@ -119,7 +119,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -119,7 +119,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsTimeOut(120)) else if (MoveInfo.IsTimeOut(120))
{ {
WarnMsg = LogName + "[" + MoveInfo.MoveStep + "]等待升降轴原点返回 超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒 "; WarnMsg = LogName + "[" + MoveInfo.MoveStep + "]等待升降轴原点返回 超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒 ";
LogUtil.error(WarnMsg); LogUtil.error(WarnMsg, (int)MoveInfo.MoveStep);
} }
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.AP_03_UpdownMove)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.AP_03_UpdownMove))
...@@ -135,7 +135,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -135,7 +135,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsTimeOut(120)) else if (MoveInfo.IsTimeOut(120))
{ {
WarnMsg = LogName + "[" + MoveInfo.MoveStep + "]等待升降轴到开始位置：" + paramInfo.UpdownStartPosition + " 超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒 "; WarnMsg = LogName + "[" + MoveInfo.MoveStep + "]等待升降轴到开始位置：" + paramInfo.UpdownStartPosition + " 超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒 ";
LogUtil.error(WarnMsg); LogUtil.error(WarnMsg, (int)MoveInfo.MoveStep);
} }
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.AP_04_MiddleMove)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.AP_04_MiddleMove))
...@@ -153,7 +153,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -153,7 +153,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsTimeOut(120)) else if (MoveInfo.IsTimeOut(120))
{ {
WarnMsg = LogName + "[" + MoveInfo.MoveStep + "]旋转轴移动到目标位置"+ p + " 超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒 "; WarnMsg = LogName + "[" + MoveInfo.MoveStep + "]旋转轴移动到目标位置"+ p + " 超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒 ";
LogUtil.error(WarnMsg); LogUtil.error(WarnMsg, (int)MoveInfo.MoveStep);
} }
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.AP_05_InoutToP)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.AP_05_InoutToP))
...@@ -169,7 +169,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -169,7 +169,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsTimeOut(60)) else if (MoveInfo.IsTimeOut(60))
{ {
WarnMsg = LogName + "[" + MoveInfo.MoveStep + "]进出轴移动到目标位置" + paramInfo.InoutTargetPosition + " 超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒 "; WarnMsg = LogName + "[" + MoveInfo.MoveStep + "]进出轴移动到目标位置" + paramInfo.InoutTargetPosition + " 超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒 ";
LogUtil.error(WarnMsg); LogUtil.error(WarnMsg, (int)MoveInfo.MoveStep);
} }
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.AP_06_UpdownMove)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.AP_06_UpdownMove))
......
source/HCSingleStore/FrmBox.Designer.cs
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
this.btnUpdown.Name = "btnUpdown"; this.btnUpdown.Name = "btnUpdown";
this.btnUpdown.Size = new System.Drawing.Size(132, 39); this.btnUpdown.Size = new System.Drawing.Size(132, 39);
this.btnUpdown.TabIndex = 14; this.btnUpdown.TabIndex = 14;
this.btnUpdown.Text = "升降轴位置调试"; this.btnUpdown.Text = "自动对点位";
this.btnUpdown.UseVisualStyleBackColor = false; this.btnUpdown.UseVisualStyleBackColor = false;
this.btnUpdown.Click += new System.EventHandler(this.btnUpdown_Click); this.btnUpdown.Click += new System.EventHandler(this.btnUpdown_Click);
// //
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
this.groupBox1.Controls.Add(this.label43); this.groupBox1.Controls.Add(this.label43);
this.groupBox1.Controls.Add(this.label42); this.groupBox1.Controls.Add(this.label42);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(11, 428); this.groupBox1.Location = new System.Drawing.Point(11, 436);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(476, 136); this.groupBox1.Size = new System.Drawing.Size(476, 136);
this.groupBox1.TabIndex = 217; this.groupBox1.TabIndex = 217;
...@@ -493,7 +493,7 @@ ...@@ -493,7 +493,7 @@
this.groupBox2.Controls.Add(this.button6); this.groupBox2.Controls.Add(this.button6);
this.groupBox2.Controls.Add(this.button3); this.groupBox2.Controls.Add(this.button3);
this.groupBox2.Controls.Add(this.button5); this.groupBox2.Controls.Add(this.button5);
this.groupBox2.Location = new System.Drawing.Point(11, 344); this.groupBox2.Location = new System.Drawing.Point(11, 352);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(476, 78); this.groupBox2.Size = new System.Drawing.Size(476, 78);
this.groupBox2.TabIndex = 276; this.groupBox2.TabIndex = 276;
...@@ -1432,10 +1432,10 @@ ...@@ -1432,10 +1432,10 @@
// tabPage1 // tabPage1
// //
this.tabPage1.Controls.Add(this.panel1); this.tabPage1.Controls.Add(this.panel1);
this.tabPage1.Location = new System.Drawing.Point(4, 29); this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(1091, 607); this.tabPage1.Size = new System.Drawing.Size(192, 74);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO调试 "; this.tabPage1.Text = " IO调试 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
......
source/HCSingleStore/FrmBox.cs
...@@ -912,7 +912,7 @@ namespace OnlineStore.ACSingleStore ...@@ -912,7 +912,7 @@ namespace OnlineStore.ACSingleStore
} }
} }
private FrmTool frmTool = null;
private void btnUpdown_Click(object sender, EventArgs e) private void btnUpdown_Click(object sender, EventArgs e)
{ {
foreach (ConfigMoveAxis axis in boxBean.moveAxisList) foreach (ConfigMoveAxis axis in boxBean.moveAxisList)
...@@ -929,20 +929,31 @@ namespace OnlineStore.ACSingleStore ...@@ -929,20 +929,31 @@ namespace OnlineStore.ACSingleStore
return; return;
} }
} }
if (boxBean.Config.DIList.ContainsKey(IO_Type.CheckPos)) if (boxBean.Config.DIList.ContainsKey(IO_Type.CheckPos))
{ {
string ioIP = boxBean.Config.DIList[IO_Type.CheckPos].IO_IP; string ioIP = boxBean.Config.DIList[IO_Type.CheckPos].IO_IP;
int ioIndex = boxBean.Config.DIList[IO_Type.CheckPos].GetIOAddr(); int ioIndex = boxBean.Config.DIList[IO_Type.CheckPos].GetIOAddr();
FrmTool frm = new FrmTool(boxBean, ioIP, ioIndex,boxBean.Name); if (frmTool == null)
frm.ShowDialog(); {
frmTool = new FrmTool(boxBean, ioIP, ioIndex, boxBean.Name);
}
frmTool.Show();
frmTool.FormClosed += FrmTool_FormClosed;
frmTool.Focus();
} }
else else
{ {
MessageBox.Show("未配置激光检测信号"); MessageBox.Show("未配置激光检测信号");
} }
} }
private void FrmTool_FormClosed(object sender, FormClosedEventArgs e)
{
frmTool = null;
}
/// <summary> /// <summary>
/// 盘点测试 /// 盘点测试
/// </summary> /// </summary>
......
source/HCSingleStore/positionTool/FrmTool.Designer.cs
...@@ -575,6 +575,7 @@ ...@@ -575,6 +575,7 @@
this.Name = "FrmTool"; this.Name = "FrmTool";
this.Text = "自动对点位"; this.Text = "自动对点位";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPositionTool_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPositionTool_FormClosing);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmTool_FormClosed);
this.Load += new System.EventHandler(this.Form1_Load); this.Load += new System.EventHandler(this.Form1_Load);
this.panelAll.ResumeLayout(false); this.panelAll.ResumeLayout(false);
this.group6.ResumeLayout(false); this.group6.ResumeLayout(false);
......
source/HCSingleStore/positionTool/FrmTool.cs
...@@ -38,7 +38,7 @@ namespace OnlineStore.ACSingleStore ...@@ -38,7 +38,7 @@ namespace OnlineStore.ACSingleStore
LogUtil.info(LogName + "创建位置保存文件夹：" + DefaultfilePath); LogUtil.info(LogName + "创建位置保存文件夹：" + DefaultfilePath);
} }
lblFileP.Text = DefaultfilePath; lblFileP.Text = DefaultfilePath;
this.Text = name + "_自动对点位 "; this.Text =StoreManager.Store.Config.CID+"_"+ name + "_自动对点位 ";
LogName = this.Text; LogName = this.Text;
txtUpdownStart.Text = 0.ToString(); txtUpdownStart.Text = 0.ToString();
FrmTool.CheckForIllegalCrossThreadCalls = false; FrmTool.CheckForIllegalCrossThreadCalls = false;
...@@ -138,9 +138,7 @@ namespace OnlineStore.ACSingleStore ...@@ -138,9 +138,7 @@ namespace OnlineStore.ACSingleStore
} }
private bool isInProcesss = false; private bool isInProcesss = false;
private void timer1_Tick(object sender, EventArgs e) private void timer1_Tick(object sender, EventArgs e)
{ {
try try
...@@ -393,6 +391,11 @@ namespace OnlineStore.ACSingleStore ...@@ -393,6 +391,11 @@ namespace OnlineStore.ACSingleStore
ConfigMoveAxis axis = Box.Config.Middle_Axis; ConfigMoveAxis axis = Box.Config.Middle_Axis;
AxisManager.instance.SuddenStop(axis.DeviceName, axis.GetAxisValue()); AxisManager.instance.SuddenStop(axis.DeviceName, axis.GetAxisValue());
} }
private void FrmTool_FormClosed(object sender, FormClosedEventArgs e)
{
}
} }
public class ResourceCulture public class ResourceCulture
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!