|
@@ -295,20 +295,20 @@ namespace UAS_MES_NEW.Make
|
|
|
// }
|
|
// }
|
|
|
//}
|
|
//}
|
|
|
}
|
|
}
|
|
|
- else
|
|
|
|
|
- {
|
|
|
|
|
- sql.Clear();
|
|
|
|
|
- sql.Append("select cm_craftcode,cm_stepcode,cm_soncode,min(cm_indate)cm_indate,sum(case when cm_status=-1 ");
|
|
|
|
|
- sql.Append("then 0 else 1 end)qty from craftmaterial left join product on pr_code=cm_soncode where(cm_sncode ");
|
|
|
|
|
- sql.Append("in (select sn from makesnrelation where firstsn='" + firstsn + "' union select '" + firstsn + "' from dual)) ");
|
|
|
|
|
- sql.Append("and cm_craftcode='" + cr_code.Text + "' group by cm_craftcode,cm_stepcode,cm_soncode having ");
|
|
|
|
|
- sql.Append("sum(case when cm_status=-1 then 0 else 1 end)=0 order by cm_indate");
|
|
|
|
|
- dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
|
|
- if (dt.Rows.Count > 0)
|
|
|
|
|
- {
|
|
|
|
|
- cdstepcode = dt.Rows[0]["cm_stepcode"].ToString();
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ //else
|
|
|
|
|
+ //{
|
|
|
|
|
+ // sql.Clear();
|
|
|
|
|
+ // sql.Append("select cm_craftcode,cm_stepcode,cm_soncode,min(cm_indate)cm_indate,sum(case when cm_status=-1 ");
|
|
|
|
|
+ // sql.Append("then 0 else 1 end)qty from craftmaterial left join product on pr_code=cm_soncode where(cm_sncode ");
|
|
|
|
|
+ // sql.Append("in (select sn from makesnrelation where firstsn='" + firstsn + "' union select '" + firstsn + "' from dual)) ");
|
|
|
|
|
+ // sql.Append("and cm_craftcode='" + cr_code.Text + "' group by cm_craftcode,cm_stepcode,cm_soncode having ");
|
|
|
|
|
+ // sql.Append("sum(case when cm_status=-1 then 0 else 1 end)=0 order by cm_indate");
|
|
|
|
|
+ // dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
|
|
+ // if (dt.Rows.Count > 0)
|
|
|
|
|
+ // {
|
|
|
|
|
+ // cdstepcode = dt.Rows[0]["cm_stepcode"].ToString();
|
|
|
|
|
+ // }
|
|
|
|
|
+ //}
|
|
|
if (cdstepcode == "")
|
|
if (cdstepcode == "")
|
|
|
{
|
|
{
|
|
|
//序号小于等于当前不良的序号
|
|
//序号小于等于当前不良的序号
|
callm