diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoode.aspx b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoode.aspx index ce5e9ef..77a66de 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoode.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoode.aspx @@ -24,6 +24,9 @@ + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoode.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoode.aspx.cs index 62a8567..fa4b7ed 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoode.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoode.aspx.cs @@ -54,7 +54,13 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage strSql += " AND Coode LIKE @Coode"; listStr.Add(new SqlParameter("@Coode", "%" + this.txtCoode.Text.Trim() + "%")); } - + + if (!string.IsNullOrEmpty(this.txtHeartNo.Text.Trim())) + { + strSql += " AND HeartNo LIKE @HeartNo"; + listStr.Add(new SqlParameter("@HeartNo", "%" + this.txtHeartNo.Text.Trim() + "%")); + } + SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoode.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoode.aspx.designer.cs index 844cb49..ef07a8c 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoode.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoode.aspx.designer.cs @@ -68,6 +68,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage /// protected global::FineUIPro.TextBox txtCoode; + /// + /// txtHeartNo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtHeartNo; + /// /// btnQuery 控件。 /// diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs index 6a45af2..5dc34dd 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs @@ -1042,7 +1042,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage var cood = coodeList.FirstOrDefault(x =>x.IsUse==true && x.Coode == d.Coode1 && x.HeartNo == ds.Tables[0].Rows[i]["炉批号1"].ToString()); if (cood == null) { - errorInfos += "炉批号1:[" + ds.Tables[0].Rows[i]["炉批号1"].ToString() + "]或对应的Coode1不存在;"; + errorInfos += "炉批号1:[" + ds.Tables[0].Rows[i]["炉批号1"].ToString() + "]或对应的Coode1:"+d.Coode1+"不存在;"; } else { @@ -1059,7 +1059,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage var cood = coodeList.FirstOrDefault(x => x.IsUse == true && x.Coode == d.Coode2 && x.HeartNo == ds.Tables[0].Rows[i]["炉批号2"].ToString()); if (cood == null) { - errorInfos += "炉批号2:[" + ds.Tables[0].Rows[i]["炉批号2"].ToString() + "]或对应的Coode2不存在;"; + errorInfos += "炉批号2:[" + ds.Tables[0].Rows[i]["炉批号2"].ToString() + "]或对应的Coode2:"+ d.Coode2 + "不存在;"; } else {