gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20260224 交工资料

This commit is contained in:
毕文静 2026-02-24 10:00:17 +08:00
parent dd57620f93
commit 40eab764a1
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
DataBase/版本日志/HJGLDB_DS_2026-02-23_bwj.sql → DataBase/版本日志/HJGLDB_DS_2026-02-24_bwj.sql
View File

14
HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx.cs
View File

@ -362,7 +362,7 @@ namespace FineUIPro.Web.JGZL
BLL.Common.FastReportService.AddFastreportTable(dt); BLL.Common.FastReportService.AddFastreportTable(dt);
var itemList = BLL.BlowingCleaningItemService.GetBlowingCleaningItemList(report.BlowingCleaningId); var itemList = BLL.BlowingCleaningItemService.GetBlowingCleaningItemList(report.BlowingCleaningId);
if (this.drpIsoNoS.SelectedValue!=BLL.Const._Null&&!string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue)) if (this.drpIsoNoS.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue))
{ {
itemList = itemList.Where(x => x.ISO_Id.Contains(this.drpIsoNoS.SelectedValue)).ToList(); itemList = itemList.Where(x => x.ISO_Id.Contains(this.drpIsoNoS.SelectedValue)).ToList();
} }
@ -391,11 +391,17 @@ namespace FineUIPro.Web.JGZL
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>(); Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
//keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); //keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
initTemplatePath = "File\\Fastreport\\JGZL\\管道吹扫、清洗检验记录.frx";
if (File.Exists(rootPath + initTemplatePath))
{
PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
}
} }
initTemplatePath = "File\\Fastreport\\JGZL\\管道吹扫、清洗检验记录.frx"; else
if (File.Exists(rootPath + initTemplatePath))
{ {
PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); Alert.ShowInTop("请先保存数据！", MessageBoxIcon.Warning);
return;
} }
} }
else else

2
HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx.cs
View File

@ -371,7 +371,7 @@ namespace FineUIPro.Web.JGZL
BLL.Common.FastReportService.ResetData(); BLL.Common.FastReportService.ResetData();
var report = (from x in Funs.DB.JGZL_PressureTestOfPipelineSystemConfirmationRecord where x.ProjectId == projectId select x); var report = (from x in Funs.DB.JGZL_PressureTestOfPipelineSystemConfirmationRecord where x.ProjectId == projectId select x);
if (report != null) if (report.Count() > 0)
{ {
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>(); Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);

12
HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs
View File

@ -380,11 +380,17 @@ namespace FineUIPro.Web.JGZL
keyValuePairs.Add("TestConclusion", report.TestConclusion); keyValuePairs.Add("TestConclusion", report.TestConclusion);
keyValuePairs.Add("Remark", report.Remark); keyValuePairs.Add("Remark", report.Remark);
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
initTemplatePath = "File\\Fastreport\\JGZL\\管道系统压力试验记录.frx";
if (File.Exists(rootPath + initTemplatePath))
{
PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
}
} }
initTemplatePath = "File\\Fastreport\\JGZL\\管道系统压力试验记录.frx"; else
if (File.Exists(rootPath + initTemplatePath))
{ {
PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); Alert.ShowInTop("请先保存数据！", MessageBoxIcon.Warning);
return;
} }
} }
else else