11

2024-05-17 15:13:24 +08:00
parent 3c6e4ddf6b
commit 999055fead
33 changed files with 308 additions and 170 deletions
@@ -108,7 +108,12 @@ namespace BLL
        /// <returns></returns>
        public static ListItem[] GetAllTeamGroupList(string projectId, string unitId)
        {
-            var q = (from x in Funs.DB.Welder_TeamGroup where x.ProjectId==projectId && x.UnitId == unitId orderby x.TeamGroupName select x).ToList();
+            var q = (from x in Funs.DB.Welder_TeamGroup where x.ProjectId==projectId  orderby x.TeamGroupName select x).ToList();
+            if (!string.IsNullOrEmpty(unitId))
+            {
+                q = q.Where(x => x.UnitId == unitId).ToList();
+            }
+            
            ListItem[] lis = new ListItem[q.Count()];

            for (int i = 0; i < q.Count(); i++)
@@ -98,6 +98,7 @@ namespace BLL
                SystemNumber = weldJoint.SystemNumber,
                Remark = weldJoint.Remark,
                IsGoldJoint = weldJoint.IsGoldJoint,
+                IsPMI=weldJoint.IsPMI,
                WPQId = weldJoint.WPQId,
                DetectionType = weldJoint.DetectionType,
                PageNum = weldJoint.PageNum,