|
|
@@ -751,11 +751,6 @@ namespace UAS_MES.PublicMethod
|
|
|
{
|
|
|
//判读第二原则送检方案为空
|
|
|
string pr_qualmethod = dh.getFieldDataByCondition("product left join productkind on pr_kind=pk_name", "pk_qualmethod", "pr_code='" + Form.Rows[0]["ob_prodcode"] + "'").ToString();
|
|
|
- if (pr_qualmethod == "" || pr_qualmethod == null)
|
|
|
- oErrorMessage = "该物料或者物料种类未维护检验方案，物料号：" + Form.Rows[0]["ob_prodcode"] + "，请先维护检验方案";
|
|
|
- //判读第二原则送检方案为空
|
|
|
- else
|
|
|
- qualmethod = pr_qualmethod;
|
|
|
}
|
|
|
//第一原则送检方案不为空
|
|
|
else
|
|
|
@@ -765,16 +760,11 @@ namespace UAS_MES.PublicMethod
|
|
|
Form.Rows[0]["ob_projectcode"] = qualmethod;
|
|
|
pr_id = dh.getFieldDataByCondition("QUA_Project", "pr_id", "pr_code = '" + qualmethod + "'").ToString();
|
|
|
sql.Clear();
|
|
|
- sql.Append("select nvl(max(oi_id),0) Choose,nvl(max(oi_id),0)oi_id,ci_kind,nvl(max(oi_sampleqty),0) oi_sampleqty from ");
|
|
|
- sql.Append("QUA_PROJECT left join QUA_ProjectDetail on pd_prid=pr_id left join QUA_CheckItem ");
|
|
|
- sql.Append("on pd_ciid=ci_id left join OQCITEMS on oi_checkno='" + iCheckNo + "' and ");
|
|
|
- sql.Append("oi_projectcode='" + qualmethod + "'and oi_projectcode = pr_code and oi_checkkind = ci_kind ");
|
|
|
- sql.Append("where pr_code='" + qualmethod + "' group by ci_kind ");
|
|
|
+ sql.Append("select nvl(max(oi_id),0)oi_id, ci_kind,max(oi_sampleqty) from QUA_PROJECT left join ");
|
|
|
+ sql.Append(" QUA_ProjectDetail on pd_prid=pr_id left join QUA_CheckItem on pd_ciid=ci_id ");
|
|
|
+ sql.Append("left join OQCITEMS on oi_checkno ='"+iCheckNo+ "' and oi_projectcode='"+ qualmethod + "' ");
|
|
|
+ sql.Append("and oi_projectcode = pr_code and oi_checkkind = ci_kind where pr_code='"+ qualmethod + "' group by ci_kind");
|
|
|
Grid = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
|
|
|
- if (Grid.Rows.Count == 0)
|
|
|
- {
|
|
|
- oErrorMessage = "检验方案:" + qualmethod + "无检验项目";
|
|
|
- }
|
|
|
}
|
|
|
else
|
|
|
oErrorMessage = "只有待检验的批次才允许维护抽样计划";
|
章政