Skip to content

李娜 / SO664-AssemblyLine

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

接驳台横移名称修改。bug修改

1 个父辈 438143b1
内嵌 并排
正在显示 8 个修改的文件 包含 65 行增加 和 15 行删除
source/AssemblyLineClient/FrmHYEquip.Designer.cs
......@@ -982,7 +982,7 @@
this.axisMoveControl1.Location = new System.Drawing.Point(5, 3);
this.axisMoveControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(566, 398);
this.axisMoveControl1.Size = new System.Drawing.Size(566, 420);
this.axisMoveControl1.TabIndex = 0;
//
// FrmHYEquip
......
source/AssemblyLineClient/FrmHYEquip.cs
......@@ -501,6 +501,13 @@ namespace OnlineStore.AssemblyLine
}
private void btnLineRun_Click(object sender, EventArgs e)
{
if (equipBase.IOValue(IO_Type.HY_LineRun).Equals(IO_VALUE.HIGH))
{
LogUtil.info(equipBase.Name + "界面点击：" + HY_LineRun.Text+"，已在正转中，停止转动");
equipBean.LineStop();
return;
}
LogUtil.info(equipBase.Name + "界面点击：" + HY_LineRun.Text);
equipBean.LineRun();
}
......@@ -511,6 +518,12 @@ namespace OnlineStore.AssemblyLine
private void btnLineBackRun_Click(object sender, EventArgs e)
{
if (equipBase.IOValue(IO_Type.HY_LineBackRun).Equals(IO_VALUE.HIGH))
{
LogUtil.info(equipBase.Name + "界面点击：" + HY_LineRun.Text + "，已在反转中，停止转动");
equipBean.LineStop();
return;
}
LogUtil.info(equipBase.Name + "界面点击：" + HY_LineBackRun.Text);
equipBean.LineStop();
}
......
source/AssemblyLineClient/FrmLineStore.Designer.cs
......@@ -125,6 +125,7 @@
this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator();
this.control_Debug = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
this.lblCardMsg = new System.Windows.Forms.Label();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox1.SuspendLayout();
......@@ -164,6 +165,7 @@
//
// tabPage1
//
this.tabPage1.Controls.Add(this.lblCardMsg);
this.tabPage1.Controls.Add(this.chbRightDis);
this.tabPage1.Controls.Add(this.chbLeftDis);
this.tabPage1.Controls.Add(this.groupBox1);
......@@ -178,7 +180,7 @@
// chbRightDis
//
this.chbRightDis.AutoSize = true;
this.chbRightDis.Location = new System.Drawing.Point(241, 14);
this.chbRightDis.Location = new System.Drawing.Point(158, 14);
this.chbRightDis.Name = "chbRightDis";
this.chbRightDis.Size = new System.Drawing.Size(126, 24);
this.chbRightDis.TabIndex = 197;
......@@ -189,7 +191,7 @@
// chbLeftDis
//
this.chbLeftDis.AutoSize = true;
this.chbLeftDis.Location = new System.Drawing.Point(26, 14);
this.chbLeftDis.Location = new System.Drawing.Point(10, 14);
this.chbLeftDis.Name = "chbLeftDis";
this.chbLeftDis.Size = new System.Drawing.Size(126, 24);
this.chbLeftDis.TabIndex = 196;
......@@ -208,7 +210,7 @@
this.groupBox1.Controls.Add(this.btnInStoreTset);
this.groupBox1.Controls.Add(this.button2);
this.groupBox1.Controls.Add(this.button1);
this.groupBox1.Location = new System.Drawing.Point(10, 61);
this.groupBox1.Location = new System.Drawing.Point(10, 59);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(1078, 69);
this.groupBox1.TabIndex = 195;
......@@ -295,9 +297,9 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(3, 55);
this.logBox.Location = new System.Drawing.Point(3, 53);
this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(1317, 549);
this.logBox.Size = new System.Drawing.Size(1317, 548);
this.logBox.TabIndex = 106;
this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
......@@ -1007,6 +1009,14 @@
this.toolStripSeparator22.Name = "toolStripSeparator22";
this.toolStripSeparator22.Size = new System.Drawing.Size(159, 6);
//
// lblCardMsg
//
this.lblCardMsg.AutoSize = true;
this.lblCardMsg.Location = new System.Drawing.Point(364, 18);
this.lblCardMsg.Name = "lblCardMsg";
this.lblCardMsg.Size = new System.Drawing.Size(0, 20);
this.lblCardMsg.TabIndex = 198;
//
// FrmLineStore
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
......@@ -1151,6 +1161,7 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator25;
private System.Windows.Forms.CheckBox chbLeftDis;
private System.Windows.Forms.CheckBox chbRightDis;
private System.Windows.Forms.Label lblCardMsg;
}
}
source/AssemblyLineClient/FrmLineStore.cs
......@@ -18,7 +18,7 @@ using System.Windows.Forms;
namespace OnlineStore.AssemblyLine
{
internal partial class FrmLineStore : Form
internal partial class FrmLineStore : FrmBase
{
private LineBean lineBean = null;
private List<TabPage> tabPageList = new List<TabPage>();
......@@ -72,8 +72,8 @@ namespace OnlineStore.AssemblyLine
return;
}
//FrmIOTest ioStatus = new FrmIOTest();
//AddForm(" IO列表查看 ", ioStatus);
FrmIOTest ioStatus = new FrmIOTest();
AddForm(" IO列表查看 ", ioStatus);
FrmLineIO frmIOStatus = new FrmLineIO();
AddForm(" 流水线IO ", frmIOStatus);
......@@ -448,6 +448,7 @@ namespace OnlineStore.AssemblyLine
}
lblWarnMsg.Text = warnMsg;
lblCardMsg.Text = HuichuanLibrary.HCBoardManager.CardMsg;
if (lineBean.runStatus > LineRunStatus.Wait)
{
if (启动AToolStripMenuItem.Enabled.Equals(true))
......
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
......@@ -708,7 +708,7 @@
//
this.axisMoveControl1.Location = new System.Drawing.Point(10, 7);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(567, 390);
this.axisMoveControl1.Size = new System.Drawing.Size(567, 420);
this.axisMoveControl1.TabIndex = 219;
//
// groupBox2
......
source/AssemblyLineClient/useControl/AxisMoveControl.Designer.cs
......@@ -100,6 +100,7 @@
this.btnAxisVMove = new System.Windows.Forms.Button();
this.btnReadPosition = new System.Windows.Forms.Button();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.lblStatus = new System.Windows.Forms.Label();
this.groupAxis.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox1.SuspendLayout();
......@@ -111,6 +112,7 @@
this.groupAxis.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupAxis.Controls.Add(this.lblStatus);
this.groupAxis.Controls.Add(this.groupBox2);
this.groupAxis.Controls.Add(this.btnComAlarmClear);
this.groupAxis.Controls.Add(this.groupBox1);
......@@ -951,6 +953,15 @@
//
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// lblStatus
//
this.lblStatus.AutoSize = true;
this.lblStatus.Location = new System.Drawing.Point(8, 380);
this.lblStatus.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblStatus.Name = "lblStatus";
this.lblStatus.Size = new System.Drawing.Size(0, 17);
this.lblStatus.TabIndex = 305;
//
// AxisMoveControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
......@@ -1043,5 +1054,6 @@
private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.Label lblAlarmcode;
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.Label lblStatus;
}
}
source/AssemblyLineClient/useControl/AxisMoveControl.cs
......@@ -165,18 +165,19 @@ namespace OnlineStore.AssemblyLine
{
btnAddMove.Text = "点动+（下降）";
btnDelMove.Text = "点动-（上升）";
txtASpeed.Text = "100";
txtMiddleSpeed.Text = "100";
color = Color.Blue;
}
else if (cmbAxis.SelectedIndex.Equals(1))
{
btnAddMove.Text = "点动+（上升）";
btnDelMove.Text = "点动-（下降）";
txtASpeed.Text = "1000";
txtMiddleSpeed.Text = "1000";
//txtASpeed.Text = "1000";
//txtjogSpeed.Text = "1000";
color = Color.Red;
}
txtASpeed.Text =(currSelAxis.TargetSpeed/2).ToString();
txtMiddleSpeed.Text = (currSelAxis.TargetSpeed / 2).ToString();
btnOpenAxis.ForeColor = color;
btnCloseAxis.ForeColor = color;
btnAxisAMove.ForeColor = color;
......@@ -295,6 +296,7 @@ namespace OnlineStore.AssemblyLine
//【2】读取轴状态，如果读取出错将关闭此定时器
AxisSts sts = HCBoardManager.GetAxisSts(axisNo);
lblStatus.Text = sts.ToStr();
if (sts.ServoOn < 0)
{
return;
......
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor.cs
......@@ -17,7 +17,18 @@ namespace OnlineStore.DeviceLibrary
{
public HY_Coveryor(string cid, HYEquip_Config config) : base(cid, config)
{
Name = (" JHY" + (DeviceID % 100).ToString().PadLeft(2, '0') + " ").ToUpper();
if (DeviceID.Equals(210))
{
Name = (" J1HY" + (DeviceID % 100).ToString().PadLeft(2, '0') + " ").ToUpper();
}
else if (DeviceID.Equals(212))
{
Name = (" J2HY" + (DeviceID % 100).ToString().PadLeft(2, '0') + " ").ToUpper();
}
else
{
Name = (" J3HY" + (DeviceID % 100).ToString().PadLeft(2, '0') + " ").ToUpper();
}
}
public override bool StartRun(bool isDebug = false)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!