|
|
@@ -386,7 +386,7 @@ namespace UAS_MES.Make
|
|
|
//查询拆解的物料
|
|
|
sql.Clear();
|
|
|
sql.Append("select distinct cm_soncode from craftmaterial where (cm_sncode='" + firstsn + "' or cm_sncode ");
|
|
|
- sql.Append("in (select sn from makesnrelation where firstsn='" + firstsn + "')) and cm_status=-1 and cm_makecode='"+ms_makecode.Text+"'");
|
|
|
+ sql.Append("in (select sn from makesnrelation where firstsn='" + firstsn + "')) and cm_status=-1 ");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
//如果含有序列号物料有被拆解过
|
|
|
if (dt.Rows.Count > 0)
|
|
|
@@ -399,7 +399,7 @@ namespace UAS_MES.Make
|
|
|
//查询对应的上料记录
|
|
|
sql.Clear();
|
|
|
sql.Append("select cm_soncode from craftmaterial where (cm_sncode='" + firstsn + "' or cm_sncode in (select sn from ");
|
|
|
- sql.Append(" makesnrelation where firstsn='" + firstsn + "')) and cm_status=0 and cm_soncode in (" + soncode.Substring(0, soncode.Length - 1) + ") and cm_makecode='"+ms_makecode.Text+"'");
|
|
|
+ sql.Append(" makesnrelation where firstsn='" + firstsn + "')) and cm_status=0 and cm_soncode in (" + soncode.Substring(0, soncode.Length - 1) + ")");
|
|
|
DataTable LoadSoncode = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
//查询的结果不相等表示未完成上料
|
|
|
if (dt.Rows.Count != LoadSoncode.Rows.Count)
|
|
|
@@ -408,13 +408,14 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
if (soncode.Contains(LoadSoncode.Rows[i][0].ToString()))
|
|
|
{
|
|
|
- soncode = soncode.Replace(LoadSoncode.Rows[i][0].ToString(),"");
|
|
|
+ soncode = soncode.Replace(LoadSoncode.Rows[i][0].ToString(), "");
|
|
|
}
|
|
|
}
|
|
|
- OperatResult.AppendText(">>" + soncode.Replace("'","") + "物料尚未备料，不允许回流\n");
|
|
|
+ OperatResult.AppendText(">>" + soncode.Replace("'", "") + "物料尚未备料，不允许回流\n", Color.Red);
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
+ return;
|
|
|
dt = (DataTable)dh.ExecuteSql("select cr_id from craft where cr_statuscode='AUDITED' and cr_code='" + cr_code.Text + "'", "select");
|
|
|
if (dt.Rows.Count == 0)
|
|
|
OperatResult.AppendText(">>回流工序不存在\n", Color.Red);
|
章政