Skip to content

李娜 / Line-Smart-Workstation

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

元器件库字段修改，解析方式修改： 

编号改为位号
名称改为物料编码
位置改为料盘位置。
1 个父辈 57ff2c2d
全部展开
内嵌 并排
正在显示 25 个修改的文件 包含 261 行增加 和 158 行删除
DeviceLibrary/config/元器件信息模板-英文.csv
Num,Name,Count,PositionNum,Describe,PositionX,PositionY,Notes Num,Code,Count,PNum,Describe,PositionX,PositionY,Notes
Number, required, not repeated,Name required,Quantity required,Location, required (1-100),,,, Number, required, not repeated,Name required,Quantity required,Location, required (1-100),,,,
DeviceLibrary/config/元器件信息模板.csv
编号,元器件名称,数量,位置,元器件描述,X坐标,Y坐标,注意事项 位号,物料编码,数量,料盘位置,元器件描述,X坐标,Y坐标,注意事项
必填，不可重复,必填,必填,必填（1-100）,,,, 必填，不可重复,必填,必填,必填（1-100）,,,,
DeviceLibrary/csvLoad/CSVAttribute.cs
...@@ -14,7 +14,13 @@ namespace TSA_V.LoadCSVLibrary ...@@ -14,7 +14,13 @@ namespace TSA_V.LoadCSVLibrary
{ {
this.IsMustHave = IsMust; this.IsMustHave = IsMust;
FieldName = fieldName; FieldName = fieldName;
FieldName1 = filedName1; FiledNames = new string[] { filedName1 };
}
public CSVAttribute(string fieldName, bool IsMust= false,params string[] filedNames)
{
this.IsMustHave = IsMust;
FieldName = fieldName;
this.FiledNames = filedNames;
} }
public CSVAttribute(string fieldName,bool IsMust) public CSVAttribute(string fieldName,bool IsMust)
{ {
...@@ -25,10 +31,9 @@ namespace TSA_V.LoadCSVLibrary ...@@ -25,10 +31,9 @@ namespace TSA_V.LoadCSVLibrary
{ {
FieldName = fieldName; FieldName = fieldName;
} }
public string[] FiledNames { get; set; }
public string FieldName { get; set; } public string FieldName { get; set; }
public string FieldName1 { get; set; }
public bool IsMustHave { get; set; } public bool IsMustHave { get; set; }
} }
......
DeviceLibrary/csvLoad/CSVReaderBase.cs
...@@ -29,11 +29,41 @@ namespace TSA_V.LoadCSVLibrary ...@@ -29,11 +29,41 @@ namespace TSA_V.LoadCSVLibrary
if (att != null) if (att != null)
{ {
string csvName = att.FieldName; string csvName = att.FieldName;
if (LibNameType.Equals(1)&&(String.IsNullOrEmpty(att.FieldName1 ).Equals(false))) //if (LibNameType.Equals(1)&&(String.IsNullOrEmpty(att.FieldName1 ).Equals(false)))
//{
// csvName = att.FieldName1;
//}
proCsvMap.Add(prop.Name, csvName);
}
}
}
return proCsvMap;
}
public static Dictionary<string, List<string>> getProAttributeMaps(Type type)
{ {
csvName = att.FieldName1; Dictionary<string, List<string>> proCsvMap = new Dictionary<string, List<string>>();
PropertyInfo[] props = type.GetProperties();
foreach (PropertyInfo prop in props)
{
object[] array = prop.GetCustomAttributes(false);
if (array.Length > 0)
{
CSVAttribute att = (CSVAttribute)array[0];
if (att != null)
{
string csvName = att.FieldName;
List<string> csvTitleList = new List<string>();
if (!String.IsNullOrEmpty(att.FieldName))
{
csvTitleList.Add(att.FieldName);
} }
proCsvMap.Add(prop.Name, csvName); if (att.FiledNames != null && att.FiledNames.Length > 0)
{
csvTitleList.AddRange(att.FiledNames);
}
proCsvMap.Add(prop.Name, csvTitleList);
} }
} }
} }
...@@ -109,6 +139,12 @@ namespace TSA_V.LoadCSVLibrary ...@@ -109,6 +139,12 @@ namespace TSA_V.LoadCSVLibrary
} }
return titleIndex; return titleIndex;
} }
/// <summary>
/// 根据csv标题查找对应的索引
/// </summary>
/// <param name="lineValue">标题行的值</param>
/// <param name="cvsTitleList">csv标题集合</param>
/// <returns>key=csv标题，value=索引</returns>
protected static Dictionary<string, int> GetTitleIndex(string lineValue, List<string> cvsTitleList) protected static Dictionary<string, int> GetTitleIndex(string lineValue, List<string> cvsTitleList)
{ {
Dictionary<string, int> titleIndex = new Dictionary<string, int>(); Dictionary<string, int> titleIndex = new Dictionary<string, int>();
...@@ -136,6 +172,32 @@ namespace TSA_V.LoadCSVLibrary ...@@ -136,6 +172,32 @@ namespace TSA_V.LoadCSVLibrary
} }
return titleIndex; return titleIndex;
} }
/// <summary>
/// 根据属性名称查找对应的列索引
/// </summary>
/// <returns>key=属性名称，value=列索引</returns>
protected static Dictionary<string,int> GetProTitleIndex(string lineValue, Dictionary<string, List<string>> proTitleMaps)
{
Dictionary<string, int> titleIndex = new Dictionary<string, int>();
var array = lineValue.Split(',');
//验证列
for (int i = 0; i < array.Length; i++)
{
string title = array[i];
List<string> propList = new List<string>(proTitleMaps.Keys);
foreach(string pro in propList)
{
List<string> titleMaps = proTitleMaps[pro];
if (titleMaps.Contains(title))
{
titleIndex.Add(pro, i);
break;
}
}
}
return titleIndex;
}
} }
} }
DeviceLibrary/csvLoad/position/ComponetInfo.cs
...@@ -19,13 +19,13 @@ namespace TSA_V.LoadCSVLibrary ...@@ -19,13 +19,13 @@ namespace TSA_V.LoadCSVLibrary
/// <summary> /// <summary>
///编号 ///编号
/// </summary> /// </summary>
[CSVAttribute("Num", "编号", false)] [CSVAttribute("Num", true,"位号", "编号")]
public string PartNum { get; set; } public string PartNum { get; set; }
/// <summary> /// <summary>
/// 元器件名称 /// 元器件名称
/// </summary> /// </summary>
[CSVAttribute("Name", "元器件名称",true)] [CSVAttribute("Code", true, "物料编码", "元器件名称", "Name")]
public string ComponentName { get; set; } public string ComponentName { get; set; }
/// <summary> /// <summary>
///元器件描述 ///元器件描述
...@@ -42,7 +42,7 @@ namespace TSA_V.LoadCSVLibrary ...@@ -42,7 +42,7 @@ namespace TSA_V.LoadCSVLibrary
/// <summary> /// <summary>
///位置 ///位置
/// </summary> /// </summary>
[CSVAttribute("PositionNum", "位置", true )] [CSVAttribute("PNum", true, "料盘位置", "位置", "PositionNum")]
public string PositionNum { get; set; } public string PositionNum { get; set; }
/// <summary> /// <summary>
......
DeviceLibrary/manager/WorkInfo.cs
...@@ -93,7 +93,7 @@ namespace TSA_V.DeviceLibrary ...@@ -93,7 +93,7 @@ namespace TSA_V.DeviceLibrary
if (currIndex > 0 && currBoard != null) if (currIndex > 0 && currBoard != null)
{ {
//如果是下一个并且当前是最后一个，其实是切换了新程序,需要减去刚刚的数量 //如果是下一个并且当前是最后一个，其实是切换了新程序,需要减去刚刚的数量
CSVReaderBomManager.DelUseCount(currBoard, currIndex); CSVBomManager.DelUseCount(currBoard, currIndex);
} }
DeviceStatus deviceStatus = MesUtil.GetCurrStatus(); DeviceStatus deviceStatus = MesUtil.GetCurrStatus();
if (MesUtil.CodeISOk) if (MesUtil.CodeISOk)
...@@ -205,7 +205,7 @@ namespace TSA_V.DeviceLibrary ...@@ -205,7 +205,7 @@ namespace TSA_V.DeviceLibrary
currPoint = GetSmtList()[currIndex]; currPoint = GetSmtList()[currIndex];
//LogUtil.info(" 程序【" + currBoard.boardName + "】插件【" + currPoint.pointName + "】"); //LogUtil.info(" 程序【" + currBoard.boardName + "】插件【" + currPoint.pointName + "】");
ComponetInfo com = CSVReaderBomManager.GetCom(currBoard.bomName, currPoint.PartNum); ComponetInfo com = CSVBomManager.GetCom(currBoard.bomName, currPoint.PartNum);
TSAVPosition position = null; TSAVPosition position = null;
if (com != null) if (com != null)
{ {
...@@ -234,7 +234,7 @@ namespace TSA_V.DeviceLibrary ...@@ -234,7 +234,7 @@ namespace TSA_V.DeviceLibrary
if (isNext && (currIndex == 0)) if (isNext && (currIndex == 0))
{ {
BoardCount++; BoardCount++;
CSVReaderBomManager.DelUseCount(currBoard, GetSmtList().Count); CSVBomManager.DelUseCount(currBoard, GetSmtList().Count);
} }
} }
//焊接工作 //焊接工作
......
TSA-V/FrmAddBoard.cs
...@@ -114,7 +114,7 @@ namespace TSA_V ...@@ -114,7 +114,7 @@ namespace TSA_V
{ {
return null; return null;
} }
List<ComponetInfo> comList = CSVReaderBomManager.GetComList(board.bomName); List<ComponetInfo> comList = CSVBomManager.GetComList(board.bomName);
if (chbSort.Checked) if (chbSort.Checked)
{ {
comList = (from m in comList orderby m.PositionX ascending, m.PositionY ascending select m).ToList<ComponetInfo>(); comList = (from m in comList orderby m.PositionX ascending, m.PositionY ascending select m).ToList<ComponetInfo>();
...@@ -277,7 +277,7 @@ namespace TSA_V ...@@ -277,7 +277,7 @@ namespace TSA_V
} }
private void LoadComList() private void LoadComList()
{ {
List<string> keyList = new List<string>(LoadCSVLibrary.CSVReaderBomManager.allComMap.Keys); List<string> keyList = new List<string>(LoadCSVLibrary.CSVBomManager.allComMap.Keys);
this.cmbBomList.Items.Clear(); this.cmbBomList.Items.Clear();
foreach (string key in keyList) foreach (string key in keyList)
{ {
......
TSA-V/FrmAddCom.cs
...@@ -33,7 +33,7 @@ namespace TSA_V ...@@ -33,7 +33,7 @@ namespace TSA_V
{ {
string fileName = this.openFileDialog1.FileName; string fileName = this.openFileDialog1.FileName;
comList = CSVReaderBomManager.ReadFile(fileName); comList = CSVBomManager.ReadFile(fileName);
if (comList.Count > 0) if (comList.Count > 0)
{ {
...@@ -106,7 +106,7 @@ namespace TSA_V ...@@ -106,7 +106,7 @@ namespace TSA_V
txtBomName.Focus(); txtBomName.Focus();
return false; return false;
} }
if (CSVReaderBomManager.allComMap.ContainsKey(bomName)) if (CSVBomManager.allComMap.ContainsKey(bomName))
{ {
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.CNameHasExits,"元器件库【{0}】已存在，请重新输入！",bomName)); MessageBox.Show(ResourceCulture.GetString(ResourceCulture.CNameHasExits,"元器件库【{0}】已存在，请重新输入！",bomName));
txtBomName.Focus(); txtBomName.Focus();
...@@ -119,7 +119,7 @@ namespace TSA_V ...@@ -119,7 +119,7 @@ namespace TSA_V
return false; return false;
} }
if (CSVReaderBomManager.AddBomList(bomName, comList)) if (CSVBomManager.AddBomList(bomName, comList))
{ {
return true; return true;
} return false; } return false;
......
TSA-V/FrmBoardInfo.Designer.cs
...@@ -762,14 +762,15 @@ ...@@ -762,14 +762,15 @@
// Column_PartNum // Column_PartNum
// //
this.Column_PartNum.DataPropertyName = "partNum"; this.Column_PartNum.DataPropertyName = "partNum";
this.Column_PartNum.HeaderText = "编号"; this.Column_PartNum.HeaderText = "位号";
this.Column_PartNum.Name = "Column_PartNum"; this.Column_PartNum.Name = "Column_PartNum";
this.Column_PartNum.ReadOnly = true; this.Column_PartNum.ReadOnly = true;
this.Column_PartNum.Width = 80;
// //
// Column_Name // Column_Name
// //
this.Column_Name.DataPropertyName = "pointName"; this.Column_Name.DataPropertyName = "pointName";
this.Column_Name.HeaderText = "名称"; this.Column_Name.HeaderText = "物料编码";
this.Column_Name.Name = "Column_Name"; this.Column_Name.Name = "Column_Name";
this.Column_Name.ReadOnly = true; this.Column_Name.ReadOnly = true;
// //
...@@ -810,10 +811,10 @@ ...@@ -810,10 +811,10 @@
// Column_positionNum // Column_positionNum
// //
this.Column_positionNum.DataPropertyName = "Column_positionNum"; this.Column_positionNum.DataPropertyName = "Column_positionNum";
this.Column_positionNum.HeaderText = "位置"; this.Column_positionNum.HeaderText = "料盘位置";
this.Column_positionNum.Name = "Column_positionNum"; this.Column_positionNum.Name = "Column_positionNum";
this.Column_positionNum.ReadOnly = true; this.Column_positionNum.ReadOnly = true;
this.Column_positionNum.Width = 70; this.Column_positionNum.Width = 80;
// //
// Column_NeedSoldering // Column_NeedSoldering
// //
......
TSA-V/FrmBoardInfo.cs
...@@ -112,9 +112,9 @@ namespace TSA_V ...@@ -112,9 +112,9 @@ namespace TSA_V
this.更新为组装坐标ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_UpdateN, "更新为组装位置"); this.更新为组装坐标ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_UpdateN, "更新为组装位置");
this.Column_PartNum.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_Num, "编号"); this.Column_PartNum.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_Num, "位号");
this.Column_Name.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_Name, "名称"); this.Column_Name.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_Name, "物料编号");
this.Column_positionNum.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_Position, "位置"); this.Column_positionNum.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_Position, "料盘位置");
this.Column_NeedSoldering.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_NWeld, "需焊接"); this.Column_NeedSoldering.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_NWeld, "需焊接");
this.Column_WeldTemp.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_WeldTemp, "焊接温度"); this.Column_WeldTemp.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_WeldTemp, "焊接温度");
...@@ -290,7 +290,7 @@ namespace TSA_V ...@@ -290,7 +290,7 @@ namespace TSA_V
view.Cells[Column_disable.Index].Value = point.Disable; view.Cells[Column_disable.Index].Value = point.Disable;
if (updateBoardInfo != null) if (updateBoardInfo != null)
{ {
ComponetInfo com = CSVReaderBomManager.GetCom(updateBoardInfo.bomName, point.PartNum); ComponetInfo com = CSVBomManager.GetCom(updateBoardInfo.bomName, point.PartNum);
if (com != null) if (com != null)
{ {
view.Cells[Column_Notes.Index].Value = com.Notes; view.Cells[Column_Notes.Index].Value = com.Notes;
...@@ -1220,7 +1220,7 @@ namespace TSA_V ...@@ -1220,7 +1220,7 @@ namespace TSA_V
//List<SMTPointInfo> newList = (from m in allSmt orderby m.PositionX ascending, m.PositionY ascending select m).ToList<SMTPointInfo>(); //List<SMTPointInfo> newList = (from m in allSmt orderby m.PositionX ascending, m.PositionY ascending select m).ToList<SMTPointInfo>();
List<LoadCSVLibrary.ComponetInfo> list = CSVReaderBomManager.GetComList(updateBoardInfo.bomName); List<LoadCSVLibrary.ComponetInfo> list = CSVBomManager.GetComList(updateBoardInfo.bomName);
if (list == null && list.Count <= 0) if (list == null && list.Count <= 0)
{ {
LogUtil.info("未找到元器件库列表【" + updateBoardInfo.bomName + "】"); LogUtil.info("未找到元器件库列表【" + updateBoardInfo.bomName + "】");
......
TSA-V/FrmBoardList.cs
...@@ -46,18 +46,18 @@ namespace TSA_V ...@@ -46,18 +46,18 @@ namespace TSA_V
} }
this.listPoint.Columns.Clear(); this.listPoint.Columns.Clear();
ColumnHeader preSendwire = new ColumnHeader(); ColumnHeader preSendwire = new ColumnHeader();
preSendwire.Text =ResourceCulture.GetString(ResourceCulture.Col_Num, "编号"); //设置列标题 preSendwire.Text =ResourceCulture.GetString(ResourceCulture.Col_Num, "位号"); //设置列标题
preSendwire.Width = 120; //设置列宽度 preSendwire.Width = 120; //设置列宽度
preSendwire.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式 preSendwire.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式
this.listPoint.Columns.Add(preSendwire); //将列头添加到ListView控件。 this.listPoint.Columns.Add(preSendwire); //将列头添加到ListView控件。
ColumnHeader chName = new ColumnHeader(); ColumnHeader chName = new ColumnHeader();
chName.Text = ResourceCulture.GetString(ResourceCulture.Col_Name, "名称"); //设置列标题 chName.Text = ResourceCulture.GetString(ResourceCulture.Col_Name, "物料编码"); //设置列标题
chName.Width = 100; //设置列宽度 chName.Width = 100; //设置列宽度
chName.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式 chName.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式
this.listPoint.Columns.Add(chName); //将列头添加到ListView控件。 this.listPoint.Columns.Add(chName); //将列头添加到ListView控件。
ColumnHeader position = new ColumnHeader(); ColumnHeader position = new ColumnHeader();
position.Text = ResourceCulture.GetString(ResourceCulture.Col_Position, "位置"); //设置列标题 position.Text = ResourceCulture.GetString(ResourceCulture.Col_Position, "料盘位置"); //设置列标题
position.Width = 80; //设置列宽度 position.Width = 80; //设置列宽度
position.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式 position.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式
this.listPoint.Columns.Add(position); //将列头添加到ListView控件。 this.listPoint.Columns.Add(position); //将列头添加到ListView控件。
...@@ -160,7 +160,7 @@ namespace TSA_V ...@@ -160,7 +160,7 @@ namespace TSA_V
lvi.Text = point.PartNum.ToString(); lvi.Text = point.PartNum.ToString();
lvi.SubItems.Add(point.pointName); lvi.SubItems.Add(point.pointName);
ComponetInfo com = CSVReaderBomManager.GetCom(board.bomName, point.PartNum); ComponetInfo com = CSVBomManager.GetCom(board.bomName, point.PartNum);
if (com != null) if (com != null)
{ {
lvi.SubItems.Add(com.PositionNum); lvi.SubItems.Add(com.PositionNum);
...@@ -265,7 +265,7 @@ namespace TSA_V ...@@ -265,7 +265,7 @@ namespace TSA_V
{ {
//SetSkin(this); //SetSkin(this);
//LoadBoard(); //LoadBoard();
if ((BoardManager.boardList.Count <= 0) && (LoadCSVLibrary.CSVReaderBomManager.allComMap.Count <= 0)) if ((BoardManager.boardList.Count <= 0) && (LoadCSVLibrary.CSVBomManager.allComMap.Count <= 0))
{ {
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.ImportComList, "请先导入元器件库！")); MessageBox.Show(ResourceCulture.GetString(ResourceCulture.ImportComList, "请先导入元器件库！"));
this.Close(); this.Close();
......
TSA-V/FrmComponentList.Designer.cs
...@@ -51,8 +51,6 @@ ...@@ -51,8 +51,6 @@
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.btnSave = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button();
this.dgvList = new System.Windows.Forms.DataGridView(); this.dgvList = new System.Windows.Forms.DataGridView();
this.btnBack = new System.Windows.Forms.Button();
this.btnNew = new System.Windows.Forms.Button();
this.Column_partNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column_partNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column_Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
...@@ -62,6 +60,8 @@ ...@@ -62,6 +60,8 @@
this.Column_X = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column_X = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Y = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column_Y = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Del = new System.Windows.Forms.DataGridViewLinkColumn(); this.Column_Del = new System.Windows.Forms.DataGridViewLinkColumn();
this.btnBack = new System.Windows.Forms.Button();
this.btnNew = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupInfo.SuspendLayout(); this.groupInfo.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dgvList)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvList)).BeginInit();
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
this.label7.Name = "label7"; this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(114, 17); this.label7.Size = new System.Drawing.Size(114, 17);
this.label7.TabIndex = 73; this.label7.TabIndex = 73;
this.label7.Text = "编号："; this.label7.Text = "位号：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// label6 // label6
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(114, 17); this.label6.Size = new System.Drawing.Size(114, 17);
this.label6.TabIndex = 71; this.label6.TabIndex = 71;
this.label6.Text = "位置："; this.label6.Text = "料盘位置：";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtCount // txtCount
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(114, 17); this.label1.Size = new System.Drawing.Size(114, 17);
this.label1.TabIndex = 32; this.label1.TabIndex = 32;
this.label1.Text = "名称："; this.label1.Text = "料盘位置：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// btnSave // btnSave
...@@ -340,32 +340,6 @@ ...@@ -340,32 +340,6 @@
this.dgvList.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvList_CellContentClick); this.dgvList.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvList_CellContentClick);
this.dgvList.SelectionChanged += new System.EventHandler(this.dgvList_SelectionChanged); this.dgvList.SelectionChanged += new System.EventHandler(this.dgvList_SelectionChanged);
// //
// btnBack
//
this.btnBack.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBack.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBack.Location = new System.Drawing.Point(1110, 623);
this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(131, 63);
this.btnBack.TabIndex = 6;
this.btnBack.Text = "返回(&B)";
this.btnBack.UseVisualStyleBackColor = true;
this.btnBack.Click += new System.EventHandler(this.btnBack_Click);
//
// btnNew
//
this.btnNew.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNew.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNew.Location = new System.Drawing.Point(971, 623);
this.btnNew.Name = "btnNew";
this.btnNew.Size = new System.Drawing.Size(131, 63);
this.btnNew.TabIndex = 3;
this.btnNew.Text = "上传元器件库";
this.btnNew.UseVisualStyleBackColor = true;
this.btnNew.Click += new System.EventHandler(this.btnNew_Click);
//
// Column_partNumber // Column_partNumber
// //
this.Column_partNumber.DataPropertyName = "PartNum"; this.Column_partNumber.DataPropertyName = "PartNum";
...@@ -376,7 +350,7 @@ ...@@ -376,7 +350,7 @@
// Column_Name // Column_Name
// //
this.Column_Name.DataPropertyName = "ComponentName"; this.Column_Name.DataPropertyName = "ComponentName";
this.Column_Name.HeaderText = "名称"; this.Column_Name.HeaderText = "物料编码";
this.Column_Name.Name = "Column_Name"; this.Column_Name.Name = "Column_Name";
this.Column_Name.ReadOnly = true; this.Column_Name.ReadOnly = true;
// //
...@@ -391,7 +365,7 @@ ...@@ -391,7 +365,7 @@
// Column_Position // Column_Position
// //
this.Column_Position.DataPropertyName = "PositionNum"; this.Column_Position.DataPropertyName = "PositionNum";
this.Column_Position.HeaderText = "位置"; this.Column_Position.HeaderText = "料盘位置";
this.Column_Position.Name = "Column_Position"; this.Column_Position.Name = "Column_Position";
this.Column_Position.ReadOnly = true; this.Column_Position.ReadOnly = true;
this.Column_Position.Width = 80; this.Column_Position.Width = 80;
...@@ -441,6 +415,32 @@ ...@@ -441,6 +415,32 @@
this.Column_Del.UseColumnTextForLinkValue = true; this.Column_Del.UseColumnTextForLinkValue = true;
this.Column_Del.Width = 70; this.Column_Del.Width = 70;
// //
// btnBack
//
this.btnBack.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBack.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBack.Location = new System.Drawing.Point(1110, 623);
this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(131, 63);
this.btnBack.TabIndex = 6;
this.btnBack.Text = "返回(&B)";
this.btnBack.UseVisualStyleBackColor = true;
this.btnBack.Click += new System.EventHandler(this.btnBack_Click);
//
// btnNew
//
this.btnNew.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNew.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNew.Location = new System.Drawing.Point(971, 623);
this.btnNew.Name = "btnNew";
this.btnNew.Size = new System.Drawing.Size(131, 63);
this.btnNew.TabIndex = 3;
this.btnNew.Text = "上传元器件库";
this.btnNew.UseVisualStyleBackColor = true;
this.btnNew.Click += new System.EventHandler(this.btnNew_Click);
//
// FrmComponentList // FrmComponentList
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
......
TSA-V/FrmComponentList.cs
...@@ -33,9 +33,9 @@ namespace TSA_V ...@@ -33,9 +33,9 @@ namespace TSA_V
private void LanguagePro() private void LanguagePro()
{ {
this.Column_partNumber.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_Num, "编号"); this.Column_partNumber.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_Num, "编号");
this.Column_Name.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_Name, "名称"); this.Column_Name.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_Name, "物料编码");
this.Column_Count.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_Count, "数量"); this.Column_Count.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_Count, "数量");
this.Column_Position.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_Position, "位置"); this.Column_Position.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_Position, "料盘位置");
this.Column_Notes.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_Notes, "注意事项"); this.Column_Notes.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_Notes, "注意事项");
this.Column_description.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_Del, "描述"); this.Column_description.HeaderText = ResourceCulture.GetString(ResourceCulture.Col_Del, "描述");
this.Column_Del.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Delete, "删除"); this.Column_Del.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Delete, "删除");
...@@ -53,7 +53,7 @@ namespace TSA_V ...@@ -53,7 +53,7 @@ namespace TSA_V
} }
private void LoadComList() private void LoadComList()
{ {
List<string> keyList =new List<string> ( LoadCSVLibrary.CSVReaderBomManager.allComMap.Keys); List<string> keyList =new List<string> ( LoadCSVLibrary.CSVBomManager.allComMap.Keys);
this.cmbList.Items.Clear(); this.cmbList.Items.Clear();
foreach (string key in keyList) foreach (string key in keyList)
{ {
...@@ -72,7 +72,7 @@ namespace TSA_V ...@@ -72,7 +72,7 @@ namespace TSA_V
{ {
this.dgvList.Rows.Clear(); this.dgvList.Rows.Clear();
string key = cmbList.Text; string key = cmbList.Text;
List<ComponetInfo> list = CSVReaderBomManager.GetComList(key); List<ComponetInfo> list = CSVBomManager.GetComList(key);
foreach (ComponetInfo com in list) foreach (ComponetInfo com in list)
{ {
if (com != null) if (com != null)
...@@ -160,11 +160,14 @@ namespace TSA_V ...@@ -160,11 +160,14 @@ namespace TSA_V
return; return;
} }
CSVReaderBomManager.SaveComponet(cmbList.Text, obj); bool result = CSVBomManager.UpdateComponet(cmbList.Text, obj);
if (result)
{
//ComponentManager.Update(obj); //ComponentManager.Update(obj);
SetRowInfo(dgvList.Rows[rowIndex], obj); SetRowInfo(dgvList.Rows[rowIndex], obj);
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.ComSaveOk,"元器件【{0}】保存成功！", obj.PartNum + "-" + obj.ComponentName )); MessageBox.Show(ResourceCulture.GetString(ResourceCulture.ComSaveOk, "元器件【{0}】保存成功！", obj.PartNum + "-" + obj.ComponentName));
groupInfo.Text = ResourceCulture.GetString(ResourceCulture.ComInfo,"元器件【{0}】的基本信息",obj.PartNum + "-" + obj.ComponentName); groupInfo.Text = ResourceCulture.GetString(ResourceCulture.ComInfo, "元器件【{0}】的基本信息", obj.PartNum + "-" + obj.ComponentName);
}
} }
} }
} }
...@@ -194,7 +197,7 @@ namespace TSA_V ...@@ -194,7 +197,7 @@ namespace TSA_V
return; return;
} }
//判断编号是否存在 //判断编号是否存在
List<ComponetInfo> allList = CSVReaderBomManager.GetComList(cmbList.Text); List<ComponetInfo> allList = CSVBomManager.GetComList(cmbList.Text);
List<ComponetInfo> objs = (from m in allList where m.PartNum.Equals(obj.PartNum) select m).ToList(); List<ComponetInfo> objs = (from m in allList where m.PartNum.Equals(obj.PartNum) select m).ToList();
if (objs.Count > 0) if (objs.Count > 0)
{ {
...@@ -217,7 +220,7 @@ namespace TSA_V ...@@ -217,7 +220,7 @@ namespace TSA_V
return; return;
} }
CSVReaderBomManager.AddCom(cmbList.Text,obj); CSVBomManager.AddCom(cmbList.Text,obj);
//ComponentManager.Update(obj); //ComponentManager.Update(obj);
...@@ -299,19 +302,40 @@ namespace TSA_V ...@@ -299,19 +302,40 @@ namespace TSA_V
txtPartNum.Enabled = false; txtPartNum.Enabled = false;
btnNewCom.Visible = true ; btnNewCom.Visible = true ;
//txtPosition.Text = obj.PositionNum; //txtPosition.Text = obj.PositionNum;
int selPosIndex = -1;
int index = -1; int index = -1;
foreach (TSAVPosition p in allPosition) foreach (TSAVPosition p in allPosition)
{ {
index++; index++;
if (p.PositionNum.Equals(obj.PositionNum)) if (p.PositionNum.Equals(obj.PositionNum))
{ {
selPosIndex = index;
break;
}
}
if (selPosIndex >= 0)
{
this.cmbPositionNumList.SelectedIndex = selPosIndex;
}
else
{
index = -1; selPosIndex = -1;
foreach (TSAVPosition p in allPosition)
{
index++;
if (p.PositionNo.ToString().Equals(obj.PositionNum))
{
selPosIndex = index;
break; break;
} }
} }
if (index >= 0) if (selPosIndex >= 0)
{ {
this.cmbPositionNumList.SelectedIndex = index; this.cmbPositionNumList.SelectedIndex = selPosIndex;
} }
}
groupInfo.Text = ResourceCulture.GetString( ResourceCulture.ComInfo, "元器件【{ 0}】的基本信息",obj.PartNum+" -"+obj.ComponentName); groupInfo.Text = ResourceCulture.GetString( ResourceCulture.ComInfo, "元器件【{ 0}】的基本信息",obj.PartNum+" -"+obj.ComponentName);
} }
private void DeleteCom(int rowIndex) private void DeleteCom(int rowIndex)
...@@ -329,7 +353,7 @@ namespace TSA_V ...@@ -329,7 +353,7 @@ namespace TSA_V
} }
else else
{ {
CSVReaderBomManager.RemoveCom(cmbList.Text, obj); CSVBomManager.RemoveCom(cmbList.Text, obj);
this.dgvList.Rows.RemoveAt(rowIndex); this.dgvList.Rows.RemoveAt(rowIndex);
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.DelComOk,"元器件【{0}】删除成功！",obj.PartNum + "-" + obj.ComponentName) MessageBox.Show(ResourceCulture.GetString(ResourceCulture.DelComOk,"元器件【{0}】删除成功！",obj.PartNum + "-" + obj.ComponentName)
,ResourceCulture.GetString(ResourceCulture.MsgTitle,"提示")); ,ResourceCulture.GetString(ResourceCulture.MsgTitle,"提示"));
...@@ -394,7 +418,7 @@ namespace TSA_V ...@@ -394,7 +418,7 @@ namespace TSA_V
if (cmbList.SelectedIndex >= 0) if (cmbList.SelectedIndex >= 0)
{ {
string key = cmbList.Text; string key = cmbList.Text;
List<ComponetInfo> list = CSVReaderBomManager.GetComList(key); List<ComponetInfo> list = CSVBomManager.GetComList(key);
FrmPutCom frm = new FrmPutCom(); FrmPutCom frm = new FrmPutCom();
if (frm.SetOperateInfo(key, list)) if (frm.SetOperateInfo(key, list))
{ {
...@@ -436,7 +460,7 @@ namespace TSA_V ...@@ -436,7 +460,7 @@ namespace TSA_V
} }
else else
{ {
CSVReaderBomManager.RemoveBom(bomName); CSVBomManager.RemoveBom(bomName);
dgvList.Rows.Clear(); dgvList.Rows.Clear();
this.txtCount.Text = ""; this.txtCount.Text = "";
this.txtDes.Text = ""; this.txtDes.Text = "";
......
TSA-V/FrmMenu.cs
...@@ -118,7 +118,7 @@ namespace TSA_V ...@@ -118,7 +118,7 @@ namespace TSA_V
//加载板卡 //加载板卡
BoardManager.LoadBoard(); BoardManager.LoadBoard();
CSVReaderBomManager.LoadAllCom(); CSVBomManager.LoadAllCom();
WorkCountManager.LoadData(); WorkCountManager.LoadData();
//CalibrationManager.LoadData(); //CalibrationManager.LoadData();
string positionFileName = CSVPositionReader<TSAVPosition>.getPositionFilePath(); string positionFileName = CSVPositionReader<TSAVPosition>.getPositionFilePath();
......
TSA-V/FrmWeldPointInfo.Designer.cs → TSA-V/FrmPointInfo.Designer.cs
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
// //
this.chbCheck.AutoSize = true; this.chbCheck.AutoSize = true;
this.chbCheck.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbCheck.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbCheck.Location = new System.Drawing.Point(109, 141); this.chbCheck.Location = new System.Drawing.Point(135, 141);
this.chbCheck.Name = "chbCheck"; this.chbCheck.Name = "chbCheck";
this.chbCheck.Size = new System.Drawing.Size(168, 24); this.chbCheck.Size = new System.Drawing.Size(168, 24);
this.chbCheck.TabIndex = 84; this.chbCheck.TabIndex = 84;
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
// txtWeldTemp // txtWeldTemp
// //
this.txtWeldTemp.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtWeldTemp.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtWeldTemp.Location = new System.Drawing.Point(185, 139); this.txtWeldTemp.Location = new System.Drawing.Point(211, 139);
this.txtWeldTemp.MaxLength = 8; this.txtWeldTemp.MaxLength = 8;
this.txtWeldTemp.Name = "txtWeldTemp"; this.txtWeldTemp.Name = "txtWeldTemp";
this.txtWeldTemp.Size = new System.Drawing.Size(90, 26); this.txtWeldTemp.Size = new System.Drawing.Size(90, 26);
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
// //
// label7 // label7
// //
this.label7.Location = new System.Drawing.Point(17, 140); this.label7.Location = new System.Drawing.Point(43, 140);
this.label7.Name = "label7"; this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(162, 22); this.label7.Size = new System.Drawing.Size(162, 22);
this.label7.TabIndex = 80; this.label7.TabIndex = 80;
...@@ -203,9 +203,9 @@ ...@@ -203,9 +203,9 @@
// label3 // label3
// //
this.label3.Enabled = false; this.label3.Enabled = false;
this.label3.Location = new System.Drawing.Point(72, 100); this.label3.Location = new System.Drawing.Point(59, 100);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(31, 22); this.label3.Size = new System.Drawing.Size(74, 22);
this.label3.TabIndex = 74; this.label3.TabIndex = 74;
this.label3.Text = "X："; this.label3.Text = "X：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
// //
this.txtNum.Enabled = false; this.txtNum.Enabled = false;
this.txtNum.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtNum.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtNum.Location = new System.Drawing.Point(109, 24); this.txtNum.Location = new System.Drawing.Point(135, 24);
this.txtNum.MaxLength = 30; this.txtNum.MaxLength = 30;
this.txtNum.Name = "txtNum"; this.txtNum.Name = "txtNum";
this.txtNum.Size = new System.Drawing.Size(219, 26); this.txtNum.Size = new System.Drawing.Size(219, 26);
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
// chbNeedSoldering // chbNeedSoldering
// //
this.chbNeedSoldering.AutoSize = true; this.chbNeedSoldering.AutoSize = true;
this.chbNeedSoldering.Location = new System.Drawing.Point(289, 144); this.chbNeedSoldering.Location = new System.Drawing.Point(315, 144);
this.chbNeedSoldering.Name = "chbNeedSoldering"; this.chbNeedSoldering.Name = "chbNeedSoldering";
this.chbNeedSoldering.Size = new System.Drawing.Size(75, 21); this.chbNeedSoldering.Size = new System.Drawing.Size(75, 21);
this.chbNeedSoldering.TabIndex = 78; this.chbNeedSoldering.TabIndex = 78;
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
// txtY // txtY
// //
this.txtY.Enabled = false; this.txtY.Enabled = false;
this.txtY.Location = new System.Drawing.Point(256, 100); this.txtY.Location = new System.Drawing.Point(282, 100);
this.txtY.MaxLength = 20; this.txtY.MaxLength = 20;
this.txtY.Name = "txtY"; this.txtY.Name = "txtY";
this.txtY.Size = new System.Drawing.Size(89, 23); this.txtY.Size = new System.Drawing.Size(89, 23);
...@@ -243,18 +243,18 @@ ...@@ -243,18 +243,18 @@
// label4 // label4
// //
this.label4.Enabled = false; this.label4.Enabled = false;
this.label4.Location = new System.Drawing.Point(221, 100); this.label4.Location = new System.Drawing.Point(230, 100);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(31, 22); this.label4.Size = new System.Drawing.Size(48, 22);
this.label4.TabIndex = 76; this.label4.TabIndex = 76;
this.label4.Text = "Y："; this.label4.Text = "Y：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// label2 // label2
// //
this.label2.Location = new System.Drawing.Point(19, 26); this.label2.Location = new System.Drawing.Point(6, 26);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(85, 22); this.label2.Size = new System.Drawing.Size(128, 22);
this.label2.TabIndex = 60; this.label2.TabIndex = 60;
this.label2.Text = "编号："; this.label2.Text = "编号：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -262,7 +262,7 @@ ...@@ -262,7 +262,7 @@
// txtName // txtName
// //
this.txtName.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtName.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtName.Location = new System.Drawing.Point(109, 62); this.txtName.Location = new System.Drawing.Point(135, 62);
this.txtName.MaxLength = 30; this.txtName.MaxLength = 30;
this.txtName.Name = "txtName"; this.txtName.Name = "txtName";
this.txtName.Size = new System.Drawing.Size(219, 26); this.txtName.Size = new System.Drawing.Size(219, 26);
...@@ -271,7 +271,7 @@ ...@@ -271,7 +271,7 @@
// txtX // txtX
// //
this.txtX.Enabled = false; this.txtX.Enabled = false;
this.txtX.Location = new System.Drawing.Point(109, 100); this.txtX.Location = new System.Drawing.Point(135, 100);
this.txtX.MaxLength = 20; this.txtX.MaxLength = 20;
this.txtX.Name = "txtX"; this.txtX.Name = "txtX";
this.txtX.Size = new System.Drawing.Size(89, 23); this.txtX.Size = new System.Drawing.Size(89, 23);
...@@ -279,9 +279,9 @@ ...@@ -279,9 +279,9 @@
// //
// label1 // label1
// //
this.label1.Location = new System.Drawing.Point(19, 64); this.label1.Location = new System.Drawing.Point(6, 64);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(85, 22); this.label1.Size = new System.Drawing.Size(128, 22);
this.label1.TabIndex = 32; this.label1.TabIndex = 32;
this.label1.Text = "名称："; this.label1.Text = "名称：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......
TSA-V/FrmWeldPointInfo.cs → TSA-V/FrmPointInfo.cs
...@@ -111,10 +111,6 @@ namespace TSA_V ...@@ -111,10 +111,6 @@ namespace TSA_V
break; break;
} }
} }
//if (selPosIndex >= 0)
//{
// this.cmbPositionNumList.SelectedIndex = selPosIndex;
//}
//this.txtRobotX.Text = smpPointInfo.NodePositionX.ToString(); //this.txtRobotX.Text = smpPointInfo.NodePositionX.ToString();
//txtRobotY.Text = smpPointInfo.NodePositionY.ToString(); //txtRobotY.Text = smpPointInfo.NodePositionY.ToString();
xyMoveControl1.XValue = smtPointInfo.NodePositionX; xyMoveControl1.XValue = smtPointInfo.NodePositionX;
...@@ -136,7 +132,7 @@ namespace TSA_V ...@@ -136,7 +132,7 @@ namespace TSA_V
lblNotes.Text = ""; lblNotes.Text = "";
if (boardInfo != null) if (boardInfo != null)
{ {
ComponetInfo com = CSVReaderBomManager.GetCom(boardInfo.bomName, smtPointInfo.PartNum); ComponetInfo com = CSVBomManager.GetCom(boardInfo.bomName, smtPointInfo.PartNum);
if (com != null) if (com != null)
{ {
lblNotes.Text = com.Notes; lblNotes.Text = com.Notes;
...@@ -184,14 +180,14 @@ namespace TSA_V ...@@ -184,14 +180,14 @@ namespace TSA_V
string name = FormUtil.getValue(txtName); string name = FormUtil.getValue(txtName);
if (name.Equals("")) if (name.Equals(""))
{ {
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WriteName, "请输入名称！")); MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WriteName, "请输入物料编码！"));
txtName.Focus(); txtName.Focus();
return false; return false;
} }
smtPointInfo.PartNum = FormUtil.getValue(txtNum); smtPointInfo.PartNum = FormUtil.getValue(txtNum);
if (smtPointInfo.PartNum.Equals("")) if (smtPointInfo.PartNum.Equals(""))
{ {
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WritePartNumber, "请输入编号！")); MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WritePartNumber, "请输入位号！"));
txtNum.Focus(); txtNum.Focus();
return false; return false;
} }
......
TSA-V/FrmPutCom.Designer.cs
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(132, 16); this.label4.Size = new System.Drawing.Size(132, 16);
this.label4.TabIndex = 289; this.label4.TabIndex = 289;
this.label4.Text = "编号："; this.label4.Text = "位号：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// btnCancel // btnCancel
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(132, 16); this.label1.Size = new System.Drawing.Size(132, 16);
this.label1.TabIndex = 78; this.label1.TabIndex = 78;
this.label1.Text = "库位号："; this.label1.Text = "料盘位置：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtNum // txtNum
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(132, 16); this.label2.Size = new System.Drawing.Size(132, 16);
this.label2.TabIndex = 73; this.label2.TabIndex = 73;
this.label2.Text = "名称："; this.label2.Text = "物料编号：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtDes // txtDes
......
TSA-V/FrmPutCom.cs
...@@ -110,7 +110,7 @@ namespace TSA_V ...@@ -110,7 +110,7 @@ namespace TSA_V
} }
//lblEndInfo.Text = "已完成" + currIndex + "个"; //lblEndInfo.Text = "已完成" + currIndex + "个";
//this.lblLeftInfo.Text = "剩余" + (comList.Count - 1 - currIndex) + "个"; //this.lblLeftInfo.Text = "剩余" + (comList.Count - 1 - currIndex) + "个";
LogUtil.info("正在备料中：元器件库【" + bomName + "】编号【" + currCom.PartNum + "】元器件名称【" + currCom.ComponentName + "】库位号【" + currCom.PositionNum + "】"); LogUtil.info("正在备料中：元器件库【" + bomName + "】位号【" + currCom.PartNum + "】物料编号【" + currCom.ComponentName + "】料盘编号【" + currCom.PositionNum + "】");
if (currIndex.Equals(0)) if (currIndex.Equals(0))
{ {
btnPre.Enabled = false; btnPre.Enabled = false;
...@@ -128,7 +128,7 @@ namespace TSA_V ...@@ -128,7 +128,7 @@ namespace TSA_V
} }
if (currPosition == null) if (currPosition == null)
{ {
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.CanotFindPosition, "未找到库位【{0}】的坐标", currCom.PositionNum)); MessageBox.Show(ResourceCulture.GetString(ResourceCulture.CanotFindPosition, "未找到物料编号【{0}】的坐标", currCom.PositionNum));
} }
else if (TSAVBean.Status.Equals(TSAVStatus.Runing)) else if (TSAVBean.Status.Equals(TSAVStatus.Runing))
{ {
...@@ -214,10 +214,10 @@ namespace TSA_V ...@@ -214,10 +214,10 @@ namespace TSA_V
if (obj.PositionNum.Equals(com.PositionNum)) if (obj.PositionNum.Equals(com.PositionNum))
{ {
obj.ComCount = newCount; obj.ComCount = newCount;
CSVReaderBomManager.SaveComponet(bomName, obj);
} }
} }
CSVBomManager.SaveComponet(bomName, oldConList);
} }
private void FrmPutCom_FormClosing(object sender, FormClosingEventArgs e) private void FrmPutCom_FormClosing(object sender, FormClosingEventArgs e)
......
TSA-V/Properties/Resource.en-US.resx
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
<value>UNAVAILABLE</value> <value>UNAVAILABLE</value>
</data> </data>
<data name="FrmWork_label6_Text" xml:space="preserve"> <data name="FrmWork_label6_Text" xml:space="preserve">
<value>PART NUMBER</value> <value>TAG NUMBER</value>
</data> </data>
<data name="FrmWork_lblPartNum_Text" xml:space="preserve"> <data name="FrmWork_lblPartNum_Text" xml:space="preserve">
<value>UNAVAILABLE</value> <value>UNAVAILABLE</value>
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
<value>UNAVAILABLE</value> <value>UNAVAILABLE</value>
</data> </data>
<data name="FrmWork_label4_Text" xml:space="preserve"> <data name="FrmWork_label4_Text" xml:space="preserve">
<value>POSITION</value> <value>PLATE 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>
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
<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>NAME</value> <value>MATERIAL CODE</value>
</data> </data>
<data name="FrmWork_lblComName_Text" xml:space="preserve"> <data name="FrmWork_lblComName_Text" xml:space="preserve">
<value>UNAVAILABLE</value> <value>UNAVAILABLE</value>
...@@ -280,10 +280,10 @@ ...@@ -280,10 +280,10 @@
<value>COMPONENT INFO.</value> <value>COMPONENT INFO.</value>
</data> </data>
<data name="FrmComponentList_label7_Text" xml:space="preserve"> <data name="FrmComponentList_label7_Text" xml:space="preserve">
<value>PART NUMBER</value> <value>TAG NUMBER</value>
</data> </data>
<data name="FrmComponentList_label6_Text" xml:space="preserve"> <data name="FrmComponentList_label6_Text" xml:space="preserve">
<value>POSITION</value> <value>PLATE POSITION</value>
</data> </data>
<data name="FrmComponentList_label5_Text" xml:space="preserve"> <data name="FrmComponentList_label5_Text" xml:space="preserve">
<value>QUANTITY</value> <value>QUANTITY</value>
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
<value>DESCRIPTION</value> <value>DESCRIPTION</value>
</data> </data>
<data name="FrmComponentList_label1_Text" xml:space="preserve"> <data name="FrmComponentList_label1_Text" xml:space="preserve">
<value>NAME</value> <value>MATERIAL CODE</value>
</data> </data>
<data name="FrmComponentList_btnSave_Text" xml:space="preserve"> <data name="FrmComponentList_btnSave_Text" xml:space="preserve">
<value>SAVE</value> <value>SAVE</value>
...@@ -319,7 +319,7 @@ ...@@ -319,7 +319,7 @@
<value>SAVE</value> <value>SAVE</value>
</data> </data>
<data name="FrmPutCom_label4_Text" xml:space="preserve"> <data name="FrmPutCom_label4_Text" xml:space="preserve">
<value>PART NUMBER</value> <value>TAG NUMBER</value>
</data> </data>
<data name="FrmPutCom_btnCancel_Text" xml:space="preserve"> <data name="FrmPutCom_btnCancel_Text" xml:space="preserve">
<value>END</value> <value>END</value>
...@@ -331,13 +331,13 @@ ...@@ -331,13 +331,13 @@
<value>NEXT</value> <value>NEXT</value>
</data> </data>
<data name="FrmPutCom_label1_Text" xml:space="preserve"> <data name="FrmPutCom_label1_Text" xml:space="preserve">
<value>POSITION</value> <value>PLATE POSITION</value>
</data> </data>
<data name="FrmPutCom_label3_Text" xml:space="preserve"> <data name="FrmPutCom_label3_Text" xml:space="preserve">
<value>QUANTITY</value> <value>QUANTITY</value>
</data> </data>
<data name="FrmPutCom_label2_Text" xml:space="preserve"> <data name="FrmPutCom_label2_Text" xml:space="preserve">
<value>NAME</value> <value>MATERIAL CODE</value>
</data> </data>
<data name="FrmAddCom_Text" xml:space="preserve"> <data name="FrmAddCom_Text" xml:space="preserve">
<value>ADD NEW COMPONENT LIBRARY</value> <value>ADD NEW COMPONENT LIBRARY</value>
...@@ -580,10 +580,10 @@ ...@@ -580,10 +580,10 @@
<value>Y：</value> <value>Y：</value>
</data> </data>
<data name="FrmPointInfo_label2_Text" xml:space="preserve"> <data name="FrmPointInfo_label2_Text" xml:space="preserve">
<value>NO.</value> <value>TAG NUMBER.</value>
</data> </data>
<data name="FrmPointInfo_label1_Text" xml:space="preserve"> <data name="FrmPointInfo_label1_Text" xml:space="preserve">
<value>NAME</value> <value>MATERIAL CODE</value>
</data> </data>
<data name="FrmPointInfo_btnCancel_Text" xml:space="preserve"> <data name="FrmPointInfo_btnCancel_Text" xml:space="preserve">
<value> CANCLE</value> <value> CANCLE</value>
...@@ -890,10 +890,10 @@ ...@@ -890,10 +890,10 @@
<value>SELECT COMPONENT</value> <value>SELECT COMPONENT</value>
</data> </data>
<data name="SelectCPosition" xml:space="preserve"> <data name="SelectCPosition" xml:space="preserve">
<value>SELECT POSITION</value> <value>SELECT PLATE POSITION</value>
</data> </data>
<data name="WriteComName" xml:space="preserve"> <data name="WriteComName" xml:space="preserve">
<value>WRITE COMPONENT NAME</value> <value>WRITE COMPONENT MATERIAL CODE</value>
</data> </data>
<data name="WriteComNum" xml:space="preserve"> <data name="WriteComNum" xml:space="preserve">
<value>WRITE COMPONENT AMOUNT</value> <value>WRITE COMPONENT AMOUNT</value>
...@@ -953,13 +953,13 @@ ...@@ -953,13 +953,13 @@
<value>COMPONENT 【{0}】AMOUNT CHANGE TO 【{1}】</value> <value>COMPONENT 【{0}】AMOUNT CHANGE TO 【{1}】</value>
</data> </data>
<data name="ChoiceComPosition" xml:space="preserve"> <data name="ChoiceComPosition" xml:space="preserve">
<value>SELECT COMPONENT POSITION</value> <value>SELECT COMPONENT PLATE POSITION</value>
</data> </data>
<data name="WriteName" xml:space="preserve"> <data name="WriteName" xml:space="preserve">
<value>WRITE NAME</value> <value>WRITE MATERIAL CODE</value>
</data> </data>
<data name="WritePartNumber" xml:space="preserve"> <data name="WritePartNumber" xml:space="preserve">
<value>WRITE PART NUMBER</value> <value>WRITE TAG NUMBER</value>
</data> </data>
<data name="FrmAddBoard_label6_Text" xml:space="preserve"> <data name="FrmAddBoard_label6_Text" xml:space="preserve">
<value>CODE:</value> <value>CODE:</value>
...@@ -1430,7 +1430,7 @@ ...@@ -1430,7 +1430,7 @@
<value>DESCRIBE</value> <value>DESCRIBE</value>
</data> </data>
<data name="Col_Name" xml:space="preserve"> <data name="Col_Name" xml:space="preserve">
<value>NAME</value> <value>MATERIAL CODE</value>
</data> </data>
<data name="Col_NCheck" xml:space="preserve"> <data name="Col_NCheck" xml:space="preserve">
<value>CHECK</value> <value>CHECK</value>
...@@ -1439,13 +1439,13 @@ ...@@ -1439,13 +1439,13 @@
<value>NOTES</value> <value>NOTES</value>
</data> </data>
<data name="Col_Num" xml:space="preserve"> <data name="Col_Num" xml:space="preserve">
<value>NUMBER</value> <value>TAG NUMBER</value>
</data> </data>
<data name="Col_NWeld" xml:space="preserve"> <data name="Col_NWeld" xml:space="preserve">
<value>WELD </value> <value>WELD </value>
</data> </data>
<data name="Col_Position" xml:space="preserve"> <data name="Col_Position" xml:space="preserve">
<value>POSITION</value> <value>PLATE POSITION</value>
</data> </data>
<data name="Col_UpdateP" xml:space="preserve"> <data name="Col_UpdateP" xml:space="preserve">
<value>UPDATE POSITION</value> <value>UPDATE POSITION</value>
...@@ -2263,6 +2263,9 @@ ...@@ -2263,6 +2263,9 @@
<data name="时间" xml:space="preserve"> <data name="时间" xml:space="preserve">
<value>creat time</value> <value>creat time</value>
</data> </data>
<data name="位号" xml:space="preserve">
<value>tag number</value>
</data>
<data name="编号" xml:space="preserve"> <data name="编号" xml:space="preserve">
<value>point no</value> <value>point no</value>
</data> </data>
...@@ -2412,4 +2415,5 @@ ...@@ -2412,4 +2415,5 @@
</data> </data>
<data name = "FrmAddBoard_lblWidth_Text" xml:space = "preserve"> <value>Line width：</value> </data> <data name = "FrmAddBoard_lblWidth_Text" xml:space = "preserve"> <value>Line width：</value> </data>
<data name = "FrmBoardSelect_chbWorkSingleStart_Text" xml:space = "preserve"> <value> Enable workspace detection to start working </value> </data> <data name = "FrmBoardSelect_chbWorkSingleStart_Text" xml:space = "preserve"> <value> Enable workspace detection to start working </value> </data>
<data name = "FrmPointInfo_lblName_Text" xml:space = "preserve"> <value> Projection words： </value> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
<value>暂无</value> <value>暂无</value>
</data> </data>
<data name="FrmWork_label6_Text" xml:space="preserve"> <data name="FrmWork_label6_Text" xml:space="preserve">
<value>编号：</value> <value>位号：</value>
</data> </data>
<data name="FrmWork_lblPartNum_Text" xml:space="preserve"> <data name="FrmWork_lblPartNum_Text" xml:space="preserve">
<value>暂无</value> <value>暂无</value>
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
<value>暂无</value> <value>暂无</value>
</data> </data>
<data name="FrmWork_label4_Text" xml:space="preserve"> <data name="FrmWork_label4_Text" xml:space="preserve">
<value>位置：</value> <value>料盘位置：</value>
</data> </data>
<data name="FrmWork_label1_Text" xml:space="preserve"> <data name="FrmWork_label1_Text" xml:space="preserve">
<value>描述：</value> <value>描述：</value>
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
<value>注意事项：</value> <value>注意事项：</value>
</data> </data>
<data name="FrmWork_label3_Text" xml:space="preserve"> <data name="FrmWork_label3_Text" xml:space="preserve">
<value>名称：</value> <value>物料编码：</value>
</data> </data>
<data name="FrmWork_lblComName_Text" xml:space="preserve"> <data name="FrmWork_lblComName_Text" xml:space="preserve">
<value>暂无</value> <value>暂无</value>
...@@ -280,10 +280,10 @@ ...@@ -280,10 +280,10 @@
<value>元器件基本信息</value> <value>元器件基本信息</value>
</data> </data>
<data name="FrmComponentList_label7_Text" xml:space="preserve"> <data name="FrmComponentList_label7_Text" xml:space="preserve">
<value>编号：</value> <value>位号：</value>
</data> </data>
<data name="FrmComponentList_label6_Text" xml:space="preserve"> <data name="FrmComponentList_label6_Text" xml:space="preserve">
<value>位置：</value> <value>料盘位置：</value>
</data> </data>
<data name="FrmComponentList_label5_Text" xml:space="preserve"> <data name="FrmComponentList_label5_Text" xml:space="preserve">
<value>数量：</value> <value>数量：</value>
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
<value>描述：</value> <value>描述：</value>
</data> </data>
<data name="FrmComponentList_label1_Text" xml:space="preserve"> <data name="FrmComponentList_label1_Text" xml:space="preserve">
<value>名称：</value> <value>物料编码：</value>
</data> </data>
<data name="FrmComponentList_btnSave_Text" xml:space="preserve"> <data name="FrmComponentList_btnSave_Text" xml:space="preserve">
<value>保存</value> <value>保存</value>
...@@ -319,7 +319,7 @@ ...@@ -319,7 +319,7 @@
<value>保存数量</value> <value>保存数量</value>
</data> </data>
<data name="FrmPutCom_label4_Text" xml:space="preserve"> <data name="FrmPutCom_label4_Text" xml:space="preserve">
<value>编号：</value> <value>位号：</value>
</data> </data>
<data name="FrmPutCom_btnCancel_Text" xml:space="preserve"> <data name="FrmPutCom_btnCancel_Text" xml:space="preserve">
<value>结束</value> <value>结束</value>
...@@ -331,13 +331,13 @@ ...@@ -331,13 +331,13 @@
<value>上一个元器件</value> <value>上一个元器件</value>
</data> </data>
<data name="FrmPutCom_label1_Text" xml:space="preserve"> <data name="FrmPutCom_label1_Text" xml:space="preserve">
<value>库位号：</value> <value>料盘位置：</value>
</data> </data>
<data name="FrmPutCom_label3_Text" xml:space="preserve"> <data name="FrmPutCom_label3_Text" xml:space="preserve">
<value>数量：</value> <value>数量：</value>
</data> </data>
<data name="FrmPutCom_label2_Text" xml:space="preserve"> <data name="FrmPutCom_label2_Text" xml:space="preserve">
<value>名称：</value> <value>料盘编码：</value>
</data> </data>
<data name="FrmAddCom_Text" xml:space="preserve"> <data name="FrmAddCom_Text" xml:space="preserve">
<value>新增元器件库</value> <value>新增元器件库</value>
...@@ -580,10 +580,10 @@ ...@@ -580,10 +580,10 @@
<value>Y：</value> <value>Y：</value>
</data> </data>
<data name="FrmPointInfo_label2_Text" xml:space="preserve"> <data name="FrmPointInfo_label2_Text" xml:space="preserve">
<value>编号：</value> <value>位号：</value>
</data> </data>
<data name="FrmPointInfo_label1_Text" xml:space="preserve"> <data name="FrmPointInfo_label1_Text" xml:space="preserve">
<value>名称：</value> <value>物料编码：</value>
</data> </data>
<data name="FrmPointInfo_btnCancel_Text" xml:space="preserve"> <data name="FrmPointInfo_btnCancel_Text" xml:space="preserve">
<value>取消</value> <value>取消</value>
...@@ -889,10 +889,10 @@ ...@@ -889,10 +889,10 @@
<value>请选择元器件</value> <value>请选择元器件</value>
</data> </data>
<data name="SelectCPosition" xml:space="preserve"> <data name="SelectCPosition" xml:space="preserve">
<value>请选择元器件位置</value> <value>请选择元器件料盘位置</value>
</data> </data>
<data name="WriteComName" xml:space="preserve"> <data name="WriteComName" xml:space="preserve">
<value>请输入元器件名称</value> <value>请输入元器件物料编码</value>
</data> </data>
<data name="WriteComNum" xml:space="preserve"> <data name="WriteComNum" xml:space="preserve">
<value>请输入元器件数量</value> <value>请输入元器件数量</value>
...@@ -952,13 +952,13 @@ ...@@ -952,13 +952,13 @@
<value>元器件【{0}】的数量已更新为【{1}】</value> <value>元器件【{0}】的数量已更新为【{1}】</value>
</data> </data>
<data name="ChoiceComPosition" xml:space="preserve"> <data name="ChoiceComPosition" xml:space="preserve">
<value>请选择元器件所在位置</value> <value>请选择元器件所在料盘位置</value>
</data> </data>
<data name="WriteName" xml:space="preserve"> <data name="WriteName" xml:space="preserve">
<value>请输入名称</value> <value>请输入物料编码</value>
</data> </data>
<data name="WritePartNumber" xml:space="preserve"> <data name="WritePartNumber" xml:space="preserve">
<value>请输入编号</value> <value>请输入位号</value>
</data> </data>
<data name="FrmMenu_btnMaintenance" xml:space="preserve"> <data name="FrmMenu_btnMaintenance" xml:space="preserve">
<value>设备配置</value> <value>设备配置</value>
...@@ -1384,7 +1384,7 @@ ...@@ -1384,7 +1384,7 @@
<value>描述</value> <value>描述</value>
</data> </data>
<data name="Col_Name" xml:space="preserve"> <data name="Col_Name" xml:space="preserve">
<value>名称</value> <value>物料编码</value>
</data> </data>
<data name="Col_NCheck" xml:space="preserve"> <data name="Col_NCheck" xml:space="preserve">
<value>需检测</value> <value>需检测</value>
...@@ -1393,13 +1393,13 @@ ...@@ -1393,13 +1393,13 @@
<value>注意事项</value> <value>注意事项</value>
</data> </data>
<data name="Col_Num" xml:space="preserve"> <data name="Col_Num" xml:space="preserve">
<value>编号</value> <value>位号</value>
</data> </data>
<data name="Col_NWeld" xml:space="preserve"> <data name="Col_NWeld" xml:space="preserve">
<value>需焊接</value> <value>需焊接</value>
</data> </data>
<data name="Col_Position" xml:space="preserve"> <data name="Col_Position" xml:space="preserve">
<value>位置</value> <value>料盘位置</value>
</data> </data>
<data name="Col_UpdateP" xml:space="preserve"> <data name="Col_UpdateP" xml:space="preserve">
<value>更新坐标</value> <value>更新坐标</value>
...@@ -2277,6 +2277,9 @@ ...@@ -2277,6 +2277,9 @@
<data name="时间" xml:space="preserve"> <data name="时间" xml:space="preserve">
<value>时间</value> <value>时间</value>
</data> </data>
<data name="位号" xml:space="preserve">
<value>位号</value>
</data>
<data name="编号" xml:space="preserve"> <data name="编号" xml:space="preserve">
<value>编号</value> <value>编号</value>
</data> </data>
...@@ -2416,10 +2419,10 @@ ...@@ -2416,10 +2419,10 @@
<value> 新增元器件 </value> <value> 新增元器件 </value>
</data> </data>
<data name="WritePartName" xml:space="preserve"> <data name="WritePartName" xml:space="preserve">
<value>请输入元器件编号</value> <value>请输入元器件位号</value>
</data> </data>
<data name="PartNAExist" xml:space="preserve"> <data name="PartNAExist" xml:space="preserve">
<value>元器件编号[{0}]已存在</value> <value>元器件位号[{0}]已存在</value>
</data> </data>
<data name="注意事项" xml:space="preserve"> <data name="注意事项" xml:space="preserve">
<value>注意事项</value> <value>注意事项</value>
...@@ -2427,4 +2430,5 @@ ...@@ -2427,4 +2430,5 @@
<data name = "FrmAddBoard_lblWidth_Text" xml:space = "preserve"> <value> 线体宽度： </value> </data> <data name = "FrmAddBoard_lblWidth_Text" xml:space = "preserve"> <value> 线体宽度： </value> </data>
<data name = "FrmBoardSelect_chbWorkSingleStart_Text" xml:space = "preserve"> <value> 启用工作区检测开始工作 </value> </data> <data name = "FrmBoardSelect_chbWorkSingleStart_Text" xml:space = "preserve"> <value> 启用工作区检测开始工作 </value> </data>
<data name = "FrmPointInfo_lblName_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
...@@ -270,11 +270,11 @@ ...@@ -270,11 +270,11 @@
<Compile Include="workForm\FrmTSAV.Designer.cs"> <Compile Include="workForm\FrmTSAV.Designer.cs">
<DependentUpon>FrmTSAV.cs</DependentUpon> <DependentUpon>FrmTSAV.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmWeldPointInfo.cs"> <Compile Include="FrmPointInfo.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="FrmWeldPointInfo.Designer.cs"> <Compile Include="FrmPointInfo.Designer.cs">
<DependentUpon>FrmWeldPointInfo.cs</DependentUpon> <DependentUpon>FrmPointInfo.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="workForm\FrmWorkCount.cs"> <Compile Include="workForm\FrmWorkCount.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
...@@ -378,8 +378,8 @@ ...@@ -378,8 +378,8 @@
<EmbeddedResource Include="workForm\FrmTSAV.resx"> <EmbeddedResource Include="workForm\FrmTSAV.resx">
<DependentUpon>FrmTSAV.cs</DependentUpon> <DependentUpon>FrmTSAV.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmWeldPointInfo.resx"> <EmbeddedResource Include="FrmPointInfo.resx">
<DependentUpon>FrmWeldPointInfo.cs</DependentUpon> <DependentUpon>FrmPointInfo.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="workForm\FrmWorkCount.resx"> <EmbeddedResource Include="workForm\FrmWorkCount.resx">
<DependentUpon>FrmWorkCount.cs</DependentUpon> <DependentUpon>FrmWorkCount.cs</DependentUpon>
......
TSA-V/workForm/FrmTSAV.cs
...@@ -522,7 +522,7 @@ namespace TSA_V ...@@ -522,7 +522,7 @@ namespace TSA_V
lblPositionNum.Text = smtPoint.PositionNum; lblPositionNum.Text = smtPoint.PositionNum;
lblPartNum.Text = smtPoint.PartNum; lblPartNum.Text = smtPoint.PartNum;
lblPointName.Text = smtPoint.pointName; lblPointName.Text = smtPoint.pointName;
ComponetInfo com = CSVReaderBomManager.GetCom(BoardManager.CurrBoard.bomName, smtPoint.PartNum); ComponetInfo com = CSVBomManager.GetCom(BoardManager.CurrBoard.bomName, smtPoint.PartNum);
TSAVPosition position = null; TSAVPosition position = null;
if (com != null) if (com != null)
{ {
...@@ -754,7 +754,7 @@ namespace TSA_V ...@@ -754,7 +754,7 @@ namespace TSA_V
} }
FrmProjectorScreen.instance.ShowPoint(true, smtPoint); FrmProjectorScreen.instance.ShowPoint(true, smtPoint);
ComponetInfo com = CSVReaderBomManager.GetCom(this.board.bomName, smtPoint.PartNum); ComponetInfo com = CSVBomManager.GetCom(this.board.bomName, smtPoint.PartNum);
TSAVPosition position = null; TSAVPosition position = null;
if (com != null) if (com != null)
{ {
...@@ -842,7 +842,7 @@ namespace TSA_V ...@@ -842,7 +842,7 @@ namespace TSA_V
string comName = lblComName.Text; string comName = lblComName.Text;
int count = FormUtil.GetIntValue(txtCount); int count = FormUtil.GetIntValue(txtCount);
string bomName = TSAVBean.Work.currBoard.bomName; string bomName = TSAVBean.Work.currBoard.bomName;
if (CSVReaderBomManager.UpdateCount(bomName, comName, count)) if (CSVBomManager.UpdateCount(bomName, comName, count))
{ {
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.UpdateCNumOk, "元器件【{0}】的数量已更新为【{1}】", comName, count)); MessageBox.Show(ResourceCulture.GetString(ResourceCulture.UpdateCNumOk, "元器件【{0}】的数量已更新为【{1}】", comName, count));
} }
......
TSA-V/记录.txt
...@@ -102,3 +102,10 @@ SmartWorkstation.exe.config文件需要增加参数： ...@@ -102,3 +102,10 @@ SmartWorkstation.exe.config文件需要增加参数：
需要再 SmartWorkstation.exe.config配置文件增加如下一行配置 ： 需要再 SmartWorkstation.exe.config配置文件增加如下一行配置 ：
<add key ="SideCylinderMoveFirst" value ="1"/> <add key ="SideCylinderMoveFirst" value ="1"/>
2.导入元器件库时，不同料配置同库位，增加提示确认。 2.导入元器件库时，不同料配置同库位，增加提示确认。
20210812:
元器件库字段修改，解析方式修改 ：
编号改为位号
名称改为物料编码
位置改为料盘位置。
\ No newline at end of file \ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!