Skip to content

李娜 / Line-Smart-Workstation

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

12.默认设置左下角 

13.上传程序改为 上传元数据
14.数据表上传可以排序，可以删除。
15.数据表上传，说明可选
1 个父辈 70984a35
内嵌 并排
正在显示 6 个修改的文件 包含 35 行增加 和 17 行删除
TSA-V/Properties/Resource.en-US.resx
...@@ -2489,7 +2489,7 @@ ...@@ -2489,7 +2489,7 @@
<value>Template Download</value> <value>Template Download</value>
</data> </data>
<data name="FrmAddBoard_rdbUpload_Text" xml:space="preserve"> <data name="FrmAddBoard_rdbUpload_Text" xml:space="preserve">
<value> BOM Upload </value> <value> Uploading component data </value>
</data> </data>
<data name="FrmAddBoard_rdbSelCom_Text" xml:space="preserve"> <data name="FrmAddBoard_rdbSelCom_Text" xml:space="preserve">
<value> Select Position </value> <value> Select Position </value>
......
TSA-V/Properties/Resource.zh-CN.resx
...@@ -2506,7 +2506,7 @@ ...@@ -2506,7 +2506,7 @@
<value> 下载模板 </value> <value> 下载模板 </value>
</data> </data>
<data name="FrmAddBoard_rdbUpload_Text" xml:space="preserve"> <data name="FrmAddBoard_rdbUpload_Text" xml:space="preserve">
<value> 上传程序 </value> <value> 上传元件数据 </value>
</data> </data>
<data name="FrmAddBoard_rdbSelCom_Text" xml:space="preserve"> <data name="FrmAddBoard_rdbSelCom_Text" xml:space="preserve">
<value> 选择元器件库 </value> <value> 选择元器件库 </value>
......
TSA-V/frmBoard/FrmAddBoard.Designer.cs
...@@ -411,10 +411,10 @@ ...@@ -411,10 +411,10 @@
this.rdbUpload.Location = new System.Drawing.Point(9, 26); this.rdbUpload.Location = new System.Drawing.Point(9, 26);
this.rdbUpload.Name = "rdbUpload"; this.rdbUpload.Name = "rdbUpload";
this.rdbUpload.RightToLeft = System.Windows.Forms.RightToLeft.No; this.rdbUpload.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.rdbUpload.Size = new System.Drawing.Size(74, 21); this.rdbUpload.Size = new System.Drawing.Size(98, 21);
this.rdbUpload.TabIndex = 299; this.rdbUpload.TabIndex = 299;
this.rdbUpload.TabStop = true; this.rdbUpload.TabStop = true;
this.rdbUpload.Text = "上传程序"; this.rdbUpload.Text = "上传元件数据";
this.rdbUpload.UseVisualStyleBackColor = true; this.rdbUpload.UseVisualStyleBackColor = true;
this.rdbUpload.CheckedChanged += new System.EventHandler(this.rdbUpload_CheckedChanged); this.rdbUpload.CheckedChanged += new System.EventHandler(this.rdbUpload_CheckedChanged);
// //
......
TSA-V/frmBoard/FrmAddBoard.cs
...@@ -290,8 +290,7 @@ namespace TSA_V ...@@ -290,8 +290,7 @@ namespace TSA_V
} }
private void FrmAddBoard_Load(object sender, EventArgs e) private void FrmAddBoard_Load(object sender, EventArgs e)
{ {
cmbOrgType.SelectedIndex = 2;
this.timer1.Enabled = true; this.timer1.Enabled = true;
LoadComList(); LoadComList();
LanguageProcess(); LanguageProcess();
...@@ -315,7 +314,7 @@ namespace TSA_V ...@@ -315,7 +314,7 @@ namespace TSA_V
"右上角", "右上角",
"右下角"}); "右下角"});
} }
cmbOrgType.SelectedIndex = 2; cmbOrgType.SelectedIndex = 1;
SetScreen(); SetScreen();
xyMoveControl1.ShowPointEvent += XyMoveControl1_ShowPointEvent; xyMoveControl1.ShowPointEvent += XyMoveControl1_ShowPointEvent;
xyMoveControl1.XValue = TSAVBean.X_Max/2; xyMoveControl1.XValue = TSAVBean.X_Max/2;
......
TSA-V/frmBoard/FrmBomUpload.cs
...@@ -75,10 +75,13 @@ namespace TSA_V.frmBoard ...@@ -75,10 +75,13 @@ namespace TSA_V.frmBoard
{ {
LoadCmbItems(cmbPn, XyFileTitleList); LoadCmbItems(cmbPn, XyFileTitleList);
} }
LoadCmbItems(cmbDes, XyFileTitleList);
LoadCmbItems(cmbX, XyFileTitleList); LoadCmbItems(cmbX, XyFileTitleList);
LoadCmbItems(cmbY, XyFileTitleList); LoadCmbItems(cmbY, XyFileTitleList);
LoadCmbItems(cmbTagNumber, XyFileTitleList); LoadCmbItems(cmbTagNumber, XyFileTitleList);
List<string> desList = new List<string>();
desList.Add("");
desList.AddRange(XyFileTitleList);
LoadCmbItems(cmbDes, desList);
} }
} }
else else
...@@ -198,12 +201,12 @@ namespace TSA_V.frmBoard ...@@ -198,12 +201,12 @@ namespace TSA_V.frmBoard
cmbY.Focus(); cmbY.Focus();
return; return;
} }
if (desTitle == "") //if (desTitle == "")
{ //{
MessageBox.Show(ResourceCulture.GetString("BOM_SelDesTitle", "请选择描述对应表头！")); // MessageBox.Show(ResourceCulture.GetString("BOM_SelDesTitle", "请选择描述对应表头！"));
cmbDes.Focus(); // cmbDes.Focus();
return; // return;
} //}
//生成数据 //生成数据
LogUtil.info($"Bom文件{txtBomFile.Text}，位置文件{txtXyFile.Text}，表头{pnTitle}，{bomTagNumber}，{xyTagNumber},{xTitle},{yTitle},{desTitle} 开始生成元器件数据 "); LogUtil.info($"Bom文件{txtBomFile.Text}，位置文件{txtXyFile.Text}，表头{pnTitle}，{bomTagNumber}，{xyTagNumber},{xTitle},{yTitle},{desTitle} 开始生成元器件数据 ");
...@@ -266,7 +269,11 @@ namespace TSA_V.frmBoard ...@@ -266,7 +269,11 @@ namespace TSA_V.frmBoard
int tagIndex = XyFileTitleList.IndexOf(xyTagNumber); int tagIndex = XyFileTitleList.IndexOf(xyTagNumber);
int xIndex = XyFileTitleList.IndexOf(xTitle); int xIndex = XyFileTitleList.IndexOf(xTitle);
int yIndex = XyFileTitleList.IndexOf(yTitle); int yIndex = XyFileTitleList.IndexOf(yTitle);
int desIndex = XyFileTitleList.IndexOf(desTitle); int desIndex = -1;
if (desTitle != "")
{
desIndex = XyFileTitleList.IndexOf(desTitle);
}
foreach (List<string> xyData in XyFileDataList) foreach (List<string> xyData in XyFileDataList)
{ {
try try
...@@ -275,7 +282,14 @@ namespace TSA_V.frmBoard ...@@ -275,7 +282,14 @@ namespace TSA_V.frmBoard
obj.TagNo = xyData[tagIndex].Trim(); obj.TagNo = xyData[tagIndex].Trim();
obj.PositionX = ToDouble(xyData[xIndex].Trim()); obj.PositionX = ToDouble(xyData[xIndex].Trim());
obj.PositionY = ToDouble(xyData[yIndex].Trim()); obj.PositionY = ToDouble(xyData[yIndex].Trim());
obj.ComponentDes = xyData[desIndex].Trim(); if(desIndex != -1)
{
obj.ComponentDes = xyData[desIndex].Trim();
}
else
{
obj.ComponentDes ="";
}
obj.PN = ""; obj.PN = "";
if (pnTagNumMap.Count >= 0) if (pnTagNumMap.Count >= 0)
{ {
......
TSA-V/记录.txt
...@@ -31,6 +31,11 @@ ...@@ -31,6 +31,11 @@
10.未修改过的点位使用上个点位的形状。 10.未修改过的点位使用上个点位的形状。
11.增加提示音。 11.增加提示音。
12.默认设置左下角
13.上传程序改为 上传元数据
14.数据表上传可以排序，可以删除。
15.数据表上传，说明可选
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!