shecs
/
Basf_TCC11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

This commit is contained in:
佘春生 2024-07-03 17:12:32 +08:00
parent 32d04f78d9
commit 22fa88f0b5
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoode.aspx
View File

@ -24,6 +24,9 @@
<Items>
<f:TextBox ID="txtCoode" runat="server" Label="物料码"
EmptyText="<%$ Resources:Lan,EnterQueryConditions %>" Width="250px" LabelWidth="120px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtHeartNo" runat="server" Label="炉批号"
EmptyText="<%$ Resources:Lan,EnterQueryConditions %>" Width="250px" LabelWidth="120px" LabelAlign="Right">
</f:TextBox>
<f:Button ID="btnQuery" ToolTip="<%$ Resources:Lan,Inquiry %>" Icon="SystemSearch"
EnablePostBack="true" OnClick="btnQuery_Click" runat="server">

8
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoode.aspx.cs
View File

@ -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);

9
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoode.aspx.designer.cs generated
View File

@ -68,6 +68,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
/// </remarks>
protected global::FineUIPro.TextBox txtCoode;
/// <summary>
/// txtHeartNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtHeartNo;
/// <summary>
/// btnQuery 控件。
/// </summary>

4
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs
View File

@ -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
{