Skip to content

李娜 / Line-Smart-Workstation

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

增加数据查询，登录界面修改

1 个父辈 04dce19f
内嵌 并排
正在显示 14 个修改的文件 包含 210 行增加 和 44 行删除
DeviceLibrary/manager/WorkInfo.cs
...@@ -14,6 +14,8 @@ namespace TSA_V.DeviceLibrary ...@@ -14,6 +14,8 @@ namespace TSA_V.DeviceLibrary
public class WorkInfo public class WorkInfo
{ {
public static int LastDBId = 0;
/// <summary> /// <summary>
/// 是否在工作中，在插件中，会接受信号移动位置 /// 是否在工作中，在插件中，会接受信号移动位置
/// </summary> /// </summary>
...@@ -88,12 +90,17 @@ namespace TSA_V.DeviceLibrary ...@@ -88,12 +90,17 @@ namespace TSA_V.DeviceLibrary
//如果是下一个并且当前是最后一个，其实是切换了新程序,需要减去刚刚的数量 //如果是下一个并且当前是最后一个，其实是切换了新程序,需要减去刚刚的数量
CSVReaderBomManager.DelUseCount(currBoard, currIndex); CSVReaderBomManager.DelUseCount(currBoard, currIndex);
} }
DeviceStatus deviceStatus = MesUtil.GetCurrStatus();
if (MesUtil.CodeISOk) if (MesUtil.CodeISOk)
{ {
DeviceStatus deviceStatus = MesUtil.GetCurrStatus();
MesUtil.SendStatus(deviceStatus); MesUtil.SendStatus(deviceStatus);
}
deviceStatus.workInfo.ID = LastDBId;
DB.db.AddHistory(deviceStatus.workInfo, out int id); DB.db.AddHistory(deviceStatus.workInfo, out int id);
if (LastDBId < 0)
{
LastDBId = id;
LogUtil.info("保存LastDBId=" + LastDBId);
} }
EndWait(); EndWait();
if (currBoard != null) if (currBoard != null)
......
DeviceLibrary/mes/MesUtil.cs
...@@ -121,6 +121,53 @@ namespace TSA_V.DeviceLibrary ...@@ -121,6 +121,53 @@ namespace TSA_V.DeviceLibrary
#region 数据获取和保存 #region 数据获取和保存
public static OpInfo GetWorkInfo()
{
OpInfo op = new OpInfo();
if (TSAVBean.Work.IsWorking)
{
BoardInfo board = TSAVBean.Work.currBoard;
op.ProName = board.boardName;
op.ProType = board.boardCode;
if (CodeISOk)
{
op.BarCode = CurrPCBCode;
op.AoiResult = CurrAOIResult;
}
op.BoardWidth = board.boardWidth;
op.BoardLength = board.boardLength;
op.pointList = new List<OpPointInfo>();
int index = 0;
foreach (SMTPointInfo sm in board.smtList)
{
if (index > TSAVBean.Work.currIndex)
{
break;
}
op.pointList.Add(new OpPointInfo(sm.PartNum, sm.pointName));
index++;
}
}
else if (TSAVBean.LineStep.moveType.Equals(1))
{
BoardInfo board = TSAVBean.Work.currBoard;
op.ProName = board.boardName;
op.ProType = board.boardCode;
if (CodeISOk)
{
op.BarCode = CurrPCBCode;
op.AoiResult = CurrAOIResult;
}
op.BoardWidth = board.boardWidth;
op.BoardLength = board.boardLength;
op.pointList = new List<OpPointInfo>();
}
return op;
}
public static DeviceStatus GetCurrStatus() public static DeviceStatus GetCurrStatus()
{ {
DeviceStatus deviceStatus = new DeviceStatus(); DeviceStatus deviceStatus = new DeviceStatus();
......
TSA-V/FrmLogin.Designer.cs
...@@ -36,53 +36,56 @@ namespace TSA_V ...@@ -36,53 +36,56 @@ namespace TSA_V
this.TxtPassword = new System.Windows.Forms.TextBox(); this.TxtPassword = new System.Windows.Forms.TextBox();
this.BtnLogin = new System.Windows.Forms.Button(); this.BtnLogin = new System.Windows.Forms.Button();
this.BtnExit = new System.Windows.Forms.Button(); this.BtnExit = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.SuspendLayout(); this.SuspendLayout();
// //
// label1 // label1
// //
this.label1.AutoSize = true; this.label1.BackColor = System.Drawing.Color.Transparent;
this.label1.Font = new System.Drawing.Font("微软雅黑", 12F); this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
this.label1.Location = new System.Drawing.Point(82, 40); this.label1.Location = new System.Drawing.Point(108, 94);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(42, 21); this.label1.Size = new System.Drawing.Size(95, 21);
this.label1.TabIndex = 0; this.label1.TabIndex = 0;
this.label1.Text = "账号"; this.label1.Text = "账号";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// TxtUsername // TxtUsername
// //
this.TxtUsername.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.TxtUsername.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.TxtUsername.ImeMode = System.Windows.Forms.ImeMode.Disable; this.TxtUsername.ImeMode = System.Windows.Forms.ImeMode.Disable;
this.TxtUsername.Location = new System.Drawing.Point(130, 37); this.TxtUsername.Location = new System.Drawing.Point(209, 91);
this.TxtUsername.Name = "TxtUsername"; this.TxtUsername.Name = "TxtUsername";
this.TxtUsername.Size = new System.Drawing.Size(179, 29); this.TxtUsername.Size = new System.Drawing.Size(179, 33);
this.TxtUsername.TabIndex = 1; this.TxtUsername.TabIndex = 1;
// //
// label2 // label2
// //
this.label2.AutoSize = true; this.label2.BackColor = System.Drawing.Color.Transparent;
this.label2.Font = new System.Drawing.Font("微软雅黑", 12F); this.label2.Font = new System.Drawing.Font("微软雅黑", 12F);
this.label2.Location = new System.Drawing.Point(82, 75); this.label2.Location = new System.Drawing.Point(108, 149);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(42, 21); this.label2.Size = new System.Drawing.Size(95, 21);
this.label2.TabIndex = 2; this.label2.TabIndex = 2;
this.label2.Text = "密码"; this.label2.Text = "密码";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// TxtPassword // TxtPassword
// //
this.TxtPassword.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.TxtPassword.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.TxtPassword.Location = new System.Drawing.Point(130, 72); this.TxtPassword.Location = new System.Drawing.Point(209, 146);
this.TxtPassword.Name = "TxtPassword"; this.TxtPassword.Name = "TxtPassword";
this.TxtPassword.PasswordChar = '*'; this.TxtPassword.PasswordChar = '*';
this.TxtPassword.Size = new System.Drawing.Size(179, 29); this.TxtPassword.Size = new System.Drawing.Size(179, 33);
this.TxtPassword.TabIndex = 3; this.TxtPassword.TabIndex = 3;
// //
// BtnLogin // BtnLogin
// //
this.BtnLogin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.BtnLogin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.BtnLogin.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.BtnLogin.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.BtnLogin.Location = new System.Drawing.Point(173, 142); this.BtnLogin.Location = new System.Drawing.Point(146, 217);
this.BtnLogin.Name = "BtnLogin"; this.BtnLogin.Name = "BtnLogin";
this.BtnLogin.Size = new System.Drawing.Size(100, 38); this.BtnLogin.Size = new System.Drawing.Size(120, 45);
this.BtnLogin.TabIndex = 4; this.BtnLogin.TabIndex = 4;
this.BtnLogin.Text = "登录"; this.BtnLogin.Text = "登录";
this.BtnLogin.UseVisualStyleBackColor = true; this.BtnLogin.UseVisualStyleBackColor = true;
...@@ -90,36 +93,53 @@ namespace TSA_V ...@@ -90,36 +93,53 @@ namespace TSA_V
// //
// BtnExit // BtnExit
// //
this.BtnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.BtnExit.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.BtnExit.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.BtnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.BtnExit.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.BtnExit.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.BtnExit.Location = new System.Drawing.Point(279, 142); this.BtnExit.Location = new System.Drawing.Point(272, 217);
this.BtnExit.Name = "BtnExit"; this.BtnExit.Name = "BtnExit";
this.BtnExit.Size = new System.Drawing.Size(100, 38); this.BtnExit.Size = new System.Drawing.Size(120, 45);
this.BtnExit.TabIndex = 5; this.BtnExit.TabIndex = 5;
this.BtnExit.Text = "退出"; this.BtnExit.Text = "退出";
this.BtnExit.UseVisualStyleBackColor = true; this.BtnExit.UseVisualStyleBackColor = true;
this.BtnExit.Click += new System.EventHandler(this.BtnExit_Click); this.BtnExit.Click += new System.EventHandler(this.BtnExit_Click);
// //
// button1
//
this.button1.BackColor = System.Drawing.Color.Transparent;
this.button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.button1.Enabled = false;
this.button1.FlatAppearance.BorderSize = 0;
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.ForeColor = System.Drawing.Color.Black;
this.button1.Location = new System.Drawing.Point(12, 12);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(235, 30);
this.button1.TabIndex = 14;
this.button1.Text = "Smart Workstation";
this.button1.UseVisualStyleBackColor = true;
//
// FrmLogin // FrmLogin
// //
this.AcceptButton = this.BtnLogin; this.AcceptButton = this.BtnLogin;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackgroundImage = global::TSA_V.Properties.Resources.背景图1;
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.CancelButton = this.BtnExit; this.CancelButton = this.BtnExit;
this.ClientSize = new System.Drawing.Size(391, 192); this.ClientSize = new System.Drawing.Size(533, 310);
this.ControlBox = false;
this.Controls.Add(this.button1);
this.Controls.Add(this.BtnExit); this.Controls.Add(this.BtnExit);
this.Controls.Add(this.BtnLogin); this.Controls.Add(this.BtnLogin);
this.Controls.Add(this.TxtPassword); this.Controls.Add(this.TxtPassword);
this.Controls.Add(this.label2); this.Controls.Add(this.label2);
this.Controls.Add(this.TxtUsername); this.Controls.Add(this.TxtUsername);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "FrmLogin"; this.Name = "FrmLogin";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "登录"; this.Text = "登录";
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
...@@ -134,5 +154,6 @@ namespace TSA_V ...@@ -134,5 +154,6 @@ namespace TSA_V
private System.Windows.Forms.TextBox TxtPassword; private System.Windows.Forms.TextBox TxtPassword;
private System.Windows.Forms.Button BtnLogin; private System.Windows.Forms.Button BtnLogin;
private System.Windows.Forms.Button BtnExit; private System.Windows.Forms.Button BtnExit;
private System.Windows.Forms.Button button1;
} }
} }
\ No newline at end of file \ No newline at end of file
TSA-V/FrmLogin.cs
...@@ -10,7 +10,7 @@ using System.Windows.Forms; ...@@ -10,7 +10,7 @@ using System.Windows.Forms;
namespace TSA_V namespace TSA_V
{ {
public partial class FrmLogin : Form public partial class FrmLogin : FrmBase
{ {
public FrmLogin() public FrmLogin()
{ {
......
TSA-V/FrmMenu.Designer.cs
...@@ -45,7 +45,7 @@ namespace TSA_V ...@@ -45,7 +45,7 @@ namespace TSA_V
this.btnMaintenance = new System.Windows.Forms.Button(); this.btnMaintenance = new System.Windows.Forms.Button();
this.btnCom = new System.Windows.Forms.Button(); this.btnCom = new System.Windows.Forms.Button();
this.btnProduct = new System.Windows.Forms.Button(); this.btnProduct = new System.Windows.Forms.Button();
this.BtnHistory = new System.Windows.Forms.Button(); this.btnHistory = new System.Windows.Forms.Button();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -98,7 +98,7 @@ namespace TSA_V ...@@ -98,7 +98,7 @@ namespace TSA_V
// panel1 // panel1
// //
this.panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.panel1.Controls.Add(this.BtnHistory); this.panel1.Controls.Add(this.btnHistory);
this.panel1.Controls.Add(this.LblUserName); this.panel1.Controls.Add(this.LblUserName);
this.panel1.Controls.Add(this.lblVersion); this.panel1.Controls.Add(this.lblVersion);
this.panel1.Controls.Add(this.btnScreenTest); this.panel1.Controls.Add(this.btnScreenTest);
...@@ -117,6 +117,7 @@ namespace TSA_V ...@@ -117,6 +117,7 @@ namespace TSA_V
// LblUserName // LblUserName
// //
this.LblUserName.AutoSize = true; this.LblUserName.AutoSize = true;
this.LblUserName.BackColor = System.Drawing.Color.Transparent;
this.LblUserName.Location = new System.Drawing.Point(21, 420); this.LblUserName.Location = new System.Drawing.Point(21, 420);
this.LblUserName.Name = "LblUserName"; this.LblUserName.Name = "LblUserName";
this.LblUserName.Size = new System.Drawing.Size(41, 12); this.LblUserName.Size = new System.Drawing.Size(41, 12);
...@@ -126,7 +127,7 @@ namespace TSA_V ...@@ -126,7 +127,7 @@ namespace TSA_V
// btnScreenTest // btnScreenTest
// //
this.btnScreenTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnScreenTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnScreenTest.Location = new System.Drawing.Point(640, 310); this.btnScreenTest.Location = new System.Drawing.Point(640, 131);
this.btnScreenTest.Name = "btnScreenTest"; this.btnScreenTest.Name = "btnScreenTest";
this.btnScreenTest.Size = new System.Drawing.Size(104, 40); this.btnScreenTest.Size = new System.Drawing.Size(104, 40);
this.btnScreenTest.TabIndex = 17; this.btnScreenTest.TabIndex = 17;
...@@ -154,7 +155,7 @@ namespace TSA_V ...@@ -154,7 +155,7 @@ namespace TSA_V
this.btnCloseLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCloseLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseLed.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseLed.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseLed.ForeColor = System.Drawing.Color.White; this.btnCloseLed.ForeColor = System.Drawing.Color.White;
this.btnCloseLed.Location = new System.Drawing.Point(412, 287); this.btnCloseLed.Location = new System.Drawing.Point(640, 285);
this.btnCloseLed.Name = "btnCloseLed"; this.btnCloseLed.Name = "btnCloseLed";
this.btnCloseLed.Size = new System.Drawing.Size(107, 81); this.btnCloseLed.Size = new System.Drawing.Size(107, 81);
this.btnCloseLed.TabIndex = 15; this.btnCloseLed.TabIndex = 15;
...@@ -171,7 +172,7 @@ namespace TSA_V ...@@ -171,7 +172,7 @@ namespace TSA_V
this.btnOpenLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOpenLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenLed.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenLed.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenLed.ForeColor = System.Drawing.Color.White; this.btnOpenLed.ForeColor = System.Drawing.Color.White;
this.btnOpenLed.Location = new System.Drawing.Point(412, 287); this.btnOpenLed.Location = new System.Drawing.Point(640, 285);
this.btnOpenLed.Name = "btnOpenLed"; this.btnOpenLed.Name = "btnOpenLed";
this.btnOpenLed.Size = new System.Drawing.Size(107, 81); this.btnOpenLed.Size = new System.Drawing.Size(107, 81);
this.btnOpenLed.TabIndex = 14; this.btnOpenLed.TabIndex = 14;
...@@ -203,7 +204,7 @@ namespace TSA_V ...@@ -203,7 +204,7 @@ namespace TSA_V
this.btnMaintenance.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnMaintenance.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMaintenance.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMaintenance.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMaintenance.ForeColor = System.Drawing.Color.White; this.btnMaintenance.ForeColor = System.Drawing.Color.White;
this.btnMaintenance.Location = new System.Drawing.Point(527, 196); this.btnMaintenance.Location = new System.Drawing.Point(527, 285);
this.btnMaintenance.Name = "btnMaintenance"; this.btnMaintenance.Name = "btnMaintenance";
this.btnMaintenance.Size = new System.Drawing.Size(107, 81); this.btnMaintenance.Size = new System.Drawing.Size(107, 81);
this.btnMaintenance.TabIndex = 8; this.btnMaintenance.TabIndex = 8;
...@@ -219,7 +220,7 @@ namespace TSA_V ...@@ -219,7 +220,7 @@ namespace TSA_V
this.btnCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCom.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCom.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCom.ForeColor = System.Drawing.Color.White; this.btnCom.ForeColor = System.Drawing.Color.White;
this.btnCom.Location = new System.Drawing.Point(412, 196); this.btnCom.Location = new System.Drawing.Point(412, 285);
this.btnCom.Name = "btnCom"; this.btnCom.Name = "btnCom";
this.btnCom.Size = new System.Drawing.Size(107, 81); this.btnCom.Size = new System.Drawing.Size(107, 81);
this.btnCom.TabIndex = 5; this.btnCom.TabIndex = 5;
...@@ -242,16 +243,21 @@ namespace TSA_V ...@@ -242,16 +243,21 @@ namespace TSA_V
this.btnProduct.UseVisualStyleBackColor = false; this.btnProduct.UseVisualStyleBackColor = false;
this.btnProduct.Click += new System.EventHandler(this.btnProduct_Click); this.btnProduct.Click += new System.EventHandler(this.btnProduct_Click);
// //
// BtnHistory // btnHistory
// //
this.BtnHistory.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnHistory.BackColor = System.Drawing.Color.Transparent;
this.BtnHistory.Location = new System.Drawing.Point(640, 264); this.btnHistory.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnHistory.BackgroundImage")));
this.BtnHistory.Name = "BtnHistory"; this.btnHistory.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.BtnHistory.Size = new System.Drawing.Size(104, 40); this.btnHistory.FlatAppearance.BorderSize = 0;
this.BtnHistory.TabIndex = 19; this.btnHistory.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.BtnHistory.Text = "历史记录查询"; this.btnHistory.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.BtnHistory.UseVisualStyleBackColor = true; this.btnHistory.ForeColor = System.Drawing.Color.White;
this.BtnHistory.Click += new System.EventHandler(this.BtnHistory_Click); this.btnHistory.Location = new System.Drawing.Point(412, 195);
this.btnHistory.Name = "btnHistory";
this.btnHistory.Size = new System.Drawing.Size(222, 81);
this.btnHistory.TabIndex = 20;
this.btnHistory.UseVisualStyleBackColor = false;
this.btnHistory.Click += new System.EventHandler(this.BtnHistory_Click);
// //
// FrmMenu // FrmMenu
// //
...@@ -294,6 +300,6 @@ namespace TSA_V ...@@ -294,6 +300,6 @@ namespace TSA_V
private System.Windows.Forms.Timer timer1; private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.Button btnScreenTest; private System.Windows.Forms.Button btnScreenTest;
private System.Windows.Forms.Label LblUserName; private System.Windows.Forms.Label LblUserName;
private System.Windows.Forms.Button BtnHistory; private System.Windows.Forms.Button btnHistory;
} }
} }
\ No newline at end of file \ No newline at end of file
TSA-V/FrmMenu.cs
...@@ -107,9 +107,12 @@ namespace TSA_V ...@@ -107,9 +107,12 @@ namespace TSA_V
if (ConfigAppSettings.GetBoolValue("CodeRun")) { } if (ConfigAppSettings.GetBoolValue("CodeRun")) { }
else else
{ {
Task.Factory.StartNew(delegate
{
IOManager.ConnectionIO(); IOManager.ConnectionIO();
TSAVBean.StartRun(); TSAVBean.StartRun();
timer.Enabled = true; timer.Enabled = true;
});
} }
LWidthManager.Init(); LWidthManager.Init();
this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title); this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title);
...@@ -144,6 +147,7 @@ namespace TSA_V ...@@ -144,6 +147,7 @@ namespace TSA_V
this.btnCom.BackgroundImage = ImageManager.Main_US_元器件; this.btnCom.BackgroundImage = ImageManager.Main_US_元器件;
this.btnOpenLed.BackgroundImage = ImageManager.Menu_US_打开光源; this.btnOpenLed.BackgroundImage = ImageManager.Menu_US_打开光源;
this.btnCloseLed.BackgroundImage = ImageManager.Menu_US_关闭光源; this.btnCloseLed.BackgroundImage = ImageManager.Menu_US_关闭光源;
this.btnHistory.BackgroundImage = ImageManager.Main_US_历史记录;
} }
else else
{ {
...@@ -156,6 +160,7 @@ namespace TSA_V ...@@ -156,6 +160,7 @@ namespace TSA_V
this.btnCom.BackgroundImage = ImageManager.Main_元器件; this.btnCom.BackgroundImage = ImageManager.Main_元器件;
this.btnOpenLed.BackgroundImage = ImageManager.Menu_打开光源; this.btnOpenLed.BackgroundImage = ImageManager.Menu_打开光源;
this.btnCloseLed.BackgroundImage = ImageManager.Menu_关闭光源; this.btnCloseLed.BackgroundImage = ImageManager.Menu_关闭光源;
this.btnHistory.BackgroundImage = ImageManager.Main_历史记录;
} }
} }
......
TSA-V/FrmMenu.resx
...@@ -522,6 +522,39 @@ ...@@ -522,6 +522,39 @@
bBQnEm4y4NILvtjgiw3EaIUOxYkKHXCTCTcZWBkHUGZqVxudnQf+fzx1G1A7nkGMAAAAAElFTkSuQmCC bBQnEm4y4NILvtjgiw3EaIUOxYkKHXCTCTcZWBkHUGZqVxudnQf+fzx1G1A7nkGMAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="btnHistory.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhPwF0AIQRAMbq+1S/9I3V+Cmv8fH6/tTv/Ea68zi18nHK9pva+Krf+X/P9+P0/bjk+mLF9f//
/xuq8P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
Mi4wAwEBAAAh+QQBAAARACwAAAAAPwF0AAAI7AAjQBhIsKDBgwgTKlzIsKHDhxAjSpxIsaLFixgzThSo
saPHjyBDihxJsuRFjiZTqlzJsqXLlwlRwpxJs6bNmy9l4tzJs6fPnwZ1Ah1KtKjRj0KPKl3KtOnApE6j
Sp1KEyrVq1izItXKtavXila/ih3bNSzZs2idmk3Lti3QtW7jyq06t67dm3Dv6t3bMS/fv4Aj+g1MuPDB
wYYTE0asuPFexo4jz4UsuTJbypYzj8WsuTNXzp5DUwUtunRT0qZTG0WtuvVP1q5j44Qtu/ZM2rZzs8St
u3dJ3r6DgwQuvHhG4saTU0SuvPlD5s6j/yuE7ljAgwcBKGaX/py7dewTrSs4eCCA+fPo06MfkJs6UQQA
4sufT7++fQAIIn7fDvHA9QfjFfTdfwQWWCB/BAVg4IIM/odgXe4NNWCDFC4ogH7XPegQAv8FONCEFRKo
oYIhVqihXBEC9R0D97XYYn4EISDAjDTWKAAA1ylg444ncnhdAgSVp96Q5i2Q4UEDEKkkekaCp1eKP313
YUg4lhjilAcNCKNEJJ5oUZeP6SWlQtcBQFGVVlKI5UEK5KjdkR6B+aSY161pUJlnXqfQfgmRaGdBAxSw
JZdwdiTnXVD6NCZCA+A5UZV7FmqQnyMdKmCaDHrpVqI9LXoQiWY+qv9nQnwiRKlIlhIEIqaSQkjnA38O
BGqeD0Tq5Kd1VtoqRqlO9mqsEMwqaq2k7iprrgMlqd6XxjJ7q12c8jRmAvUVcB0BLsaHEKTFPlvQqcEu
6Kymb3rr611josnqqAZxi1CpuMKaoLjfrsufAUvme16TC6B3wLl2TVvtdSzed10B27KbZbPgKmuetcTO
yyp/6q6rJsB1eTopsgg52m6dO85YpY4htylvwhEf+wAAIdtoMsUWlwjsWdHupHFBTc7scUEVx3zyQe6q
PLPE5HZb9JzocmzQd4PeuTJC1LrIwMH3QQxs0OH+rJCy7BkU6AK2engQAk2j+GrZA71M5tMJDeD/QEJV
/muq0jwrnPXQDVVZgAHv/ic3oA00e9mrXsadkAE/9jn12wdBrNABMxZuN7jaTU03BAOGmqDlDzSAqF4J
NHutQpQXdAABDxDAN6AHW4R16RMNEPrBq39IINi2X4s7tHpVWXtBDuy8sdYG+VhA1wMF/wCQFb1+OUUO
oP4AA5emnqEBEHeOPO93YU2QybvHO7TJxxMU+AOM0zo83gQNoED6SOJY+wBMoy799EcPfhfBCPl33d/i
YwjEVAcB/xHgIs4jHumENykIGCABBJBRhnyUOvZt6i6IY5tBzqe5vpnLawNcwPksqJAEkpBEzOtfAjiX
AD5RMAHbQ1pdcjY2/wctBF5bO99/CBBDibgrAPh6ngf/dIAFZO9gEnQSBRkAv8/ZBWIPymDnGILDGxII
AAAc1kBCJwDYJURtAyniEae3ALnBCwH3A0ATMRYXA05KegzooUEg9ruFNOmKCJBj3q6DvTp5ESEQGwD9
xsiABNQRh338TyHreMG6mCyFEKAgARdCogM2JABoagDnrtOABTByIWPEov86qJAMUg8C9yOAArxURQgs
4H4EC19balYT/z1Abu7b4e8W0MLIOQCCblqIA9Q1JQSMsUwtBOLWCESA3f2nAfkC5vK22Lk1fuyD9Eul
HmlWl5HJinN7M8gdDUSALA7EAAhoACwLEMUVVouIReEz2QPC+T1W8TBZPTxAfEiWvW1GMnDWTAstZ3K6
1P1LitqLl4EYwEgdEkhQCzkAAhRwzP/8TnmQTFbPGtQAcx6EQWLbGvfkYgACYMlIzWxbAHiUEApOz5Bc
klEDAIA6hBnkfY/TVwD8WZAxEgCGjhkoTZpYRo80IAEI8Ch3XCLUpQanqU7tDVSjjNoeqlp1OFfNqkam
qtXWcLWrqfkqWEsj1rGGpqxm7Qxa05qZtbK1Mm59a2TiKtfG0LWuibkrXguj170Gpq9+/QtgAxsmwr51
sIYdaWLHitjFms2xjIVsZCXb1cZSVqCX1aplM0uWzXJWLJ79rFdCK9rPlDaqpD0tVlKr2tG0ljusfW1U
Yivb09TWObS9Kq1Scqvb1fQ2Obz97VCCK9zXZOu4yE2ucpfL3OY697nQja50p0vd6kY3IAA7
</value>
</data>
<data name="btnCloseLed.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnCloseLed.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAAJ4AAAB6CAMAAAB5jhrdAAAABGdBTUEAALGPC/xhBQAAAp1QTFRFHJ7t iVBORw0KGgoAAAANSUhEUgAAAJ4AAAB6CAMAAAB5jhrdAAAABGdBTUEAALGPC/xhBQAAAp1QTFRFHJ7t
......
TSA-V/ImageManager.cs
...@@ -32,6 +32,8 @@ namespace TSA_V ...@@ -32,6 +32,8 @@ namespace TSA_V
public static Image Menu_退出; public static Image Menu_退出;
public static Image Menu_标题; public static Image Menu_标题;
public static Image Main_历史记录;
public static Image Main_US_历史记录;
public static Image Main_US_元器件; public static Image Main_US_元器件;
public static Image Main_US_程序编辑; public static Image Main_US_程序编辑;
...@@ -96,6 +98,7 @@ namespace TSA_V ...@@ -96,6 +98,7 @@ namespace TSA_V
Main_MOSCOT = GetImage(Application.StartupPath + "\\image\\CN\\MOSCOT.jpg"); Main_MOSCOT = GetImage(Application.StartupPath + "\\image\\CN\\MOSCOT.jpg");
Menu_打开光源 = GetImage(Application.StartupPath + "\\image\\CN\\打开光源.jpg"); Menu_打开光源 = GetImage(Application.StartupPath + "\\image\\CN\\打开光源.jpg");
Menu_关闭光源 = GetImage(Application.StartupPath + "\\image\\CN\\关闭光源.jpg"); Menu_关闭光源 = GetImage(Application.StartupPath + "\\image\\CN\\关闭光源.jpg");
Main_历史记录=GetImage(Application.StartupPath+ "\\image\\CN\\历史记录.gif");
Main_US_元器件 = GetImage(Application.StartupPath + "\\image\\US\\元器件信息.gif"); Main_US_元器件 = GetImage(Application.StartupPath + "\\image\\US\\元器件信息.gif");
...@@ -115,6 +118,7 @@ namespace TSA_V ...@@ -115,6 +118,7 @@ namespace TSA_V
Main_US_MOSCOT = GetImage(Application.StartupPath + "\\image\\US\\MOSCOT.png"); Main_US_MOSCOT = GetImage(Application.StartupPath + "\\image\\US\\MOSCOT.png");
Menu_US_打开光源 = GetImage(Application.StartupPath + "\\image\\US\\打开光源.gif"); Menu_US_打开光源 = GetImage(Application.StartupPath + "\\image\\US\\打开光源.gif");
Menu_US_关闭光源 = GetImage(Application.StartupPath + "\\image\\US\\关闭光源.gif"); Menu_US_关闭光源 = GetImage(Application.StartupPath + "\\image\\US\\关闭光源.gif");
Main_US_历史记录 = GetImage(Application.StartupPath + "\\image\\US\\历史记录.gif");
} }
catch (Exception ex) catch (Exception ex)
{ {
......
TSA-V/Properties/Resource.en-US.resx
...@@ -2197,4 +2197,22 @@ ...@@ -2197,4 +2197,22 @@
<data name="请输入PCB板条码" xml:space="preserve"> <data name="请输入PCB板条码" xml:space="preserve">
<value>Please enter the PCB bar code</value> <value>Please enter the PCB bar code</value>
</data> </data>
<data name="FrmLogin_BtnExit_Text" xml:space="preserve">
<value>Exit</value>
</data>
<data name="FrmLogin_BtnLogin_Text" xml:space="preserve">
<value>Login</value>
</data>
<data name="FrmLogin_button1_Text" xml:space="preserve">
<value>Smart Workstation</value>
</data>
<data name="FrmLogin_label1_Text" xml:space="preserve">
<value>UserName</value>
</data>
<data name="FrmLogin_label2_Text" xml:space="preserve">
<value>Password</value>
</data>
<data name="FrmLogin_Text" xml:space="preserve">
<value>Login</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
...@@ -2211,4 +2211,22 @@ ...@@ -2211,4 +2211,22 @@
<data name="请输入PCB板条码" xml:space="preserve"> <data name="请输入PCB板条码" xml:space="preserve">
<value>请输入PCB板条码</value> <value>请输入PCB板条码</value>
</data> </data>
<data name="FrmLogin_BtnExit_Text" xml:space="preserve">
<value>退出</value>
</data>
<data name="FrmLogin_BtnLogin_Text" xml:space="preserve">
<value>登录</value>
</data>
<data name="FrmLogin_button1_Text" xml:space="preserve">
<value>Smart Workstation</value>
</data>
<data name="FrmLogin_label1_Text" xml:space="preserve">
<value>用户名</value>
</data>
<data name="FrmLogin_label2_Text" xml:space="preserve">
<value>密码</value>
</data>
<data name="FrmLogin_Text" xml:space="preserve">
<value>登录</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Smart-Workstation.csproj
...@@ -465,6 +465,9 @@ ...@@ -465,6 +465,9 @@
<Content Include="image\CN\关闭光源.jpg"> <Content Include="image\CN\关闭光源.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="image\CN\历史记录.gif">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="image\CN\开始工作.jpg"> <Content Include="image\CN\开始工作.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
...@@ -535,6 +538,9 @@ ...@@ -535,6 +538,9 @@
<Content Include="image\US\关闭光源.gif"> <Content Include="image\US\关闭光源.gif">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="image\US\历史记录.gif">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="image\US\开始工作.gif"> <Content Include="image\US\开始工作.gif">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
......
TSA-V/workForm/FrmBoardSelect.cs
...@@ -99,6 +99,7 @@ namespace TSA_V ...@@ -99,6 +99,7 @@ namespace TSA_V
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.CanotFindInfo, "电路板【{0}】没有组装信息，请选择其他程序！", BoardManager.CurrBoard.boardName)); MessageBox.Show(ResourceCulture.GetString(ResourceCulture.CanotFindInfo, "电路板【{0}】没有组装信息，请选择其他程序！", BoardManager.CurrBoard.boardName));
return; return;
} }
WorkInfo.LastDBId = 0;
FrmWork fw = new FrmWork(); FrmWork fw = new FrmWork();
this.Hide(); this.Hide();
fw.ShowDialog(); fw.ShowDialog();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!