This commit is contained in:
2026-05-20 15:15:33 +08:00
2 changed files with 25 additions and 19 deletions
@@ -358,24 +358,6 @@ namespace FineUIPro.Web.HJGL.DataIn
dtIsoInfo.Columns.Add("insulation_thickness_mm");
dtIsoInfo.Columns.Add("post_weld_heat_treatment");
dtIsoInfo.Columns.Add("radiographic_examination");
// 遍历并提取数据
foreach (JObject item in jArray)
{
var row = dt.NewRow();
row["id"] = item.Value<string>("id");
row["pipe_no"] = item.Value<string>("pipe_no");
row["drawing_number"] = item.Value<string>("drawing_number");
row["seq_no"] = item.Value<string>("seq_no");
row["category"] = item.Value<string>("category");
row["description"] = item.Value<string>("description");
row["spec"] = item.Value<string>("spec");
row["qty"] = item.Value<string>("qty");
row["page_no"] = item.Value<string>("page_no");
row["remark"] = item.Value<string>("remark");
dt.Rows.Add(row);
}
foreach (JObject item in jArrayOther)
{
var row = dtOther.NewRow();
@@ -387,6 +369,30 @@ namespace FineUIPro.Web.HJGL.DataIn
dtOther.Rows.Add(row);
}
// 遍历并提取数据
foreach (JObject item in jArray)
{
var row = dt.NewRow();
row["id"] = item.Value<string>("id");
row["pipe_no"] = item.Value<string>("pipe_no");
row["drawing_number"] = item.Value<string>("drawing_number");
row["seq_no"] = item.Value<string>("seq_no");
row["category"] = item.Value<string>("category");
row["description"] = item.Value<string>("description");
row["spec"] = item.Value<string>("spec");
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()))
{
var rowOther = dtOther.Select("page= " + row["page_no"].ToString()).FirstOrDefault();
row["drawing_number"] = rowOther["text"];
}
dt.Rows.Add(row);
}
foreach (JObject item in jArrayIsoInfo)
{
File diff suppressed because one or more lines are too long