|
|
@@ -363,7 +363,7 @@ namespace UAS_MES.Make
|
|
|
string confirm = MessageBox.Show(this.ParentForm, "此操作不可撤销，是否确认报废", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Asterisk).ToString();
|
|
|
if (confirm == "Yes")
|
|
|
{
|
|
|
- DataTable dt = dh.getFieldsDataByCondition("makeserial", new string[] { "nvl(ms_ifrework,0)ms_ifrework", "ms_reworkcode" }, "ms_sncode='" + ms_sncode.Text + "' and ms_makecode='" + macode + "'");
|
|
|
+ DataTable dt = dh.getFieldsDataByCondition("makeserial", new string[] { "nvl(ms_ifrework,0)ms_ifrework", "ms_reworkcode"}, "ms_sncode='" + ms_sncode.Text + "' and ms_makecode='" + macode + "'");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
string ms_ifrework = dt.Rows[0]["ms_ifrework"].ToString();
|
|
|
@@ -375,8 +375,8 @@ namespace UAS_MES.Make
|
|
|
else
|
|
|
{
|
|
|
sqls.Clear();
|
|
|
- sqls.Add("update makeserial set ms_paststep = ms_paststep ||'," + User.CurrentStepCode + "',ms_reworkstatus= 4,ms_nextstepcode='',ms_stepcode='" + User.CurrentStepCode + "' where ms_sncode='" + ms_sncode.Text + "' and ms_makecode='" + macode + "'");
|
|
|
- sqls.Add("update oqcbatch set ob_nowcheckqty=ob_nowcheckqty-1 where ob_checkno='" + ms_checkno.Text + "'");
|
|
|
+ sqls.Add("update makeserial set ms_paststep = ms_paststep ||'," + User.CurrentStepCode + "',ms_status=4,ms_reworkstatus= 4,ms_nextstepcode='',ms_stepcode='" + User.CurrentStepCode + "' where ms_sncode='" + ms_sncode.Text + "' and ms_makecode='" + macode + "'");
|
|
|
+ sqls.Add("update oqcbatch set ob_nowcheckqty=ob_nowcheckqty-1 where ob_checkno='" + ms_reworkcheckno.Text + "'");
|
|
|
sqls.Add("delete from oqcbatchdetail where obd_sncode='" + ms_sncode.Text + "' and obd_checkno='" + ms_reworkcheckno.Text + "'");
|
|
|
sqls.Add("update ReworkDetail set rd_rwstatus='报废' where rd_reid=(select re_id from rework where re_code='" + reworkcode + "') and rd_sncode='" + reworkcode + "'");
|
|
|
dh.ExecuteSQLTran(sqls.ToArray());
|
章政