布置图绘制，取消区域限制，所属系统支持多选

Learun.Application.Web/AppApi/PlotLayoutApiController.cs

@@ -124,9 +124,23 @@ namespace Learun.Application.Web.AppApi
             }
 
             //这里要考虑下拉列表  带 ||的问题
-            var matchedTagIds = propAll.Where(x => x.PropertyName == keyProp
+            List<string> matchedTagIds = new List<string>();
+            if (keyProp == GlobalObject.propName_System)
+            {
+                //#task 9536 
+                // 筛选出所有以 "a||" 或 "b||" 开头的元素
+                var validSystems = keyValue.Split().ToList();
+                matchedTagIds = propAll.Where(item =>
+                  validSystems.Any(prefix => item.PropertyValue == prefix) || validSystems.Any(prefix => item.PropertyValue.StartsWith(prefix + GlobalObject.enum_separator))
+                ).Select(X => X.EngineDataID).Distinct().ToList();
+            }
+            else
+            {
+                matchedTagIds = propAll.Where(x => x.PropertyName == keyProp
                          && (x.PropertyValue == keyValue || x.PropertyValue.StartsWith(keyValue + GlobalObject.enum_separator))).
                              Select(X => X.EngineDataID).Distinct().ToList();
+            }
+
 
             //有效范围的设备
             var matchedTags = SqlSugarHelper.Db.Queryable<ec_enginedataEntity>().AS(tagTbName).
@@ -143,9 +157,9 @@ namespace Learun.Application.Web.AppApi
                 #region 每个基点关联的设备
                 //甲板 区域都和基点一致的设备
                 var DeckMatchedTagIds = EquipPropAll.Where(x => x.PropertyName == "甲板号" && x.PropertyValue == basePoint.deck).Select(X => X.EngineDataID).ToList();
-                var AreaMatchedTagIds = EquipPropAll.Where(x => x.PropertyName == "区域" && x.PropertyValue == basePoint.area).Select(X => X.EngineDataID).ToList();
+                //var AreaMatchedTagIds = EquipPropAll.Where(x => x.PropertyName == "区域" && x.PropertyValue == basePoint.area).Select(X => X.EngineDataID).ToList();
-
+                //#task 9542
-                var matchPointTagIds = DeckMatchedTagIds.Intersect(AreaMatchedTagIds).ToList();
+                var matchPointTagIds = DeckMatchedTagIds;//.Intersect(AreaMatchedTagIds).ToList();
 
                 foreach (var matchPointTagId in matchPointTagIds)
                 {

Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_enginedata/ec_enginedataBLL.cs

@@ -1838,6 +1838,7 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
                                         }
                                     }
                                     //更新电缆属性里的 起始设备 和 终止设备
+                                    //不需要 查询时会自动处理
                                 }
                             }
                         }

Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_enginedata/ec_enginedataService.cs

@@ -8,6 +8,7 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Windows.Controls.Primitives;
+using static Learun.Application.TwoDevelopment.ZZDT_EC.GlobalEnum;
 using DbType = System.Data.DbType;
 
 namespace Learun.Application.TwoDevelopment.ZZDT_EC

Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_notification/ec_notificationBLL.cs

@@ -198,7 +198,7 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
                 //DELETE
                 var tagsExisted = ec_EnginedataService.GetListBySQL("", ProjectId).Where(TAG => DateTime.Compare((DateTime)TAG.CreateTime, (DateTime)Drawing.CheckOutTime) < 0).OrderBy(x => x.ObjectTypeName);
                 //图纸上所有的pixel记录
-                var pixelsExisted = new ec_enginedata_pixelService().GetList("{\"ProjectId\":\"" + ProjectId + "\",\"DrawingFileID\":\"" + DrawingID + "\"}").ToList();
+                var pixelsExisted = new ec_enginedata_pixelService().GetList("{\"ProjectId\":\"" + ProjectId + "\",\"DrawingFileID\":\"" + DrawingID + "\"}",ProjectId).ToList();
 
                 // 创建时间 早于 检出时间
                 foreach (var TAG in tagsExisted)

Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_objecttype/ec_objecttypeBLL.cs

@@ -10,6 +10,7 @@ using System.IO;
 using System.Linq;
 using System.Web.Caching;
 using System.Windows.Input;
+using static Learun.Application.TwoDevelopment.ZZDT_EC.GlobalEnum;
 using static Learun.Application.TwoDevelopment.ZZDT_EC.ProjectSugar;
 using static Learun.Util.SqlSugar.SqlSugarHelper;
 

Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ZZDT_EC/ec_objecttype/ec_objecttypeEntity.cs

@@ -2,6 +2,7 @@
 using SqlSugar;
 using System;
 using System.Collections.Generic;
+using static Learun.Application.TwoDevelopment.ZZDT_EC.GlobalEnum;
 namespace Learun.Application.TwoDevelopment.ZZDT_EC
 {
     /// <summary>
@@ -181,12 +182,6 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
         #endregion
     }
 
-    public enum specialType
+    
-    {
-        未定义 = 0,
-        电力一次 = 1,
-        电力二次 = 2,
-        系统柜 = 3,
-    }
 }