From d0c285f1e9045ab0f072cc5326b95a1dc15dd8cc Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Thu, 20 Aug 2026 20:26:50 +0800
Subject: [PATCH] 11
---
.../DataIn/DrawingRecognitionContent.aspx | 9 +++
.../DataIn/DrawingRecognitionContent.aspx.cs | 64 ++++++++++++-------
2 files changed, 50 insertions(+), 23 deletions(-)
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx
index 04b5939..ae157a1 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx
@@ -69,6 +69,9 @@
+
+
@@ -126,6 +129,9 @@
+
+
@@ -180,6 +186,9 @@
+
+
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs
index c2aacc3..4ce77b1 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs
@@ -351,6 +351,8 @@ namespace FineUIPro.Web.HJGL.DataIn
dt.Columns.Add("qty");
dt.Columns.Add("page_no");
dt.Columns.Add("remark");
+ dt.Columns.Add("coating_code");
+
dtOther = new DataTable();
dtOther.Columns.Add("id");
@@ -377,6 +379,7 @@ namespace FineUIPro.Web.HJGL.DataIn
dtIsoInfo.Columns.Add("insulation_thickness_mm");
dtIsoInfo.Columns.Add("post_weld_heat_treatment");
dtIsoInfo.Columns.Add("radiographic_examination");
+ dtIsoInfo.Columns.Add("coating_code");
foreach (JObject item in jArrayOther)
{
var row = dtOther.NewRow();
@@ -387,7 +390,29 @@ namespace FineUIPro.Web.HJGL.DataIn
row["text"] = item.Value("text");
dtOther.Rows.Add(row);
}
+ foreach (JObject item in jArrayIsoInfo)
+ {
+
+ var row = dtIsoInfo.NewRow();
+ row["id"] = item.Value("id");
+ row["page_no"] = item.Value("page_no");
+ row["drawing_number"] = item.Value("drawing_number");
+ row["pipeline_id"] = item.Value("pipeline_id");
+ 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");
+ row["test_pressure_mpa"] = item.Value("test_pressure_mpa");
+ row["hydraulic_test_pressure"] = item.Value("hydraulic_test_pressure");
+ row["pipe_diameter_dn"] = item.Value("pipe_diameter_dn");
+ row["pipe_spec_grade"] = item.Value("pipe_spec_grade");
+ row["heat_insulation"] = item.Value("heat_insulation");
+ row["insulation_thickness_mm"] = item.Value("insulation_thickness_mm");
+ row["post_weld_heat_treatment"] = item.Value("post_weld_heat_treatment");
+ row["radiographic_examination"] = item.Value("radiographic_examination");
+ row["coating_code"] = item.Value("coating_code");
+ dtIsoInfo.Rows.Add(row);
+ }
// 遍历并提取数据
foreach (JObject item in jArray)
{
@@ -411,32 +436,17 @@ namespace FineUIPro.Web.HJGL.DataIn
row["drawing_number"] = rowOther["text"];
}
}
+ var rowIso = dtIsoInfo.Select("page= '" + row["page_no"].ToString() + "'").FirstOrDefault();
+ if (rowIso != null)
+ {
+ row["coating_code"] = rowIso["coating_code"];
+ }
+
dt.Rows.Add(row);
}
- foreach (JObject item in jArrayIsoInfo)
- {
-
-
- var row = dtIsoInfo.NewRow();
- row["id"] = item.Value("id");
- row["page_no"] = item.Value("page_no");
- row["drawing_number"] = item.Value("drawing_number");
- row["pipeline_id"] = item.Value("pipeline_id");
- 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");
- row["test_pressure_mpa"] = item.Value("test_pressure_mpa");
- row["hydraulic_test_pressure"] = item.Value("hydraulic_test_pressure");
- row["pipe_diameter_dn"] = item.Value("pipe_diameter_dn");
- row["pipe_spec_grade"] = item.Value("pipe_spec_grade");
- row["heat_insulation"] = item.Value("heat_insulation");
- row["insulation_thickness_mm"] = item.Value("insulation_thickness_mm");
- row["post_weld_heat_treatment"] = item.Value("post_weld_heat_treatment");
- row["radiographic_examination"] = item.Value("radiographic_examination");
- dtIsoInfo.Rows.Add(row);
- }
+
BindGrid();
}
}
@@ -456,8 +466,9 @@ namespace FineUIPro.Web.HJGL.DataIn
dtGroupByDrawing.Columns.Add("category");
dtGroupByDrawing.Columns.Add("spec");
dtGroupByDrawing.Columns.Add("qty");
- dtGroupByDrawing.Columns.Add("description");
+ dtGroupByDrawing.Columns.Add("description");
dtGroupByDrawing.Columns.Add("code");
+ dtGroupByDrawing.Columns.Add("coating_code");
var groups2 = dt.AsEnumerable()
.GroupBy(r => new
@@ -465,6 +476,7 @@ namespace FineUIPro.Web.HJGL.DataIn
drawing_number = r.Field("drawing_number") ?? "",
category = r.Field("category") ?? "",
code = r.Field("code") ?? "",
+ coating_code = r.Field("coating_code") ?? "",
spec = r.Field("spec") ?? "",
description = r.Field("description") ?? ""
})
@@ -473,6 +485,7 @@ namespace FineUIPro.Web.HJGL.DataIn
g.Key.drawing_number,
g.Key.category,
g.Key.code,
+ g.Key.coating_code,
g.Key.spec,
g.Key.description,
qty = g.Sum(r => Funs.GetNewDecimalOrZero(r.Field("qty"))),
@@ -485,6 +498,7 @@ namespace FineUIPro.Web.HJGL.DataIn
newRow["drawing_number"] = g.drawing_number;
newRow["category"] = g.category;
newRow["code"] = g.code;
+ newRow["coating_code"] = g.coating_code;
newRow["spec"] = g.spec;
newRow["qty"] = g.qty.ToString() + g.unit;
newRow["description"] = g.description;
@@ -509,6 +523,7 @@ namespace FineUIPro.Web.HJGL.DataIn
dtGroupByPipe.Columns.Add("spec");
dtGroupByPipe.Columns.Add("qty");
dtGroupByPipe.Columns.Add("description");
+ dtGroupByPipe.Columns.Add("coating_code");
var groups3 = dt.AsEnumerable()
.GroupBy(r => new
{
@@ -516,6 +531,7 @@ namespace FineUIPro.Web.HJGL.DataIn
category = r.Field("category") ?? "",
code = r.Field("code") ?? "",
spec = r.Field("spec") ?? "",
+ coating_code = r.Field("coating_code") ?? "",
description = r.Field("description") ?? ""
})
.Select(g => new
@@ -523,6 +539,7 @@ namespace FineUIPro.Web.HJGL.DataIn
g.Key.pipe_no,
g.Key.category,
g.Key.code,
+ g.Key.coating_code,
g.Key.spec,
g.Key.description,
qty = g.Sum(r => Funs.GetNewDecimalOrZero(r.Field("qty"))),
@@ -535,6 +552,7 @@ namespace FineUIPro.Web.HJGL.DataIn
newRow["pipe_no"] = g.pipe_no;
newRow["category"] = g.category;
newRow["spec"] = g.spec;
+ newRow["coating_code"] = g.coating_code;
newRow["code"] = g.code;
newRow["qty"] = g.qty.ToString() + g.unit;
newRow["description"] = g.description;