11

2024-05-24 07:49:29 +08:00
parent 9db2db1ad1
commit c8248ad5d5
8 changed files with 517 additions and 7 deletions
@@ -58,10 +58,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
        private List<Pipeline_WeldJoint> GetDataJointGrid2(string PipelineID)
        {
            List<string> listData = new List<string>();
-            var tempData = Funs.DB.PTP_PipelineList.Where(t => t.PipelineId == PipelineID && t.IsAll == false)
-                .Select(t => t.WeldJonintCode).ToList();
+            var tempData = Funs.DB.PTP_PipelineList.Where(t => t.PipelineId == PipelineID  && t.IsAll == false)
+               .AsQueryable();

-            foreach (var item in tempData)
+            if (!string.IsNullOrEmpty(this.ptpId))
+            {
+                tempData = tempData.Where(t => t.PTP_ID != this.ptpId);
+            }
+            var newData = tempData.Select(t => t.WeldJonintCode).ToList();
+            foreach (var item in newData)
            {
                if (!string.IsNullOrEmpty(item))
                {
@@ -78,7 +83,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
            }
            var query = Funs.DB.Pipeline_WeldJoint.Where(t => t.PipelineId == PipelineID)
             .OrderBy(t => t.WeldJointCode).AsQueryable();
-            if (listData.Count>0)
+            if (listData.Count>0 )
            {
                query = query.Where(t => !listData.Contains(t.WeldJointCode));
            }