lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

大屏展示的两个问题，

Browse Source 
一个是质量管理点击报错，
二是点击项目清单后，加载的项目清单页面默认显示所有行
This commit is contained in:
夏菊
2025-07-25 17:43:33 +08:00
parent 45ed356149
commit c4f43bee08
12 changed files with 371 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectInstrument.aspx.cs
+7 -6
View File
@@ -56,15 +56,16 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
private void BindGrid()
{
string strSql = @"select * from PreRun_InstrumentSysPiping where ProjectId=@ProjectId and SystemId=@SystemId ";
//string strSql = @"select * from PreRun_InstrumentSysPiping where ProjectId=@ProjectId and SystemId=@SystemId ";
string strSql = @"select * from PreRun_InstrumentSysPiping where ProjectId=@ProjectId and SystemId=@SystemId and InstrumentId not in (select InstrumentId from PreRun_SubInstrumentSelect) ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@SystemId", this.SystemId));
if (!string.IsNullOrWhiteSpace(SelectInstrumentIds))
{
var ids = SelectInstrumentIds.Split(',').ToList();
strSql += $" and InstrumentId not in ('{string.Join("','", ids)}')";
}
//if (!string.IsNullOrWhiteSpace(SelectInstrumentIds))
//{
// var ids = SelectInstrumentIds.Split(',').ToList();
// strSql += $" and InstrumentId not in ('{string.Join("','", ids)}')";
//}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectProperty.aspx.cs
+7 -6
View File
@@ -56,15 +56,16 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
private void BindGrid()
{
string strSql = @"select * from PreRun_PropertySysPiping where ProjectId=@ProjectId and SystemId=@SystemId and PropertyId not in (select PropertyId from PreRun_SubPropertySelect where SystemId=@SystemId) ";
//string strSql = @"select * from PreRun_PropertySysPiping where ProjectId=@ProjectId and SystemId=@SystemId and PropertyId not in (select PropertyId from PreRun_SubPropertySelect where SystemId=@SystemId) ";
string strSql = @"select * from PreRun_PropertySysPiping where ProjectId=@ProjectId and SystemId=@SystemId and PropertyId not in (select PropertyId from PreRun_SubPropertySelect) ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@SystemId", this.SystemId));
if (!string.IsNullOrWhiteSpace(SelectPropertyIds))
{
var ids = SelectPropertyIds.Split(',').ToList();
strSql += $" and PropertyId not in ('{string.Join("','", ids)}')";
}
//if (!string.IsNullOrWhiteSpace(SelectPropertyIds))
//{
// var ids = SelectPropertyIds.Split(',').ToList();
// strSql += $" and PropertyId not in ('{string.Join("','", ids)}')";
//}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectTechnology.aspx.cs
+7 -6
View File
@@ -57,15 +57,16 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
private void BindGrid()
{
string strSql = @"select * from PreRun_TechnologySysPiping where ProjectId=@ProjectId and SystemId=@SystemId and TechnologyId not in (select TechnologyId from PreRun_SubTechnologySelect where SystemId=@SystemId) ";
//string strSql = @"select * from PreRun_TechnologySysPiping where ProjectId=@ProjectId and SystemId=@SystemId and TechnologyId not in (select TechnologyId from PreRun_SubTechnologySelect where SystemId=@SystemId) ";
string strSql = @"select * from PreRun_TechnologySysPiping where ProjectId=@ProjectId and SystemId=@SystemId and TechnologyId not in (select TechnologyId from PreRun_SubTechnologySelect ) ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@SystemId", this.SystemId));
if (!string.IsNullOrWhiteSpace(SelectTechnologyIds))
{
var ids = SelectTechnologyIds.Split(',').ToList();
strSql += $" and TechnologyId not in ('{string.Join("','", ids)}')";
}
//if (!string.IsNullOrWhiteSpace(SelectTechnologyIds))
//{
// var ids = SelectTechnologyIds.Split(',').ToList();
// strSql += $" and TechnologyId not in ('{string.Join("','", ids)}')";
//}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx.cs
+2 -1
View File
@@ -1253,7 +1253,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
protected void btngySelect_Click(object sender, EventArgs e)
{
string window = $"SelectTechnology.aspx?SubSystemId={this.tvControlItem.SelectedNodeID}&SystemId={hidSystemId.Text}&SelectTechnologyIds={hidSelectTechnology.Text}";
//string window = $"SelectTechnology.aspx?SubSystemId={this.tvControlItem.SelectedNodeID}&SystemId={hidSystemId.Text}&SelectTechnologyIds={hidSelectTechnology.Text}";
string window = $"SelectTechnology.aspx?SubSystemId={this.tvControlItem.SelectedNodeID}&SystemId={hidSystemId.Text}";
PageContext.RegisterStartupScript(Window2.GetSaveStateReference(this.hidSelectTechnology.ClientID) + Window2.GetShowReference(window));
}