From 0a02b8a2f90cafbe166b995851fbd2cb9589f978 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Wed, 6 Aug 2025 11:26:51 +0800 Subject: [PATCH] =?UTF-8?q?20250806=20=E7=83=AD=E5=A4=84=E7=90=86=E3=80=81?= =?UTF-8?q?=E7=A1=AC=E5=BA=A6=E5=A7=94=E6=89=98=E5=8D=95=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/HJGLDB_DS_2025-08-05_bwj.sql | 41 ++ .../版本日志/HJGLDB_DS_2025-08-06_bwj.sql | 79 ++++ .../HardnessTestOrderPrint.aspx | 5 +- .../HardnessTestOrderPrint.aspx.cs | 25 +- .../File/Fastreport/热处理委托单.frx | 4 +- .../File/Fastreport/硬度试验委托单.frx | 412 ++++++++-------- .../Fastreport/管道焊接接头热处理报告.frx | 441 ++++++++++-------- .../HotHardManage/HotHardManageEdit.aspx.cs | 22 +- .../HotProessManageEdit.aspx.cs | 8 +- HJGL_DS/FineUIPro.Web/Web.config | 28 +- 10 files changed, 623 insertions(+), 442 deletions(-) create mode 100644 DataBase/版本日志/HJGLDB_DS_2025-08-05_bwj.sql create mode 100644 DataBase/版本日志/HJGLDB_DS_2025-08-06_bwj.sql diff --git a/DataBase/版本日志/HJGLDB_DS_2025-08-05_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2025-08-05_bwj.sql new file mode 100644 index 0000000..f5931c6 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2025-08-05_bwj.sql @@ -0,0 +1,41 @@ + +ALTER PROCEDURE [dbo].[HJGL_spCH_HardTestReportItemDistinct2] +( + @HardTestReportId nvarchar(50) +) +AS +--ͨidȡίеϢ +BEGIN + select ROW_NUMBER() OVER(ORDER BY c.Sort1,c.Sort2,c.Sort3,c.Sort4,c.Sort5,c.SortIndex) as sort, + ROW_NUMBER() OVER(ORDER BY c.Sort1,c.Sort2,c.Sort3,c.Sort4,c.Sort5,c.SortIndex) as Number, + c.HardTestReportItemId, --Ӳίϸid + c.HardTestReportId, -- Ӳίid + c.JOT_ID, --id + c.ISO_IsoNo, + Batch.BatchCode,-- + c.JOT_JointNo, + c.Remark, + c.JOT_JointDesc, -- + c.TestPart, + Result.Remark as RemarkStr, + c.STE_Code, -- + c.WED_Code, + convert(nvarchar(10),HotProessItem.HotProessDate,111) as HotProessDate, --ȴ + HotProessItem.RecordChartNo --߱ +from dbo.HJGL_View_CH_HardTestReportItem c +left join dbo.HJGL_BO_BatchDetail BatchDetail on BatchDetail.JOT_ID=c.JOT_ID +left join dbo.HJGL_BO_Batch Batch on Batch.BatchId=BatchDetail.BatchId +left join dbo.HJGL_CH_HotProessResult Result ON Result.JOT_ID=c.JOT_ID and Result.HotProessTrustId=c.HotProessTrustId +left join HJGL_HotProessItem HotProessItem on HotProessItem.JOT_ID = c.JOT_ID +where c.HardTestReportId = @HardTestReportId and c.TestPart='' + + +union + +select 99999 as sort,null,null,null,null,null,null,'¿հ',null,null,null,null,null,null,null,null + +END + +GO + + diff --git a/DataBase/版本日志/HJGLDB_DS_2025-08-06_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2025-08-06_bwj.sql new file mode 100644 index 0000000..c51711b --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2025-08-06_bwj.sql @@ -0,0 +1,79 @@ +ALTER PROCEDURE [dbo].[HJGL_spCH_HardTestReportItemDistinct2] +( + @HardTestReportId nvarchar(50) +) +AS +--ͨidȡίеϢ +BEGIN +-- select ROW_NUMBER() OVER(ORDER BY c.Sort1,c.Sort2,c.Sort3,c.Sort4,c.Sort5,c.SortIndex) as sort, +-- ROW_NUMBER() OVER(ORDER BY c.Sort1,c.Sort2,c.Sort3,c.Sort4,c.Sort5,c.SortIndex) as Number, +-- c.HardTestReportItemId, --Ӳίϸid +-- c.HardTestReportId, -- Ӳίid +-- c.JOT_ID, --id +-- c.ISO_IsoNo, +-- Batch.BatchCode,-- +-- c.JOT_JointNo, +-- c.Remark, +-- c.JOT_JointDesc, -- +-- c.TestPart, +-- Result.Remark as RemarkStr, +-- c.STE_Code, -- +-- c.WED_Code, +-- convert(nvarchar(10),HotProessItem.HotProessDate,111) as HotProessDate, --ȴ +-- HotProessItem.RecordChartNo --߱ +--from dbo.HJGL_View_CH_HardTestReportItem c +--left join dbo.HJGL_BO_BatchDetail BatchDetail on BatchDetail.JOT_ID=c.JOT_ID +--left join dbo.HJGL_BO_Batch Batch on Batch.BatchId=BatchDetail.BatchId +--left join dbo.HJGL_CH_HotProessResult Result ON Result.JOT_ID=c.JOT_ID and Result.HotProessTrustId=c.HotProessTrustId +--left join HJGL_HotProessItem HotProessItem on HotProessItem.JOT_ID = c.JOT_ID + +SELECT ROW_NUMBER() OVER(ORDER BY JointInfo.Sort1,JointInfo.Sort2,JointInfo.Sort3,JointInfo.Sort4,JointInfo.Sort5,ReportItem.SortIndex) as Number, + ReportItem.HardTestReportItemId, --Ӳȼ鱨ϸid + --ReportItem.HardTestReportId, -- Ӳȼ鱨id + JointInfo.JOT_ID, --id + --ReportItem.TestPart, --鲿λ + ReportItem.IsShow, + JointInfo.ISO_ID, + IsoInfo.ISO_IsoNo, + JointInfo.JOT_JointNo+ + ISNULL((SELECT TOP 1 RepairMark FROM dbo.HJGL_CH_HotProessTrustItem TrustItem + LEFT JOIN dbo.HJGL_CH_RepairItemRecord AS record ON record.RepairItemRecordId=TrustItem.TrustItemID + WHERE TrustItem.JOT_ID=JointInfo.JOT_ID AND TrustItem.HotProessTrustId=ReportItem.HotProessTrustId),'')+ + ISNULL((SELECT TOP 1 HardRepairMark FROM dbo.HJGL_CH_HotProessTrustItem a WHERE a.JOT_ID=JointInfo.JOT_ID AND a.HotProessTrustId=ReportItem.HotProessTrustId AND a.ProessTypes='4'),'') AS JOT_JointNo, + JointInfo.JOT_JointDesc, -- + --(JointInfo.JOT_JointNo+ + -- ISNULL((SELECT TOP 1 RepairMark FROM dbo.HJGL_CH_HotProessTrustItem TrustItem + -- LEFT JOIN dbo.HJGL_CH_RepairItemRecord AS record ON record.RepairItemRecordId=TrustItem.TrustItemID + -- WHERE TrustItem.JOT_ID=JointInfo.JOT_ID AND TrustItem.HotProessTrustId=ReportItem.HotProessTrustId),'')+ + -- ISNULL((SELECT TOP 1 HardRepairMark FROM dbo.HJGL_CH_HotProessTrustItem a WHERE a.JOT_ID=JointInfo.JOT_ID AND a.HotProessTrustId=ReportItem.HotProessTrustId AND a.ProessTypes='4'),''))+'('+JointInfo.JOT_JointDesc+')' AS JOT_JointNoStr, + + (CASE WHEN Steel.STE_Code IS NOT NULL AND Steel2.STE_Code IS NOT NULL AND Steel.STE_Code!=Steel2.STE_Code + THEN Steel.STE_Code + '/' + Steel2.STE_Code + WHEN Steel.STE_Code IS NOT NULL THEN Steel.STE_Code + ELSE ISNULL(Steel2.STE_Code,'') END) AS STE_Code, -- + JointInfo.JOT_CellWelder, + JointInfo.JOT_FloorWelder, + (CASE WHEN JointInfo.JOT_CellWelder!=JointInfo.JOT_FloorWelder THEN Welder1.WED_Code+'/'+Welder2.WED_Code ELSE Welder1.WED_Code END) AS WED_Code, -- + convert(nvarchar(10),HotProessItem.HotProessDate,111) as HotProessDate, --ȴ + HotProessItem.RecordChartNo --߱ +FROM dbo.HJGL_PW_JointInfo AS JointInfo +LEFT JOIN dbo.HJGL_CH_HardTestReportItem AS ReportItem ON JointInfo.JOT_ID = ReportItem.JOT_ID +LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON IsoInfo.ISO_ID = JointInfo.ISO_ID +LEFT JOIN dbo.HJGL_BS_Steel AS Steel ON JointInfo.STE_ID = Steel.STE_ID +LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID =JointInfo.STE_ID2 +LEFT JOIN dbo.HJGL_BS_Welder AS Welder1 ON Welder1.WED_ID = JointInfo.JOT_CellWelder +LEFT JOIN dbo.HJGL_BS_Welder AS Welder2 ON Welder2.WED_ID = JointInfo.JOT_FloorWelder +left join HJGL_HotProessItem HotProessItem on HotProessItem.JOT_ID = JointInfo.JOT_ID +WHERE ReportItem.IsShow=1 +and ReportItem.HardTestReportId = @HardTestReportId and ReportItem.TestPart='' + + +union + +select 99999 as sort,null,null,null,null,null,'¿հ',null,null,null,null,null,null,null + +END + +GO + + diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/HardnessTestOrderPrint.aspx b/HJGL_DS/FineUIPro.Web/ContinuousPrint/HardnessTestOrderPrint.aspx index 5e09298..fdf041a 100644 --- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/HardnessTestOrderPrint.aspx +++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/HardnessTestOrderPrint.aspx @@ -88,13 +88,16 @@ - + + + diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/HardnessTestOrderPrint.aspx.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/HardnessTestOrderPrint.aspx.cs index 7a81e0c..c104deb 100644 --- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/HardnessTestOrderPrint.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/HardnessTestOrderPrint.aspx.cs @@ -54,7 +54,7 @@ namespace FineUIPro.Web.ContinuousPrint { str += " and a.IsPrintTrust=" + this.drpIsPrint.SelectedValue + ""; } - string strSql = @"select a.HardTestReportId,a.HardTestReportCode,a.ProjectId,b.ProjectName,a.ISO_ID,a.TrustUnitId,a.TestDate,a.InstrumentType,a.HotProessState,a.SurfaceAppearance,a.TestMethod,a.ContractUnit,a.IsPrintReport,(case a.IsPrintReport when 1 then '已打印' else '未打印' end) as IsPrintReportName,(case a.IsPrintTrust when 1 then '已打印' else '未打印' end) as IsPrintTrustName from HJGL_CH_HardTestReport as a inner join Base_Project as b on a.ProjectId=b.ProjectId where a.ProjectId=@ProjectId" + str; + string strSql = @"select a.HardTestReportId,a.HardTestReportCode,iso.ISO_IsoNo,a.ProjectId,b.ProjectName,a.ISO_ID,a.TrustUnitId,a.TestDate,a.InstrumentType,a.HotProessState,a.SurfaceAppearance,a.TestMethod,a.ContractUnit,a.IsPrintReport,(case a.IsPrintReport when 1 then '已打印' else '未打印' end) as IsPrintReportName,(case a.IsPrintTrust when 1 then '已打印' else '未打印' end) as IsPrintTrustName from HJGL_CH_HardTestReport as a left join HJGL_PW_IsoInfo iso on iso.ISO_ID = a.ISO_ID inner join Base_Project as b on a.ProjectId=b.ProjectId where a.ProjectId=@ProjectId" + str; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", ProjectId)); SqlParameter[] parameter = listStr.ToArray(); @@ -198,10 +198,15 @@ namespace FineUIPro.Web.ContinuousPrint SqlParameter[] parameter = listStr.ToArray(); DataTable tb = BLL.SQLHelper.GetDataTableRunProc("HJGL_spCH_HardTestReport", parameter); + List listStr2 = new List(); + listStr2.Add(new SqlParameter("@HardTestReportId", this.Grid2.SelectedRowID)); + SqlParameter[] parameter2 = listStr2.ToArray(); + DataTable tb2 = BLL.SQLHelper.GetDataTableRunProc("HJGL_spCH_HardTestReportItemDistinct2", parameter2); + DataTable dt = new DataTable(); dt.TableName = "MainData"; dt.Columns.Add("ProjectName"); - dt.Columns.Add("UnitWork"); + //dt.Columns.Add("UnitWork"); dt.Columns.Add("InstallationName"); dt.Columns.Add("InstallationCode"); dt.Columns.Add("TrustUnitName"); @@ -222,7 +227,7 @@ namespace FineUIPro.Web.ContinuousPrint { var newRows = dt.NewRow(); newRows["ProjectName"] = row["ProjectName"].ToString(); - newRows["UnitWork"] = row["UnitWork"].ToString(); + //newRows["UnitWork"] = row["UnitWork"].ToString(); newRows["InstallationName"] = row["InstallationName"].ToString(); newRows["InstallationCode"] = row["InstallationCode"].ToString(); newRows["TrustUnitName"] = row["TrustUnitName"].ToString(); @@ -236,17 +241,11 @@ namespace FineUIPro.Web.ContinuousPrint newRows["TestMethod"] = row["TestMethod"].ToString(); newRows["TestStandard"] = row["TestStandard"].ToString(); newRows["TestRate"] = row["TestRate"].ToString(); - newRows["checkCount"] = row["checkCount"].ToString(); + newRows["checkCount"] = tb2.Rows.Count - 1; //row["checkCount"].ToString(); dt.Rows.Add(newRows); } BLL.Common.FastReportService.AddFastreportTable(dt); - - List listStr2 = new List(); - listStr2.Add(new SqlParameter("@HardTestReportId", this.Grid2.SelectedRowID)); - SqlParameter[] parameter2 = listStr2.ToArray(); - DataTable tb2 = BLL.SQLHelper.GetDataTableRunProc("HJGL_spCH_HardTestReportItemDistinct2", parameter2); - DataTable dt2 = new DataTable(); dt2.TableName = "Data"; dt2.Columns.Add("Number"); @@ -254,9 +253,11 @@ namespace FineUIPro.Web.ContinuousPrint dt2.Columns.Add("WED_Code"); dt2.Columns.Add("STE_Code"); dt2.Columns.Add("JOT_JointDesc"); + dt2.Columns.Add("HotProessDate"); + dt2.Columns.Add("RecordChartNo"); DataView dv = tb2.DefaultView;//获取表视图 - dv.Sort = "JOT_JointNo ASC";//按照ID倒序排序 + dv.Sort = "Number ASC";//按照ID倒序排序 tb2 = dv.ToTable();//转为表 DataRow[] rows2 = tb2.DefaultView.ToTable().Select(); int i = 0; @@ -271,6 +272,8 @@ namespace FineUIPro.Web.ContinuousPrint newRows["WED_Code"] = row["WED_Code"].ToString(); newRows["STE_Code"] = row["STE_Code"].ToString(); newRows["JOT_JointDesc"] = row["JOT_JointDesc"].ToString(); + newRows["HotProessDate"] = row["HotProessDate"].ToString(); + newRows["RecordChartNo"] = row["RecordChartNo"].ToString(); dt2.Rows.Add(newRows); i++; } diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx index a10d78e..b6c9219 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/硬度试验委托单.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/硬度试验委托单.frx index d5b272c..cd132eb 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/硬度试验委托单.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/硬度试验委托单.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -18,7 +18,7 @@ namespace FastReport { public class ReportScript { - + private void Table2_ManualBuild(object sender, EventArgs e) { DataSourceBase rowData = Report.GetDataSource("Data"); @@ -37,29 +37,27 @@ namespace FastReport // go next data source row rowData.Next(); } - } + } } -} - +} - - + + - - - - - - - - - - + + + + + + + + + - + @@ -67,217 +65,241 @@ namespace FastReport + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - + + + - - - - + + + + + + - - - + + + - - - - + + + + + + - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头热处理报告.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头热处理报告.frx index 2ebdfd9..7a0718c 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头热处理报告.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头热处理报告.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -18,7 +18,27 @@ namespace FastReport { public class ReportScript { - private string header=""; + string header=""; + string t=""; + private void Cell4_BeforePrint(object sender, EventArgs e) + { + if (Report.Engine.PageNo>1) + { + header="(续)"; + } + } + + private void Cell1_BeforePrint(object sender, EventArgs e) + { + if (Report.Engine.PageNo>1) + { + t="2"; + } else + { + t="1"; + } + } + private void Table2_ManualBuild(object sender, EventArgs e) { DataSourceBase rowData = Report.GetDataSource("Data"); @@ -38,19 +58,11 @@ namespace FastReport rowData.Next(); } } - - private void Cell5_BeforePrint(object sender, EventArgs e) - { - if (Report.Engine.PageNo>1) - { - header="(续)"; - } - } } } - + @@ -67,231 +79,254 @@ namespace FastReport - - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + - - - + + + - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + - - + + - - - - - - + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx.cs index fce4910..5c856d2 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx.cs @@ -628,10 +628,15 @@ namespace FineUIPro.Web.HJGL.HotHardManage SqlParameter[] parameter = listStr.ToArray(); DataTable tb = BLL.SQLHelper.GetDataTableRunProc("HJGL_spCH_HardTestReport", parameter); + List listStr2 = new List(); + listStr2.Add(new SqlParameter("@HardTestReportId", this.HardTestReportId)); + SqlParameter[] parameter2 = listStr2.ToArray(); + DataTable tb2 = BLL.SQLHelper.GetDataTableRunProc("HJGL_spCH_HardTestReportItemDistinct2", parameter2); + DataTable dt = new DataTable(); dt.TableName = "MainData"; dt.Columns.Add("ProjectName"); - dt.Columns.Add("UnitWork"); + //dt.Columns.Add("UnitWork"); dt.Columns.Add("InstallationName"); dt.Columns.Add("InstallationCode"); dt.Columns.Add("TrustUnitName"); @@ -652,7 +657,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage { var newRows = dt.NewRow(); newRows["ProjectName"] = row["ProjectName"].ToString(); - newRows["UnitWork"] = row["UnitWork"].ToString(); + //newRows["UnitWork"] = row["UnitWork"].ToString(); newRows["InstallationName"] = row["InstallationName"].ToString(); newRows["InstallationCode"] = row["InstallationCode"].ToString(); newRows["TrustUnitName"] = row["TrustUnitName"].ToString(); @@ -666,17 +671,12 @@ namespace FineUIPro.Web.HJGL.HotHardManage newRows["TestMethod"] = row["TestMethod"].ToString(); newRows["TestStandard"] = row["TestStandard"].ToString(); newRows["TestRate"] = row["TestRate"].ToString(); - newRows["checkCount"] = row["checkCount"].ToString(); + newRows["checkCount"] = tb2.Rows.Count - 1; //row["checkCount"].ToString(); dt.Rows.Add(newRows); } BLL.Common.FastReportService.AddFastreportTable(dt); - List listStr2 = new List(); - listStr2.Add(new SqlParameter("@HardTestReportId", this.HardTestReportId)); - SqlParameter[] parameter2 = listStr2.ToArray(); - DataTable tb2 = BLL.SQLHelper.GetDataTableRunProc("HJGL_spCH_HardTestReportItemDistinct2", parameter2); - DataTable dt2 = new DataTable(); dt2.TableName = "Data"; dt2.Columns.Add("Number"); @@ -684,9 +684,11 @@ namespace FineUIPro.Web.HJGL.HotHardManage dt2.Columns.Add("WED_Code"); dt2.Columns.Add("STE_Code"); dt2.Columns.Add("JOT_JointDesc"); + dt2.Columns.Add("HotProessDate"); + dt2.Columns.Add("RecordChartNo"); DataView dv = tb2.DefaultView;//获取表视图 - dv.Sort = "JOT_JointNo ASC";//按照ID倒序排序 + dv.Sort = "Number ASC";//按照ID倒序排序 tb2 = dv.ToTable();//转为表 DataRow[] rows2 = tb2.DefaultView.ToTable().Select(); int i = 0; @@ -701,6 +703,8 @@ namespace FineUIPro.Web.HJGL.HotHardManage newRows["WED_Code"] = row["WED_Code"].ToString(); newRows["STE_Code"] = row["STE_Code"].ToString(); newRows["JOT_JointDesc"] = row["JOT_JointDesc"].ToString(); + newRows["HotProessDate"] = row["HotProessDate"].ToString(); + newRows["RecordChartNo"] = row["RecordChartNo"].ToString(); dt2.Rows.Add(newRows); i++; } diff --git a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEdit.aspx.cs index d737a2e..3216945 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEdit.aspx.cs @@ -602,8 +602,8 @@ namespace FineUIPro.Web.HJGL.HotProessManage BLL.HJGL_HotProessManageEditService.AddHotProess(hotProess); } string hotProessNo = this.txtHotProessNo.Text.Trim().Replace("/", ","); - string installName = string.Empty; - installName = this.txtUnit.Text.Trim().Replace("/", ","); + //string installName = string.Empty; + //installName = this.txtUnit.Text.Trim().Replace("/", ","); string proessMethod = this.txtProessMethod.Text.Trim().Replace("/", ","); string proessEquipment = this.txtProessEquipment.Text.Trim().Replace("/", ","); string projectName = string.Empty; @@ -641,7 +641,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage //传参 Dictionary keyValuePairs = new Dictionary(); keyValuePairs.Add("ProjectName", projectName); - keyValuePairs.Add("InstallationName", installName); + //keyValuePairs.Add("InstallationName", installName); keyValuePairs.Add("HotProessNo", hotProessNo); keyValuePairs.Add("ProessMethod", proessMethod); keyValuePairs.Add("ProessEquipment", proessEquipment); @@ -670,7 +670,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage dt.Columns.Add("HardnessReportNo"); DataView dv = tb.DefaultView;//获取表视图 - dv.Sort = "ISO_IsoNo,JOT_JointNo ASC";//按照ID倒序排序 + dv.Sort = "Number ASC";//按照ID倒序排序 tb = dv.ToTable();//转为表 DataRow[] rows = tb.DefaultView.ToTable().Select(); foreach (var row in rows) diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 3ea3adc..5c46a5b 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -11,7 +11,7 @@ - + @@ -60,9 +60,8 @@ - - - + + @@ -161,17 +160,12 @@ - - - - - - - - - - - - - + + + + + + + + \ No newline at end of file