gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
高飞 2025-07-02 09:14:16 +08:00
parent 2782cd0933
commit 3f34ab5da2
4 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HJGL_DS/FineUIPro.Web/Web.config
View File

@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings>
<!--连接字符串-->
<add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<!--系统名称-->
<add key="SystemName" value="诺必达焊接管理系统"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

8
HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx
View File

@ -170,6 +170,9 @@
<f:RenderField Width="100px" ColumnID="WeldCode" DataField="WeldCode" FieldType="String"
HeaderText="焊材型号" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="WeldSpec" DataField="WeldSpec" FieldType="String"
HeaderText="焊材规格" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="140px" ColumnID="Amount" DataField="Amount" FieldType="Float"
HeaderText="计划领用数量(根)" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
@ -224,6 +227,11 @@
<asp:Label ID="Label4" runat="server" Text='<%# ConvertWeldCode(Eval("WeldId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ID="tfWeldSpec" HeaderText="焊材型号" HeaderTextAlign="Center" Width="150px">
<ItemTemplate>
<asp:Label ID="Label5" runat="server" Text='<%# ConvertWeldSpec(Eval("WeldId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="120px" ColumnID="Amount" DataField="Amount" FieldType="Float"
HeaderText="领用(一次)" HeaderTextAlign="Center">
</f:RenderField>

13
HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs
View File

@ -1229,6 +1229,19 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
return null;
}
protected string ConvertWeldSpec(object weldId)
{
if (weldId != null)
{
var weldInfo = BLL.WeldInfoService.GetWeldInfoById(weldId.ToString());
if (weldInfo != null)
{
return weldInfo.WeldSpec;
}
}
return null;
}
/// <summary>
///
/// </summary>

18
HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.designer.cs generated
View File

@ -228,6 +228,24 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat {
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label4;
/// <summary>
/// tfWeldSpec 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TemplateField tfWeldSpec;
/// <summary>
/// Label5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label5;
/// <summary>
/// tfUsingMan 控件。
/// </summary>