|
|
@@ -682,7 +682,6 @@ namespace UAS_MES_NEW.Make
|
|
|
else
|
|
|
{
|
|
|
sqls.Clear();
|
|
|
- sqls.Add("delete from makebadreason where mbr_sncode='"+ ms_sncode.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 + "'");
|
|
|
@@ -1089,6 +1088,7 @@ namespace UAS_MES_NEW.Make
|
|
|
OperatResult.AppendText(">>SN" + ms_sncode.Text + "不处于报废状态,不允许取消报废\n", Color.Red);
|
|
|
return;
|
|
|
}
|
|
|
+ //dh.ExecuteSql("delete from makebadreason where mbr_sncode='" + ms_sncode.Text + "'", "delete");
|
|
|
OperatResult.AppendText(">>SN" + ms_sncode.Text + "取消报废成功\n", Color.Green);
|
|
|
sqls.Add("update makeserial set ms_paststep = ms_paststep ||'," + User.CurrentStepCode + "',ms_status=3,ms_reworkstatus= '',ms_nextstepcode='',ms_stepcode='" + User.CurrentStepCode + "' where ms_sncode='" + ms_sncode.Text + "' and ms_makecode='" + macode + "'");
|
|
|
dh.ExecuteSQLTran(sqls.ToArray());
|