diff --git a/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs index b1b34718..df2fff4c 100644 --- a/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs @@ -222,7 +222,7 @@ namespace FineUIPro.Web.HJGL.NDT join y in Funs.DB.Base_DetectionType on x.DetectionTypeId equals y.DetectionTypeId where x.ProjectId == this.CurrUser.LoginProjectId - && x.UnitWorkId == e.Node.NodeID && x.TrustType == (this.Type == "R" ? "R" : null) + && x.UnitWorkId == e.Node.NodeID && Equals(x.TrustType, (this.Type == "R" ? "R" : null)) && x.DetectionTypeId == item.DetectionTypeId orderby y.DetectionTypeCode select y).Distinct(); @@ -260,7 +260,7 @@ namespace FineUIPro.Web.HJGL.NDT where x.TrustDate < Convert.ToDateTime(this.txtNDEDateMonth.Text.Trim() + "-01").AddMonths(1) && x.TrustDate >= Convert.ToDateTime(this.txtNDEDateMonth.Text.Trim() + "-01") && x.ProjectId == this.CurrUser.LoginProjectId && x.TrustBatchCode.Contains(this.txtSearchCode.Text.Trim()) - && x.UnitWorkId.ToString() == e.Node.ParentNode.NodeID && x.TrustType == (this.Type == "R" ? "R" : null) + && x.UnitWorkId.ToString() == e.Node.ParentNode.NodeID && Equals(x.TrustType, (this.Type == "R" ? "R" : null)) && x.DetectionTypeId == ndtTypeId && x.DetectionRateId == item.DetectionRateId orderby x.TrustBatchCode descending select x; @@ -296,7 +296,7 @@ namespace FineUIPro.Web.HJGL.NDT where x.TrustDate < Convert.ToDateTime(this.txtNDEDateMonth.Text.Trim() + "-01").AddMonths(1) && x.TrustDate >= Convert.ToDateTime(this.txtNDEDateMonth.Text.Trim() + "-01") && x.ProjectId == this.CurrUser.LoginProjectId && x.TrustBatchCode.Contains(this.txtSearchCode.Text.Trim()) - && x.UnitWorkId.ToString() == e.Node.ParentNode.ParentNode.NodeID && x.TrustType == (this.Type == "R" ? "R" : null) + && x.UnitWorkId.ToString() == e.Node.ParentNode.ParentNode.NodeID && Equals(x.TrustType, (this.Type == "R" ? "R" : null)) && x.DetectionTypeId == ndtTypeId && x.DetectionRateId == ndtRateId orderby x.TrustBatchCode descending select x;