diff --git a/DataBase/版本日志/HJGLDB_DS_2026-01-13_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-01-13_bwj.sql new file mode 100644 index 0000000..8bdb41a --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2026-01-13_bwj.sql @@ -0,0 +1,14 @@ +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule) +values('D145745B-2A1F-4AFA-B7C5-B038EA32326C','濾¼','JGZL/WeldingRodBaking.aspx',210,'2A84FA58-8B20-48ED-A621-3EC98CF4AD28','3') +go +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule) +values('E7681A08-F21C-441B-B6BC-DF41BF2651CD','Żռ¼','HJGL/MaterialManage/ElectrodeRecovery.aspx',220,'2A84FA58-8B20-48ED-A621-3EC98CF4AD28','3') +go +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule) +values('87D52498-9FCC-4D47-B717-4CB2CA355E31','˿ż¼','HJGL/MaterialManage/WeldingWireRecovery.aspx',230,'2A84FA58-8B20-48ED-A621-3EC98CF4AD28','3') +go +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule) +values('C79CAE07-DAB5-4EBD-A192-31A26A3F9353','Ŀʪȼ¼','HJGL/MaterialManage/EWeldRHRecordNew.aspx',240,'2A84FA58-8B20-48ED-A621-3EC98CF4AD28','3') +go + + diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/CommissionRepairPrint.aspx.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/CommissionRepairPrint.aspx.cs index 512696c..7da50ff 100644 --- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/CommissionRepairPrint.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/CommissionRepairPrint.aspx.cs @@ -217,17 +217,17 @@ namespace FineUIPro.Web.ContinuousPrint dt.Columns.Add("ProjectName"); dt.Columns.Add("InstallastionName"); dt.Columns.Add("InstallatinCode"); - dt.Columns.Add("TrustUnit"); + //dt.Columns.Add("TrustUnit"); dt.Columns.Add("TrustCode"); dt.Columns.Add("CheckUnit"); - dt.Columns.Add("ItemName"); + //dt.Columns.Add("ItemName"); dt.Columns.Add("WME_Code"); - dt.Columns.Add("IsHot"); dt.Columns.Add("JST_Name"); - dt.Columns.Add("NDTR_Name"); + dt.Columns.Add("IsHot"); dt.Columns.Add("NDT_Code"); - dt.Columns.Add("AcceptGrade"); dt.Columns.Add("CH_NDTCriteria"); + dt.Columns.Add("NDTR_Name"); + dt.Columns.Add("AcceptGrade"); DataRow[] rows = tbTitle.DefaultView.ToTable().Select(); foreach (var row in rows) @@ -236,12 +236,21 @@ namespace FineUIPro.Web.ContinuousPrint newRow["ProjectName"] = row["ProjectName"].ToString(); newRow["InstallastionName"] = row["InstallationName"].ToString(); newRow["InstallatinCode"] = row["InstallationCode"].ToString(); - newRow["TrustUnit"] = row["UnitName"].ToString(); + //newRow["TrustUnit"] = row["UnitName"].ToString(); newRow["TrustCode"] = row["CH_TrustCode"].ToString(); newRow["CheckUnit"] = row["CheckUnitName"].ToString(); - newRow["ItemName"] = row["CH_ItemName"].ToString(); + //newRow["ItemName"] = row["CH_ItemName"].ToString(); newRow["WME_Code"] = row["WME_Code"].ToString(); - newRow["IsHot"] = "合格"; + string hot = string.Empty; + if (row["IsHot"].ToString() == "是") + { + hot = "☑是/□否"; + } + else + { + hot = "□是/☑否"; + } + newRow["IsHot"] = hot; newRow["JST_Name"] = row["JST_Code"]; newRow["NDTR_Name"] = row["NDTR_Name"]; newRow["NDT_Code"] = row["NDT_Code"]; @@ -302,7 +311,7 @@ namespace FineUIPro.Web.ContinuousPrint dt2.TableName = "Data"; dt2.Columns.Add("SortNum"); dt2.Columns.Add("IsoNo"); - dt2.Columns.Add("ISO_Number"); + //dt2.Columns.Add("ISO_Number"); dt2.Columns.Add("JointNo"); dt2.Columns.Add("JointDesc"); dt2.Columns.Add("Ste_Code"); @@ -322,7 +331,7 @@ namespace FineUIPro.Web.ContinuousPrint newRows["SortNum"] = i + 1; //} newRows["IsoNo"] = row["ISO_IsoNo"].ToString(); - newRows["ISO_Number"] = row["ISO_IsoNo"].ToString(); + //newRows["ISO_Number"] = row["ISO_IsoNo"].ToString(); newRows["JointNo"] = row["JOT_JointNo"].ToString(); newRows["JointDesc"] = row["JOT_JointDesc"].ToString(); newRows["Ste_Code"] = row["STE_Code"].ToString(); @@ -334,13 +343,13 @@ namespace FineUIPro.Web.ContinuousPrint } BLL.Common.FastReportService.AddFastreportTable(dt2); - string isoid = rows2[0]["ISO_ID"].ToString(); - string jotyId = rows2[0]["JOTY_ID"].ToString(); - int jointCount = BLL.HJGL_PW_JointInfoService.GetJointCountByIsoId(isoid, jotyId); + //string isoid = rows2[0]["ISO_ID"].ToString(); + //string jotyId = rows2[0]["JOTY_ID"].ToString(); + //int jointCount = BLL.HJGL_PW_JointInfoService.GetJointCountByIsoId(isoid, jotyId); //传参 Dictionary keyValuePairs = new Dictionary(); - keyValuePairs.Add("JointCount", jointCount.ToString()); - keyValuePairs.Add("CheckCount", (rows.Count() - 1).ToString()); + //keyValuePairs.Add("JointCount", jointCount.ToString()); + //keyValuePairs.Add("CheckCount", (rows.Count() - 1).ToString()); BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx.cs index 2092eca..d64f488 100644 --- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx.cs @@ -218,10 +218,10 @@ namespace FineUIPro.Web.ContinuousPrint dt.Columns.Add("ProjectName"); dt.Columns.Add("InstallastionName"); dt.Columns.Add("InstallatinCode"); - dt.Columns.Add("TrustUnit"); + //dt.Columns.Add("TrustUnit"); dt.Columns.Add("TrustCode"); dt.Columns.Add("CheckUnit"); - dt.Columns.Add("ItemName"); + //dt.Columns.Add("ItemName"); dt.Columns.Add("WME_Code"); dt.Columns.Add("IsHot"); dt.Columns.Add("JST_Name"); @@ -237,12 +237,21 @@ namespace FineUIPro.Web.ContinuousPrint newRow["ProjectName"] = row["ProjectName"].ToString(); newRow["InstallastionName"] = row["InstallationName"].ToString(); newRow["InstallatinCode"] = row["InstallationCode"].ToString(); - newRow["TrustUnit"] = row["UnitName"].ToString(); + //newRow["TrustUnit"] = row["UnitName"].ToString(); newRow["TrustCode"] = row["CH_TrustCode"].ToString(); newRow["CheckUnit"] = row["CheckUnitName"].ToString(); - newRow["ItemName"] = row["CH_ItemName"].ToString(); + //newRow["ItemName"] = row["CH_ItemName"].ToString(); newRow["WME_Code"] = row["WME_Code"].ToString(); - newRow["IsHot"] = "合格"; + string hot = string.Empty; + if (row["IsHot"].ToString() == "是") + { + hot = "☑是/□否"; + } + else + { + hot = "□是/☑否"; + } + newRow["IsHot"] = hot; newRow["JST_Name"] = row["JST_Name"]; newRow["NDTR_Name"] = row["NDTR_Name"]; newRow["NDT_Code"] = row["NDT_Code"]; @@ -304,7 +313,7 @@ namespace FineUIPro.Web.ContinuousPrint dt2.TableName = "Data"; dt2.Columns.Add("SortNum"); dt2.Columns.Add("IsoNo"); - dt2.Columns.Add("ISO_Number"); + //dt2.Columns.Add("ISO_Number"); dt2.Columns.Add("JointNo"); dt2.Columns.Add("JointDesc"); dt2.Columns.Add("Ste_Code"); @@ -324,7 +333,7 @@ namespace FineUIPro.Web.ContinuousPrint newRows["SortNum"] = i + 1; } newRows["IsoNo"] = row["ISO_IsoNo"].ToString(); - newRows["ISO_Number"] = row["ISO_Number"].ToString(); + //newRows["ISO_Number"] = row["ISO_Number"].ToString(); newRows["JointNo"] = row["JOT_JointNo"].ToString(); newRows["JointDesc"] = row["JOT_JointDesc"].ToString(); newRows["Ste_Code"] = row["STE_Code"].ToString(); @@ -336,15 +345,15 @@ namespace FineUIPro.Web.ContinuousPrint } BLL.Common.FastReportService.AddFastreportTable(dt2); - string isoid = rows2[0]["ISO_ID"].ToString(); - string jotyId = rows2[0]["JOTY_ID"].ToString(); - int jointCount = BLL.HJGL_PW_JointInfoService.GetJointCountByIsoId(isoid, jotyId); - string pointDate = string.Format("{0:yyyy-MM-dd}", rows2[0]["PointDate"]); + //string isoid = rows2[0]["ISO_ID"].ToString(); + //string jotyId = rows2[0]["JOTY_ID"].ToString(); + //int jointCount = BLL.HJGL_PW_JointInfoService.GetJointCountByIsoId(isoid, jotyId); + //string pointDate = string.Format("{0:yyyy-MM-dd}", rows2[0]["PointDate"]); //传参 Dictionary keyValuePairs = new Dictionary(); - keyValuePairs.Add("JointCount", jointCount.ToString()); - keyValuePairs.Add("CheckCount", (rows2.Count() - 1).ToString()); - keyValuePairs.Add("pointDate", pointDate); + //keyValuePairs.Add("JointCount", jointCount.ToString()); + //keyValuePairs.Add("CheckCount", (rows2.Count() - 1).ToString()); + //keyValuePairs.Add("pointDate", pointDate); BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); initTemplatePath = "File\\Fastreport\\管道焊缝检测委托单.frx"; diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条烘烤记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条烘烤记录.frx new file mode 100644 index 0000000..1232690 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条烘烤记录.frx @@ -0,0 +1,335 @@ + + + using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Windows.Forms; +using System.Drawing; +using System.Data; +using FastReport; +using FastReport.Data; +using FastReport.Dialog; +using FastReport.Barcode; +using FastReport.Table; +using FastReport.Utils; + +namespace FastReport +{ + public class ReportScript + { + private void Table2_ManualBuild(object sender, EventArgs e) + { + DataSourceBase rowData = Report.GetDataSource("Data"); + // init the data source + rowData.Init(); + + // now enumerate the data source and print the table body + while (rowData.HasMoreRows) + { + // print the table body + Table2.PrintRow(0); + Table2.PrintColumns(); + + // go next data source row + rowData.Next(); + } + } + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/焊丝发放记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/焊丝发放记录.frx index 3e2b785..df6a3e0 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/焊丝发放记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/焊丝发放记录.frx @@ -1,7 +1,7 @@  - + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/焊条发放回收记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/焊条发放回收记录.frx index c5ab402..4803373 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/焊条发放回收记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/焊条发放回收记录.frx @@ -1,7 +1,7 @@  - + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊口检测委托单.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊口检测委托单.frx index e818c25..a7dba0e 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 00a933b..f0b0b56 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; @@ -17,8 +17,9 @@ using FastReport.Utils; namespace FastReport { public class ReportScript - { - private void Table2_ManualBuild(object sender, EventArgs e) + { + + private void Table3_ManualBuild(object sender, EventArgs e) { DataSourceBase rowData = Report.GetDataSource("Data"); // init the data source @@ -30,8 +31,8 @@ namespace FastReport while (rowData.HasMoreRows) { // print the table body - Table2.PrintRow(0); - Table2.PrintColumns(); + Table3.PrintRow(0); + Table3.PrintColumns(); // go next data source row rowData.Next(); @@ -41,22 +42,20 @@ namespace FastReport } - + - - - - - - - + + + + + + + - - @@ -66,237 +65,219 @@ namespace FastReport - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - + + + + + + + - - + + - - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + - - - - - + + + + + + + + + - - - - - + + + + + + + + + - - - - - + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊缝检测委托单Old.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊缝检测委托单Old.frx new file mode 100644 index 0000000..00a933b --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊缝检测委托单Old.frx @@ -0,0 +1,304 @@ + + + using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Windows.Forms; +using System.Drawing; +using System.Data; +using FastReport; +using FastReport.Data; +using FastReport.Dialog; +using FastReport.Barcode; +using FastReport.Table; +using FastReport.Utils; + +namespace FastReport +{ + public class ReportScript + { + private void Table2_ManualBuild(object sender, EventArgs e) + { + DataSourceBase rowData = Report.GetDataSource("Data"); + // init the data source + rowData.Init(); + + // print the first table row - it is a header + + // now enumerate the data source and print the table body + while (rowData.HasMoreRows) + { + // print the table body + Table2.PrintRow(0); + Table2.PrintColumns(); + + // go next data source row + rowData.Next(); + } + } + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/项目管理部焊缝检测委托单.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/项目管理部焊缝检测委托单.frx index d3f6788..b58b33d 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/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj index 62d7d65..466839c 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj @@ -1263,6 +1263,7 @@ + @@ -6697,6 +6698,13 @@ TeamWeldingInspectionEdit.aspx + + WeldingRodBaking.aspx + ASPXCodeBehind + + + WeldingRodBaking.aspx + WeldInspectionCheckRecord.aspx ASPXCodeBehind diff --git a/HJGL_DS/FineUIPro.Web/HJGL/RepairManage/RepairManageEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/RepairManage/RepairManageEdit.aspx.cs index 4d6adb0..f3e0050 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/RepairManage/RepairManageEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/RepairManage/RepairManageEdit.aspx.cs @@ -709,10 +709,10 @@ namespace FineUIPro.Web.HJGL.RepairManage dt.Columns.Add("ProjectName"); dt.Columns.Add("InstallastionName"); dt.Columns.Add("InstallatinCode"); - dt.Columns.Add("TrustUnit"); + //dt.Columns.Add("TrustUnit"); dt.Columns.Add("TrustCode"); dt.Columns.Add("CheckUnit"); - dt.Columns.Add("ItemName"); + //dt.Columns.Add("ItemName"); dt.Columns.Add("WME_Code"); dt.Columns.Add("IsHot"); dt.Columns.Add("JST_Name"); @@ -728,12 +728,21 @@ namespace FineUIPro.Web.HJGL.RepairManage newRows["ProjectName"] = row["ProjectName"].ToString(); newRows["InstallastionName"] = row["InstallationName"].ToString(); newRows["InstallatinCode"] = row["InstallationCode"].ToString(); - newRows["TrustUnit"] = row["UnitName"].ToString(); + //newRows["TrustUnit"] = row["UnitName"].ToString(); newRows["TrustCode"] = row["CH_RepairNo"].ToString(); newRows["CheckUnit"] = row["CheckUnitName"].ToString(); - newRows["ItemName"] = row["CH_ItemName"].ToString(); + //newRows["ItemName"] = row["CH_ItemName"].ToString(); newRows["WME_Code"] = row["WME_Code"].ToString(); - newRows["IsHot"] = row["IsHot"].ToString(); + string hot = string.Empty; + if(row["IsHot"].ToString()=="是") + { + hot = "☑是/□否"; + } + else + { + hot = "□是/☑否"; + } + newRows["IsHot"] = hot; newRows["JST_Name"] = row["JST_Code"].ToString(); newRows["NDTR_Name"] = row["NDTR_Name"].ToString(); newRows["NDT_Code"] = row["NDT_Code"].ToString(); @@ -754,7 +763,7 @@ namespace FineUIPro.Web.HJGL.RepairManage dt2.TableName = "Data"; dt2.Columns.Add("SortNum"); dt2.Columns.Add("IsoNo"); - dt2.Columns.Add("ISO_Number"); + //dt2.Columns.Add("ISO_Number"); dt2.Columns.Add("JointNo"); dt2.Columns.Add("JointDesc"); dt2.Columns.Add("Ste_Code"); @@ -774,7 +783,7 @@ namespace FineUIPro.Web.HJGL.RepairManage newRows["SortNum"] = i + 1; } newRows["IsoNo"] = row["ISO_IsoNo"].ToString(); - newRows["ISO_Number"] = row["ISO_IsoNo"].ToString(); + //newRows["ISO_Number"] = row["ISO_IsoNo"].ToString(); newRows["JointNo"] = row["JOT_JointNo"].ToString(); newRows["JointDesc"] = row["JOT_JointDesc"].ToString(); newRows["Ste_Code"] = row["STE_Code"].ToString(); @@ -785,13 +794,13 @@ namespace FineUIPro.Web.HJGL.RepairManage } BLL.Common.FastReportService.AddFastreportTable(dt2); #endregion - string isoid = rows[0]["ISO_ID"].ToString(); - string jotyId = rows[0]["JOTY_ID"].ToString(); - int jointCount = BLL.HJGL_PW_JointInfoService.GetJointCountByIsoId(isoid, jotyId); + //string isoid = rows[0]["ISO_ID"].ToString(); + //string jotyId = rows[0]["JOTY_ID"].ToString(); + //int jointCount = BLL.HJGL_PW_JointInfoService.GetJointCountByIsoId(isoid, jotyId); //传参 Dictionary keyValuePairs = new Dictionary(); - keyValuePairs.Add("JointCount", jointCount.ToString()); - keyValuePairs.Add("CheckCount", (rows.Count() - 1).ToString()); + //keyValuePairs.Add("JointCount", jointCount.ToString()); + //keyValuePairs.Add("CheckCount", (rows.Count() - 1).ToString()); BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); initTemplatePath = "File\\Fastreport\\管道焊缝检测委托单.frx"; diff --git a/HJGL_DS/FineUIPro.Web/HJGL/TrustManage/TrustManageEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/TrustManage/TrustManageEdit.aspx.cs index 42c3c9e..210795d 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/TrustManage/TrustManageEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/TrustManage/TrustManageEdit.aspx.cs @@ -682,10 +682,10 @@ namespace FineUIPro.Web.HJGL.TrustManage dt.Columns.Add("ProjectName"); dt.Columns.Add("InstallastionName"); dt.Columns.Add("InstallatinCode"); - dt.Columns.Add("TrustUnit"); + //dt.Columns.Add("TrustUnit"); dt.Columns.Add("TrustCode"); dt.Columns.Add("CheckUnit"); - dt.Columns.Add("ItemName"); + //dt.Columns.Add("ItemName"); dt.Columns.Add("WME_Code"); dt.Columns.Add("IsHot"); dt.Columns.Add("JST_Name"); @@ -701,12 +701,21 @@ namespace FineUIPro.Web.HJGL.TrustManage newRows["ProjectName"] = row["ProjectName"].ToString(); newRows["InstallastionName"] = row["InstallationName"].ToString(); newRows["InstallatinCode"] = row["InstallationCode"].ToString(); - newRows["TrustUnit"] = row["UnitName"].ToString(); + //newRows["TrustUnit"] = row["UnitName"].ToString(); newRows["TrustCode"] = row["CH_TrustCode"].ToString(); newRows["CheckUnit"] = row["CheckUnitName"].ToString(); - newRows["ItemName"] = row["CH_ItemName"].ToString(); + //newRows["ItemName"] = row["CH_ItemName"].ToString(); newRows["WME_Code"] = row["WME_Code"].ToString(); - newRows["IsHot"] = "合格";//row["IsHot"].ToString(); + string hot = string.Empty; + if (row["IsHot"].ToString() == "是") + { + hot = "☑是/□否"; + } + else + { + hot = "□是/☑否"; + } + newRows["IsHot"] = hot; newRows["JST_Name"] = row["JST_Name"].ToString(); newRows["NDTR_Name"] = row["NDTR_Name"].ToString(); newRows["NDT_Code"] = row["NDT_Code"].ToString(); @@ -769,7 +778,7 @@ namespace FineUIPro.Web.HJGL.TrustManage dt2.TableName = "Data"; dt2.Columns.Add("SortNum"); dt2.Columns.Add("IsoNo"); - dt2.Columns.Add("ISO_Number"); + //dt2.Columns.Add("ISO_Number"); dt2.Columns.Add("JointNo"); dt2.Columns.Add("JointDesc"); dt2.Columns.Add("Ste_Code"); @@ -789,7 +798,7 @@ namespace FineUIPro.Web.HJGL.TrustManage newRows["SortNum"] = i + 1; } newRows["IsoNo"] = row["ISO_IsoNo"].ToString(); - newRows["ISO_Number"] = row["ISO_Number"].ToString(); + //newRows["ISO_Number"] = row["ISO_Number"].ToString(); newRows["JointNo"] = row["JOT_JointNo"].ToString(); newRows["JointDesc"] = row["JOT_JointDesc"].ToString(); newRows["Ste_Code"] = row["STE_Code"].ToString(); @@ -802,13 +811,13 @@ namespace FineUIPro.Web.HJGL.TrustManage BLL.Common.FastReportService.AddFastreportTable(dt2); #endregion - string isoid = rows[0]["ISO_ID"].ToString(); - string jotyId = rows[0]["JOTY_ID"].ToString(); - int jointCount = BLL.HJGL_PW_JointInfoService.GetJointCountByIsoId(isoid, jotyId); + //string isoid = rows[0]["ISO_ID"].ToString(); + //string jotyId = rows[0]["JOTY_ID"].ToString(); + //int jointCount = BLL.HJGL_PW_JointInfoService.GetJointCountByIsoId(isoid, jotyId); //传参 Dictionary keyValuePairs = new Dictionary(); - keyValuePairs.Add("JointCount", jointCount.ToString()); - keyValuePairs.Add("CheckCount", (rows.Count() - 1).ToString()); + //keyValuePairs.Add("JointCount", jointCount.ToString()); + //keyValuePairs.Add("CheckCount", (rows.Count() - 1).ToString()); BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); initTemplatePath = "File\\Fastreport\\管道焊缝检测委托单.frx"; diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx b/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx new file mode 100644 index 0000000..249d99a --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx @@ -0,0 +1,151 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldingRodBaking.aspx.cs" Inherits="FineUIPro.Web.JGZL.WeldingRodBaking" %> + + + + + + + 焊条烘烤记录 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + + + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.cs new file mode 100644 index 0000000..f54dd69 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.cs @@ -0,0 +1,255 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.IO; + +namespace FineUIPro.Web.JGZL +{ + public partial class WeldingRodBaking : PageBase + { + /// + /// + /// + private static List reportLists = new List(); + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.drpProjectId.DataTextField = "ProjectCode"; + this.drpProjectId.DataValueField = "ProjectId"; + this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectList("1"); + this.drpProjectId.DataBind(); + Funs.FineUIPleaseSelect(this.drpProjectId); + BindGrid(); + } + } + private void BindGrid() + { + string strSql = @"SELECT BakeRecords.BakeRecordsId, + BakeRecords.BakeDate, + BakeRecords.Brand, + BakeRecords.BatchNum, + BakeRecords.InboundSelfNum, + BakeRecords.Specifications, + BakeRecords.Quantity, + BakeRecords.PowerTime, + datepart(HOUR,BakeRecords.PowerTime) as PowerTimeHour, + datepart(MINUTE,BakeRecords.PowerTime) as PowerTimeMin, + BakeRecords.PowerTemperature, + BakeRecords.ConstantTemperature, + BakeRecords.ConstantStartTime, + datepart(HOUR,BakeRecords.ConstantStartTime) as ConstantStartHour, + datepart(MINUTE,BakeRecords.ConstantStartTime) as ConstantStartMin, + BakeRecords.ConstantEndTime, + datepart(HOUR,BakeRecords.ConstantEndTime) as ConstantEndHour, + datepart(MINUTE,BakeRecords.ConstantEndTime) as ConstantEndMin, + BakeRecords.MoveInsulationBoxTime, + datepart(HOUR,BakeRecords.MoveInsulationBoxTime) as MoveInsulationBoxHour, + datepart(MINUTE,BakeRecords.MoveInsulationBoxTime) as MoveInsulationBoxMin, + BakeRecords.MoveInsulationBoxTemperature, + BakeRecords.BakingFrequency, + BakeRecords.Bakers, + BakeRecords.UnitStoreId, + BakeRecords.Type, + store.UnitStoreName + FROM dbo.HJGL_BakeRecords AS BakeRecords + LEFT JOIN dbo.Weld_UnitStore store ON store.UnitStoreId=BakeRecords.UnitStoreId + WHERE BakeRecords.Type='1' "; + List listStr = new List(); + //listStr.Add(new SqlParameter("@projectId",this.drpProjectId.SelectedValue)); + if (!string.IsNullOrEmpty(this.txtBrand.Text.Trim())) + { + strSql += " AND BakeRecords.Brand LIKE @Brand"; + listStr.Add(new SqlParameter("@Brand", "%" + this.txtBrand.Text.Trim() + "%")); + } + if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim())) + { + strSql += " AND BakeRecords.BakeDate >= @startDate"; + listStr.Add(new SqlParameter("@startDate", this.txtStartDate.Text.Trim())); + } + if (!string.IsNullOrEmpty(this.txtEndDate.Text.Trim())) + { + strSql += " AND BakeRecords.BakeDate <= @endDate"; + listStr.Add(new SqlParameter("@endDate", this.txtEndDate.Text.Trim())); + } + strSql += " order by BakeRecords.BakeDate desc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + Grid1.RecordCount = tb.Rows.Count; + //var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = tb; + Grid1.DataBind(); + } + #endregion + + #region 排序 + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + BindGrid(); + } + #endregion + + #region 提交 + /// + /// 确定按钮 + /// + /// + /// + protected void btnSure_Click(object sender, EventArgs e) + { + if (this.drpProjectId.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择项目！"); + return; + } + reportLists.Clear(); + if (Grid1.SelectedRowIDArray.Length <= 0) + { + Alert.ShowInTop("请至少选择一条记录！"); + return; + } + string[] selectRowId = Grid1.SelectedRowIDArray; + int n = 0; + int j = 0; + int[] selections = new int[selectRowId.Count()]; + foreach (GridRow row in Grid1.Rows) + { + if (selectRowId.Contains(row.DataKeys[0])) + { + selections[n] = j; + n++; + } + j++; + } + + var select = selections.Distinct(); + foreach (int i in select) + { + var bakeRecords = BLL.BakeRecordsService.GetBakeRecordsById(Grid1.DataKeys[i][0].ToString()); + if (bakeRecords != null) + { + reportLists.Add(bakeRecords); + } + if (!string.IsNullOrEmpty(this.txtBrand.Text.Trim())) + { + reportLists = (from x in reportLists where x.Brand.Contains(this.txtBrand.Text.Trim()) select x).ToList(); + } + if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim())) + { + reportLists = (from x in reportLists where x.BakeDate >= Funs.GetNewDateTime(this.txtStartDate.Text.Trim()) select x).ToList(); + } + if (!string.IsNullOrEmpty(this.txtEndDate.Text.Trim())) + { + reportLists = (from x in reportLists where x.BakeDate <= Funs.GetNewDateTime(this.txtEndDate.Text.Trim()) select x).ToList(); + } + string initTemplatePath = ""; + string rootPath = Server.MapPath("~/"); + BLL.Common.FastReportService.ResetData(); + + Dictionary keyValuePairs = new Dictionary(); + if (this.drpProjectId.SelectedValue != BLL.Const._Null) + { + var project = BLL.Base_ProjectService.GetProjectByProjectId(this.drpProjectId.SelectedValue); + if (project != null) + { + keyValuePairs.Add("ProjectName", project.ProjectName); + } + } + + DataTable dt = new DataTable(); + dt.TableName = "Data"; + dt.Columns.Add("BakeDateMonth"); + dt.Columns.Add("BakeDateDay"); + dt.Columns.Add("Brand"); + dt.Columns.Add("BatchNum"); + dt.Columns.Add("InboundSelfNum"); + dt.Columns.Add("Specifications"); + dt.Columns.Add("Quantity"); + dt.Columns.Add("PowerTimeHour"); + dt.Columns.Add("PowerTimeMin"); + dt.Columns.Add("PowerTemperature"); + dt.Columns.Add("ConstantTemperature"); + dt.Columns.Add("ConstantStartHour"); + dt.Columns.Add("ConstantStartMin"); + dt.Columns.Add("ConstantEndHour"); + dt.Columns.Add("ConstantEndMin"); + dt.Columns.Add("MoveInsulationBoxHour"); + dt.Columns.Add("MoveInsulationBoxMin"); + dt.Columns.Add("MoveInsulationBoxTemperature"); + dt.Columns.Add("BakingFrequency"); + dt.Columns.Add("Bakers"); + reportLists = reportLists.OrderBy(x => x.BakeDate).ToList(); + foreach (var item in reportLists) + { + var newRow = dt.NewRow(); + newRow["BakeDateMonth"] = item.BakeDate.Value.Month.ToString(); + newRow["BakeDateDay"] = item.BakeDate.Value.Day.ToString(); + newRow["Brand"] = item.Brand; + newRow["BatchNum"] = item.BatchNum; + newRow["InboundSelfNum"] = item.InboundSelfNum; + newRow["Specifications"] = item.Specifications; + newRow["Quantity"] = item.Quantity.Value.ToString("0.#"); + newRow["PowerTimeHour"] = item.PowerTime.HasValue ? item.PowerTime.Value.Hour.ToString() : ""; + newRow["PowerTimeMin"] = item.PowerTime.HasValue ? item.PowerTime.Value.Minute.ToString() : ""; + newRow["PowerTemperature"] = item.PowerTemperature.HasValue ? item.PowerTemperature.Value.ToString("0.#") : ""; + newRow["ConstantTemperature"] = item.ConstantTemperature.HasValue ? item.ConstantTemperature.Value.ToString("0.#") : ""; + newRow["ConstantStartHour"] = item.ConstantStartTime.HasValue ? item.ConstantStartTime.Value.Hour.ToString() : ""; + newRow["ConstantStartMin"] = item.ConstantStartTime.HasValue ? item.ConstantStartTime.Value.Minute.ToString() : ""; + newRow["ConstantEndHour"] = item.ConstantEndTime.HasValue ? item.ConstantEndTime.Value.Hour.ToString() : ""; + newRow["ConstantEndMin"] = item.ConstantEndTime.HasValue ? item.ConstantEndTime.Value.Minute.ToString() : ""; + newRow["MoveInsulationBoxHour"] = item.MoveInsulationBoxTime.HasValue ? item.MoveInsulationBoxTime.Value.Hour.ToString() : ""; + newRow["MoveInsulationBoxMin"] = item.MoveInsulationBoxTime.HasValue ? item.MoveInsulationBoxTime.Value.Minute.ToString() : ""; + newRow["MoveInsulationBoxTemperature"] = item.MoveInsulationBoxTemperature.HasValue ? item.MoveInsulationBoxTemperature.Value.ToString("0.#") : ""; + newRow["BakingFrequency"] = item.BakingFrequency.ToString(); + newRow["Bakers"] = item.Bakers; + dt.Rows.Add(newRow); + } + + BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); + BLL.Common.FastReportService.AddFastreportTable(dt); + initTemplatePath = "File\\Fastreport\\JGZL\\焊条烘烤记录.frx"; + + if (File.Exists(rootPath + initTemplatePath)) + { + PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); + + } + } + } + #endregion + + #region 查找 + /// + /// 查找 + /// + /// + /// + protected void btnSearch_Click(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.designer.cs new file mode 100644 index 0000000..5e94cdf --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.designer.cs @@ -0,0 +1,152 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JGZL +{ + + + public partial class WeldingRodBaking + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// drpProjectId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProjectId; + + /// + /// txtStartDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartDate; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// txtEndDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndDate; + + /// + /// txtBrand 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtBrand; + + /// + /// btnSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSearch; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSure 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSure; + + /// + /// Window2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window2; + } +}