|
|
@@ -167,7 +167,6 @@ namespace UAS_MES.Make
|
|
|
bool ifFirst;
|
|
|
if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
|
|
|
{
|
|
|
-
|
|
|
if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
|
|
|
{
|
|
|
dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,pr_detail,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
|
|
|
@@ -184,15 +183,15 @@ namespace UAS_MES.Make
|
|
|
string stepcode = dt.Rows[0]["ms_stepcode"].ToString();
|
|
|
if (stepcode == User.CurrentStepCode && (status == "1" || status == "2"))
|
|
|
{
|
|
|
- OperateResult.AppendText(">>" + ms_sncode.Text + " 序列号已执行过" + User.CurrentStepCode + "工序,采集结果为良品\n", Color.Red);
|
|
|
+ OperateResult.AppendText(">>" + ms_sncode.Text + " 序列号已执行过" + User.CurrentStepCode + "工序,采集结果为良品\n", Color.Red, ms_sncode);
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
SetCollectResult();
|
|
|
}
|
|
|
- else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
|
|
|
+ else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
|
|
|
}
|
|
|
- else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
|
|
|
+ else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -320,11 +319,10 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
//良品信息采集
|
|
|
if (LogicHandler.UpdateMakeMessage(ms_sncode.Text, ma_code.Text, "良品采集", User.UserSourceCode, User.UserCode, "检测合格", out ErrorMessage))
|
|
|
- OperateResult.AppendText(">>" + ms_sncode.Text + "已采集为良品\n", Color.Green);
|
|
|
+ OperateResult.AppendText(">>" + ms_sncode.Text + "已采集为良品\n", Color.Green, ms_sncode);
|
|
|
else
|
|
|
- OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
|
|
|
+ OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
|
|
|
}
|
|
|
- ms_sncode.Text = "";
|
|
|
}
|
|
|
|
|
|
private void Save_Click(object sender, EventArgs e)
|
|
|
@@ -335,9 +333,7 @@ namespace UAS_MES.Make
|
|
|
return;
|
|
|
}
|
|
|
if (GoodProduct.Checked)
|
|
|
- {
|
|
|
- ms_code_KeyDown(sender,new KeyEventArgs(Keys.Enter));
|
|
|
- }
|
|
|
+ ms_code_KeyDown(sender, new KeyEventArgs(Keys.Enter));
|
|
|
else if (Reject.Checked)
|
|
|
{
|
|
|
int RejectCount = ChoosedRejectList.Items.Count;
|
|
|
@@ -403,14 +399,13 @@ namespace UAS_MES.Make
|
|
|
dh.ExecuteSql("delete from makebad where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "'", "delete");
|
|
|
if (LogicHandler.SetTestNGDetail(ms_sncode.Text, ma_code.Text, User.UserName, User.UserSourceCode, "检查未通过", bgcode, bccode, bcremark, out ErrorMessage))
|
|
|
{
|
|
|
- OperateResult.AppendText(">>" + ms_sncode.Text + "已采集为不良\n", Color.Green);
|
|
|
+ OperateResult.AppendText(">>" + ms_sncode.Text + "已采集为不良\n", Color.Green,ms_sncode);
|
|
|
//清除不良信息
|
|
|
bc_groupcode.DataSource = null;
|
|
|
bc_groupcode.Text = "";
|
|
|
bc_code.Text = "";
|
|
|
WaitRejectList.Items.Clear();
|
|
|
ChoosedRejectList.Items.Clear();
|
|
|
- ms_sncode.Text = "";
|
|
|
LoadCollectedNum();
|
|
|
WaitList.Clear();
|
|
|
ChoosedList.Clear();
|
|
|
@@ -431,7 +426,7 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
if (ChoosedRejectList.Items[i].ListView.Items[i].SubItems[2].Text == bc_code.Text)
|
|
|
{
|
|
|
- OperateResult.AppendText(">>已添加过不良代码" + bc_code.Text + "\n", Color.Red);
|
|
|
+ OperateResult.AppendText(">>已添加过不良代码" + bc_code.Text + "\n", Color.Red,bc_code);
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
@@ -441,7 +436,7 @@ namespace UAS_MES.Make
|
|
|
lvi.SubItems.Add(dt.Rows[0][j].ToString());
|
|
|
ChoosedRejectList.Items.Add(lvi);
|
|
|
}
|
|
|
- else OperateResult.AppendText(">>不良代码" + bc_code.Text + "不存在\n", Color.Red);
|
|
|
+ else OperateResult.AppendText(">>不良代码" + bc_code.Text + "不存在\n", Color.Red, bc_code);
|
|
|
}
|
|
|
}
|
|
|
|