11

2024-06-05 08:24:19 +08:00
parent 1677a6d714
commit 3990f747ce
67 changed files with 6774 additions and 1645 deletions
@@ -230,7 +230,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
            this.SetTextTemp();
            this.PageInfoLoad(); ///页面输入保存信息
            string strSql = @"SELECT ptp.ProjectId, ptp.PTP_ID,ptpPipe.PT_PipeId, WorkArea.WorkAreaCode,IsoInfo.PipelineCode,
-                                    IsoInfo.DesignPressure,IsoInfo.DesignTemperature,ser.MediumName
+                                    IsoInfo.DesignPressure,IsoInfo.DesignTemperature,ser.MediumName,
+                                    ptpPipe.isAll,(case when (isnull(ptpPipe.WeldJonintCode,'')='') then '全部' else ptpPipe.WeldJonintCode end) as WeldJonintCode
                               FROM dbo.PTP_TestPackage AS ptp
                               LEFT JOIN dbo.PTP_PipelineList AS ptpPipe ON ptp.PTP_ID=ptpPipe.PTP_ID
                               LEFT JOIN dbo.Pipeline_Pipeline AS IsoInfo ON  IsoInfo.PipelineId = ptpPipe.PipelineId
@@ -751,8 +752,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
        protected void btnDownLoad_Click(object sender, EventArgs e)
        {
            string rootPath = Server.MapPath("~/");
-            string uploadfilepath = rootPath + Const.HJGL_DataInTemplateUrl;
-            string filePath = Const.HJGL_DataInTemplateUrl;
+            string uploadfilepath = rootPath + Const.HJGL_TestTemplateUrl;
+            string filePath = Const.HJGL_TestTemplateUrl;
            string fileName = Path.GetFileName(filePath);
            FileInfo info = new FileInfo(uploadfilepath);
            long fileSize = info.Length;