Browse Source

mxg:修正按cadid比对岗位的方法

mengxiangge 5 years ago
parent
commit
a39df48c0d

+ 0 - 11
MBI/SAGA.MBI/DataArrange/DalUploadFloor.cs

@@ -529,20 +529,9 @@ namespace SAGA.MBI.DataArrange
         /// <returns></returns>
         public static bool IsEqualDutyByCADID(MRevitEquipBase cduty, MRevitEquipBase lduty)
         {
-            string lbimId = lduty.BimID;
-            string cbimId = cduty.BimID;
             bool result = false;
             do
             {
-                result = lbimId == cbimId;
-                //本地的bimid一定是完整的。
-                //bimId的格式正确。直接返回,不进行CADID判断
-                if (!cbimId.IsOnlyDutyNoModelBIMID())
-                {
-                    result = false;
-                    break;
-                }
-
                 string lcadId, ccadId;
                 //bimId格式不正确,判断CADID
                 //设备

+ 2 - 2
MBI/SAGA.MBI/Model/MEquipment.cs

@@ -90,12 +90,12 @@ namespace SAGA.MBI.Model
         [Description("CADID")]
         public string CADID
         {
-
+            set { m_CADID=value; }
             get
             {
                 if (!string.IsNullOrWhiteSpace(Id))
                 {
-                    return null;
+                    return m_CADID;
                 }
                 return MBIElementUtils.GetCADID(LocalId, LocalName);
             }

+ 2 - 1
MBI/SAGA.MBI/Model/MEquipmentPart.cs

@@ -98,11 +98,12 @@ namespace SAGA.MBI.Model
         [Description("CADID")]
         public string CADID
         {
+            set { m_CADID = value; }
             get
             {
                 if (!string.IsNullOrWhiteSpace(Id))
                 {
-                    return null;
+                    return m_CADID;
                 }
                 return MBIElementUtils.GetCADID(LocalId, LocalName);
             }