11

2024-05-23 11:20:42 +08:00
parent 08ef405174
commit 0a06a9f562
10 changed files with 220 additions and 519 deletions
@@ -55,19 +55,30 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
        }
        private List<Pipeline_WeldJoint> GetDataJointGrid2(string PipelineID)
        {
-            string[] arr = null;
+            List<string> listData = new List<string>();
            var tempData = Funs.DB.PTP_PipelineList.Where(t => t.PipelineId == PipelineID && t.IsAll == false)
-                .Select(t => t.WeldJonintCode).FirstOrDefault();
+                .Select(t => t.WeldJonintCode).ToList();

-            if (tempData != null)
+            foreach (var item in tempData)
            {
-                arr = tempData.Split(',');
+                if (!string.IsNullOrEmpty(item))
+                {
+                    string[] strcode = item.Split(',');
+                    for (int i = 0; i < strcode.Length; i++)
+                    {
+                        if (!listData.Contains(strcode[i]))
+                        {
+                            listData.Add(strcode[i]);   
+                        }
+                    }
+                }
+
            }
            var query = Funs.DB.Pipeline_WeldJoint.Where(t => t.PipelineId == PipelineID)
             .OrderBy(t => t.WeldJointCode).AsQueryable();
-            if (arr != null)
+            if (listData.Count>0)
            {
-                query = query.Where(t => !arr.Contains(t.WeldJointCode));
+                query = query.Where(t => !listData.Contains(t.WeldJointCode));
            }
            return query.ToList();