|
|
@@ -569,7 +569,7 @@ namespace UAS_MES.Make
|
|
|
ErrorMessage += "【" + dt.Rows[i]["bc_name"].ToString() + "】";
|
|
|
if (dt.Rows[i]["MBR_SOLUTIONCODE"].ToString() == "JJ_123")
|
|
|
{
|
|
|
- if (dh.getRowCount("craftmaterial", "nvl(cm_mbid,0)<>0 and cm_sncode='" + GetSNCode.Text + "' and cm_makecode='" + ms_makecode.Text + "'") == 0)
|
|
|
+ if (dh.getRowCount("craftmaterial", "nvl(cm_mbid,0)<>0 and cm_sncode='" + GetSNCode.Text + "' or cm_firstsn='"+ firstsn + "' and cm_makecode='" + ms_makecode.Text + "'") == 0)
|
|
|
{
|
|
|
OperatResult.AppendText(">>解决方案为更换物料，必须存在拆解记录\n", Color.Red);
|
|
|
return;
|
callm