Skip to content

李娜 / SO664-AssemblyLine

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

界面按钮增加日志

1 个父辈 5075635d
全部展开
内嵌 并排
正在显示 12 个修改的文件 包含 130 行增加 和 73 行删除
source/AssemblyLineClient/FrmEquipBase.cs
......@@ -188,11 +188,13 @@ namespace OnlineStore.AssemblyLine
{
equipBase.IOMove(ioType, IO_VALUE.LOW);
c.BackColor = c.Parent.BackColor;
LogUtil.info(equipBase.Name+"界面点击：" + c.Text + "，写入DO" + ioType + "=LOW");
}
else
{
equipBase.IOMove(ioType, IO_VALUE.HIGH);
c.BackColor = Color.LawnGreen;
LogUtil.info(equipBase.Name + "界面点击：" + c.Text + "，写入DO" + ioType + "=HIGH");
}
}
}
......
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
......@@ -515,7 +515,7 @@
this.SL_RollerLine_Run.BackColor = System.Drawing.Color.White;
this.SL_RollerLine_Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_RollerLine_Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_RollerLine_Run.Location = new System.Drawing.Point(347, 60);
this.SL_RollerLine_Run.Location = new System.Drawing.Point(347, 62);
this.SL_RollerLine_Run.Name = "SL_RollerLine_Run";
this.SL_RollerLine_Run.Size = new System.Drawing.Size(140, 34);
this.SL_RollerLine_Run.TabIndex = 275;
......
source/AssemblyLineClient/FrmFeedingEquip.cs
......@@ -371,22 +371,22 @@ namespace OnlineStore.AssemblyLine
}
}
private void btnLocationCylinder_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + SL_LocationCylinder_Up.Text);
equipBean.CylinderMove(null, IO_Type.SL_LocationCylinder_Down, IO_Type.SL_LocationCylinder_Up);
}
private void btnOutTopCylinder_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + SL_OutTopCylinder_Up.Text);
equipBean.CylinderMove(null, IO_Type.SL_OutTopCylinder_Down, IO_Type.SL_OutTopCylinder_Up);
}
private void btnFeedSideWayCylinder_Click(object sender, EventArgs e)
{
if (equipBean.UpdownIsInP1())
{
LogUtil.info(equipBase.Name + "界面点击：" + SL_MoveCylinder_Take.Text);
equipBean.CylinderMove(null, IO_Type.SL_MoveCylinder_Give, IO_Type.SL_MoveCylinder_Take);
}
else
......@@ -404,6 +404,7 @@ namespace OnlineStore.AssemblyLine
return;
}
}
LogUtil.info(equipBase.Name + "界面点击：" + SL_TrayLocation_Before.Text);
equipBean.CylinderMove(null,IO_Type.SL_TrayLocation_After, IO_Type.SL_TrayLocation_Before);
}
......@@ -586,7 +587,7 @@ namespace OnlineStore.AssemblyLine
private void chbBoxSendShelf_CheckedChanged(object sender, EventArgs e)
{
IsInCheck = true;
LogUtil.info(equipBean.Name + "用户点击：出库完成送出料架=" + chbBoxSendShelf.Checked);
LogUtil.info(equipBean.Name + "界面点击：出库完成送出料架=" + chbBoxSendShelf.Checked);
equipBean.OutEndSendShelfOut = chbBoxSendShelf.Checked;
IsInCheck = false;
}
......@@ -710,11 +711,13 @@ namespace OnlineStore.AssemblyLine
private void btnGuding_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + SL_FixedCylinder_Up.Text);
equipBean.CylinderMove(null, IO_Type.SL_FixedCylinder_Down, IO_Type.SL_FixedCylinder_Up);
}
private void btnTopUp_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name+ "界面点击：" + SL_TopCylinder_Up.Text);
equipBean.CylinderMove(null, IO_Type.SL_TopCylinder_Down, IO_Type.SL_TopCylinder_Up);
}
......@@ -725,16 +728,19 @@ namespace OnlineStore.AssemblyLine
private void btnFeedCylinder_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + SL_ClampCylinder_Work.Text);
equipBean.CylinderMove(null,IO_Type.SL_ClampCylinder_Relax, IO_Type.SL_ClampCylinder_Work);
}
private void SL_TopCylinder_Down_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + SL_TopCylinder_Down.Text);
equipBean.CylinderMove(null, IO_Type.SL_OutTopCylinder_Up, IO_Type.SL_TopCylinder_Down);
}
private void SL_FixedCylinder_Down_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + SL_FixedCylinder_Down.Text);
equipBean.CylinderMove(null, IO_Type.SL_FixedCylinder_Up, IO_Type.SL_FixedCylinder_Down);
}
......@@ -747,6 +753,7 @@ namespace OnlineStore.AssemblyLine
{
if (equipBean.UpdownIsInP1())
{
LogUtil.info(equipBase.Name + "界面点击：" + SL_MoveCylinder_Give.Text);
equipBean.CylinderMove(null, IO_Type.SL_MoveCylinder_Take, IO_Type.SL_MoveCylinder_Give);
}
else
......@@ -757,11 +764,13 @@ namespace OnlineStore.AssemblyLine
private void SL_ClampCylinder_Work_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + SL_ClampCylinder_Relax.Text);
equipBean.CylinderMove(null, IO_Type.SL_ClampCylinder_Work, IO_Type.SL_ClampCylinder_Relax);
}
private void SL_OutTopCylinder_Down_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + SL_OutTopCylinder_Down.Text);
equipBean.CylinderMove(null, IO_Type.SL_OutTopCylinder_Up, IO_Type.SL_OutTopCylinder_Down);
}
......@@ -775,6 +784,7 @@ namespace OnlineStore.AssemblyLine
return;
}
}
LogUtil.info(equipBase.Name + "界面点击：" + SL_TrayLocation_After.Text);
equipBean.CylinderMove(null, IO_Type.SL_TrayLocation_After, IO_Type.SL_TrayLocation_After);
}
}
......
source/AssemblyLineClient/FrmHYEquip.cs
......@@ -503,6 +503,7 @@ namespace OnlineStore.AssemblyLine
}
private void btnLineRun_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + HY_LineRun.Text);
equipBean.LineRun();
}
private void btnStopDown_Click(object sender, EventArgs e)
......@@ -512,6 +513,7 @@ namespace OnlineStore.AssemblyLine
private void btnLineBackRun_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + HY_LineBackRun.Text);
equipBean.LineStop();
}
......@@ -522,20 +524,25 @@ namespace OnlineStore.AssemblyLine
}
private void btnTopCylinder_Up_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + HY_TopCylinder_Up.Text);
equipBean.CylinderMove(null, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
}
private void btnLocation_Up_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + HY_LocationCylinder_Up.Text);
equipBean.CylinderMove(null, IO_Type.HY_LocationCylinder_Down, IO_Type.HY_LocationCylinder_Up);
}
private void btnMoveTake_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + HY_MoveCylinder_Take.Text);
equipBean.CylinderMove(null, IO_Type.HY_MoveCylinder_Give, IO_Type.HY_MoveCylinder_Take);
}
private void btnClampWork_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + HY_ClampCylinder_Work.Text);
equipBean.CylinderMove(null, IO_Type.HY_ClampCylinder_Relax, IO_Type.HY_ClampCylinder_Work);
}
......@@ -551,41 +558,49 @@ namespace OnlineStore.AssemblyLine
private void HY_StopCylinder_Up_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + HY_StopCylinder_Up.Text);
equipBean.CylinderMove(null, IO_Type.HY_StopCylinder_Down, IO_Type.HY_StopCylinder_Up);
}
private void HY_StopCylinder_Down_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + HY_StopCylinder_Down.Text);
equipBean.CylinderMove(null, IO_Type.HY_StopCylinder_Up, IO_Type.HY_StopCylinder_Down);
}
private void HY_OL_StopCylinder_Up_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + HY_OL_StopCylinder_Up.Text);
equipBean.CylinderMove(null, IO_Type.HY_OL_StopCylinder_Down, IO_Type.HY_OL_StopCylinder_Up);
}
private void HY_OL_StopCylinder_Down_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + HY_OL_StopCylinder_Down.Text);
equipBean.CylinderMove(null, IO_Type.HY_OL_StopCylinder_Up, IO_Type.HY_OL_StopCylinder_Down);
}
private void HY_TopCylinder_Down_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + HY_TopCylinder_Down.Text);
equipBean.CylinderMove(null, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
}
private void HY_LocationCylinder_Down1_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + HY_LocationCylinder_Down.Text);
equipBean.CylinderMove(null, IO_Type.HY_LocationCylinder_Up, IO_Type.HY_LocationCylinder_Down);
}
private void HY_MoveCylinder_Give_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + HY_MoveCylinder_Give.Text);
equipBean.CylinderMove(null, IO_Type.HY_MoveCylinder_Take, IO_Type.HY_MoveCylinder_Give);
}
private void HY_ClampCylinder_Relax_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + HY_ClampCylinder_Relax.Text);
equipBean.CylinderMove(null, IO_Type.HY_ClampCylinder_Work, IO_Type.HY_ClampCylinder_Relax);
}
......
source/AssemblyLineClient/FrmLineIO.Designer.cs
......@@ -37,11 +37,11 @@
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.btnLineStop = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.HY_TopCylinder_Down = new System.Windows.Forms.Button();
this.btnDriveMotor_Run = new System.Windows.Forms.Button();
this.btnFrontStopDown = new System.Windows.Forms.Button();
this.btnStopDown = new System.Windows.Forms.Button();
this.btnTopDown = new System.Windows.Forms.Button();
this.HY_TopCylinder_Up = new System.Windows.Forms.Button();
this.lblTrayNum = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.chbTray = new System.Windows.Forms.CheckBox();
......@@ -307,11 +307,11 @@
// groupBox5
//
this.groupBox5.Controls.Add(this.btnLineStop);
this.groupBox5.Controls.Add(this.button2);
this.groupBox5.Controls.Add(this.HY_TopCylinder_Down);
this.groupBox5.Controls.Add(this.btnDriveMotor_Run);
this.groupBox5.Controls.Add(this.btnFrontStopDown);
this.groupBox5.Controls.Add(this.btnStopDown);
this.groupBox5.Controls.Add(this.btnTopDown);
this.groupBox5.Controls.Add(this.HY_TopCylinder_Up);
this.groupBox5.Location = new System.Drawing.Point(573, 134);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(475, 130);
......@@ -331,17 +331,17 @@
this.btnLineStop.UseVisualStyleBackColor = false;
this.btnLineStop.Click += new System.EventHandler(this.btnLineStop_Click);
//
// button2
// HY_TopCylinder_Down
//
this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button2.Location = new System.Drawing.Point(317, 69);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(140, 37);
this.button2.TabIndex = 277;
this.button2.Text = "T3-C1顶升下降 ↓ ";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
this.HY_TopCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.HY_TopCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.HY_TopCylinder_Down.Location = new System.Drawing.Point(317, 69);
this.HY_TopCylinder_Down.Name = "HY_TopCylinder_Down";
this.HY_TopCylinder_Down.Size = new System.Drawing.Size(140, 37);
this.HY_TopCylinder_Down.TabIndex = 277;
this.HY_TopCylinder_Down.Text = "T3-C1顶升下降 ↓ ";
this.HY_TopCylinder_Down.UseVisualStyleBackColor = true;
this.HY_TopCylinder_Down.Click += new System.EventHandler(this.HY_TopCylinder_Down_Click);
//
// btnDriveMotor_Run
//
......@@ -379,24 +379,24 @@
this.btnStopDown.UseVisualStyleBackColor = true;
this.btnStopDown.Click += new System.EventHandler(this.btn34Top_Click);
//
// btnTopDown
// HY_TopCylinder_Up
//
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(317, 22);
this.btnTopDown.Name = "btnTopDown";
this.btnTopDown.Size = new System.Drawing.Size(140, 37);
this.btnTopDown.TabIndex = 262;
this.btnTopDown.Text = "T3-C1顶升上升 ↑";
this.btnTopDown.UseVisualStyleBackColor = true;
this.btnTopDown.Click += new System.EventHandler(this.btnSWRun_Click);
this.HY_TopCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.HY_TopCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.HY_TopCylinder_Up.Location = new System.Drawing.Point(317, 22);
this.HY_TopCylinder_Up.Name = "HY_TopCylinder_Up";
this.HY_TopCylinder_Up.Size = new System.Drawing.Size(140, 37);
this.HY_TopCylinder_Up.TabIndex = 262;
this.HY_TopCylinder_Up.Text = "T3-C1顶升上升 ↑";
this.HY_TopCylinder_Up.UseVisualStyleBackColor = true;
this.HY_TopCylinder_Up.Click += new System.EventHandler(this.HY_TopCylinder_Up_Click);
//
// lblTrayNum
//
this.lblTrayNum.AutoSize = true;
this.lblTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblTrayNum.Location = new System.Drawing.Point(827, 478);
this.lblTrayNum.Location = new System.Drawing.Point(827, 481);
this.lblTrayNum.Name = "lblTrayNum";
this.lblTrayNum.Size = new System.Drawing.Size(68, 17);
this.lblTrayNum.TabIndex = 275;
......@@ -483,7 +483,7 @@
// chbSmall
//
this.chbSmall.AutoSize = true;
this.chbSmall.Location = new System.Drawing.Point(316, 58);
this.chbSmall.Location = new System.Drawing.Point(316, 60);
this.chbSmall.Name = "chbSmall";
this.chbSmall.Size = new System.Drawing.Size(63, 21);
this.chbSmall.TabIndex = 279;
......@@ -562,7 +562,7 @@
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(155, 60);
this.label7.Location = new System.Drawing.Point(155, 62);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(35, 17);
this.label7.TabIndex = 209;
......@@ -570,7 +570,7 @@
//
// txtTrayCode
//
this.txtTrayCode.Location = new System.Drawing.Point(195, 57);
this.txtTrayCode.Location = new System.Drawing.Point(195, 59);
this.txtTrayCode.Name = "txtTrayCode";
this.txtTrayCode.Size = new System.Drawing.Size(105, 23);
this.txtTrayCode.TabIndex = 208;
......@@ -587,7 +587,7 @@
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(4, 60);
this.label1.Location = new System.Drawing.Point(4, 62);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(59, 17);
this.label1.TabIndex = 206;
......@@ -596,7 +596,7 @@
// chbInStoNG
//
this.chbInStoNG.AutoSize = true;
this.chbInStoNG.Location = new System.Drawing.Point(398, 58);
this.chbInStoNG.Location = new System.Drawing.Point(398, 60);
this.chbInStoNG.Name = "chbInStoNG";
this.chbInStoNG.Size = new System.Drawing.Size(70, 21);
this.chbInStoNG.TabIndex = 205;
......@@ -611,7 +611,7 @@
"无",
"入库",
"出库"});
this.cmbTrayType.Location = new System.Drawing.Point(65, 56);
this.cmbTrayType.Location = new System.Drawing.Point(65, 58);
this.cmbTrayType.Name = "cmbTrayType";
this.cmbTrayType.Size = new System.Drawing.Size(78, 25);
this.cmbTrayType.TabIndex = 204;
......@@ -658,7 +658,7 @@
//
this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.Location = new System.Drawing.Point(577, 478);
this.lblMoveInfo.Location = new System.Drawing.Point(577, 481);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(29, 17);
this.lblMoveInfo.TabIndex = 276;
......@@ -711,7 +711,7 @@
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
private System.Windows.Forms.GroupBox groupBox5;
private System.Windows.Forms.Button btnTopDown;
private System.Windows.Forms.Button HY_TopCylinder_Up;
private System.Windows.Forms.Button btnDriveMotor_Run;
private System.Windows.Forms.Button btnStopDown;
private System.Windows.Forms.Panel panel1;
......@@ -719,7 +719,7 @@
private System.Windows.Forms.Label lblTrayNum;
private System.Windows.Forms.Button btnFrontStopDown;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button HY_TopCylinder_Down;
private System.Windows.Forms.Button btnLineStop;
private System.Windows.Forms.Label lblMoveInfo;
private System.Windows.Forms.GroupBox groupTray;
......
source/AssemblyLineClient/FrmLineIO.cs
......@@ -43,7 +43,7 @@ namespace OnlineStore.AssemblyLine
}
else
{
this.tableLayoutPanel3.RowCount =0 ;
this.tableLayoutPanel3.RowCount = 0;
}
foreach (ConfigIO ioValue in LineManager.Config.DIList.Values)
{
......@@ -70,7 +70,7 @@ namespace OnlineStore.AssemblyLine
roleindex = 0;
foreach (ConfigIO ioValue in LineManager.Config.DOList.Values)
{
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain,ioValue.ProName);
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
control.Click += Control_Click;
if (roleindex >= count)
{
......@@ -106,17 +106,34 @@ namespace OnlineStore.AssemblyLine
private void timer1_Tick(object sender, EventArgs e)
{
if ( this.Visible)
if (this.Visible)
{
ReadIOList();
lblMoveInfo.Text = LineManager.Line.GetMoveStr();
lblTrayNum.Text ="T3-C1托盘号："+ LineManager.Line.T3C1_TrayNum.ToString();
lblTrayNum.Text = "T3-C1托盘号：" + LineManager.Line.T3C1_TrayNum.ToString();
if (cmbTray.SelectedIndex >= 0)
{
int trayNum = cmbTray.SelectedIndex + 1;
TrayInfo tray = TrayManager.GetTrayInfo(trayNum);
lblSelTrayNum.Text = tray.ToStr();
}
if (LineManager.Line.IOValue(IO_Type.HY_TopCylinder_Up).Equals(IO_VALUE.HIGH))
{
HY_TopCylinder_Up.ForeColor = Color.LawnGreen;
}
else
{
HY_TopCylinder_Up.ForeColor = Color.White ;
}
if (LineManager.Line.IOValue(IO_Type.HY_TopCylinder_Down).Equals(IO_VALUE.HIGH))
{
HY_TopCylinder_Down.ForeColor = Color.LawnGreen;
}
else
{
HY_TopCylinder_Down.ForeColor = Color.White;
}
}
}
......@@ -133,7 +150,7 @@ namespace OnlineStore.AssemblyLine
catch (Exception ex)
{
MessageBox.Show(ex.StackTrace, "Exception(异常)", MessageBoxButtons.OK, MessageBoxIcon.Error);
LogUtil.error("",ex);
LogUtil.error("", ex);
}
}
......@@ -239,7 +256,7 @@ namespace OnlineStore.AssemblyLine
string code = txtTrayCode.Text.Trim();
if (hasTray)
{
InOutParam inoutP = new InOutParam(num, "CodeTest", posId, ph, pw, inNg,urg,cutReel, isSmall, "",loc);
InOutParam inoutP = new InOutParam(num, "CodeTest", posId, ph, pw, inNg, urg, cutReel, isSmall, "", loc);
TrayManager.UpdateTrayInfo(num, hasTray, trayType, inoutP, "InStoreNG ");
}
else
......@@ -253,7 +270,7 @@ namespace OnlineStore.AssemblyLine
TrayInfo info = TrayManager.GetTrayInfo(num);
MessageBox.Show("更新成功：\r" + info.ToStr());
LogUtil.info("手动更新托盘信息：" + info.ToStr());
LogUtil.info("界面点击手动更新托盘信息：" + info.ToStr());
}
}
......@@ -307,7 +324,7 @@ namespace OnlineStore.AssemblyLine
}
protected void BtnMove(Button btn, string defaultText, string targetText, string ioHighType)
{
LogUtil.info(LineManager.Line.Name+ "点击【" + btn.Text + "】 ");
LogUtil.info(LineManager.Line.Name + "点击【" + btn.Text + "】 ");
if (btn.Text.Equals(defaultText))
{
LineManager.Line.IOMove(ioHighType, IO_VALUE.HIGH);
......@@ -340,11 +357,13 @@ namespace OnlineStore.AssemblyLine
}
private void btnDriveMotor_Run_Click(object sender, EventArgs e)
{
LogUtil.info("界面点击：" + btnDriveMotor_Run.Text);
LineManager.Line.WriteDrivetMotorRun(IO_VALUE.HIGH);
}
private void btnSWRun_Click(object sender, EventArgs e)
private void HY_TopCylinder_Up_Click(object sender, EventArgs e)
{
LogUtil.info("界面点击：" + HY_TopCylinder_Up.Text);
LineManager.Line.CylinderMove(null, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
}
......@@ -356,22 +375,25 @@ namespace OnlineStore.AssemblyLine
private void btnSw4Location_Click(object sender, EventArgs e)
{
LogUtil.info("界面点击：" + btnFrontStopDown.Text);
BtnMove(btnFrontStopDown, "T3-C1前阻挡上升", "T3-C1前阻挡下降", IO_Type.HY_FrontStopDown);
}
private void btn34Top_Click(object sender, EventArgs e)
{
LogUtil.info("界面点击：" + btnStopDown.Text);
BtnMove(btnStopDown, "T3-C1前阻挡上升", "T3-C1前阻挡下降", IO_Type.HY_StopDown);
}
private void button2_Click(object sender, EventArgs e)
private void HY_TopCylinder_Down_Click(object sender, EventArgs e)
{
LogUtil.info("界面点击：" + HY_TopCylinder_Down.Text);
LineManager.Line.CylinderMove(null, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
}
private void btnLineStop_Click(object sender, EventArgs e)
{
LogUtil.info("界面点击：" + btnLineStop.Text);
LineManager.Line.WriteDrivetMotorRun(IO_VALUE.LOW);
}
......@@ -402,11 +424,11 @@ namespace OnlineStore.AssemblyLine
txtTrayPosid.Text = "";
cmbWidth.Text = "";
cmbHeight.Text = "";
rdbCutreel.Checked = false ;
rdbUrg.Checked = false ;
chbSmall.Checked = false ;
rdbCutreel.Checked = false;
rdbUrg.Checked = false;
chbSmall.Checked = false;
txtTrayLoc.Text = "";
chbInStoNG.Checked = false ;
chbInStoNG.Checked = false;
}
}
......
source/AssemblyLineClient/FrmLineStore.Designer.cs
......@@ -178,7 +178,7 @@
// chbRightDis
//
this.chbRightDis.AutoSize = true;
this.chbRightDis.Location = new System.Drawing.Point(176, 14);
this.chbRightDis.Location = new System.Drawing.Point(339, 14);
this.chbRightDis.Name = "chbRightDis";
this.chbRightDis.Size = new System.Drawing.Size(126, 24);
this.chbRightDis.TabIndex = 197;
......
source/AssemblyLineClient/FrmLineStore.cs
......@@ -179,7 +179,7 @@ namespace OnlineStore.AssemblyLine
private void FrmMain_FormClosing(object sender, FormClosingEventArgs e)
{
if (e.CloseReason == CloseReason.UserClosing)//当用户点击窗体右上角X按钮或(Alt + F4)时 发生
if (e.CloseReason == CloseReason.UserClosing)//当界面点击窗体右上角X按钮或(Alt + F4)时 发生
{
e.Cancel = true;
HideForm();
......@@ -1094,7 +1094,7 @@ namespace OnlineStore.AssemblyLine
return;
}
LineManager.DisLeftOutLine = chbLeftDis.Checked;
LogUtil.error("用户点击勾选：" + chbLeftDis.Text+"="+ LineManager.DisLeftOutLine);
LogUtil.error("界面点击勾选：" + chbLeftDis.Text+"="+ LineManager.DisLeftOutLine);
}
private void chbRightDis_CheckedChanged(object sender, EventArgs e)
......@@ -1108,7 +1108,7 @@ namespace OnlineStore.AssemblyLine
return;
}
LineManager.DisRightOutLine = chbRightDis.Checked;
LogUtil.error("用户点击勾选：" + chbRightDis.Text + "="+ LineManager.DisRightOutLine);
LogUtil.error("界面点击勾选：" + chbRightDis.Text + "="+ LineManager.DisRightOutLine);
}
}
}
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
......@@ -357,7 +357,7 @@
this.ClampCylinder_Work.BackColor = System.Drawing.Color.White;
this.ClampCylinder_Work.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.ClampCylinder_Work.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ClampCylinder_Work.Location = new System.Drawing.Point(262, 30);
this.ClampCylinder_Work.Location = new System.Drawing.Point(266, 30);
this.ClampCylinder_Work.Name = "ClampCylinder_Work";
this.ClampCylinder_Work.Size = new System.Drawing.Size(120, 34);
this.ClampCylinder_Work.TabIndex = 262;
......@@ -370,7 +370,7 @@
this.BeforeAfterCylinder_After.BackColor = System.Drawing.Color.White;
this.BeforeAfterCylinder_After.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.BeforeAfterCylinder_After.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.BeforeAfterCylinder_After.Location = new System.Drawing.Point(394, 70);
this.BeforeAfterCylinder_After.Location = new System.Drawing.Point(395, 70);
this.BeforeAfterCylinder_After.Name = "BeforeAfterCylinder_After";
this.BeforeAfterCylinder_After.Size = new System.Drawing.Size(120, 34);
this.BeforeAfterCylinder_After.TabIndex = 261;
......@@ -396,7 +396,7 @@
this.TopCylinder_Down.BackColor = System.Drawing.Color.White;
this.TopCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.TopCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.TopCylinder_Down.Location = new System.Drawing.Point(136, 70);
this.TopCylinder_Down.Location = new System.Drawing.Point(137, 70);
this.TopCylinder_Down.Name = "TopCylinder_Down";
this.TopCylinder_Down.Size = new System.Drawing.Size(120, 34);
this.TopCylinder_Down.TabIndex = 259;
......@@ -435,7 +435,7 @@
this.ClampCylinder_Relax.BackColor = System.Drawing.Color.White;
this.ClampCylinder_Relax.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.ClampCylinder_Relax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ClampCylinder_Relax.Location = new System.Drawing.Point(262, 70);
this.ClampCylinder_Relax.Location = new System.Drawing.Point(266, 70);
this.ClampCylinder_Relax.Name = "ClampCylinder_Relax";
this.ClampCylinder_Relax.Size = new System.Drawing.Size(120, 34);
this.ClampCylinder_Relax.TabIndex = 255;
......@@ -448,7 +448,7 @@
this.BeforeAfterCylinder_Before.BackColor = System.Drawing.Color.White;
this.BeforeAfterCylinder_Before.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.BeforeAfterCylinder_Before.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.BeforeAfterCylinder_Before.Location = new System.Drawing.Point(394, 30);
this.BeforeAfterCylinder_Before.Location = new System.Drawing.Point(395, 30);
this.BeforeAfterCylinder_Before.Name = "BeforeAfterCylinder_Before";
this.BeforeAfterCylinder_Before.Size = new System.Drawing.Size(120, 34);
this.BeforeAfterCylinder_Before.TabIndex = 249;
......@@ -461,7 +461,7 @@
this.TopCylinder_Up.BackColor = System.Drawing.Color.White;
this.TopCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.TopCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.TopCylinder_Up.Location = new System.Drawing.Point(135, 30);
this.TopCylinder_Up.Location = new System.Drawing.Point(137, 30);
this.TopCylinder_Up.Name = "TopCylinder_Up";
this.TopCylinder_Up.Size = new System.Drawing.Size(120, 34);
this.TopCylinder_Up.TabIndex = 246;
......
source/AssemblyLineClient/FrmMoveEquip.cs
......@@ -582,10 +582,12 @@ namespace OnlineStore.AssemblyLine
private void TopCylinder_Down_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + TopCylinder_Down.Text);
equipBean.CylinderMove(null, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down);
}
private void btnTopUp_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + TopCylinder_Up.Text);
equipBean.CylinderMove(null, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_Up);
}
......@@ -593,6 +595,7 @@ namespace OnlineStore.AssemblyLine
{
if (equipBean.CanBeforeAfter())
{
LogUtil.info(equipBase.Name + "界面点击：" + BeforeAfterCylinder_Before.Text);
equipBase.CylinderMove(null, IO_Type.BeforeAfterCylinder_After, IO_Type.BeforeAfterCylinder_Before);
}
else
......@@ -603,12 +606,14 @@ namespace OnlineStore.AssemblyLine
}
private void btnUpDownUp_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + UpDownCylinder_Up.Text);
equipBase.CylinderMove(null, IO_Type.UpDownCylinder_Down, IO_Type.UpDownCylinder_Up);
}
private void button4_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + UpDownCylinder_Down.Text);
equipBase.CylinderMove(null, IO_Type.UpDownCylinder_Up, IO_Type.UpDownCylinder_Down);
}
......@@ -616,6 +621,7 @@ namespace OnlineStore.AssemblyLine
{
if (equipBean.CanBeforeAfter())
{
LogUtil.info(equipBase.Name + "界面点击：" + BeforeAfterCylinder_After.Text);
equipBase.CylinderMove(null, IO_Type.BeforeAfterCylinder_Before, IO_Type.BeforeAfterCylinder_After);
}
else
......@@ -627,10 +633,12 @@ namespace OnlineStore.AssemblyLine
private void ClampCylinder_Check_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + ClampCylinder_Relax.Text);
equipBase.CylinderMove(null, IO_Type.ClampCylinder_Work, IO_Type.ClampCylinder_Relax);
}
private void btnClampSlack_Click(object sender, EventArgs e)
{
LogUtil.info(equipBase.Name + "界面点击：" + ClampCylinder_Work.Text);
equipBase.CylinderMove(null, IO_Type.ClampCylinder_Relax, IO_Type.ClampCylinder_Work);
}
......
source/AssemblyLineClient/useControl/AxisMoveControl.cs
......@@ -64,13 +64,13 @@ namespace OnlineStore.AssemblyLine
}
private void btnOpenAxis_Click(object sender, EventArgs e)
{
LogUtil.info("点击【打开伺服】，【" + PortName + "_" + SlvAddr + "】 ");
LogUtil.info(equipBase.Name+ "界面点击【打开伺服】，【" + PortName + "_" + SlvAddr + "】 ");
equipBase.RunAxis(false, axisList[cmbAxis.SelectedIndex]);
}
private void btnCloseAxis_Click(object sender, EventArgs e)
{
LogUtil.info("点击【关闭伺服】，【" + PortName + "_" + SlvAddr + "】 ");
LogUtil.info(equipBase.Name + "界面点击【关闭伺服】，【" + PortName + "_" + SlvAddr + "】 ");
// AxisManager.instance.ServoOff(PortName, SlvAddr);
equipBase.CloseAxis(axisList[cmbAxis.SelectedIndex]);
}
......@@ -79,7 +79,7 @@ namespace OnlineStore.AssemblyLine
{
int position = FormUtil.GetIntValue(txtAPosition);
int speed = FormUtil.GetIntValue(txtASpeed);
LogUtil.info("点击【绝对运动】，【" + PortName + "_" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
LogUtil.info(equipBase.Name + "界面点击【绝对运动】，【" + PortName + "_" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
AxisManager.instance.AbsMove(PortName, SlvAddr, position, speed, currSelAxis.AddSpeed, currSelAxis.DelSpeed);
}
......@@ -87,20 +87,20 @@ namespace OnlineStore.AssemblyLine
{
int position = FormUtil.GetIntValue(txtAPosition);
int speed = FormUtil.GetIntValue(txtASpeed);
LogUtil.info("点击【相对运动】，【" + PortName + "_" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
LogUtil.info(equipBase.Name + "界面点击【相对运动】，【" + PortName + "_" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
AxisManager.instance.RelMove(PortName, SlvAddr, position, speed, currSelAxis.AddSpeed, currSelAxis.DelSpeed);
}
private void btnAxisVMove_Click(object sender, EventArgs e)
{
int speed = FormUtil.GetIntValue(txtASpeed);
LogUtil.info("点击【匀速运动】，【" + PortName + "_" + SlvAddr + "】 速度【" + speed + "】");
LogUtil.info(equipBase.Name + "界面点击【匀速运动】，【" + PortName + "_" + SlvAddr + "】 速度【" + speed + "】");
AxisManager.instance.SpeedMove(PortName, SlvAddr, speed);
}
private void btnAxisStop_Click(object sender, EventArgs e)
{
LogUtil.info("点击【停止运动】，【" + PortName + "_" + SlvAddr + "】 ");
LogUtil.info(equipBase.Name + "界面点击【停止运动】，【" + PortName + "_" + SlvAddr + "】 ");
AxisManager.instance.SuddenStop(PortName, SlvAddr);
if (btnAddMove.BackColor == Color.Green)
{
......@@ -116,7 +116,7 @@ namespace OnlineStore.AssemblyLine
private void btnComAlarmClear_Click(object sender, EventArgs e)
{
LogUtil.info("点击【清理报警】，【" + PortName + "_" + SlvAddr + "】 ");
LogUtil.info(equipBase.Name + "界面点击【清理报警】，【" + PortName + "_" + SlvAddr + "】 ");
AxisManager.instance.AlarmClear(PortName, SlvAddr);
Thread.Sleep(100);
AxisManager.instance.ServoOn(PortName, SlvAddr);
......@@ -127,7 +127,7 @@ namespace OnlineStore.AssemblyLine
if (currSelAxis != null)
{
int speed = FormUtil.GetIntValue(txtASpeed);
LogUtil.info("点击【原点返回】，【" + PortName + "_" + SlvAddr + "】 速度【" + speed + "】");
LogUtil.info(equipBase.Name + "界面点击【原点返回】，【" + PortName + "_" + SlvAddr + "】 速度【" + speed + "】");
AxisManager.instance.HomeMove(PortName, SlvAddr, speed,currSelAxis.HomeLowSpeed,currSelAxis.HomeAddSpeed);
}
}
......@@ -200,7 +200,7 @@ namespace OnlineStore.AssemblyLine
}
private void AxisMove( int speed)
{
LogUtil.info("【" + PortName + "_" + SlvAddr + "】点动： 速度：" + speed);
LogUtil.info(equipBase.Name+"界面点击【" + PortName + "_" + SlvAddr + "】点动： 速度：" + speed);
AxisManager.instance.SpeedMove(PortName, SlvAddr, speed);
}
private void btnAddMove_MouseDown(object sender, MouseEventArgs e)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!