赛鼎焊接修改

SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs

@@ -487,14 +487,18 @@ namespace FineUIPro.Web.HJGL.InfoQuery
         /// <param name="e"></param>
         protected void btnOut_Click(object sender, EventArgs e)
         {
+            string fileName = "";
             if (this.tvControlItem.SelectedNode.CommandName.Split('|').Count() == 2) //单位工程
             {
                 Model.View_HJGL_WeldJoint model = new Model.View_HJGL_WeldJoint();
                 model.UnitWorkId = this.tvControlItem.SelectedNodeID;
                 var list = BLL.WeldJointService.GetViewWeldJointsBymodel(model);
                 View_HJGL_WeldJoint = list;
-               /* PrintByUnitWork(this.tvControlItem.SelectedNodeID);
-                return;*/
+                fileName = UnitWorkService.GetNameById(model.UnitWorkId);
+            }
+            else if (this.tvControlItem.SelectedNode.CommandName == "管线")
+            {
+                fileName = PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID)?.PipelineCode;
             } 
 
             string path = Funs.RootPath + @"File\Excel\Temp\JointQuery.xlsx";
@@ -537,7 +541,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
                      }).ToList();
             MiniExcel.SaveAs(path, q);
 
-            string fileName = "焊口信息总览.xlsx";
+            fileName = fileName+ "-焊口信息总览.xlsx";
             FileInfo info = new FileInfo(path);
             long fileSize = info.Length;
             System.Web.HttpContext.Current.Response.Clear();