|
|
@@ -140,6 +140,8 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
mb_id = e.Node.Tag.ToString();
|
|
|
BaseUtil.CleanControlsText(bc_name, bc_code, bg_name, bg_code, mb_badremark, nrg_name, nr_name, nr_code, mbr_solutioncode, mbr_dutycode, mbc_component);
|
|
|
+ mbl_locdgv.DataSource = null;
|
|
|
+ mbp_partdgv.DataSource = null;
|
|
|
bc_name.Text = BadInf_1[mb_id]["bc_name"];
|
|
|
bc_code.Text = BadInf_1[mb_id]["mb_badcode"];
|
|
|
bg_name.Text = BadInf_1[mb_id]["bg_name"];
|
|
|
@@ -293,6 +295,7 @@ namespace UAS_MES.Make
|
|
|
}
|
|
|
dh.UpdateByCondition("makebad", "mb_status=-1", "mb_sncode='" + ms_sncode.Text + "'");
|
|
|
LogicHandler.InsertMakeProcess(ms_sncode.Text, ms_makecode.Text, User.UserSourceCode, "回流工序", "完成维修回流", User.UserCode);
|
|
|
+ LogicHandler.DoCommandLog(User.UserCode, macode, User.UserLineCode, User.UserSourceCode, "回流工序", "完成维修回流", ms_sncode.Text, ms_checkno.Text);
|
|
|
OperatResult.AppendText(">>" + ms_sncode.Text + " 序列号回流成功\n", Color.Green);
|
|
|
BaseUtil.CleanForm(this);
|
|
|
BadCodeTree.Nodes.Clear();
|
|
|
@@ -325,6 +328,7 @@ namespace UAS_MES.Make
|
|
|
}
|
|
|
dh.UpdateByCondition("make", "MA_NGMADEQTY=nvl(MA_NGMADEQTY,0)+1", "ma_code='" + macode + "'");
|
|
|
LogicHandler.InsertMakeProcess(ms_sncode.Text, ms_makecode.Text, User.UserSourceCode, "报废", "序列号报废", User.UserCode);
|
|
|
+ LogicHandler.DoCommandLog(User.UserCode, macode, User.UserLineCode, User.UserSourceCode, "报废", "序列号报废", ms_sncode.Text, ms_checkno.Text);
|
|
|
OperatResult.AppendText(">>报废成功\n", Color.Green);
|
|
|
GetSNCode.Clear();
|
|
|
BaseUtil.CleanForm(this);
|
|
|
@@ -386,6 +390,7 @@ namespace UAS_MES.Make
|
|
|
sql.Append("'" + bc_code.Text + "','" + nr_code.Text + "','" + GetSNCode.Text + "','" + macode + "',");
|
|
|
sql.Append("sysdate,'" + User.UserCode + "' from dual");
|
|
|
dh.BatchInsert(sql.GetString(), new string[] { "prodcode" }, prodcode.ToArray());
|
|
|
+ LogicHandler.DoCommandLog(User.UserCode, macode, User.UserLineCode, User.UserSourceCode, "不良零件保存", "不良零件保存成功", ms_sncode.Text, ms_checkno.Text);
|
|
|
}
|
|
|
OperatResult.AppendText(">>不良零件保存成功\n", Color.Green);
|
|
|
}
|
|
|
@@ -408,6 +413,7 @@ namespace UAS_MES.Make
|
|
|
sql.Append(",:location,'" + bc_code.Text + "','" + nr_code.Text + "','" + GetSNCode.Text + "','" + macode + "',");
|
|
|
sql.Append("sysdate,'" + User.UserCode + "' from dual");
|
|
|
dh.BatchInsert(sql.GetString(), new string[] { "location" }, location.ToArray());
|
|
|
+ LogicHandler.DoCommandLog(User.UserCode, macode, User.UserLineCode, User.UserSourceCode, "不良位置保存", "不良位置保存成功", ms_sncode.Text, ms_checkno.Text);
|
|
|
}
|
|
|
OperatResult.AppendText(">>不良位置保存成功\n", Color.Green);
|
|
|
}
|
|
|
@@ -448,14 +454,14 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
if (mbr_id != "")
|
|
|
{
|
|
|
- dt = (DataTable)mbl_locdgv.DataSource;
|
|
|
- for (int i = 0; i < dt.Rows.Count; i++)
|
|
|
- {
|
|
|
-
|
|
|
- }
|
|
|
- DataRow dr = dt.NewRow();
|
|
|
- dr["mbl_loc"] = mbl_loc.Text;
|
|
|
- dt.Rows.Add(dr);
|
|
|
+ sql.Clear();
|
|
|
+ sql.Append("insert into makebadrsloc(mbl_id,mbl_mbrid,mbl_loc,mbl_badcode,mbl_brcode,");
|
|
|
+ sql.Append("mbl_sncode,mbl_makecode,mbl_indate ,mbl_inman) select makebadrsloc_seq.nextval," + mbr_id);
|
|
|
+ sql.Append(",'"+mbl_loc.Text+"','" + bc_code.Text + "','" + nr_code.Text + "','" + GetSNCode.Text + "','" + macode + "',");
|
|
|
+ sql.Append("sysdate,'" + User.UserCode + "' from dual");
|
|
|
+ dh.ExecuteSql(sql.GetString(), "insert");
|
|
|
+ dt = (DataTable)dh.ExecuteSql("select mbl_id,mbl_loc from makebadrsloc where mbl_mbrid=" + mbr_id, "select");
|
|
|
+ BaseUtil.FillDgvWithDataTable(mbl_locdgv, dt);
|
|
|
}
|
|
|
else OperatResult.AppendText(">>请先选择不良原因\n", Color.Red);
|
|
|
}
|
|
|
@@ -493,10 +499,15 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
if (mbr_id != "")
|
|
|
{
|
|
|
- DataTable dt = (DataTable)mbp_partdgv.DataSource;
|
|
|
- DataRow dr = dt.NewRow();
|
|
|
- dr["mbp_part"] = prodcode.Text;
|
|
|
- dt.Rows.Add(dr);
|
|
|
+ sql.Clear();
|
|
|
+ sql.Append("insert into makebadrspart(mbp_id,mbp_mbrid,mbp_part,mbp_badcode,");
|
|
|
+ sql.Append("mbp_brcode,mbp_sncode,mbp_makecode,mbp_indate,mbp_inman)");
|
|
|
+ sql.Append("select makebadrspart_seq.nextval," + mbr_id + ",'"+prodcode.Text+"',");
|
|
|
+ sql.Append("'" + bc_code.Text + "','" + nr_code.Text + "','" + GetSNCode.Text + "','" + macode + "',");
|
|
|
+ sql.Append("sysdate,'" + User.UserCode + "' from dual");
|
|
|
+ dh.ExecuteSql(sql.GetString(), "insert");
|
|
|
+ DataTable dt = (DataTable)dh.ExecuteSql("select mbp_id,mbp_part from makebadrspart where mbp_mbrid=" + mbr_id, "select");
|
|
|
+ BaseUtil.FillDgvWithDataTable(mbp_partdgv, dt);
|
|
|
}
|
|
|
else OperatResult.AppendText(">>请先选择不良原因\n", Color.Red);
|
|
|
}
|
|
|
@@ -518,7 +529,9 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
if (mbl_locdgv.Columns[e.ColumnIndex].Name == "DeletePos")
|
|
|
{
|
|
|
- mbl_locdgv.Rows.RemoveAt(e.RowIndex);
|
|
|
+ dh.ExecuteSql("delete from makebadrsloc where mbl_id='" + mbl_locdgv.Rows[e.RowIndex].Cells["mbl_id"].Value.ToString() + "'", "insert");
|
|
|
+ dt = (DataTable)dh.ExecuteSql("select mbl_id,mbl_loc from makebadrsloc where mbl_mbrid=" + mbr_id, "select");
|
|
|
+ BaseUtil.FillDgvWithDataTable(mbl_locdgv, dt);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -526,7 +539,9 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
if (mbp_partdgv.Columns[e.ColumnIndex].Name == "DeleteCom")
|
|
|
{
|
|
|
- mbp_partdgv.Rows.RemoveAt(e.RowIndex);
|
|
|
+ dh.ExecuteSql("delete from makebadrspart where mbp_id='" + mbp_partdgv.Rows[e.RowIndex].Cells["mbp_id"].Value.ToString() + "'", "insert");
|
|
|
+ DataTable dt = (DataTable)dh.ExecuteSql("select mbp_id,mbp_part from makebadrspart where mbp_mbrid=" + mbr_id, "select");
|
|
|
+ BaseUtil.FillDgvWithDataTable(mbp_partdgv, dt);
|
|
|
}
|
|
|
}
|
|
|
}
|