diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index aa58035..bf404b8 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -11,7 +11,7 @@ - + diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx index a6b3b9b..1fe4378 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx @@ -170,6 +170,9 @@ + + @@ -224,6 +227,11 @@ + + + + + diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs index 12ca7b7..cd9a1a3 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs @@ -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; + } + /// /// /// diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.designer.cs index fee6809..cc1f8ca 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.designer.cs @@ -228,6 +228,24 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat { /// protected global::System.Web.UI.WebControls.Label Label4; + /// + /// tfWeldSpec 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TemplateField tfWeldSpec; + + /// + /// Label5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label5; + /// /// tfUsingMan 控件。 ///