Skip to content

李娜 / Line-Smart-Workstation

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

1

2 个父辈 43974366 cd2c3227
内嵌 并排
正在显示 11 个修改的文件 包含 172 行增加 和 76 行删除
Common/util/ConfigAppSettings.cs
...@@ -292,6 +292,61 @@ namespace TSA_V.Common ...@@ -292,6 +292,61 @@ namespace TSA_V.Common
{ {
LogUtil.error($"删除 appconfig [{keyName}] 出错：" + ex.ToString()); LogUtil.error($"删除 appconfig [{keyName}] 出错：" + ex.ToString());
} }
} }
///// <summary>
///// 更新配置文件信息
///// </summary>
///// <param name="name">配置文件字段名称</param>
///// <param name="Xvalue">值</param>
//private static void UpdateConfig(string name, string Xvalue)
//{
// try
// {
// XmlDocument doc = new XmlDocument();
// doc.Load(Application.ExecutablePath + ".config");
// XmlNode node = doc.SelectSingleNode(@"//add[@key='" + name + "']");
// XmlElement ele = (XmlElement)node;
// ele.SetAttribute("value", Xvalue);
// doc.Save(Application.ExecutablePath + ".config");
// }
// catch (Exception ex)
// {
// LogUtil.error(LOGGER, "UpdateConfig保存配置出错：name=" + name + "，Xvalue=" + Xvalue + "," + ex.StackTrace);
// }
//}
/////<summary>
/////向.config文件的appKey结写入信息AppValue 保存设置
/////</summary>
/////<param name="AppKey">节点名</param>
/////<param name="AppValue">值</param>
//private static void SetValue(String AppKey, String AppValue)
//{
// try
// {
// XmlDocument xDoc = new XmlDocument();
// xDoc.Load(System.Windows.Forms.Application.ExecutablePath + ".config");
// XmlNode xNode;
// XmlElement xElem1;
// XmlElement xElem2;
// xNode = xDoc.SelectSingleNode("//appSettings");
// xElem1 = (XmlElement)xNode.SelectSingleNode("//add[@key='" + AppKey + "']");
// if (xElem1 != null)
// xElem1.SetAttribute("value", AppValue);
// else
// {
// xElem2 = xDoc.CreateElement("add");
// xElem2.SetAttribute("key", AppKey);
// xElem2.SetAttribute("value", AppValue);
// xNode.AppendChild(xElem2);
// }
// xDoc.Save(System.Windows.Forms.Application.ExecutablePath + ".config");
// }
// catch (Exception ex)
// {
// LogUtil.error(LOGGER, "SetValue保存配置出错：AppKey=" + AppKey + "，AppValue=" + AppValue + "," + ex.StackTrace);
// }
//}
} }
} }
DeviceLibrary/deviceLibrary/ledLabel/LedLabelController.cs
...@@ -56,7 +56,11 @@ namespace TSA_V.DeviceLibrary ...@@ -56,7 +56,11 @@ namespace TSA_V.DeviceLibrary
return new LabelInfo(); return new LabelInfo();
} }
LabelInfo label = new LabelInfo(position.PositionNum, com.ComCount, com.PN, com.ComponentDes, com.Notes, position.DeviceIP, position.Leds, opendLed); LabelInfo label = new LabelInfo(position.PositionNum, com.ComCount, com.PN, com.ComponentDes, com.Notes, position.DeviceIP, position.Leds, opendLed);
if (int.Parse(com.ComCount) <= 0)
{
label.notes = ResourceControl.GetString("元器件数量不足", "元器件数量不足");
}
return label; return label;
} }
......
DeviceLibrary/manager/TSAVBean.cs
...@@ -199,6 +199,8 @@ namespace TSA_V.DeviceLibrary ...@@ -199,6 +199,8 @@ namespace TSA_V.DeviceLibrary
WarnMsg = GetTime() + ResourceControl.GetString("FrmBoardInfo_lblMsg_Text", "急停未开"); WarnMsg = GetTime() + ResourceControl.GetString("FrmBoardInfo_lblMsg_Text", "急停未开");
LogUtil.error(WarnMsg); LogUtil.error(WarnMsg);
} }
IOManager.IOMove(IOManager.Device_Led, IO_VALUE.HIGH);
//如果无转盘无线体，不需要加载 //如果无转盘无线体，不需要加载
//有线体无转盘，不需要选择 //有线体无转盘，不需要选择
...@@ -931,7 +933,7 @@ namespace TSA_V.DeviceLibrary ...@@ -931,7 +933,7 @@ namespace TSA_V.DeviceLibrary
} }
} }
LedLabelController.CloseAll(); //LedLabelController.CloseAll();
//停止调宽 //停止调宽
LWidthManager.StopChangeWidth(); LWidthManager.StopChangeWidth();
......
DeviceLibrary/manager/WorkInfo.cs
...@@ -57,8 +57,8 @@ namespace TSA_V.DeviceLibrary ...@@ -57,8 +57,8 @@ namespace TSA_V.DeviceLibrary
} }
else else
{ {
LogUtil.info("开始程序【" + boardInfo.boardName + "】的插件,关闭所有灯"); LogUtil.info("开始程序【" + boardInfo.boardName + "】的插件");
LedLabelController.CloseAll(); //LedLabelController.CloseAll();
} }
IsShowAOI = false; IsShowAOI = false;
currPoint = null; currPoint = null;
...@@ -117,6 +117,11 @@ namespace TSA_V.DeviceLibrary ...@@ -117,6 +117,11 @@ namespace TSA_V.DeviceLibrary
{ {
LogUtil.info("停止程序【" + currBoard.boardName + "】工作"); LogUtil.info("停止程序【" + currBoard.boardName + "】工作");
} }
if (PreLabel != null)
{
LedLabelController.CloseLed(PreLabel.ip, PreLabel.mac);
PreLabel = null;
}
//把上次的旋转轴转回待机点 //把上次的旋转轴转回待机点
if (this.WorkType.Equals(1) && PreNodeId > 0) if (this.WorkType.Equals(1) && PreNodeId > 0)
{ {
...@@ -220,22 +225,13 @@ namespace TSA_V.DeviceLibrary ...@@ -220,22 +225,13 @@ namespace TSA_V.DeviceLibrary
if (com != null) if (com != null)
{ {
#region 2023-10-31添加 #region 2023-10-31添加
position = CSVPositionReader<TSAVPosition>.GetPositonByNum(com.PositionNum); position = CSVPositionReader<TSAVPosition>.GetPositonByNum(com.PositionNum);
////记录运行过程的位号
//ConfigAppSettings.UpdateAppSetting(Setting_Init.ProcedureName, currBoard.boardName);
//ConfigAppSettings.UpdateAppSetting(Setting_Init.TagNumber, currIndex.ToString());
//if (currPoint.pointNum == 1)//第一个位号不需要记录
//{
// ConfigAppSettings.UpdateAppSetting(Setting_Init.ProcedureName, "");
// ConfigAppSettings.UpdateAppSetting(Setting_Init.TagNumber, "");
//}
Setting_NInit.Work_ProcedureName = currBoard.boardName; Setting_NInit.Work_ProcedureName = currBoard.boardName;
Setting_NInit.Work_TagNumber = currIndex ; Setting_NInit.Work_TagNumber = currIndex ;
if (currPoint.pointNum == 1) if (currPoint.pointNum == 1)
{ {
Setting_NInit.Work_ProcedureName=currBoard.boardName; Setting_NInit.Work_ProcedureName=currBoard.boardName;
Setting_NInit.Work_TagNumber = currIndex; Setting_NInit.Work_TagNumber = currIndex;
} }
#endregion #endregion
useComponets.Add(com); useComponets.Add(com);
......
TSA-V/FrmComponentList.cs
...@@ -633,7 +633,14 @@ namespace TSA_V ...@@ -633,7 +633,14 @@ namespace TSA_V
private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{ {
CloseLed(""); CloseLed("");
string pNum = cmbPositionNumList.Text;
TSAVPosition position = CSVPositionReader<TSAVPosition>.GetPositonByNum(pNum);
if (position != null && position.PositionType.Equals(2))
{
PreLabel = LedLabelController.GetLabel(position, selCom, true);
LedLabelController.CloseLed(PreLabel.ip, PreLabel.mac);
}
} }
private void btnExport_Click(object sender, EventArgs e) private void btnExport_Click(object sender, EventArgs e)
......
TSA-V/Properties/Resource.en-US.resx
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
<value>Not available</value> <value>Not available</value>
</data> </data>
<data name="FrmWork_label6_Text" xml:space="preserve"> <data name="FrmWork_label6_Text" xml:space="preserve">
<value>Part Number</value> <value>Part Number:</value>
</data> </data>
<data name="FrmWork_lblPartNum_Text" xml:space="preserve"> <data name="FrmWork_lblPartNum_Text" xml:space="preserve">
<value>Not available</value> <value>Not available</value>
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
<value>Quantity Edit</value> <value>Quantity Edit</value>
</data> </data>
<data name="FrmWork_label5_Text" xml:space="preserve"> <data name="FrmWork_label5_Text" xml:space="preserve">
<value>Qty</value> <value>Qty:</value>
</data> </data>
<data name="FrmWork_lblCount_Text" xml:space="preserve"> <data name="FrmWork_lblCount_Text" xml:space="preserve">
<value>Not available</value> <value>Not available</value>
...@@ -205,19 +205,19 @@ ...@@ -205,19 +205,19 @@
<value>Not available</value> <value>Not available</value>
</data> </data>
<data name="FrmWork_label4_Text" xml:space="preserve"> <data name="FrmWork_label4_Text" xml:space="preserve">
<value>Position</value> <value>Position:</value>
</data> </data>
<data name="FrmWork_label1_Text" xml:space="preserve"> <data name="FrmWork_label1_Text" xml:space="preserve">
<value>Description</value> <value>Description:</value>
</data> </data>
<data name="FrmWork_lblComDes_Text" xml:space="preserve"> <data name="FrmWork_lblComDes_Text" xml:space="preserve">
<value>Not available</value> <value>Not available</value>
</data> </data>
<data name="FrmWork_label2_Text" xml:space="preserve"> <data name="FrmWork_label2_Text" xml:space="preserve">
<value>Notice</value> <value>Notice:</value>
</data> </data>
<data name="FrmWork_label3_Text" xml:space="preserve"> <data name="FrmWork_label3_Text" xml:space="preserve">
<value>Material</value> <value>Component:</value>
</data> </data>
<data name="FrmWork_lblComName_Text" xml:space="preserve"> <data name="FrmWork_lblComName_Text" xml:space="preserve">
<value>Not available</value> <value>Not available</value>
...@@ -1232,7 +1232,7 @@ ...@@ -1232,7 +1232,7 @@
<value>Note: The last step is to start the new program.</value> <value>Note: The last step is to start the new program.</value>
</data> </data>
<data name="FrmWork_lblStart_Text" xml:space="preserve"> <data name="FrmWork_lblStart_Text" xml:space="preserve">
<value>Note: The new program has started and reached the first assembly point.</value> <value>Note: New program, reached 1st position.</value>
</data> </data>
<data name="FrmWork_radioButton1_Text" xml:space="preserve"> <data name="FrmWork_radioButton1_Text" xml:space="preserve">
<value>Foot Peddler</value> <value>Foot Peddler</value>
...@@ -2156,7 +2156,7 @@ ...@@ -2156,7 +2156,7 @@
<value>Inline Mode</value> <value>Inline Mode</value>
</data> </data>
<data name="元器件数量不足，请及时补充" xml:space="preserve"> <data name="元器件数量不足，请及时补充" xml:space="preserve">
<value>The number of components is insufficient, please supplement in time</value> <value>Component out of stock, please replenish</value>
</data> </data>
<data name="FrmDeviceConfig_groupBox3_Text" xml:space="preserve"> <data name="FrmDeviceConfig_groupBox3_Text" xml:space="preserve">
<value>Data Upload Test</value> <value>Data Upload Test</value>
...@@ -2606,24 +2606,33 @@ ...@@ -2606,24 +2606,33 @@
<value>Close LED</value> <value>Close LED</value>
</data> </data>
<data name="Label_lblPos" xml:space="preserve"> <data name="Label_lblPos" xml:space="preserve">
<value>Postion: </value> <value>Postion:</value>
</data> </data>
<data name="Label_lblNum" xml:space="preserve"> <data name="Label_lblNum" xml:space="preserve">
<value>Count: </value> <value>Qty:</value>
</data> </data>
<data name="Label_lblPn" xml:space="preserve"> <data name="Label_lblPn" xml:space="preserve">
<value>PartNumber: </value> <value>Component:</value>
</data> </data>
<data name="Label_lblDes" xml:space="preserve"> <data name="Label_lblDes" xml:space="preserve">
<value>Description : </value> <value>Description:</value>
</data> </data>
<data name="Label_lblNotes" xml:space="preserve"> <data name="Label_lblNotes" xml:space="preserve">
<value>Note: </value> <value>Notice:</value>
</data> </data>
<data name="FrmComponentList_btnExport_Text" xml:space="preserve"> <data name="FrmComponentList_btnExport_Text" xml:space="preserve">
<value>Export</value> <value>Export</value>
</data> </data>
<data name = "FrmComponentList_linkCloseAll_Text" xml:space = "preserve"> <value> Close All </value> </data> <data name="FrmComponentList_linkCloseAll_Text" xml:space="preserve">
<data name = "FrmComponentList_linkOpenAll_Text" xml:space = "preserve"> <value> Open All </value> </data> <value> Close All </value>
<data name = "FrmComponentList_linkUpdate_Text" xml:space = "preserve"> <value> Display Test </value> </data> </data>
<data name="FrmComponentList_linkOpenAll_Text" xml:space="preserve">
<value> Open All </value>
</data>
<data name="FrmComponentList_linkUpdate_Text" xml:space="preserve">
<value> Display Test </value>
</data>
<data name="元器件数量不足" xml:space="preserve">
<value>Component out of stock</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.ru-RU.resx
...@@ -2583,20 +2583,40 @@ ...@@ -2583,20 +2583,40 @@
<data name="iscontinue" xml:space="preserve"> <data name="iscontinue" xml:space="preserve">
<value>有未结束的程序'{0}'，是否继续?</value> <value>有未结束的程序'{0}'，是否继续?</value>
</data> </data>
<data name = "不使用AOI" xml:space = "preserve"> <value> 不使用AOI </value> </data> <data name="不使用AOI" xml:space="preserve">
<data name = "FrmWork_lblGuoBan_Text" xml:space = "preserve"> <value> 过板模式 </value> </data> <value> 不使用AOI </value>
<data name = "FrmAOICheck_btnUpdateImg_Text" xml:space = "preserve"> <value> 修正 </value> </data> </data>
<data name = "SureUpdateMethod" xml:space = "preserve"> <value> 确定修正{0}？ </value> </data> <data name="FrmWork_lblGuoBan_Text" xml:space="preserve">
<data name = "FrmLanguage_rbtnRussian_Text" xml:space = "preserve"> <value> 俄文 </value> </data> <value> 过板模式 </value>
</data>
<data name="FrmAOICheck_btnUpdateImg_Text" xml:space="preserve">
<value> 修正 </value>
</data>
<data name="SureUpdateMethod" xml:space="preserve">
<value> 确定修正{0}？ </value>
</data>
<data name="FrmLanguage_rbtnRussian_Text" xml:space="preserve">
<value> 俄文 </value>
</data>
<data name="FrmComponentList_linkLabel1_Text" xml:space="preserve"> <data name="FrmComponentList_linkLabel1_Text" xml:space="preserve">
<value>亮灯测试</value> <value>亮灯测试</value>
</data> </data>
<data name="FrmComponentList_linkLabel2_Text" xml:space="preserve"> <data name="FrmComponentList_linkLabel2_Text" xml:space="preserve">
<value>关灯测试</value> <value>关灯测试</value>
</data> </data>
<data name = "FrmComponentList_btnExport_Text" xml:space = "preserve"> <value> EXPORT </value> </data> <data name="FrmComponentList_btnExport_Text" xml:space="preserve">
<value> EXPORT </value>
<data name = "FrmComponentList_linkCloseAll_Text" xml:space = "preserve"> <value> 全关 </value> </data> </data>
<data name = "FrmComponentList_linkOpenAll_Text" xml:space = "preserve"> <value> 全开 </value> </data> <data name="FrmComponentList_linkCloseAll_Text" xml:space="preserve">
<data name = "FrmComponentList_linkUpdate_Text" xml:space = "preserve"> <value> 显示测试 </value> </data> <value> 全关 </value>
</data>
<data name="FrmComponentList_linkOpenAll_Text" xml:space="preserve">
<value> 全开 </value>
</data>
<data name="FrmComponentList_linkUpdate_Text" xml:space="preserve">
<value> 显示测试 </value>
</data>
<data name="元器件数量不足" xml:space="preserve">
<value>元器件数量不足</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
...@@ -2622,7 +2622,16 @@ ...@@ -2622,7 +2622,16 @@
<data name="FrmComponentList_btnExport_Text" xml:space="preserve"> <data name="FrmComponentList_btnExport_Text" xml:space="preserve">
<value> 导出 </value> <value> 导出 </value>
</data> </data>
<data name = "FrmComponentList_linkCloseAll_Text" xml:space = "preserve"> <value> 全关 </value> </data> <data name="FrmComponentList_linkCloseAll_Text" xml:space="preserve">
<data name = "FrmComponentList_linkOpenAll_Text" xml:space = "preserve"> <value> 全开 </value> </data> <value> 全关 </value>
<data name = "FrmComponentList_linkUpdate_Text" xml:space = "preserve"> <value> 显示测试 </value> </data> </data>
<data name="FrmComponentList_linkOpenAll_Text" xml:space="preserve">
<value> 全开 </value>
</data>
<data name="FrmComponentList_linkUpdate_Text" xml:space="preserve">
<value> 显示测试 </value>
</data>
<data name="元器件数量不足" xml:space="preserve">
<value>元器件数量不足</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/workForm/FrmBoardSelect.cs
...@@ -104,7 +104,8 @@ namespace TSA_V ...@@ -104,7 +104,8 @@ namespace TSA_V
//this.lblBoardMsg.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); //this.lblBoardMsg.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblBoardMsg.ForeColor = Color.Black; this.lblBoardMsg.ForeColor = Color.Black;
BoardManager.CurrBoard = board; BoardManager.CurrBoard = board;
LogUtil.info("切换到新板子：" + board.boardName); LogUtil.info("切换到新板子：" + board.boardName+",保存当前工作的程序名称");
Setting_NInit.Work_ProcedureName= board.boardName;
FrmProjectorScreen.instance.ShowPoint(false, board.GetSmtList().ToArray()); FrmProjectorScreen.instance.ShowPoint(false, board.GetSmtList().ToArray());
} }
} }
...@@ -408,7 +409,7 @@ namespace TSA_V ...@@ -408,7 +409,7 @@ namespace TSA_V
if (dr == DialogResult.OK) if (dr == DialogResult.OK)
{ {
BoardManager.CurrBoard = board; BoardManager.CurrBoard = board;
LogUtil.info($"继续之前的工作： {ProcedureName} ，索引{TagNumber}"); LogUtil.info($"继续之前的工作： {ProcedureName} ，索引{TagNumber}");
FrmWork fw = new FrmWork(true); FrmWork fw = new FrmWork(true);
this.Hide(); this.Hide();
this.Close(); this.Close();
......
TSA-V/workForm/FrmTSAV.Designer.cs
...@@ -383,7 +383,7 @@ ...@@ -383,7 +383,7 @@
this.lblComNotices.AutoSize = true; this.lblComNotices.AutoSize = true;
this.lblComNotices.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblComNotices.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComNotices.ForeColor = System.Drawing.Color.Red; this.lblComNotices.ForeColor = System.Drawing.Color.Red;
this.lblComNotices.Location = new System.Drawing.Point(193, 165); this.lblComNotices.Location = new System.Drawing.Point(167, 165);
this.lblComNotices.Name = "lblComNotices"; this.lblComNotices.Name = "lblComNotices";
this.lblComNotices.Size = new System.Drawing.Size(37, 19); this.lblComNotices.Size = new System.Drawing.Size(37, 19);
this.lblComNotices.TabIndex = 279; this.lblComNotices.TabIndex = 279;
...@@ -404,9 +404,9 @@ ...@@ -404,9 +404,9 @@
this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.label6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label6.Location = new System.Drawing.Point(43, 20); this.label6.Location = new System.Drawing.Point(9, 20);
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(128, 19); this.label6.Size = new System.Drawing.Size(157, 19);
this.label6.TabIndex = 277; this.label6.TabIndex = 277;
this.label6.Text = "编号："; this.label6.Text = "编号：";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -416,7 +416,7 @@ ...@@ -416,7 +416,7 @@
this.lblPartNum.AutoSize = true; this.lblPartNum.AutoSize = true;
this.lblPartNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblPartNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPartNum.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.lblPartNum.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblPartNum.Location = new System.Drawing.Point(193, 20); this.lblPartNum.Location = new System.Drawing.Point(167, 20);
this.lblPartNum.Name = "lblPartNum"; this.lblPartNum.Name = "lblPartNum";
this.lblPartNum.Size = new System.Drawing.Size(37, 19); this.lblPartNum.Size = new System.Drawing.Size(37, 19);
this.lblPartNum.TabIndex = 276; this.lblPartNum.TabIndex = 276;
...@@ -439,9 +439,9 @@ ...@@ -439,9 +439,9 @@
this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(43, 78); this.label5.Location = new System.Drawing.Point(9, 78);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(128, 19); this.label5.Size = new System.Drawing.Size(157, 19);
this.label5.TabIndex = 274; this.label5.TabIndex = 274;
this.label5.Text = "剩余数量："; this.label5.Text = "剩余数量：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -451,7 +451,7 @@ ...@@ -451,7 +451,7 @@
this.lblCount.AutoSize = true; this.lblCount.AutoSize = true;
this.lblCount.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblCount.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCount.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.lblCount.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblCount.Location = new System.Drawing.Point(193, 78); this.lblCount.Location = new System.Drawing.Point(167, 78);
this.lblCount.Name = "lblCount"; this.lblCount.Name = "lblCount";
this.lblCount.Size = new System.Drawing.Size(37, 19); this.lblCount.Size = new System.Drawing.Size(37, 19);
this.lblCount.TabIndex = 273; this.lblCount.TabIndex = 273;
...@@ -462,7 +462,7 @@ ...@@ -462,7 +462,7 @@
this.lblPositionNum.AutoSize = true; this.lblPositionNum.AutoSize = true;
this.lblPositionNum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblPositionNum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPositionNum.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.lblPositionNum.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblPositionNum.Location = new System.Drawing.Point(193, 107); this.lblPositionNum.Location = new System.Drawing.Point(167, 107);
this.lblPositionNum.Name = "lblPositionNum"; this.lblPositionNum.Name = "lblPositionNum";
this.lblPositionNum.Size = new System.Drawing.Size(42, 22); this.lblPositionNum.Size = new System.Drawing.Size(42, 22);
this.lblPositionNum.TabIndex = 8; this.lblPositionNum.TabIndex = 8;
...@@ -473,9 +473,9 @@ ...@@ -473,9 +473,9 @@
this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(43, 107); this.label4.Location = new System.Drawing.Point(9, 107);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(128, 19); this.label4.Size = new System.Drawing.Size(157, 19);
this.label4.TabIndex = 7; this.label4.TabIndex = 7;
this.label4.Text = "位置："; this.label4.Text = "位置：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -485,9 +485,9 @@ ...@@ -485,9 +485,9 @@
this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(43, 136); this.label1.Location = new System.Drawing.Point(9, 136);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(128, 19); this.label1.Size = new System.Drawing.Size(157, 19);
this.label1.TabIndex = 6; this.label1.TabIndex = 6;
this.label1.Text = "描述："; this.label1.Text = "描述：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -497,7 +497,7 @@ ...@@ -497,7 +497,7 @@
this.lblComDes.AutoSize = true; this.lblComDes.AutoSize = true;
this.lblComDes.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblComDes.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComDes.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.lblComDes.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblComDes.Location = new System.Drawing.Point(193, 136); this.lblComDes.Location = new System.Drawing.Point(167, 136);
this.lblComDes.Name = "lblComDes"; this.lblComDes.Name = "lblComDes";
this.lblComDes.Size = new System.Drawing.Size(37, 19); this.lblComDes.Size = new System.Drawing.Size(37, 19);
this.lblComDes.TabIndex = 3; this.lblComDes.TabIndex = 3;
...@@ -508,9 +508,9 @@ ...@@ -508,9 +508,9 @@
this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.Red; this.label2.ForeColor = System.Drawing.Color.Red;
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(43, 165); this.label2.Location = new System.Drawing.Point(9, 165);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(128, 19); this.label2.Size = new System.Drawing.Size(157, 19);
this.label2.TabIndex = 5; this.label2.TabIndex = 5;
this.label2.Text = "注意事项："; this.label2.Text = "注意事项：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -520,9 +520,9 @@ ...@@ -520,9 +520,9 @@
this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(43, 49); this.label3.Location = new System.Drawing.Point(9, 49);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(128, 19); this.label3.Size = new System.Drawing.Size(157, 19);
this.label3.TabIndex = 4; this.label3.TabIndex = 4;
this.label3.Text = "名称："; this.label3.Text = "名称：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -544,7 +544,7 @@ ...@@ -544,7 +544,7 @@
this.lblPointName.AutoSize = true; this.lblPointName.AutoSize = true;
this.lblPointName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblPointName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPointName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.lblPointName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblPointName.Location = new System.Drawing.Point(193, 49); this.lblPointName.Location = new System.Drawing.Point(167, 49);
this.lblPointName.Name = "lblPointName"; this.lblPointName.Name = "lblPointName";
this.lblPointName.Size = new System.Drawing.Size(42, 22); this.lblPointName.Size = new System.Drawing.Size(42, 22);
this.lblPointName.TabIndex = 1; this.lblPointName.TabIndex = 1;
...@@ -874,7 +874,7 @@ ...@@ -874,7 +874,7 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip1; this.MainMenuStrip = this.menuStrip1;
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "FrmWork"; this.Name = "FrmWork";
this.Text = "TSA_V工作"; this.Text = "TSA_V工作";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
......
TSA-V/workForm/FrmTSAV.cs
...@@ -612,20 +612,13 @@ namespace TSA_V ...@@ -612,20 +612,13 @@ namespace TSA_V
{ {
lblComNotices.Text = ResourceCulture.GetString("元器件数量不足，请及时补充", "元器件数量不足，请及时补充"); lblComNotices.Text = ResourceCulture.GetString("元器件数量不足，请及时补充", "元器件数量不足，请及时补充");
} }
//记录运行过程的位号 //记录运行过程的位号
//ConfigAppSettings.UpdateAppSetting(Setting_Init.ProcedureName, board.boardName);
//ConfigAppSettings.UpdateAppSetting(Setting_Init.TagNumber, smtPoint.pointNum.ToString());
//if (smtPoint.pointNum==1)//第一个位号不需要记录
//{
// ConfigAppSettings.UpdateAppSetting(Setting_Init.ProcedureName, "");
// ConfigAppSettings.UpdateAppSetting(Setting_Init.TagNumber, "");
//}
Setting_NInit.Work_ProcedureName=board.boardName; Setting_NInit.Work_ProcedureName=board.boardName;
Setting_NInit.Work_TagNumber = smtPoint.pointNum; Setting_NInit.Work_TagNumber = smtPoint.pointNum;
if (smtPoint.pointNum == 1)//第一个位号不需要记录 if (smtPoint.pointNum == 1)//第一个位号不需要记录
{ {
Setting_NInit.Work_ProcedureName = ""; Setting_NInit.Work_ProcedureName = "";
Setting_NInit.Work_TagNumber = 0; Setting_NInit.Work_TagNumber = 0;
} }
#endregion #endregion
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!