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

2023-04-07-003 无损检测单录入树加载修改

Browse Source
This commit is contained in:
李鹏飞
2023-04-07 18:20:30 +08:00
parent 53e82c04c5
commit 67ce2a0f9d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs
+3 -3
View File
@@ -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;