Skip to content

李娜 / Line-Smart-Workstation

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

补料功能完善

1 个父辈 855b5efd
全部展开
内嵌 并排
正在显示 6 个修改的文件 包含 93 行增加 和 41 行删除
TSA-V/Properties/Resource.en-US.resx
......@@ -2807,4 +2807,6 @@
<data name = "FrmNImageViewer_btnR_Text" xml:space = "preserve"> <value> Rotate </value> </data>
<data name = "FrmNImageViewer_btnCancel_Text" xml:space = "preserve"> <value> Cancel </value> </data>
<data name = "FrmNImageViewer_btnOK_Text" xml:space = "preserve"> <value> OK </value> </data>
<data name = "FrmScanPutCom_label7_Text" xml:space = "preserve"> <value> Pos: </value> </data>
<data name = "NotFindPNPos" xml:space = "preserve"> <value> Data Not Found: PN={0}, Location={1}, Please Scan Again</value> </data>
</root>
\ No newline at end of file
TSA-V/Properties/Resource.ru-RU.resx
......@@ -2785,4 +2785,6 @@
<data name = "FrmNImageViewer_btnR_Text" xml:space = "preserve"> <value> 旋转 </value> </data>
<data name = "FrmNImageViewer_btnCancel_Text" xml:space = "preserve"> <value> 取消 </value> </data>
<data name = "FrmNImageViewer_btnOK_Text" xml:space = "preserve"> <value> 确认 </value> </data>
<data name = "FrmScanPutCom_label7_Text" xml:space = "preserve"> <value> Pos: </value> </data>
<data name = "NotFindPNPos" xml:space = "preserve"> <value> 未找到数据：PN={0}，位置={1}，请重新扫码 </value> </data>
</root>
\ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
......@@ -3029,4 +3029,6 @@
<data name = "FrmNImageViewer_btnR_Text" xml:space = "preserve"> <value> 旋转 </value> </data>
<data name = "FrmNImageViewer_btnCancel_Text" xml:space = "preserve"> <value> 取消 </value> </data>
<data name = "FrmNImageViewer_btnOK_Text" xml:space = "preserve"> <value> 确认 </value> </data>
<data name = "FrmScanPutCom_label7_Text" xml:space = "preserve"> <value> 料盘位置: </value> </data>
<data name = "NotFindPNPos" xml:space = "preserve"> <value> 未找到数据：PN={0}，位置={1}，请重新扫码 </value> </data>
</root>
\ No newline at end of file
TSA-V/frmBoard/FrmPointInfo.cs
......@@ -110,6 +110,7 @@ namespace TSA_V
{
pnList.Insert(0,point.PN);
}
cmbPnList.DataSource = null;
cmbPnList.Items.Clear();
cmbPnList.DataSource = pnList;
cmbPnList.SelectedIndex = pnList.IndexOf(point.PN);
......
TSA-V/frmCom/FrmScanPutCom.cs
......@@ -92,6 +92,8 @@ namespace TSA_V
private void ClearCom()
{
txtScanPn.Text = string.Empty;
cmbPosition.Items.Clear();
cmbPosition.Text = "";
currPn = "";
currCom = null;
......@@ -104,24 +106,32 @@ namespace TSA_V
txtScanPn.Focus();
btnSaveCount.Visible = false ;
}
private int getIndex(string pn)
private List<ComponetInfo> getDataByPN(string pn)
{
List<ComponetInfo> result = (from m in comList where m.PN.Equals(pn) select m).ToList();
return result;
}
private int getIndex(string pn, string pos) {
int index = -1;
for(int i = 0; i < comList.Count; i++)
for (int i = 0; i < comList.Count; i++)
{
if (comList[i].PN.Equals(pn))
{
if (pos == "" || comList[i].PositionNum == pos)
{
index = i;
break;
}
}
}
return index;
}
private void ShowCom()
{
lblMsg.Text = "";
currCom = comList[currIndex];
currPosition = CSVPositionReader<TSAVPosition>.GetPositonByNum(currCom.PositionNum);
cmbPosition.Text= currCom.PositionNum;
this.lblPN.Text = currCom.PN;
this.numCount.Text = currCom.ComCount.ToString();
this.lblTagNo.Text = currCom.TagNo;
......@@ -178,41 +188,6 @@ namespace TSA_V
}
protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
{
// 按快捷键Ctrl+S执行按钮的点击事件方法
//if (keyData.Equals(Keys.Up) || keyData.Equals(Keys.MButton | Keys.Space))
//{
// if (btnPre.Enabled)
// {
// btnPre.PerformClick();
// }
// return true;
//}
//else if (keyData.Equals(Keys.Down) || keyData.Equals(Keys.Back | Keys.Space))
//{
// if (btnNext.Enabled)
// {
// this.btnNext.PerformClick();
// }
// return true;
//}
//else if (keyData.Equals(Keys.Left) || keyData.Equals(Keys.LButton | Keys.MButton | Keys.Space))
//{
// if (btnPre.Enabled)
// {
// btnPre.PerformClick();
// }
// return true;
//}
//else if (keyData.Equals(Keys.Right) || keyData.Equals(Keys.LButton | Keys.RButton | Keys.MButton | Keys.Space))
//{
// if (btnNext.Enabled)
// {
// this.btnNext.PerformClick();
// }
// return true;
//}
return base.ProcessCmdKey(ref msg, keyData);　// 其他键按默认处理　
}
private void btnSaveCount_LinkClicked(object sender, EventArgs e)
......@@ -239,6 +214,10 @@ namespace TSA_V
lblMoveStr.Text = "";
txtScanPn.Focus();
}
else if (currIndex < 0)
{
cmbPosition.Focus();
}
else
{
numCount.Focus();
......@@ -293,6 +272,9 @@ namespace TSA_V
private void FrmPutCom_Shown(object sender, EventArgs e)
{
cmbPosition.BackColor = System.Drawing.Color.White;
cmbPosition.ForeColor = System.Drawing.Color.Black;
lblMsg.ForeColor = System.Drawing.Color.Red;
}
private void txtScanPn_KeyDown(object sender, KeyEventArgs e)
......@@ -302,23 +284,86 @@ namespace TSA_V
{
if (currPn == "")
{
string pn = txtScanPn.Text.Trim();
currIndex = getIndex(pn);
if (currIndex >= 0)
List<ComponetInfo> list= getDataByPN(pn);
if (list.Count > 0)
{
currPn = pn;
cmbPosition.Items.Clear();
foreach (ComponetInfo obj in list)
{
cmbPosition.Items.Add(obj.PositionNum);
}
cmbPosition.Text = "";
cmbPosition.Focus();
cmbPosition.BackColor =System.Drawing.Color.White;
if (list.Count == 1)
{
cmbPosition.Text = list[0].PositionNum;
currIndex = getIndex(pn, "");
ShowCom();
}
}
else
{
//未找到对应的PN，请重新输入
currPn = "";
currIndex = -1;
MessageBox.Show(ResourceControl.GetString("NotFindPN", "未找到对应的PN={0}，请重新扫码", new string[] { pn }));
lblMsg.Text = (ResourceControl.GetString("NotFindPN", "未找到数据：PN={0}，请重新扫码", new string[] { pn }));
txtScanPn.Clear();
}
}
}
}
private void cmbPosition_KeyDown(object sender, KeyEventArgs e)
{
if (currPn == "" || cmbPosition.Text.Trim() == "")
{
return;
}
if (e.KeyCode == Keys.Enter)
{
string pos = cmbPosition.Text.Trim();
currIndex = getIndex(currPn, pos);
if (currIndex >= 0)
{
ShowCom();
}
else
{
//未找到对应的PN，请重新输入
currIndex = -1;
lblMsg.Text = (ResourceControl.GetString("NotFindPNPos", "未找到数据：PN={0}，位置={1}，请重新扫码", new string[] { currPn, pos }));
cmbPosition.Text="";
}
}
}
private void cmbPosition_SelectedIndexChanged(object sender, EventArgs e)
{
if (currPn == ""|| cmbPosition.Text.Trim()=="")
{
return;
}
string pos = cmbPosition.Text.Trim();
currIndex = getIndex(currPn, pos);
if (currIndex >= 0)
{
ShowCom();
}
else
{
//未找到对应的PN，请重新输入
currIndex = -1;
lblMsg.Text=(ResourceControl.GetString("NotFindPNPos", "未找到数据：PN={0}，位置={1}，请重新扫码", new string[] { currPn, pos }));
cmbPosition.Text = "";
}
}
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!