11
This commit is contained in:
@@ -370,29 +370,7 @@ 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["code"] = item.Value<string>("code");
|
||||
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)
|
||||
@@ -417,6 +395,31 @@ namespace FineUIPro.Web.HJGL.DataIn
|
||||
row["radiographic_examination"] = item.Value<string>("radiographic_examination");
|
||||
dtIsoInfo.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["code"] = item.Value<string>("code");
|
||||
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);
|
||||
}
|
||||
|
||||
BindGrid();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user