|
|
@@ -562,14 +562,14 @@ namespace UAS_MES_NEW.Make
|
|
|
return;
|
|
|
}
|
|
|
//如果岗位资源对应工序的版面不为空的时候
|
|
|
- //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 + "' and mbl_makecode='" + ms_makecode.Text + "' and mbl_sncode='" + GetSNCode.Text + "' "))
|
|
|
- // {
|
|
|
- // OperatResult.AppendText(">>工序存在版面必须维护不良位置\n", Color.Red);
|
|
|
- // return;
|
|
|
- // }
|
|
|
- //}
|
|
|
+ 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 + "' and mbl_makecode='" + ms_makecode.Text + "' and mbl_sncode='" + GetSNCode.Text + "' "))
|
|
|
+ {
|
|
|
+ OperatResult.AppendText(">>工序存在版面必须维护不良位置\n", Color.Red);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
//查询拆解的物料
|
|
|
sql.Clear();
|
|
|
sql.Append("select distinct cm_soncode from craftmaterial where cm_sncode in (select '" + firstsn + "' from dual union ");
|