lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
高飞
2023-11-28 18:53:48 +08:00
parent 7c20d53ed3
commit dcb9ef5f6c
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
+2 -1
View File
@@ -848,7 +848,7 @@ namespace BLL
} }
if (isExitWPQId) 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<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@UnitWorkId", node.NodeID)); listStr.Add(new SqlParameter("@UnitWorkId", node.NodeID));
if (!string.IsNullOrEmpty(pipecode)) if (!string.IsNullOrEmpty(pipecode))
@@ -857,6 +857,7 @@ namespace BLL
listStr.Add(new SqlParameter("@PipelineCode", "" + pipecode + "")); listStr.Add(new SqlParameter("@PipelineCode", "" + pipecode + ""));
} }
strSql += " order by PipelineCode";
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
System.Data.DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter); System.Data.DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
var pipeline = Funs.TableToEntity<Model.PipeLineIdCodeItem>(dt); var pipeline = Funs.TableToEntity<Model.PipeLineIdCodeItem>(dt);
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs
+6
View File
@@ -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; string strSql = "SELECT distinct PipelineCode FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL AND UnitWorkId =@UnitWorkId AND WPQId IS NULL" + pipeAreasql;
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@UnitWorkId", q.UnitWorkId)); 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(); SqlParameter[] parameter = listStr.ToArray();
System.Data.DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter); System.Data.DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
a = dt.Rows.Count; a = dt.Rows.Count;