20220923 焊接终版测试修改

2022-09-23 22:29:48 +08:00
parent 08c2646ef1
commit 5e4a7de2ac
18 changed files with 1521 additions and 126 deletions
@@ -221,12 +221,14 @@ namespace FineUIPro.Web.HJGL.PreDesign
                    var dt = pds.AsEnumerable()
                    .GroupBy(x => new {
                        pipelinecode = x.Field<string>("管线号"),
-                        PipelineComponentCode = x.Field<string>("预制组件")
+                        PipelineComponentCode = x.Field<string>("预制组件"),
+                        DrawingName = x.Field<string>("预制图纸名称"),
                    })
                    .Select(x => new
                    {
                        pipelinecode = x.Key.pipelinecode,
                        PipelineComponentCode = x.Key.PipelineComponentCode,
+                        DrawingName = x.Key.DrawingName,
                        QRCode = String.Join("&", x.Select(z => z.Field<string>("二维码信息")))
                    });
                    foreach (var item in dt)
@@ -244,6 +246,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                            rootName.QRCode.Add(qRCodeQRCodeItem);
                        }
                        hJGL_Pipeline_Component.QRCode = JsonConvert.SerializeObject(rootName);
+                        hJGL_Pipeline_Component.DrawingName = item.DrawingName;
                        Pipeline_ComponentList.Add(hJGL_Pipeline_Component);
                    }
                    errorInfos = string.Empty;