11
This commit is contained in:
@@ -74,6 +74,48 @@
|
|||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
<f:RenderField Width="70px" HeaderText="图号" ColumnID="drawing_number" DataField="drawing_number"
|
<f:RenderField Width="70px" HeaderText="图号" ColumnID="drawing_number" DataField="drawing_number"
|
||||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="60px" HeaderText="页号" ColumnID="page_no" DataField="page_no"
|
||||||
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="100px" HeaderText="管线标识" ColumnID="pipeline_id" DataField="pipeline_id"
|
||||||
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="90px" HeaderText="操作压力(MPa)" ColumnID="operation_pressure_mpa" DataField="operation_pressure_mpa"
|
||||||
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="90px" HeaderText="操作温度(℃)" ColumnID="operation_temp_c" DataField="operation_temp_c"
|
||||||
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="90px" HeaderText="设计压力(MPa)" ColumnID="design_pressure_mpa" DataField="design_pressure_mpa"
|
||||||
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="90px" HeaderText="设计温度(℃)" ColumnID="design_temp_c" DataField="design_temp_c"
|
||||||
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="90px" HeaderText="试验压力(MPa)" ColumnID="test_pressure_mpa" DataField="test_pressure_mpa"
|
||||||
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="80px" HeaderText="水压试验" ColumnID="hydraulic_test_pressure" DataField="hydraulic_test_pressure"
|
||||||
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="90px" HeaderText="公称直径(DN)" ColumnID="pipe_diameter_dn" DataField="pipe_diameter_dn"
|
||||||
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="80px" HeaderText="管道等级" ColumnID="pipe_spec_grade" DataField="pipe_spec_grade"
|
||||||
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="80px" HeaderText="保温" ColumnID="heat_insulation" DataField="heat_insulation"
|
||||||
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="90px" HeaderText="保温厚度(mm)" ColumnID="insulation_thickness_mm" DataField="insulation_thickness_mm"
|
||||||
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="90px" HeaderText="焊后热处理" ColumnID="post_weld_heat_treatment" DataField="post_weld_heat_treatment"
|
||||||
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
|
||||||
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="80px" HeaderText="射线检测" ColumnID="radiographic_examination" DataField="radiographic_examination"
|
||||||
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
|
||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
<f:RenderField Width="70px" HeaderText="材料代号" ColumnID="code" DataField="code"
|
<f:RenderField Width="70px" HeaderText="材料代号" ColumnID="code" DataField="code"
|
||||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
|
||||||
|
|||||||
@@ -352,6 +352,19 @@ namespace FineUIPro.Web.HJGL.DataIn
|
|||||||
dt.Columns.Add("page_no");
|
dt.Columns.Add("page_no");
|
||||||
dt.Columns.Add("remark");
|
dt.Columns.Add("remark");
|
||||||
dt.Columns.Add("coating_code");
|
dt.Columns.Add("coating_code");
|
||||||
|
dt.Columns.Add("pipeline_id");
|
||||||
|
dt.Columns.Add("operation_pressure_mpa");
|
||||||
|
dt.Columns.Add("operation_temp_c");
|
||||||
|
dt.Columns.Add("design_pressure_mpa");
|
||||||
|
dt.Columns.Add("design_temp_c");
|
||||||
|
dt.Columns.Add("test_pressure_mpa");
|
||||||
|
dt.Columns.Add("hydraulic_test_pressure");
|
||||||
|
dt.Columns.Add("pipe_diameter_dn");
|
||||||
|
dt.Columns.Add("pipe_spec_grade");
|
||||||
|
dt.Columns.Add("heat_insulation");
|
||||||
|
dt.Columns.Add("insulation_thickness_mm");
|
||||||
|
dt.Columns.Add("post_weld_heat_treatment");
|
||||||
|
dt.Columns.Add("radiographic_examination");
|
||||||
|
|
||||||
|
|
||||||
dtOther = new DataTable();
|
dtOther = new DataTable();
|
||||||
@@ -399,6 +412,7 @@ namespace FineUIPro.Web.HJGL.DataIn
|
|||||||
row["page_no"] = item.Value<string>("page_no");
|
row["page_no"] = item.Value<string>("page_no");
|
||||||
row["drawing_number"] = item.Value<string>("drawing_number");
|
row["drawing_number"] = item.Value<string>("drawing_number");
|
||||||
row["pipeline_id"] = item.Value<string>("pipeline_id");
|
row["pipeline_id"] = item.Value<string>("pipeline_id");
|
||||||
|
row["operation_pressure_mpa"] = item.Value<string>("operation_pressure_mpa");
|
||||||
row["operation_temp_c"] = item.Value<string>("operation_temp_c");
|
row["operation_temp_c"] = item.Value<string>("operation_temp_c");
|
||||||
row["design_pressure_mpa"] = item.Value<string>("design_pressure_mpa");
|
row["design_pressure_mpa"] = item.Value<string>("design_pressure_mpa");
|
||||||
row["design_temp_c"] = item.Value<string>("design_temp_c");
|
row["design_temp_c"] = item.Value<string>("design_temp_c");
|
||||||
@@ -436,10 +450,31 @@ namespace FineUIPro.Web.HJGL.DataIn
|
|||||||
row["drawing_number"] = rowOther["text"];
|
row["drawing_number"] = rowOther["text"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var rowIso = dtIsoInfo.Select("page= '" + row["page_no"].ToString() + "'").FirstOrDefault();
|
var rowIso = dtIsoInfo.Select("page_no= '" + row["page_no"].ToString() + "' and pipeline_id='" + row["pipe_no"].ToString().Trim() + "'").FirstOrDefault();
|
||||||
|
if (rowIso == null)
|
||||||
|
{
|
||||||
|
rowIso = dtIsoInfo.Select("page_no= '" + row["page_no"].ToString() + "'").FirstOrDefault();
|
||||||
|
}
|
||||||
if (rowIso != null)
|
if (rowIso != null)
|
||||||
{
|
{
|
||||||
|
if (string.IsNullOrEmpty(row["drawing_number"].ToString()))
|
||||||
|
{
|
||||||
|
row["drawing_number"] = rowIso["drawing_number"];
|
||||||
|
}
|
||||||
row["coating_code"] = rowIso["coating_code"];
|
row["coating_code"] = rowIso["coating_code"];
|
||||||
|
row["pipeline_id"] = rowIso["pipeline_id"];
|
||||||
|
row["operation_pressure_mpa"] = rowIso["operation_pressure_mpa"];
|
||||||
|
row["operation_temp_c"] = rowIso["operation_temp_c"];
|
||||||
|
row["design_pressure_mpa"] = rowIso["design_pressure_mpa"];
|
||||||
|
row["design_temp_c"] = rowIso["design_temp_c"];
|
||||||
|
row["test_pressure_mpa"] = rowIso["test_pressure_mpa"];
|
||||||
|
row["hydraulic_test_pressure"] = rowIso["hydraulic_test_pressure"];
|
||||||
|
row["pipe_diameter_dn"] = rowIso["pipe_diameter_dn"];
|
||||||
|
row["pipe_spec_grade"] = rowIso["pipe_spec_grade"];
|
||||||
|
row["heat_insulation"] = rowIso["heat_insulation"];
|
||||||
|
row["insulation_thickness_mm"] = rowIso["insulation_thickness_mm"];
|
||||||
|
row["post_weld_heat_treatment"] = rowIso["post_weld_heat_treatment"];
|
||||||
|
row["radiographic_examination"] = rowIso["radiographic_examination"];
|
||||||
}
|
}
|
||||||
|
|
||||||
dt.Rows.Add(row);
|
dt.Rows.Add(row);
|
||||||
|
|||||||
Reference in New Issue
Block a user