From dcb9ef5f6cb4e3cb9b2aeeae45eb7e313e451378 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 28 Nov 2023 18:53:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/HJGL/WeldingManage/PipelineService.cs | 3 ++- .../FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs index 96d64f9a..761cef9c 100644 --- a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs @@ -848,7 +848,7 @@ namespace BLL } if (isExitWPQId) { - string strSql = "SELECT distinct PipelineId, PipelineCode FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL AND UnitWorkId =@UnitWorkId AND WPQId IS NULL" + pipeAreasql + " order by PipelineCode"; + string strSql = "SELECT distinct PipelineId, PipelineCode FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL AND UnitWorkId =@UnitWorkId AND WPQId IS NULL" + pipeAreasql; List listStr = new List(); listStr.Add(new SqlParameter("@UnitWorkId", node.NodeID)); if (!string.IsNullOrEmpty(pipecode)) @@ -857,6 +857,7 @@ namespace BLL listStr.Add(new SqlParameter("@PipelineCode", "" + pipecode + "")); } + strSql += " order by PipelineCode"; SqlParameter[] parameter = listStr.ToArray(); System.Data.DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter); var pipeline = Funs.TableToEntity(dt); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs index 2d19afcc..5bfe511d 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs @@ -142,6 +142,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage string strSql = "SELECT distinct PipelineCode FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL AND UnitWorkId =@UnitWorkId AND WPQId IS NULL" + pipeAreasql; List listStr = new List(); listStr.Add(new SqlParameter("@UnitWorkId", q.UnitWorkId)); + if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim())) + { + strSql += " and PipelineCode=@PipelineCode "; + listStr.Add(new SqlParameter("@PipelineCode", "" + this.txtPipelineCode.Text.Trim() + "")); + + } SqlParameter[] parameter = listStr.ToArray(); System.Data.DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter); a = dt.Rows.Count;