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

1212

Browse Source
This commit is contained in:
jackchenyang
2024-05-22 21:36:20 +08:00
parent ff6c6d3470
commit f686ffdb56
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs
+11 -7
View File
@@ -214,8 +214,12 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
LEFT JOIN DBO.Project_WorkArea AS WorkArea ON IsoInfo.WorkAreaId =WorkArea.WorkAreaId
LEFT JOIN dbo.Base_Medium AS bs ON bs.MediumId = IsoInfo.MediumId
WHERE IsoInfo.ProjectId= @ProjectId AND IsoInfo.UnitId= @UnitId
AND WorkArea.InstallationId= @InstallationId
AND NOT EXISTS(select 1 from PTP_PipelineList where IsoInfo.PipelineId=PTP_PipelineList.PipelineId and isAll=1) ";
AND WorkArea.InstallationId= @InstallationId AND
IsoInfo.PipelineId not in(
select PipelineId from PTP_PipelineList where PipelineId=IsoInfo.PipelineId and
WorkAreaId=IsoInfo.WorkAreaId and isAll=1
)
";
}
else
{
@@ -237,11 +241,11 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
listStr.Add(new SqlParameter("@UnitId", this.drpUnit.SelectedValue));
listStr.Add(new SqlParameter("@InstallationId", this.drpInstallation.SelectedValue));
if (!string.IsNullOrEmpty(this.PTP_ID))
{
strSql += " AND IsoList.PTP_ID=@PTP_ID";
listStr.Add(new SqlParameter("@PTP_ID", this.PTP_ID));
}
//if (!string.IsNullOrEmpty(this.PTP_ID))
//{
// strSql += " AND IsoList.PTP_ID=@PTP_ID";
// listStr.Add(new SqlParameter("@PTP_ID", this.PTP_ID));
//}
if (this.drpWorkArea.SelectedValue != Const._Null && drpWorkArea.SelectedValue!=null)
{