|
|
@@ -393,7 +393,7 @@ namespace UAS_MES.Make
|
|
|
//如果岗位资源对应工序的版面不为空的时候
|
|
|
if (dh.getFieldDataByCondition("makeserial left join step on ms_stepcode=st_code", "st_table", "ms_id='" + msid+ "'").ToString() != "")
|
|
|
{
|
|
|
- if (!dh.CheckExist("makebadrsloc", "mbl_mbrid='" + mbr_id + "' mbl_makecode='"+ms_makecode.Text+"' and mbl_sncode='" + GetSNCode.Text + "' "))
|
|
|
+ if (!dh.CheckExist("makebadrsloc", "mbl_mbrid='" + mbr_id + "' and mbl_makecode='"+ms_makecode.Text+"' and mbl_sncode='" + GetSNCode.Text + "' "))
|
|
|
{
|
|
|
OperatResult.AppendText(">>工序存在版面必须维护不良位置\n", Color.Red);
|
|
|
return;
|
|
|
@@ -461,7 +461,7 @@ namespace UAS_MES.Make
|
|
|
dh.UpdateByCondition("makebad", "mb_status=-1", "mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ms_makecode.Text + "'");
|
|
|
LogicHandler.InsertMakeProcess(ms_sncode.Text, ms_makecode.Text, User.UserSourceCode, "回流工序", "完成维修回流", User.UserCode);
|
|
|
LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, macode, User.UserLineCode, User.UserSourceCode, "回流工序", "完成维修回流", ms_sncode.Text, ms_checkno.Text);
|
|
|
- OperatResult.AppendText(">>" + ms_sncode.Text + " 序列号回流成功\n", Color.Green);
|
|
|
+ OperatResult.AppendText(">>序列号" + ms_sncode.Text + "回流成功\n", Color.Green);
|
|
|
BaseUtil.CleanForm(this);
|
|
|
BadCodeTree.Nodes.Clear();
|
|
|
GetSNCode.Clear();
|