diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx
index ae157a1..342e7f1 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx
@@ -74,6 +74,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs
index 4ce77b1..76bb767 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs
@@ -352,6 +352,19 @@ namespace FineUIPro.Web.HJGL.DataIn
dt.Columns.Add("page_no");
dt.Columns.Add("remark");
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();
@@ -399,6 +412,7 @@ namespace FineUIPro.Web.HJGL.DataIn
row["page_no"] = item.Value("page_no");
row["drawing_number"] = item.Value("drawing_number");
row["pipeline_id"] = item.Value("pipeline_id");
+ row["operation_pressure_mpa"] = item.Value("operation_pressure_mpa");
row["operation_temp_c"] = item.Value("operation_temp_c");
row["design_pressure_mpa"] = item.Value("design_pressure_mpa");
row["design_temp_c"] = item.Value("design_temp_c");
@@ -436,10 +450,31 @@ namespace FineUIPro.Web.HJGL.DataIn
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 (string.IsNullOrEmpty(row["drawing_number"].ToString()))
+ {
+ row["drawing_number"] = rowIso["drawing_number"];
+ }
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);