|
|
@@ -493,6 +493,7 @@ namespace UAS_MES.Make
|
|
|
|
|
|
private void RepairComplete_Click(object sender, EventArgs e)
|
|
|
{
|
|
|
+
|
|
|
if (ms_sncode.Text == "")
|
|
|
{
|
|
|
OperatResult.AppendText(">>序列号不允许为空\n", Color.Red);
|
|
|
@@ -601,21 +602,23 @@ namespace UAS_MES.Make
|
|
|
code = param[2];
|
|
|
//查询不良原因组数据插入,插入第一条
|
|
|
sql.Clear();
|
|
|
- sql.Append("select mb_bgname,mb_badname,mbr_brgname from makebad left join makebadreason on mbr_mbid=mb_id where mb_sncode='" + ms_sncode.Text + "' and mb_status<>-1 and rownum=1");
|
|
|
+ sql.Append("select mb_bgname,mb_badname,mbr_brgname,mbr_dutyname from makebad left join makebadreason on mbr_mbid=mb_id where mb_sncode='" + ms_sncode.Text + "' and mb_status<>-1 and rownum=1");
|
|
|
DataTable badinf = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
string mb_bgname = "";
|
|
|
string mb_badname = "";
|
|
|
string mbr_brgname = "";
|
|
|
+ string mbr_dutyname = "";
|
|
|
if (badinf.Rows.Count > 0)
|
|
|
{
|
|
|
mb_bgname = badinf.Rows[0]["mb_bgname"].ToString();
|
|
|
mb_badname = badinf.Rows[0]["mb_badname"].ToString();
|
|
|
mbr_brgname = badinf.Rows[0]["mbr_brgname"].ToString();
|
|
|
+ mbr_dutyname = badinf.Rows[0]["mbr_dutyname"].ToString();
|
|
|
}
|
|
|
sql.Clear();
|
|
|
- sql.Append("insert into makebadhandle@N_malata_zz(mbh_id,mbh_code,mbh_linecode,mbh_sn,mbh_indate,mbh_inman,mbh_statuscode,mbh_status,mbh_returnstep,mbh_wccode,mbh_badname,mbh_badgroup,mbh_badreason)");
|
|
|
+ sql.Append("insert into makebadhandle@N_malata_zz(mbh_id,mbh_code,mbh_linecode,mbh_sn,mbh_indate,mbh_inman,mbh_statuscode,mbh_status,mbh_returnstep,mbh_wccode,mbh_badname,mbh_badgroup,mbh_badreason,mbh_brduty)");
|
|
|
sql.Append("values(makebadhandle_seq.nextval@N_malata_zz,'" + code + "','" + User.UserLineCode + "','" + ms_sncode.Text + "',sysdate,'" + User.UserName + "',");
|
|
|
- sql.Append("'ENTERING','在录入','" + cd_stepcode.Text + "','" + User.WorkCenter + "','" + mb_badname + "','" + mb_bgname + "','" + mbr_brgname + "')");
|
|
|
+ sql.Append("'ENTERING','在录入','" + cd_stepcode.Text + "','" + User.WorkCenter + "','" + mb_badname + "','" + mb_bgname + "','" + mbr_brgname + "','"+ mbr_dutyname + "')");
|
|
|
|
|
|
dh.ExecuteSql(sql.GetString(), "insert");
|
|
|
}
|