diff --git a/DataBase/版本日志/HJGLDB_DS_2026-02-12_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-02-12_bwj.sql index 81e191f..420088e 100644 --- a/DataBase/版本日志/HJGLDB_DS_2026-02-12_bwj.sql +++ b/DataBase/版本日志/HJGLDB_DS_2026-02-12_bwj.sql @@ -80,7 +80,7 @@ CREATE TABLE [dbo].[JGZL_InsulationAcceptanceRecordItem]( ) ON [PRIMARY] GO -ALTER TABLE [dbo].[JGZL_InsulationAcceptanceRecordItem] WITH CHECK ADD CONSTRAINT [FK_JGZL_InsulationAcceptanceRecordItem_JGZL_InsulationAcceptanceRecord] FOREIGN KEY([InsulationAcceptanceRecordItemId]) +ALTER TABLE [dbo].[JGZL_InsulationAcceptanceRecordItem] WITH CHECK ADD CONSTRAINT [FK_JGZL_InsulationAcceptanceRecordItem_JGZL_InsulationAcceptanceRecord] FOREIGN KEY([InsulationAcceptanceRecordId]) REFERENCES [dbo].[JGZL_InsulationAcceptanceRecord] ([InsulationAcceptanceRecordId]) GO diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接接头报检检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接接头报检检查记录.frx index 2aa7f31..8a1d3e6 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接接头报检检查记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接接头报检检查记录.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/JGZL/隔热工程质量验收记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/隔热工程质量验收记录.frx index 5210fde..935e1fd 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/隔热工程质量验收记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/隔热工程质量验收记录.frx @@ -1,6 +1,34 @@  - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -11,7 +39,7 @@ - + @@ -32,13 +60,13 @@ - + - + @@ -52,70 +80,70 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -148,9 +176,9 @@ - - - + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/InsulationAcceptanceRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/InsulationAcceptanceRecord.aspx.cs index 06edfcf..b26b1e9 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/InsulationAcceptanceRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/InsulationAcceptanceRecord.aspx.cs @@ -216,25 +216,37 @@ namespace FineUIPro.Web.JGZL var itemList = BLL.InsulationAcceptanceRecordItemService.GetItemsByInsulationAcceptanceRecordId(this.Grid1.SelectedRowID); if (itemList.Count > 0) { - DataTable itemdt = new DataTable(); - itemdt.TableName = "Data"; - itemdt.Columns.Add("CheckCode"); - itemdt.Columns.Add("CheckItem"); - itemdt.Columns.Add("CheckResult"); + //DataTable itemdt = new DataTable(); + //itemdt.TableName = "Data"; + //itemdt.Columns.Add("CheckCode"); + //itemdt.Columns.Add("CheckItem"); + //itemdt.Columns.Add("CheckResult"); - foreach (var item in itemList) - { - var newRow2 = itemdt.NewRow(); - newRow2["CheckCode"] = item.CheckCode; - newRow2["CheckItem"] = item.CheckItem; - newRow2["CheckResult"] = item.CheckResult; - itemdt.Rows.Add(newRow2); - } - BLL.Common.FastReportService.AddFastreportTable(itemdt); + //foreach (var item in itemList) + //{ + // var newRow2 = itemdt.NewRow(); + // newRow2["CheckCode"] = item.CheckCode; + // newRow2["CheckItem"] = item.CheckItem; + // newRow2["CheckResult"] = item.CheckResult; + // itemdt.Rows.Add(newRow2); + //} + //BLL.Common.FastReportService.AddFastreportTable(itemdt); + + + Dictionary keyValuePairs = new Dictionary(); + keyValuePairs.Add("CheckResult1", itemList.Where(x => x.CheckCode == "1").FirstOrDefault().CheckResult); + keyValuePairs.Add("CheckResult2", itemList.Where(x => x.CheckCode == "2").FirstOrDefault().CheckResult); + keyValuePairs.Add("CheckResult3", itemList.Where(x => x.CheckCode == "3").FirstOrDefault().CheckResult); + keyValuePairs.Add("CheckResult4", itemList.Where(x => x.CheckCode == "4").FirstOrDefault().CheckResult); + keyValuePairs.Add("CheckResult5", itemList.Where(x => x.CheckCode == "5").FirstOrDefault().CheckResult); + keyValuePairs.Add("CheckResult6", itemList.Where(x => x.CheckCode == "6").FirstOrDefault().CheckResult); + keyValuePairs.Add("CheckResult7", itemList.Where(x => x.CheckCode == "7").FirstOrDefault().CheckResult); + keyValuePairs.Add("CheckResult8", itemList.Where(x => x.CheckCode == "8").FirstOrDefault().CheckResult); + keyValuePairs.Add("CheckResult9", itemList.Where(x => x.CheckCode == "9").FirstOrDefault().CheckResult); + keyValuePairs.Add("CheckResult10", itemList.Where(x => x.CheckCode == "10").FirstOrDefault().CheckResult); + keyValuePairs.Add("CheckResult11", itemList.Where(x => x.CheckCode == "11").FirstOrDefault().CheckResult); + BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); } - Dictionary keyValuePairs = new Dictionary(); - //keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); - BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); } initTemplatePath = "File\\Fastreport\\JGZL\\隔热工程质量验收记录.frx"; if (File.Exists(rootPath + initTemplatePath)) diff --git a/HJGL_DS/FineUIPro.Web/JGZL/InsulationAcceptanceRecordEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/InsulationAcceptanceRecordEdit.aspx.cs index 8366b14..c844433 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/InsulationAcceptanceRecordEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/InsulationAcceptanceRecordEdit.aspx.cs @@ -199,7 +199,7 @@ namespace FineUIPro.Web.JGZL void saveItem() { BLL.InsulationAcceptanceRecordItemService.DeleteItemByInsulationAcceptanceRecordId(this.InsulationAcceptanceRecordId); - List detailLists = new List(); + //List detailLists = new List(); JArray teamGroupData = Grid1.GetMergedData(); foreach (JObject teamGroupRow in teamGroupData) { @@ -213,19 +213,7 @@ namespace FineUIPro.Web.JGZL CheckItem = values.Value("CheckItem"), CheckResult = values.Value("CheckResult") }; - detailLists.Add(newDetail); - } - try - { - if (detailLists.Count > 0) - { - Funs.DB.JGZL_InsulationAcceptanceRecordItem.InsertAllOnSubmit(detailLists); - } - Funs.DB.SubmitChanges(); - } - catch (Exception) - { - return; + BLL.InsulationAcceptanceRecordItemService.AddInsulationAcceptanceRecordItem(newDetail); } } } diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs index ca8b7f6..d118634 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs @@ -37,6 +37,14 @@ namespace FineUIPro.Web.JGZL this.InitTreeMenu();//加载树 this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; this.BindGrid(); + + this.drpIsoId.Items.Clear(); + this.drpIsoId.DataTextField = "ISO_IsoNo"; + this.drpIsoId.DataValueField = "ISO_ID"; + this.drpIsoId.DataSource = (from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.tvControlItem.SelectedNodeID select x).ToList(); + this.drpIsoId.DataBind(); + Funs.FineUIPleaseSelect(this.drpIsoId); + this.drpIsoId.SelectedIndex = 0; } } #endregion