shecs/Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1221

Browse Source
This commit is contained in:
jackchenyang
2024-05-23 01:05:28 +08:00
parent df39b88c09
commit d4401663c9
9 changed files with 271 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs
+6 -35
View File
@@ -211,7 +211,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
strSql = @"SELECT
IsoInfo.ProjectId,IsoInfo.WorkAreaId,WorkArea.WorkAreaCode,IsoInfo.PipelineId,IsoInfo.PipelineCode,
IsoInfo.DesignPressure,IsoInfo.DesignTemperature, WorkArea.InstallationId,IsoInfo.UnitId,
IsoInfo.TestPressure,IsoInfo.TestTemperature,bs.MediumName,IsoInfo.SingleNumber
IsoInfo.TestPressure,IsoInfo.TestTemperature,bs.MediumName,IsoInfo.SingleNumber,
'全部' as WeldJointCode
FROM dbo.Pipeline_Pipeline AS IsoInfo
LEFT JOIN DBO.Project_WorkArea AS WorkArea ON IsoInfo.WorkAreaId =WorkArea.WorkAreaId
LEFT JOIN dbo.Base_Medium AS bs ON bs.MediumId = IsoInfo.MediumId
@@ -229,7 +230,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
IsoInfo.ProjectId,IsoInfo.WorkAreaId,WorkArea.WorkAreaCode,IsoInfo.PipelineId,IsoInfo.PipelineCode,
IsoInfo.DesignPressure,IsoInfo.DesignTemperature, WorkArea.InstallationId,IsoInfo.UnitId,
IsoInfo.TestPressure,IsoInfo.TestTemperature,bs.MediumName,IsoInfo.SingleNumber,
IsoList.isAll,(case when (isnull(IsoList.WeldJonintCode,'')='') then '全部' else IsoList.WeldJonintCode end) as WeldJonintCode
IsoList.isAll,(case when (isnull(IsoList.WeldJonintCode,'')='') then '全部' else IsoList.WeldJonintCode end) as WeldJointCode
FROM dbo.Pipeline_Pipeline AS IsoInfo
LEFT JOIN DBO.Project_WorkArea AS WorkArea ON IsoInfo.WorkAreaId =WorkArea.WorkAreaId
LEFT JOIN dbo.Base_Medium AS bs ON bs.MediumId = IsoInfo.MediumId
@@ -543,7 +544,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
if (listSelects.Contains(PipelineId))
{
JObject values = teamGroupRow.Value<JObject>("values");
string WeldJonintCodes = values.Value<string>("isALL");
string WeldJonintCodes = values.Value<string>("WeldJointCode");
string workAreaId = values.Value<string>("WorkAreaId");
if (string.IsNullOrEmpty(WeldJonintCodes))
WeldJonintCodes = "全部";
@@ -595,32 +596,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
#region 绑定焊口信息Grid2列表
private void GetBindGrid2Data(string PipelineID)
{
this.Grid2.DataSource = GetDataJointGrid2(PipelineID);
this.Grid2.DataBind();
}
private List<Pipeline_WeldJoint> GetDataJointGrid2(string PipelineID)
{
string[] arr = null;
var tempData=Funs.DB.PTP_PipelineList.Where(t=>t.PipelineId == PipelineID && t.IsAll==false)
.Select(t=>t.WeldJonintCode).FirstOrDefault();
if (tempData != null)
{
arr = tempData.Split(',');
}
var query = Funs.DB.Pipeline_WeldJoint.Where(t => t.PipelineId == PipelineID )
.OrderBy(t => t.WeldJointCode).AsQueryable();
if (arr != null)
{
query = query.Where(t => !arr.Contains(t.WeldJointCode));
}
return query.ToList();
}
#endregion
@@ -690,13 +666,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
this.ShowGridItem();
}
#endregion
protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
{
string rowId = e.RowID;
Grid dataGrid = e.Row.FindControl("Grid2") as Grid;
}
}
}