1.SCR组立服务器G型动静盘组装岗位,一体机上要增加一个按键,名字叫动盘与支架等级匹配ok,这个要关联到机种登录里面,目前只有一个机种会要这个按键,每个工件都要点这个按键,需要关联到给我PLC的放行信号里面
2.SCR组立服务器G型筒体烧嵌岗位,需要增加一个治具号,13位字符串
This commit is contained in:
@@ -65,6 +65,7 @@ namespace DynStatDisk.App
|
||||
ColumnHeader h11 = new ColumnHeader();
|
||||
ColumnHeader h12 = new ColumnHeader();
|
||||
ColumnHeader h13 = new ColumnHeader();
|
||||
ColumnHeader h14 = new ColumnHeader();
|
||||
|
||||
h1.TextAlign = HorizontalAlignment.Center;
|
||||
h2.TextAlign = HorizontalAlignment.Center;
|
||||
@@ -79,6 +80,7 @@ namespace DynStatDisk.App
|
||||
h11.TextAlign = HorizontalAlignment.Center;
|
||||
h12.TextAlign = HorizontalAlignment.Center;
|
||||
h13.TextAlign = HorizontalAlignment.Center;
|
||||
h14.TextAlign = HorizontalAlignment.Center;
|
||||
|
||||
h0.Width = 20;
|
||||
h1.Width = 100;
|
||||
@@ -94,6 +96,7 @@ namespace DynStatDisk.App
|
||||
h11.Width = 100;
|
||||
h12.Width = 100;
|
||||
h13.Width = 0;
|
||||
h14.Width = 100;
|
||||
|
||||
h0.Text = "";
|
||||
h1.Text = "机种番号";
|
||||
@@ -110,21 +113,22 @@ namespace DynStatDisk.App
|
||||
h11.Text = "吸油管压入";
|
||||
h12.Text = "创建时间";
|
||||
h13.Text = "";
|
||||
//h14.Text = "";
|
||||
h14.Text = "动静盘支架匹配";
|
||||
|
||||
listView1.Columns.AddRange(new ColumnHeader[] { h0, h1, h2, h3, h4 });
|
||||
listView1.Columns.AddRange(new ColumnHeader[] { h0, h1, h2, h3, h4, h14 });
|
||||
listView1.View = View.Details;
|
||||
}
|
||||
|
||||
private void InsertlistView1Result(long guid, string ModelNo, string GapInfo, string DynStatDiskKeyMatch)
|
||||
private void InsertlistView1Result(long guid, string ModelNo, string GapInfo, string DynStatDiskKeyMatch, string DyDiskBrackMatch)
|
||||
{
|
||||
ListViewItem lvi = new ListViewItem();
|
||||
lvi.ImageIndex = 0;
|
||||
lvi.Text = "";
|
||||
lvi.SubItems.Add(ModelNo.ToString());
|
||||
lvi.SubItems.Add(GapInfo.ToString());
|
||||
lvi.SubItems.Add(DynStatDiskKeyMatch!=null ?DynStatDiskKeyMatch.ToString():"");
|
||||
lvi.SubItems.Add(DynStatDiskKeyMatch != null ? DynStatDiskKeyMatch.ToString() : "");
|
||||
lvi.SubItems.Add(guid.ToString());
|
||||
lvi.SubItems.Add(DyDiskBrackMatch != null ? DyDiskBrackMatch.ToString() : "");
|
||||
this.listView1.Items.Add(lvi);
|
||||
}
|
||||
|
||||
@@ -144,7 +148,8 @@ namespace DynStatDisk.App
|
||||
InsertlistView1Result(item.Id,
|
||||
item.ModelNo,
|
||||
item.GapInfo,
|
||||
item.DynStatDiskKeyMatch
|
||||
item.DynStatDiskKeyMatch,
|
||||
item.DyDiskBrackMatch
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -169,6 +174,16 @@ namespace DynStatDisk.App
|
||||
this.cbxGapTest.SelectedIndex = -1;//默认显示LHK
|
||||
|
||||
|
||||
this.cbxDyDiskBrackMatch.Items.Clear();
|
||||
|
||||
this.cbxDyDiskBrackMatch.Items.Add("检测");//赋值
|
||||
this.cbxDyDiskBrackMatch.SelectedIndex = 0;//设置下标
|
||||
|
||||
this.cbxDyDiskBrackMatch.Items.Add("不检测");//赋值
|
||||
this.cbxDyDiskBrackMatch.SelectedIndex = 1;//下标
|
||||
|
||||
this.cbxDyDiskBrackMatch.SelectedIndex = -1;
|
||||
|
||||
//this.cbxInsulatPad.Items.Clear();
|
||||
|
||||
//this.cbxInsulatPad.Items.Add("A");//赋值
|
||||
@@ -240,7 +255,19 @@ namespace DynStatDisk.App
|
||||
break;
|
||||
}
|
||||
|
||||
txtDynStatDiskKeyMatch.Text= listView1.FocusedItem.SubItems[3].Text;
|
||||
txtDynStatDiskKeyMatch.Text = listView1.FocusedItem.SubItems[3].Text;
|
||||
|
||||
switch (listView1.FocusedItem.SubItems[5].Text)
|
||||
{
|
||||
case "检测":
|
||||
cbxDyDiskBrackMatch.SelectedIndex = 0;
|
||||
break;
|
||||
case "不检测":
|
||||
cbxDyDiskBrackMatch.SelectedIndex = 1;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
//switch (listView1.FocusedItem.SubItems[3].Text)
|
||||
//{
|
||||
@@ -298,7 +325,8 @@ namespace DynStatDisk.App
|
||||
{
|
||||
if (!string.IsNullOrEmpty(txtModelNo.Text.Trim()) &&
|
||||
//!string.IsNullOrEmpty(txtESOPPath.Text.Trim()) &&
|
||||
!string.IsNullOrEmpty(cbxGapTest.SelectedItem.ToString().Trim())
|
||||
!string.IsNullOrEmpty(cbxGapTest.SelectedItem.ToString().Trim()) &&
|
||||
!string.IsNullOrEmpty(cbxDyDiskBrackMatch.SelectedItem.ToString().Trim())
|
||||
//!string.IsNullOrEmpty(cbxInsulatPad.SelectedItem.ToString().Trim()) &&
|
||||
//!string.IsNullOrEmpty(cbxDynStatDiskConver.SelectedItem.ToString().Trim())
|
||||
)
|
||||
@@ -308,7 +336,8 @@ namespace DynStatDisk.App
|
||||
{
|
||||
ModelNo = txtModelNo.Text.Trim(),
|
||||
GapInfo = cbxGapTest.SelectedItem.ToString().Trim(),
|
||||
DynStatDiskKeyMatch= txtDynStatDiskKeyMatch.Text.Trim(),
|
||||
DynStatDiskKeyMatch = txtDynStatDiskKeyMatch.Text.Trim(),
|
||||
DyDiskBrackMatch = cbxDyDiskBrackMatch.SelectedItem.ToString().Trim(),
|
||||
//InsulatPad = cbxInsulatPad.SelectedItem.ToString().Trim(),
|
||||
//DynStatDiskConver = cbxDynStatDiskConver.SelectedItem.ToString().Trim(),
|
||||
//ESOPPath = txtESOPPath.Text.ToString().Trim()
|
||||
@@ -331,6 +360,7 @@ namespace DynStatDisk.App
|
||||
.Set(a => a.ModelNo, txtModelNo.Text.Trim())
|
||||
.Set(a => a.GapInfo, cbxGapTest.SelectedItem.ToString().Trim())
|
||||
.Set(a => a.DynStatDiskKeyMatch, txtDynStatDiskKeyMatch.Text.Trim())
|
||||
.Set(a => a.DyDiskBrackMatch, cbxDyDiskBrackMatch.SelectedItem.ToString().Trim())
|
||||
//.Set(a => a.DynStatDiskConver, cbxDynStatDiskConver.SelectedItem.ToString().Trim())
|
||||
//.Set(a => a.ESOPPath, txtESOPPath.Text.ToString().Trim())
|
||||
.Where(a => a.Id == SelectedId)
|
||||
@@ -357,7 +387,7 @@ namespace DynStatDisk.App
|
||||
|
||||
private void btnClose_Click(object sender, EventArgs e)
|
||||
{
|
||||
MachineModelConfigChanged(this,new EventArgs());
|
||||
MachineModelConfigChanged(this, new EventArgs());
|
||||
this.Close();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user