lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
李超
2026-05-30 11:36:22 +08:00
parent 7b944d66c5
commit e714396c85
12 changed files with 136 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingRecognitionContent.aspx.cs
+2 -2
View File
@@ -412,10 +412,10 @@ namespace FineUIPro.Web.HJGL.DataIn
row["qty"] = item.Value<string>("qty");
row["page_no"] = item.Value<string>("page_no");
row["remark"] = item.Value<string>("remark");
if (string.IsNullOrEmpty(row["drawing_number"].ToString()))
if (string.IsNullOrEmpty(row["pipe_no"].ToString()))
{
var rowOther = dtOther.Select("page= " + row["page_no"].ToString()).FirstOrDefault();
row["drawing_number"] = rowOther["text"];
row["pipe_no"] = rowOther["text"];
}
dt.Rows.Add(row);
}
SGGL/FineUIPro.Web/HJGL/DataImport/PipelineGrid.aspx
+13 -6
View File
@@ -81,12 +81,19 @@
Locked="true">
</f:WindowField>
<f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:TemplateField Width="130px" HeaderText="无损检测类型" HeaderTextAlign="Center"
<f:TemplateField Width="130px" HeaderText="单位名称" HeaderTextAlign="Center"
TextAlign="Center" SortField="UnitId">
<ItemTemplate>
<asp:Label ID="Label10" runat="server" Text='<%# ConvertUnit(Eval("UnitId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField Width="130px" HeaderText="单位工程" HeaderTextAlign="Center"
TextAlign="Center" SortField="UnitWorkId">
<ItemTemplate>
<asp:Label ID="Label11" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField Width="130px" HeaderText="无损检测类型" HeaderTextAlign="Center"
TextAlign="Center" SortField="DetectionType">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# ConvertDetectionType(Eval("DetectionType")) %>'></asp:Label>
SGGL/FineUIPro.Web/HJGL/DataImport/PipelineGrid.aspx.cs
+26 -2
View File
@@ -647,12 +647,36 @@ namespace FineUIPro.Web.HJGL.DataIn
isoList[i].PipingClassId = iso.PipingClassId;
}
}
this.IsoGrid.DataSource = this.isoList;
this.IsoGrid.DataBind();
}
public static string ConvertUnitWork(object UnitWorkId)
{
if (UnitWorkId != null)
{
var unitWork = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == UnitWorkId.ToString());
if (unitWork != null)
{
return unitWork.UnitWorkName;
}
}
return null;
}
public static string ConvertUnit(object UnitId)
{
if (UnitId != null)
{
var unit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitId == UnitId.ToString());
if (unit != null)
{
return unit.UnitName;
}
}
return null;
}
public static string ConvertDetectionType(object DetectionTypeId)
{
if (DetectionTypeId != null)
SGGL/FineUIPro.Web/HJGL/DataImport/PipelineGrid.aspx.designer.cs
Generated
+18
View File
@@ -140,6 +140,24 @@ namespace FineUIPro.Web.HJGL.DataIn
/// </remarks>
protected global::FineUIPro.Grid IsoGrid;
/// <summary>
/// Label10 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label10;
/// <summary>
/// Label11 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label11;
/// <summary>
/// Label1 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/DataImport/PipelineInEdit.aspx
+2 -2
View File
@@ -95,7 +95,7 @@
<f:FormRow>
<Items>
<f:TextBox ID="numDesignPress" Label="设计压力 MPa(g)" runat="server" LabelWidth="140px">
</f:TextBox>
</f:TextBox>
<f:DropDownList ID="drpTestMedium" Label="压力试验介质" runat="server"
EnableEdit="true" LabelWidth="120px">
</f:DropDownList>
@@ -148,7 +148,7 @@
<f:FormRow>
<Items>
<f:CheckBox ID="ckAll" runat="server" Checked="true" Text="是否批量修改"></f:CheckBox>
<f:CheckBox ID="ckAll" runat="server" Checked="true" Hidden="true" Text="是否批量修改"></f:CheckBox>
</Items>
</f:FormRow>
</Rows>