Skip to content

李娜 / Line-Smart-Workstation

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

增加开始工作演示按钮

1 个父辈 cbdfae5b
内嵌 并排
正在显示 7 个修改的文件 包含 76 行增加 和 74 行删除
DeviceLibrary/manager/TSAVBean.cs
...@@ -42,13 +42,7 @@ namespace TSA_V.DeviceLibrary ...@@ -42,13 +42,7 @@ namespace TSA_V.DeviceLibrary
/// </summary> /// </summary>
public static int WorkMode = ConfigAppSettings.GetIntValue(Setting_Init.WorkMode); public static int WorkMode = ConfigAppSettings.GetIntValue(Setting_Init.WorkMode);
public static int AuToModeSeconds = ConfigAppSettings.GetIntValue(Setting_Init.AuToModeSeconds); public static int AuToModeSeconds = ConfigAppSettings.GetIntValue(Setting_Init.AuToModeSeconds);
/// <summary>
/// 是否已经可以争正常运行，设备初始化完成
/// </summary>
public static bool ISRun = false;
/// <summary>
/// 是否在重置中
/// </summary>
public static TSAVStatus Status = TSAVStatus.Wait; public static TSAVStatus Status = TSAVStatus.Wait;
public static ResetStep resetStep = ResetStep.OpenCan_0; public static ResetStep resetStep = ResetStep.OpenCan_0;
public static DateTime LastResetChangeTime = DateTime.Now; public static DateTime LastResetChangeTime = DateTime.Now;
...@@ -64,6 +58,7 @@ namespace TSA_V.DeviceLibrary ...@@ -64,6 +58,7 @@ namespace TSA_V.DeviceLibrary
/// </summary> /// </summary>
public static void ExitWork() public static void ExitWork()
{ {
WorkInfo.IsCycleDebug = false;
Work.WorkType = 0; Work.WorkType = 0;
IOManager.IOMove(IOManager.SMEMA_Down, IO_VALUE.LOW); IOManager.IOMove(IOManager.SMEMA_Down, IO_VALUE.LOW);
IOManager.IOMove(IOManager.SMEMA_Up, IO_VALUE.LOW); IOManager.IOMove(IOManager.SMEMA_Up, IO_VALUE.LOW);
...@@ -346,18 +341,7 @@ namespace TSA_V.DeviceLibrary ...@@ -346,18 +341,7 @@ namespace TSA_V.DeviceLibrary
LogUtil.error(Name + WarnMsg); LogUtil.error(Name + WarnMsg);
} }
} }
//private static void PuHomeMove(uint node,int targetDefaultPosition,int movetype=0)
//{
// PUSICANControl.RHomeMoveEnd(node);
// Thread.Sleep(10);
// //设置为位置模式
// PUSICANControl.WriteSDO(node, CAN_Address.MoveType, movetype);
// Thread.Sleep(100);
// PUSICANControl.SetSpeed(node);
// Thread.Sleep(10);
// //所有轴走到待机点
// PUSICANControl.AbsMove(node, targetDefaultPosition);
//}
public static void StartWork(BoardInfo boardInfo) public static void StartWork(BoardInfo boardInfo)
{ {
Work.StartWork(boardInfo); Work.StartWork(boardInfo);
......
DeviceLibrary/manager/WorkInfo.cs
...@@ -13,6 +13,7 @@ namespace TSA_V.DeviceLibrary ...@@ -13,6 +13,7 @@ namespace TSA_V.DeviceLibrary
{ {
public class WorkInfo public class WorkInfo
{ {
public static bool IsCycleDebug = false;
public static int LastDBId = 0; public static int LastDBId = 0;
...@@ -85,6 +86,7 @@ namespace TSA_V.DeviceLibrary ...@@ -85,6 +86,7 @@ namespace TSA_V.DeviceLibrary
{ {
if (IsWorking) if (IsWorking)
{ {
EndWait();
if (currIndex > 0 && currBoard != null) if (currIndex > 0 && currBoard != null)
{ {
//如果是下一个并且当前是最后一个，其实是切换了新程序,需要减去刚刚的数量 //如果是下一个并且当前是最后一个，其实是切换了新程序,需要减去刚刚的数量
...@@ -96,13 +98,12 @@ namespace TSA_V.DeviceLibrary ...@@ -96,13 +98,12 @@ namespace TSA_V.DeviceLibrary
MesUtil.SendStatus(deviceStatus); MesUtil.SendStatus(deviceStatus);
} }
deviceStatus.workInfo.ID = LastDBId; deviceStatus.workInfo.ID = LastDBId;
DB.db.AddHistory(deviceStatus.workInfo, out int id); //DB.db.AddHistory(deviceStatus.workInfo, out int id);
if (LastDBId < 0) //if (LastDBId < 0)
{ //{
LastDBId = id; // LastDBId = id;
LogUtil.info("保存LastDBId=" + LastDBId); // LogUtil.info("保存LastDBId=" + LastDBId);
} //}
EndWait();
if (currBoard != null) if (currBoard != null)
{ {
LogUtil.info("停止程序【" + currBoard.boardName + "】工作"); LogUtil.info("停止程序【" + currBoard.boardName + "】工作");
...@@ -112,6 +113,7 @@ namespace TSA_V.DeviceLibrary ...@@ -112,6 +113,7 @@ namespace TSA_V.DeviceLibrary
{ {
//上一个节点返回原点 //上一个节点返回原点
PUSICANControl.AbsMove(PreNodeId, TSAVBean.RotateNode_DefaultPosition); PUSICANControl.AbsMove(PreNodeId, TSAVBean.RotateNode_DefaultPosition);
Thread.Sleep(10);
} }
Thread.Sleep(100); Thread.Sleep(100);
endWorkTime = DateTime.Now; endWorkTime = DateTime.Now;
...@@ -148,17 +150,22 @@ namespace TSA_V.DeviceLibrary ...@@ -148,17 +150,22 @@ namespace TSA_V.DeviceLibrary
{ {
currIndex--; currIndex--;
} }
if (currIndex > GetSmtList().Count) if (currIndex > GetSmtList().Count)
//if (currIndex >= currBoard.smtList.Count)
{ {
if (isReset) if (isReset)
{ {
//currIndex = 0; if (IsCycleDebug)
//IsShowSoldering = false; {
LogUtil.info("程序【" + currBoard.boardName + "】已到达最后一个焊点，停止工作"); LogUtil.info("程序【" + currBoard.boardName + "】已到达最后一个焊点，重新开始工作");
//StatusClient.instance.SendNew(Color.Green, " 程序【" + currBoard.boardName + "】组装完成"); StartWork(BoardManager.CurrBoard);
StopWork(); return true;
return true ; }
else
{
LogUtil.info("程序【" + currBoard.boardName + "】已到达最后一个焊点，停止工作");
StopWork();
return true;
}
} }
else else
{ {
......
TSA-V/FrmLogin.Designer.cs
...@@ -58,6 +58,7 @@ namespace TSA_V ...@@ -58,6 +58,7 @@ namespace TSA_V
this.TxtUsername.Name = "TxtUsername"; this.TxtUsername.Name = "TxtUsername";
this.TxtUsername.Size = new System.Drawing.Size(179, 33); this.TxtUsername.Size = new System.Drawing.Size(179, 33);
this.TxtUsername.TabIndex = 1; this.TxtUsername.TabIndex = 1;
this.TxtUsername.Text = "admin";
// //
// label2 // label2
// //
...@@ -78,6 +79,7 @@ namespace TSA_V ...@@ -78,6 +79,7 @@ namespace TSA_V
this.TxtPassword.PasswordChar = '*'; this.TxtPassword.PasswordChar = '*';
this.TxtPassword.Size = new System.Drawing.Size(179, 33); this.TxtPassword.Size = new System.Drawing.Size(179, 33);
this.TxtPassword.TabIndex = 3; this.TxtPassword.TabIndex = 3;
this.TxtPassword.Text = "12345";
// //
// BtnLogin // BtnLogin
// //
......
TSA-V/FrmMenu.Designer.cs
...@@ -208,7 +208,7 @@ namespace TSA_V ...@@ -208,7 +208,7 @@ namespace TSA_V
this.button1.Name = "button1"; this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(235, 30); this.button1.Size = new System.Drawing.Size(235, 30);
this.button1.TabIndex = 13; this.button1.TabIndex = 13;
this.button1.Text = "Neo Station"; this.button1.Text = "Smart Workstation";
this.button1.UseVisualStyleBackColor = true; this.button1.UseVisualStyleBackColor = true;
// //
// btnMaintenance // btnMaintenance
......
TSA-V/Properties/Resource.en-US.resx
...@@ -2030,7 +2030,7 @@ ...@@ -2030,7 +2030,7 @@
<value>Please enter the correct password</value> <value>Please enter the correct password</value>
</data> </data>
<data name="FrmMaintenance_btnPwdUpdate_Text" xml:space="preserve"> <data name="FrmMaintenance_btnPwdUpdate_Text" xml:space="preserve">
<value>password modification</value> <value>PASSWORD MODIFICATION</value>
</data> </data>
<data name="FrmUpdatePwd_btnBack_Text" xml:space="preserve"> <data name="FrmUpdatePwd_btnBack_Text" xml:space="preserve">
<value>back</value> <value>back</value>
...@@ -2045,7 +2045,7 @@ ...@@ -2045,7 +2045,7 @@
<value>new password：</value> <value>new password：</value>
</data> </data>
<data name="FrmUpdatePwd_Text" xml:space="preserve"> <data name="FrmUpdatePwd_Text" xml:space="preserve">
<value>password modification</value> <value>PASSWORD MODIFICATION</value>
</data> </data>
<data name="修改密码成功" xml:space="preserve"> <data name="修改密码成功" xml:space="preserve">
<value>Password changed successfully</value> <value>Password changed successfully</value>
...@@ -2120,7 +2120,7 @@ ...@@ -2120,7 +2120,7 @@
<value>Save parameters</value> <value>Save parameters</value>
</data> </data>
<data name="FrmChangeWidth_groupBox1_Text" xml:space="preserve"> <data name="FrmChangeWidth_groupBox1_Text" xml:space="preserve">
<value>Track the wide</value> <value>track the wide</value>
</data> </data>
<data name="FrmChangeWidth_groupBox2_Text" xml:space="preserve"> <data name="FrmChangeWidth_groupBox2_Text" xml:space="preserve">
<value>configuration</value> <value>configuration</value>
...@@ -2153,7 +2153,7 @@ ...@@ -2153,7 +2153,7 @@
<value>Track the wide</value> <value>Track the wide</value>
</data> </data>
<data name="FrmMaintenance_btnWidthC_Text" xml:space="preserve"> <data name="FrmMaintenance_btnWidthC_Text" xml:space="preserve">
<value>Track the wide</value> <value>TRACK THE WIDE</value>
</data> </data>
<data name="FrmBoardSelect_chbGuoban_Text" xml:space="preserve"> <data name="FrmBoardSelect_chbGuoban_Text" xml:space="preserve">
<value>Pipeline overedition mode</value> <value>Pipeline overedition mode</value>
......
TSA-V/workForm/FrmTSAV.Designer.cs
...@@ -467,14 +467,16 @@ ...@@ -467,14 +467,16 @@
// //
// btnStartWorking // btnStartWorking
// //
this.btnStartWorking.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnStartWorking.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnStartWorking.Location = new System.Drawing.Point(1236, 515); this.btnStartWorking.BackColor = System.Drawing.SystemColors.Control;
this.btnStartWorking.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStartWorking.Font = new System.Drawing.Font("微软雅黑", 10.5F);
this.btnStartWorking.Location = new System.Drawing.Point(721, 487);
this.btnStartWorking.Name = "btnStartWorking"; this.btnStartWorking.Name = "btnStartWorking";
this.btnStartWorking.Size = new System.Drawing.Size(48, 38); this.btnStartWorking.Size = new System.Drawing.Size(120, 60);
this.btnStartWorking.TabIndex = 263; this.btnStartWorking.TabIndex = 263;
this.btnStartWorking.Text = "开始工作"; this.btnStartWorking.Text = "开始工作";
this.btnStartWorking.UseVisualStyleBackColor = true; this.btnStartWorking.UseVisualStyleBackColor = false;
this.btnStartWorking.Visible = false;
this.btnStartWorking.Click += new System.EventHandler(this.btnStartWorking_Click); this.btnStartWorking.Click += new System.EventHandler(this.btnStartWorking_Click);
// //
// btnGoHome // btnGoHome
...@@ -483,7 +485,7 @@ ...@@ -483,7 +485,7 @@
this.btnGoHome.BackColor = System.Drawing.SystemColors.Control; this.btnGoHome.BackColor = System.Drawing.SystemColors.Control;
this.btnGoHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnGoHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnGoHome.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnGoHome.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnGoHome.Location = new System.Drawing.Point(721, 487); this.btnGoHome.Location = new System.Drawing.Point(599, 487);
this.btnGoHome.Name = "btnGoHome"; this.btnGoHome.Name = "btnGoHome";
this.btnGoHome.Size = new System.Drawing.Size(120, 60); this.btnGoHome.Size = new System.Drawing.Size(120, 60);
this.btnGoHome.TabIndex = 273; this.btnGoHome.TabIndex = 273;
......
TSA-V/workForm/FrmTSAV.cs
...@@ -180,12 +180,7 @@ namespace TSA_V ...@@ -180,12 +180,7 @@ namespace TSA_V
lblMsg.Text = ResourceCulture.GetString(ResourceCulture.StartError, "启动失败") + "：" + str; lblMsg.Text = ResourceCulture.GetString(ResourceCulture.StartError, "启动失败") + "：" + str;
LogUtil.error("启动失败：" + str); LogUtil.error("启动失败：" + str);
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.StartError, "启动失败：") + str); MessageBox.Show(ResourceCulture.GetString(ResourceCulture.StartError, "启动失败：") + str);
} }
else
{
btnStart.Enabled = false;
btnStart.Enabled = true;
}
} }
timer.Start(); timer.Start();
} }
...@@ -237,11 +232,12 @@ namespace TSA_V ...@@ -237,11 +232,12 @@ namespace TSA_V
btnNextPoint_Click(null, null); btnNextPoint_Click(null, null);
} }
} }
FormStatus();
if (TSAVBean.IsInSuddenDown) if (TSAVBean.IsInSuddenDown)
{ {
lblMsg.Text = ResourceCulture.GetString(ResourceCulture.DeviceInSuddenStop, "设备急停中"); lblMsg.Text = ResourceCulture.GetString(ResourceCulture.DeviceInSuddenStop, "设备急停中");
btnStart.Enabled = true; //btnStart.Enabled = true;
btnGoHome.Enabled = false; //btnGoHome.Enabled = false;
btnStartWorking.Enabled = false; btnStartWorking.Enabled = false;
if (TSAVBean.IsDebug.Equals(false)) if (TSAVBean.IsDebug.Equals(false))
{ {
...@@ -255,8 +251,8 @@ namespace TSA_V ...@@ -255,8 +251,8 @@ namespace TSA_V
if (!lblMsg.Text.Equals(msg)) if (!lblMsg.Text.Equals(msg))
{ {
lblMsg.Text = msg; lblMsg.Text = msg;
btnStart.Enabled = true; //btnStart.Enabled = true;
btnGoHome.Enabled = false; //btnGoHome.Enabled = false;
btnStartWorking.Enabled = false; btnStartWorking.Enabled = false;
if (TSAVBean.IsDebug.Equals(false)) if (TSAVBean.IsDebug.Equals(false))
{ {
...@@ -271,8 +267,8 @@ namespace TSA_V ...@@ -271,8 +267,8 @@ namespace TSA_V
if (!lblMsg.Text.Equals(msg)) if (!lblMsg.Text.Equals(msg))
{ {
lblMsg.Text = msg + "\r\n" + TSAVBean.WarnMsg; lblMsg.Text = msg + "\r\n" + TSAVBean.WarnMsg;
btnStart.Enabled = false; //btnStart.Enabled = false;
btnGoHome.Enabled = true; //btnGoHome.Enabled = true;
btnStartWorking.Enabled = false; btnStartWorking.Enabled = false;
if (TSAVBean.IsDebug.Equals(false)) if (TSAVBean.IsDebug.Equals(false))
{ {
...@@ -308,8 +304,8 @@ namespace TSA_V ...@@ -308,8 +304,8 @@ namespace TSA_V
{ {
lblMsg.Text = msg + "\r\n" + TSAVBean.WarnMsg; lblMsg.Text = msg + "\r\n" + TSAVBean.WarnMsg;
} }
btnStart.Enabled = false; //btnStart.Enabled = false;
btnGoHome.Enabled = true; //btnGoHome.Enabled = true;
btnStartWorking.Enabled = true; btnStartWorking.Enabled = true;
btnNextPoint.Enabled = true; btnNextPoint.Enabled = true;
btnPrePoint.Enabled = true; btnPrePoint.Enabled = true;
...@@ -365,12 +361,12 @@ namespace TSA_V ...@@ -365,12 +361,12 @@ namespace TSA_V
private void btnStartWorking_Click(object sender, EventArgs e) private void btnStartWorking_Click(object sender, EventArgs e)
{ {
//btnStartWorking.Enabled = false; LogUtil.info(Name + "点击：" + btnStartWorking.Text + "，自动启动循环测试模式");
//BoardManager.CurrBoard = (BoardInfo)this.cmbBoardList.SelectedItem; btnStartWorking.Enabled = false;
//开始工作 //开始工作
//TSAVBean.StartWork(BoardManager.CurrBoard); TSAVBean.StartWork(BoardManager.CurrBoard);
//prepareWeld = true; WorkInfo.IsCycleDebug = true;
//btnStartWorking.Enabled = true; btnStartWorking.Enabled = true;
} }
private void FrmWelding_FormClosing(object sender, FormClosingEventArgs e) private void FrmWelding_FormClosing(object sender, FormClosingEventArgs e)
...@@ -385,23 +381,32 @@ namespace TSA_V ...@@ -385,23 +381,32 @@ namespace TSA_V
{ {
TSAVBean.StopWork(); TSAVBean.StopWork();
} }
TSAVBean.ExitWork(); TSAVBean.ExitWork();
// StatusClient.instance.Close();
//TSAVBean.StopRun();
} }
private void FormStatus()
private void btnStart_Click(object sender, EventArgs e)
{ {
StartRun(); btnSave.Enabled = true;
if (TSAVBean.ISRun) btnGoHome.Enabled = true;
if (TSAVBean.Status <=(TSAVStatus.Wait))
{ {
btnStart.Enabled = true; btnStart.Visible = true;
btnGoHome.Visible = false;
} }
else
{
btnStart.Visible = false;
btnGoHome.Visible = true;
}
}
private void btnStart_Click(object sender, EventArgs e)
{
StartRun();
FormStatus();
} }
private void btnGoHome_Click(object sender, EventArgs e) private void btnGoHome_Click(object sender, EventArgs e)
{ {
btnGoHome.Enabled = false; //btnGoHome.Enabled = false;
if (TSAVBean.LineStep.moveType.Equals(1)) if (TSAVBean.LineStep.moveType.Equals(1))
{ {
...@@ -417,7 +422,9 @@ namespace TSA_V ...@@ -417,7 +422,9 @@ namespace TSA_V
TSAVBean.StopMove(); TSAVBean.StopMove();
TSAVBean.StartReset(); TSAVBean.StartReset();
} }
btnGoHome.Enabled = true; //btnGoHome.Enabled = true;
FormStatus();
} }
private void btnBack_Click(object sender, EventArgs e) private void btnBack_Click(object sender, EventArgs e)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!