|
|
@@ -66,6 +66,16 @@ namespace UAS_MES.Make
|
|
|
cr_code.DBTitle = "回流工艺";
|
|
|
cr_code.DbChange += Cr_code_DbChange;
|
|
|
|
|
|
+
|
|
|
+ em_name.FormName = Name;
|
|
|
+ em_name.TableName = "employee";
|
|
|
+ em_name.SelectField = "em_code # 人员编号,em_name # 人员名称,em_position # 岗位";
|
|
|
+ em_name.SetValueField = new string[] { "em_code","em_name" };
|
|
|
+ em_name.DBTitle = "人员";
|
|
|
+ em_name.Condition = " em_class = '正式' ";
|
|
|
+ em_name.DbChange += mbr_dutyman_DbChange;
|
|
|
+
|
|
|
+
|
|
|
cd_stepcode.FormName = Name;
|
|
|
cd_stepcode.TableName = "craftdetail left join step on st_code=cd_stepcode left join craft on cd_crid=cr_id";
|
|
|
cd_stepcode.SetValueField = new string[] { "cd_stepcode" };
|
|
|
@@ -111,6 +121,11 @@ namespace UAS_MES.Make
|
|
|
GetSNCode.Focus();
|
|
|
}
|
|
|
|
|
|
+ private void mbr_dutyman_DbChange(object sender, EventArgs e)
|
|
|
+ {
|
|
|
+ throw new NotImplementedException();
|
|
|
+ }
|
|
|
+
|
|
|
private void Prodcode_DbChange(object sender, EventArgs e)
|
|
|
{
|
|
|
Dbfind = bd_soncode.ReturnData;
|
|
|
@@ -352,8 +367,8 @@ namespace UAS_MES.Make
|
|
|
else OperatResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
|
|
|
}
|
|
|
else OperatResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
|
|
|
-
|
|
|
- if(QuickRepair.Checked)
|
|
|
+ SaveRepairInf.Enabled = false;
|
|
|
+ if (QuickRepair.Checked)
|
|
|
RepairComplete_Click(sender, new EventArgs());
|
|
|
}
|
|
|
}
|
|
|
@@ -380,7 +395,7 @@ namespace UAS_MES.Make
|
|
|
if (e.Node.Level == 0)
|
|
|
{
|
|
|
mb_id = e.Node.Tag.ToString();
|
|
|
- BaseUtil.CleanControlsText(bc_name, bc_code, bg_name, bg_code, mb_badremark, nrg_name, nrg_code, nr_name, nr_code, so_name, so_code, mbr_dutyname, mbr_dutycode, mbc_component);
|
|
|
+ BaseUtil.CleanControlsText(bc_name, bc_code, bg_name, bg_code, mb_badremark, nrg_name, nrg_code, nr_name, nr_code, so_name, so_code, mbr_dutyname, mbr_dutycode, mbc_component,em_name,em_code);
|
|
|
mbl_locdgv.DataSource = null;
|
|
|
mbp_partdgv.DataSource = null;
|
|
|
bc_name.Text = BadInf_1[mb_id]["bc_name"];
|
|
|
@@ -411,6 +426,8 @@ namespace UAS_MES.Make
|
|
|
so_name.Text = BadInf_2[mbr_id]["so_name"];
|
|
|
mbr_dutycode.Text = BadInf_2[mbr_id]["mbr_dutycode"];
|
|
|
mbr_dutyname.Text = BadInf_2[mbr_id]["mbr_dutyname"];
|
|
|
+ em_name.Text = BadInf_2[mbr_id]["mbr_dutyman"];
|
|
|
+ em_code.Text = BadInf_2[mbr_id]["mbr_dutymancode"];
|
|
|
mbc_component.Text = dh.getFieldDataByCondition("makebadrscom", "mbc_component", "mbc_mbrid=" + mbr_id).ToString();
|
|
|
|
|
|
DataTable dt = (DataTable)dh.ExecuteSql("select mbp_id,mbp_part from makebadrspart where mbp_mbrid=" + mbr_id, "select");
|
|
|
@@ -465,7 +482,7 @@ namespace UAS_MES.Make
|
|
|
|
|
|
sql.Clear();
|
|
|
sql.Append("select mbr_id,mbr_brcode,mbr_brgcode,mbr_solutioncode,so_code,so_name,mbr_dutycode,mbr_dutyname,nd_name,nrg_name");
|
|
|
- sql.Append(",nr_name,nr_code,nrg_code from makebadreason left join QUA_NGReason on nr_code=mbr_brcode left join ");
|
|
|
+ sql.Append(",nr_name,nr_code,nrg_code,mbr_dutyman,mbr_dutymancode from makebadreason left join QUA_NGReason on nr_code=mbr_brcode left join ");
|
|
|
sql.Append("QUA_NGREASONGROUPdet on nrgd_nrcode=nr_code left join QUA_NGREASONGROUP on nrg_id=nrgd_nrgid and ");
|
|
|
sql.Append("mbr_brgcode=nrg_code left join solution on so_code=mbr_solutioncode left join ngduty on nd_code=mbr_dutycode ");
|
|
|
sql.Append("where mbr_mbid=" + mb_id);
|
|
|
@@ -490,18 +507,20 @@ namespace UAS_MES.Make
|
|
|
dic1.Add("nrg_code", dt1.Rows[j]["nrg_code"].ToString());
|
|
|
dic1.Add("nr_name", dt1.Rows[j]["nr_name"].ToString());
|
|
|
dic1.Add("nr_code", dt1.Rows[j]["nr_code"].ToString());
|
|
|
+ dic1.Add("mbr_dutyman", dt1.Rows[j]["mbr_dutyman"].ToString());
|
|
|
+ dic1.Add("mbr_dutymancode", dt1.Rows[j]["mbr_dutymancode"].ToString());
|
|
|
tnode_1.Text = dt1.Rows[j]["nr_name"].ToString();
|
|
|
if (!BadInf_2.ContainsKey(mbr_id))
|
|
|
BadInf_2.Add(mbr_id, dic1);
|
|
|
tnode_0.Nodes.Add(tnode_1);
|
|
|
}
|
|
|
}
|
|
|
- try
|
|
|
- {
|
|
|
- if (bg_code.Text != "")
|
|
|
- BadCodeTree.Nodes[bg_code.Text].Expand();
|
|
|
- }
|
|
|
- catch (Exception) { }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
private void RefreshTreeView_Click(object sender, EventArgs e)
|
|
|
@@ -723,6 +742,8 @@ namespace UAS_MES.Make
|
|
|
ErrorMessage += " 不良原因 ";
|
|
|
if (mbr_dutyname.Text == "")
|
|
|
ErrorMessage += " 责任别 ";
|
|
|
+ if ((mbr_dutyname.Text == "整机作业问题"|| mbr_dutyname.Text == "基板作业问题")&&em_name.Text=="")
|
|
|
+ ErrorMessage += " 责任人 ";
|
|
|
if (ErrorMessage != "")
|
|
|
{
|
|
|
ErrorMessage += "不能为空";
|
|
|
@@ -767,9 +788,9 @@ namespace UAS_MES.Make
|
|
|
sql.Clear();
|
|
|
sql.Append("insert into makebadreason (mbr_mbid,mbr_id,mbr_brcode,mbr_solutioncode,");
|
|
|
sql.Append("mbr_dutycode,mbr_brgcode,mbr_badcode,mbr_sncode,mbr_makecode,mbr_indate,");
|
|
|
- sql.Append("mbr_inman,mbr_brname,mbr_solutionname,mbr_badname,mbr_brgname,mbr_dutyname) select '" + mb_id + "','" + mbr_id + "','" + nr_code.Text + "',");
|
|
|
+ sql.Append("mbr_inman,mbr_brname,mbr_solutionname,mbr_badname,mbr_brgname,mbr_dutyname,mbr_dutyman,mbr_dutymancode) select '" + mb_id + "','" + mbr_id + "','" + nr_code.Text + "',");
|
|
|
sql.Append("'" + so_code.Text + "','" + mbr_dutyname.Text + "','" + nrg_code.Text + "','" + bc_code.Text + "',");
|
|
|
- sql.Append("'" + ms_sncode.Text + "','" + ms_makecode.Text + "',sysdate,'" + User.UserCode + "','" + nr_name.Text + "','" + so_name.Text + "','" + bc_name.Text + "','" + nrg_name.Text + "','" + mbr_dutyname.Text + "' from dual");
|
|
|
+ sql.Append("'" + ms_sncode.Text + "','" + ms_makecode.Text + "',sysdate,'" + User.UserCode + "','" + nr_name.Text + "','" + so_name.Text + "','" + bc_name.Text + "','" + nrg_name.Text + "','" + mbr_dutyname.Text + "','"+em_name.Text+"','"+em_code.Text+"' from dual");
|
|
|
dh.ExecuteSql(sql.GetString(), "insert");
|
|
|
if (mbc_component.Text != "")
|
|
|
{
|
|
|
@@ -798,7 +819,7 @@ namespace UAS_MES.Make
|
|
|
string delete4 = "delete from makebadreason where mbr_id='" + mbr_id + "'";
|
|
|
dh.ExecuteSQLTran(delete1, delete2, delete3, delete4);
|
|
|
OperatResult.AppendText(">>删除成功\n", Color.Green);
|
|
|
- BaseUtil.CleanControlsText(bc_name, bc_code, bg_name, bg_code, mb_badremark, nrg_name, nrg_code, nr_name, nr_code, so_name, so_code, mbr_dutyname, mbr_dutycode, mbc_component);
|
|
|
+ BaseUtil.CleanControlsText(bc_name, bc_code, bg_name, bg_code, mb_badremark, nrg_name, nrg_code, nr_name, nr_code, so_name, so_code, mbr_dutyname, mbr_dutycode, mbc_component,em_name, em_code);
|
|
|
mbp_partdgv.DataSource = null;
|
|
|
mbl_locdgv.DataSource = null;
|
|
|
mbr_id = "";
|
|
|
@@ -1029,7 +1050,7 @@ namespace UAS_MES.Make
|
|
|
string delete = "delete from makebad where mb_id = '" + mb_id + "'";
|
|
|
dh.ExecuteSQLTran(delete1, delete2, delete3, delete4, delete);
|
|
|
OperatResult.AppendText(">>删除成功\n", Color.Green);
|
|
|
- BaseUtil.CleanControlsText(bc_name, bc_code, bg_name, bg_code, mb_badremark, nrg_name, nrg_code, nr_name, nr_code, so_name, so_code, mbr_dutyname, mbr_dutycode, mbc_component);
|
|
|
+ BaseUtil.CleanControlsText(bc_name, bc_code, bg_name, bg_code, mb_badremark, nrg_name, nrg_code, nr_name, nr_code, so_name, so_code, mbr_dutyname, mbr_dutycode, mbc_component,em_name,em_code);
|
|
|
mbp_partdgv.DataSource = null;
|
|
|
mbl_locdgv.DataSource = null;
|
|
|
mb_id = "";
|
caosy