diff --git a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_IsoInfoService.cs b/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_IsoInfoService.cs index 1b34141..287b9c4 100644 --- a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_IsoInfoService.cs +++ b/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_IsoInfoService.cs @@ -315,5 +315,16 @@ namespace BLL select x.PipeLineLength).Sum(); return PipeLineLength; } + + public static string GetStrIsoNos(string projectId) + { + List isoInfos = GetIsoInfoByProjectId(projectId); + string isoNos = string.Empty; + foreach (var iso in isoInfos) + { + isoNos += iso.ISO_IsoNo + ","; + } + return isoNos; + } } } diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj index c7164e6..ce97e84 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj @@ -8270,7 +8270,6 @@ - diff --git a/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificate.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificate.aspx.cs index a39d752..62c0cf9 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificate.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificate.aspx.cs @@ -163,7 +163,7 @@ namespace FineUIPro.Web.JGZL /// //private void BindGrid() //{ - // //string projectIds = BLL.Base_ProjectService.GetStrOnProjectIds(this.CurrUser.UserId, "1"); + //string projectIds = BLL.Base_ProjectService.GetStrOnProjectIds(this.CurrUser.UserId, "1"); // string strSql = @"SELECT * from JGZL_AcceptanceCertificate where 1=1"; // List listStr = new List(); // if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx index 4bc1a85..7071cd4 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx @@ -37,7 +37,7 @@ - + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx index 95559d3..e51d776 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx @@ -37,7 +37,7 @@ - + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs index 79520e9..36cbc48 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs @@ -310,6 +310,7 @@ namespace FineUIPro.Web.JGZL /// private void BindGrid() { + string isoNos = BLL.HJGL_PW_IsoInfoService.GetStrIsoNos(this.CurrUser.LoginProjectId); string strSql = @"SELECT * from JGZL_PressureTestOfPipelineSystemRecordItem where 1=1"; List listStr = new List(); if (!string.IsNullOrEmpty(this.RecordId)) @@ -317,6 +318,11 @@ namespace FineUIPro.Web.JGZL strSql += " AND RecordId = @RecordId"; listStr.Add(new SqlParameter("@RecordId", this.RecordId)); } + if (!string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue)) + { + strSql += " AND CHARINDEX(PipelineNo,@isoNos)>0 "; + listStr.Add(new SqlParameter("@isoNos", isoNos)); + } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); Grid1.RecordCount = tb.Rows.Count; @@ -736,6 +742,7 @@ namespace FineUIPro.Web.JGZL ShowNotify("保存成功!", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + BindGrid(); } else {