|
|
@@ -110,10 +110,10 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
//验证makeserial或者ms_firstsn表序列号是否存在
|
|
|
sql.Clear();
|
|
|
- sql.Append("select max(ms_id) ms_id,ms_makecode,ms_prodcode,ms_sncode,pr_detail ");
|
|
|
- sql.Append("ms_stepcode,ms_craftcode from makeserial left join product on pr_code=ms_prodcode where ms_makecode ='" + macode + "' and(ms_sncode");
|
|
|
- sql.Append("='" + GetSNCode.Text + "' or ms_firstsn in (select firstsn from makesnrelation ");
|
|
|
- sql.Append("where sn='" + GetSNCode.Text + "')) group by ms_makecode,ms_prodcode,ms_sncode,pr_detail,ms_stepcode,ms_craftcode");
|
|
|
+ sql.Append("select max(ms_id) ms_id,ms_makecode,ms_prodcode,ms_sncode,pr_detail,ms_stepcode,ms_craftcode ");
|
|
|
+ sql.Append("from makeserial left join product on pr_code=ms_prodcode where ms_makecode ='" + macode + "' and(ms_sncode");
|
|
|
+ sql.Append("='" + GetSNCode.Text + "' or ms_firstsn in (select firstsn from makesnrelation where ");
|
|
|
+ sql.Append("sn='" + GetSNCode.Text + "')) group by ms_makecode,ms_prodcode,ms_sncode,pr_detail,ms_stepcode,ms_craftcode");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
@@ -142,6 +142,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, nr_name, nr_code, mbr_solutioncode, mbr_dutycode, mbc_component);
|
|
|
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"];
|
|
|
@@ -154,7 +155,7 @@ namespace UAS_MES.Make
|
|
|
nrg_name.Text = BadInf_2[mbr_id]["nrg_name"];
|
|
|
nr_name.Text = BadInf_2[mbr_id]["nr_name"];
|
|
|
nr_code.Text = BadInf_2[mbr_id]["nr_code"];
|
|
|
- mbr_solutioncode.Text = BadInf_2[mbr_id]["mbr_solutioncode"];
|
|
|
+ mbr_solutioncode.Text = BadInf_2[mbr_id]["so_name"];
|
|
|
mbr_dutycode.Text = BadInf_2[mbr_id]["mbr_dutycode"];
|
|
|
mbc_component.Text = dh.getFieldDataByCondition("makebadrscom", "mbc_component", "mbc_mbrid=" + mbr_id).ToString();
|
|
|
//加载两个Grid的数据源
|
|
|
@@ -175,7 +176,7 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
//添加根节点
|
|
|
TreeNode tnode_0 = new TreeNode();
|
|
|
- tnode_0.Text = dt.Rows[i]["mb_bgcode"].ToString();
|
|
|
+ tnode_0.Text = dt.Rows[i]["bg_name"].ToString() + ":" + dt.Rows[i]["bc_name"].ToString();
|
|
|
tnode_0.Name = dt.Rows[i]["mb_bgcode"].ToString();
|
|
|
//作为Dictionary的主标识
|
|
|
string mb_id = dt.Rows[i]["mb_id"].ToString();
|
|
|
@@ -193,10 +194,10 @@ namespace UAS_MES.Make
|
|
|
BadCodeTree.Nodes.Add(tnode_0);
|
|
|
//添加子节点
|
|
|
sql.Clear();
|
|
|
- sql.Append("select mbr_id,mbr_brcode,mbr_brgcode,mbr_solutioncode,so_name,mbr_dutycode,nd_name,");
|
|
|
- sql.Append("nrg_name,nr_name,nr_code from makebadreason left join QUA_NGReason left join QUA_NGREASONGROUP on ");
|
|
|
- sql.Append("nrg_code=nr_group on nr_code=mbr_brcode left join solution ");
|
|
|
- sql.Append("on so_code=mbr_solutioncode left join ngduty on nd_code=mbr_dutycode where mbr_mbid=" + mb_id);
|
|
|
+ sql.Append("select mbr_id,mbr_brcode,mbr_brgcode,mbr_solutioncode,so_name,mbr_dutycode,nd_name,nrg_name");
|
|
|
+ sql.Append(",nr_name,nr_code from makebadreason left join QUA_NGReason left join QUA_NGREASONGROUP on ");
|
|
|
+ sql.Append("nrg_code=nr_group on nr_code=mbr_brcode left join solution on so_code=mbr_solutioncode ");
|
|
|
+ sql.Append("left join ngduty on nd_code=mbr_dutycode where mbr_mbid=" + mb_id);
|
|
|
DataTable dt1 = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
for (int j = 0; j < dt1.Rows.Count; j++)
|
|
|
{
|
|
|
@@ -222,9 +223,7 @@ namespace UAS_MES.Make
|
|
|
}
|
|
|
}
|
|
|
if (bg_code.Text != "")
|
|
|
- {
|
|
|
BadCodeTree.Nodes[bg_code.Text].Expand();
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
private void RefreshTreeView_Click(object sender, EventArgs e)
|
|
|
@@ -234,37 +233,29 @@ namespace UAS_MES.Make
|
|
|
|
|
|
private void RepairComplete_Click(object sender, EventArgs e)
|
|
|
{
|
|
|
- string ErrorMessage = "";
|
|
|
- string oMakeCode = "";
|
|
|
- string MsID = "";
|
|
|
- if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text, User.UserSourceCode, GetSNCode.Text, User.UserCode, out oMakeCode, out MsID, out ErrorMessage))
|
|
|
+ int RejectNum = int.Parse(dh.getFieldDataByCondition("makebad", "count(0) cn", "mb_sncode='" + GetSNCode.Text + "' and mb_status not in (1,-1)").ToString());
|
|
|
+ if (RejectNum > 0)
|
|
|
+ OperatResult.AppendText(">>维修结果必须为已维修或无不良\n", Color.Red);
|
|
|
+ else
|
|
|
{
|
|
|
- int RejectNum = int.Parse(dh.getFieldDataByCondition("makebad", "count(0) cn", "mb_sncode='" + GetSNCode.Text + "' and mb_status not in (1,-1)").ToString());
|
|
|
- if (RejectNum > 0)
|
|
|
- OperatResult.AppendText(">>维修结果必须为已维修或无不良\n", Color.Red);
|
|
|
+ dt = (DataTable)dh.ExecuteSql("select cr_id from craft where cr_statuscode='AUDITED' and cr_code='" + cr_code.Text + "'", "select");
|
|
|
+ if (dt.Rows.Count == 0)
|
|
|
+ OperatResult.AppendText(">>回流工序不存在\n", Color.Red);
|
|
|
else
|
|
|
{
|
|
|
- dt = (DataTable)dh.ExecuteSql("select cr_id from craft where cr_statuscode='AUDITED' and cr_code='" + cr_code.Text + "'", "select");
|
|
|
+ string cr_id = dt.Rows[0]["cr_id"].ToString();
|
|
|
+ dt = (DataTable)dh.ExecuteSql("select cd_ifinput from craftdetail left join step on st_code=cd_stepcode where cd_crid='" + cr_id + "' and cd_stepcode='" + cd_stepcode.Text + "' and st_statuscode='AUDITED'", "select");
|
|
|
if (dt.Rows.Count == 0)
|
|
|
- OperatResult.AppendText(">>回流工序不存在\n", Color.Red);
|
|
|
+ OperatResult.AppendText(">>回流工序不在回流工艺中\n", Color.Red);
|
|
|
else
|
|
|
{
|
|
|
- string cr_id = dt.Rows[0]["cr_id"].ToString();
|
|
|
- dt = (DataTable)dh.ExecuteSql("select cd_ifinput from craftdetail left join step on st_code=cd_stepcode where cd_crid='" + cr_id + "' and cd_stepcode='" + cd_stepcode.Text + "' and st_statuscode='AUDITED'", "select");
|
|
|
- if (dt.Rows.Count == 0)
|
|
|
- OperatResult.AppendText(">>回流工序不在回流工艺中\n", Color.Red);
|
|
|
- else
|
|
|
- {
|
|
|
- dh.UpdateByCondition("makeserial", "ms_nextstepcode='" + cd_stepcode.Text + "',ms_craftcode='" + cr_code.Text + "',ms_stepcode='" + User.CurrentStepCode + "',ms_status=1", "ms_sncode='" + ms_sncode.Text + "'");
|
|
|
- dh.ExecuteSql(insert_makeprocess.Replace("#", "完成维修"), "insert", ms_sncode.Text, User.CurrentStepCode);
|
|
|
- OperatResult.AppendText(">>序列号" + ms_sncode.Text + "回流成功\n", Color.Green);
|
|
|
- GetSNCode.Clear();
|
|
|
- }
|
|
|
+ dh.UpdateByCondition("makeserial", "ms_nextstepcode='" + cd_stepcode.Text + "',ms_craftcode='" + cr_code.Text + "',ms_stepcode='" + User.CurrentStepCode + "',ms_status=1", "ms_sncode='" + ms_sncode.Text + "'");
|
|
|
+ dh.ExecuteSql(insert_makeprocess.Replace("#", "完成维修"), "insert", ms_sncode.Text, User.CurrentStepCode);
|
|
|
+ OperatResult.AppendText(">>序列号" + ms_sncode.Text + "回流成功\n", Color.Green);
|
|
|
+ GetSNCode.Clear();
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- else
|
|
|
- OperatResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
|
|
|
}
|
|
|
|
|
|
private void Scrap_Click(object sender, EventArgs e)
|
|
|
@@ -347,17 +338,20 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
if (mbr_id != "")
|
|
|
{
|
|
|
- string delete1 = "delete from makebadrsloc where mbl_mbrid=" + mbr_id;
|
|
|
+ string delete1 = "delete from makebadrsloc where mbl_mbrid=" + mbr_id;
|
|
|
string delete2 = "delete from makebadrspart where mbp_mbrid=" + mbr_id;
|
|
|
string delete3 = "delete from makebadrscom where mbc_mbrid=" + mbr_id;
|
|
|
- string delete4 = "delete from makebadreason where mbr_id" + mbr_id;
|
|
|
+ string delete4 = "delete from makebadreason where mbr_id=" + mbr_id;
|
|
|
dh.ExecuteSQLTran(delete1, delete2, delete3, delete4);
|
|
|
- MessageBox.Show("删除成功");
|
|
|
+ OperatResult.AppendText(">>删除成功\n", Color.Green);
|
|
|
+ mbr_id = "";
|
|
|
+ //删除后重新加载Tree的信息
|
|
|
+ LoadBadInfTree(sender, e);
|
|
|
}
|
|
|
- else MessageBox.Show("必须选择不了原因");
|
|
|
+ else OperatResult.AppendText(">>必须选择不良原因\n", Color.Red);
|
|
|
}
|
|
|
else
|
|
|
- MessageBox.Show("序列号错误，不存在或者不处于维修状态");
|
|
|
+ OperatResult.AppendText(">>序列号错误，不存在或者不处于维修状态\n", Color.Red);
|
|
|
}
|
|
|
|
|
|
private void SaveBadLocation_Click(object sender, EventArgs e)
|
|
|
@@ -374,11 +368,11 @@ namespace UAS_MES.Make
|
|
|
dr["mbl_loc"] = mbl_loc.Text;
|
|
|
dt.Rows.Add(dr);
|
|
|
}
|
|
|
- else MessageBox.Show("请先选择不良原因");
|
|
|
+ else OperatResult.AppendText(">>请先选择不良原因\n", Color.Red);
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
- MessageBox.Show("序列号错误，不存在或者不处于维修状态");
|
|
|
+ OperatResult.AppendText(">>序列号错误，不存在或者不处于维修状态\n", Color.Red);
|
|
|
}
|
|
|
|
|
|
private void mbl_loc_TextChanged(object sender, EventArgs e)
|
章政