|
|
@@ -129,11 +129,24 @@ namespace UAS_MES.Make
|
|
|
}
|
|
|
else if (unload.Checked == true)
|
|
|
{
|
|
|
- OperateResult.AppendText(">>开始执行下料工序\n");
|
|
|
- if (LogicHandler.SetMaterialDown(ms_sncode.Text, code.Text, User.UserSourceCode, User.CurrentStepCode, User.UserName, out ErrorMessage))
|
|
|
- OperateResult.AppendText(">>条码" + code.Text + "下料成功\n", Color.Green);
|
|
|
- else
|
|
|
- OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
|
|
|
+ if (LogicHandler.CheckStepSNAndMacode(ma_code, User.UserSourceCode, code.Text, User.UserCode, out ma_code, out Msid, out ErrorMessage))
|
|
|
+ {
|
|
|
+ dt = (DataTable)dh.ExecuteSql("select cm_id,cm_stepcode,ms_makecode,cm_mccode from craftmaterial left join makeserial on cm_makecode=ms_makecode and cm_sncode=ms_sncode where ms_sncode='" + code.Text + "' and cm_makecode='" + ma_code + "'", "select");
|
|
|
+ if (dt.Rows.Count > 0)
|
|
|
+ {
|
|
|
+ string ms_macode = dt.Rows[0]["ms_makecode"].ToString();
|
|
|
+ string cm_stepcode = dt.Rows[0]["cm_stepcode"].ToString();
|
|
|
+ string cm_mccode = dt.Rows[0]["cm_mccode"].ToString();
|
|
|
+ dh.ExecuteSql("delete from craftmaterial where cm_sncode='" + code.Text + "' and cm_makecode='" + ma_code + "'", "delete");
|
|
|
+ LogicHandler.InsertMakeProcess(ms_macode, code.Text, User.UserSourceCode, "上料采集操作", "下料成功", User.UserCode);
|
|
|
+ int count = dh.getRowCount("craftMaterial", "cm_mccode='" + cm_mccode + "' and cm_stepcode='" + cm_stepcode + "' and cm_sncode='" + code.Text + "'");
|
|
|
+ if (count == 0)
|
|
|
+ dh.UpdateByCondition("makecraftdetail ", "mcd_inqty=mcd_inqty-1,mcd_outqty=mcd_outqty-1,mcd_okqty = mcd_okqty - 1", "mcd_mccode='" + cm_mccode + "' and mcd_stepcode='" + cm_stepcode + "'");
|
|
|
+ OperateResult.AppendText(">>序列号" + code.Text + "下料成功\n", Color.Green, code);
|
|
|
+ }
|
|
|
+ else OperateResult.AppendText(">>该序列号未上料，无需下料\n", Color.Red, code);
|
|
|
+ }
|
|
|
+ else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, code);
|
|
|
}
|
|
|
}
|
|
|
else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
|
章政