|
|
@@ -93,14 +93,14 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
sql.Append("select wm_concat(pr_detail) sp_soncode from stepproduct left join product on pr_code=sp_fsoncode where ");
|
|
|
sql.Append("sp_bomversion='" + ms_bomversion + "' and sp_craftcode='" + ms_craftcode + "' ");
|
|
|
sql.Append("And sp_mothercode ='" + ms_prodcode + "' and sp_tracekind=1 and not exists(select 1 from craftmaterial where ");
|
|
|
- sql.Append("cm_sncode in (select '" + ms_firstsn + "' from dual union select sn from makesnrelation where firstsn='" + ms_firstsn + "') and cm_makecode='" + ms_makecode + "' and cm_fsoncode=");
|
|
|
+ sql.Append("cm_sncode in (select '" + ms_firstsn + "' from dual union select sn from makesnrelation where firstsn='" + ms_firstsn + "') and cm_fsoncode=");
|
|
|
sql.Append("sp_fsoncode and cm_status=0 and cm_stepcode=sp_stepcode)");
|
|
|
DataTable dt1 = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt1.Rows.Count > 0)
|
|
|
{
|
|
|
if (dt1.Rows[0]["sp_soncode"].ToString() != "")
|
|
|
{
|
|
|
- Error += "组装工单号" + dt1.Rows[0]["sp_soncode"] + "的物料信息有误";
|
|
|
+ Error += "组装段" + dt1.Rows[0]["sp_soncode"] + "的物料未绑定";
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -117,13 +117,14 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
sql.Append("select wm_concat(pr_detail) sp_soncode from stepproduct left join product on pr_code=sp_fsoncode where ");
|
|
|
sql.Append("sp_bomversion='" + ms_bomversion + "' and sp_craftcode='" + ms_craftcode + "' ");
|
|
|
sql.Append("And sp_mothercode ='" + ms_prodcode + "' and sp_tracekind=1 and not exists(select 1 from craftmaterial where ");
|
|
|
- sql.Append("cm_sncode in (select '" + ms_firstsn + "' from dual union select sn from makesnrelation where firstsn='" + ms_firstsn + "') and cm_makecode='" + ms_makecode + "' and cm_fsoncode=");
|
|
|
+ sql.Append("cm_sncode in (select '" + ms_firstsn + "' from dual union select sn from makesnrelation where firstsn='" + ms_firstsn + "') and cm_fsoncode=");
|
|
|
sql.Append("sp_fsoncode and cm_status=0 and cm_stepcode=sp_stepcode) ");
|
|
|
DataTable dt1 = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt1.Rows.Count > 0)
|
|
|
{
|
|
|
- if (dt1.Rows[0]["sp_soncode"].ToString() != "") {
|
|
|
- Error += "包装工单号" + dt1.Rows[0]["sp_soncode"] + "的物料信息有误";
|
|
|
+ if (dt1.Rows[0]["sp_soncode"].ToString() != "")
|
|
|
+ {
|
|
|
+ Error += "包装段" + dt1.Rows[0]["sp_soncode"] + "的物料未绑定";
|
|
|
}
|
|
|
}
|
|
|
}
|
callm