11

HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx

@@ -69,6 +69,9 @@
                                                         <f:RenderField Width="70px" HeaderText="管线号" ColumnID="pipe_no" DataField="pipe_no"
                                                             FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
                                                         </f:RenderField>
+                                                         <f:RenderField Width="70px" HeaderText="涂漆编码" ColumnID="coating_code" DataField="coating_code"
+                                                             FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
+                                                         </f:RenderField>
                                                         <f:RenderField Width="70px" HeaderText="图号" ColumnID="drawing_number" DataField="drawing_number"
                                                             FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
                                                         </f:RenderField>
@@ -126,6 +129,9 @@
                                                         <f:RenderField Width="100px" HeaderText="图号" ColumnID="drawing_number" DataField="drawing_number"
                                                             FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
                                                         </f:RenderField>
+                                                         <f:RenderField Width="70px" HeaderText="涂漆编码" ColumnID="coating_code" DataField="coating_code"
+                                                             FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
+                                                         </f:RenderField>
                                                          <f:RenderField Width="70px" HeaderText="材料代号" ColumnID="code" DataField="code"
                                                             FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
                                                         </f:RenderField>
@@ -180,6 +186,9 @@
                                                         <f:RenderField Width="100px" HeaderText="管线号" ColumnID="pipe_no" DataField="pipe_no"
                                                             FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
                                                         </f:RenderField>
+                                                         <f:RenderField Width="70px" HeaderText="涂漆编码" ColumnID="coating_code" DataField="coating_code"
+                                                             FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
+                                                         </f:RenderField>
                                                          <f:RenderField Width="70px" HeaderText="材料代号" ColumnID="code" DataField="code"
                                                             FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
                                                         </f:RenderField>

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<string>("text");
                     dtOther.Rows.Add(row);
                 }
+                foreach (JObject item in jArrayIsoInfo)
+                {
 
+
+                    var row = dtIsoInfo.NewRow();
+                    row["id"] = item.Value<string>("id");
+                    row["page_no"] = item.Value<string>("page_no");
+                    row["drawing_number"] = item.Value<string>("drawing_number");
+                    row["pipeline_id"] = item.Value<string>("pipeline_id");
+                    row["operation_temp_c"] = item.Value<string>("operation_temp_c");
+                    row["design_pressure_mpa"] = item.Value<string>("design_pressure_mpa");
+                    row["design_temp_c"] = item.Value<string>("design_temp_c");
+                    row["test_pressure_mpa"] = item.Value<string>("test_pressure_mpa");
+                    row["hydraulic_test_pressure"] = item.Value<string>("hydraulic_test_pressure");
+                    row["pipe_diameter_dn"] = item.Value<string>("pipe_diameter_dn");
+                    row["pipe_spec_grade"] = item.Value<string>("pipe_spec_grade");
+                    row["heat_insulation"] = item.Value<string>("heat_insulation");
+                    row["insulation_thickness_mm"] = item.Value<string>("insulation_thickness_mm");
+                    row["post_weld_heat_treatment"] = item.Value<string>("post_weld_heat_treatment");
+                    row["radiographic_examination"] = item.Value<string>("radiographic_examination");
+                    row["coating_code"] = item.Value<string>("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<string>("id");
-                    row["page_no"] = item.Value<string>("page_no");
-                    row["drawing_number"] = item.Value<string>("drawing_number");
-                    row["pipeline_id"] = item.Value<string>("pipeline_id");
-                    row["operation_temp_c"] = item.Value<string>("operation_temp_c");
-                    row["design_pressure_mpa"] = item.Value<string>("design_pressure_mpa");
-                    row["design_temp_c"] = item.Value<string>("design_temp_c");
-                    row["test_pressure_mpa"] = item.Value<string>("test_pressure_mpa");
-                    row["hydraulic_test_pressure"] = item.Value<string>("hydraulic_test_pressure");
-                    row["pipe_diameter_dn"] = item.Value<string>("pipe_diameter_dn");
-                    row["pipe_spec_grade"] = item.Value<string>("pipe_spec_grade");
-                    row["heat_insulation"] = item.Value<string>("heat_insulation");
-                    row["insulation_thickness_mm"] = item.Value<string>("insulation_thickness_mm");
-                    row["post_weld_heat_treatment"] = item.Value<string>("post_weld_heat_treatment");
-                    row["radiographic_examination"] = item.Value<string>("radiographic_examination");
-                    dtIsoInfo.Rows.Add(row);
-                }
                 BindGrid();
             }
         }
@@ -458,6 +468,7 @@ namespace FineUIPro.Web.HJGL.DataIn
                 dtGroupByDrawing.Columns.Add("qty");
                 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<string>("drawing_number") ?? "",
                         category = r.Field<string>("category") ?? "",
                         code = r.Field<string>("code") ?? "",
+                        coating_code = r.Field<string>("coating_code") ?? "",
                         spec = r.Field<string>("spec") ?? "",
                         description = r.Field<string>("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<string>("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<string>("category") ?? "",
                         code = r.Field<string>("code") ?? "",
                         spec = r.Field<string>("spec") ?? "",
+                        coating_code = r.Field<string>("coating_code") ?? "",
                         description = r.Field<string>("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<string>("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;