Przeglądaj źródła

Merge branch 'master' of https://git.dev.tencent.com/xuhuo1234/saga

xulisong 6 lat temu
rodzic
commit
90af51bc20

+ 1 - 26
MBI/SAGA.MBI/Calc/CalcContext.cs

@@ -114,32 +114,7 @@ namespace SAGA.MBI.Calc
             Log4Net.Debug("更新楼层数据结束");
             return result;
         }
-
-        /// <summary>
-        /// 根据用户选择,进行删除,或者清除BimId的保留
-        /// </summary>
-        /// <returns></returns>
-        public bool Del()
-        {
-            bool result = true;
-            try
-            {
-                //修改空间
-                MSpaces.ForEach(t => t.DelOrClearBIMIDSave());
-                //修改设备
-                MEquipments.ForEach(t => t.DelOrClearBIMIDSave());
-                //修改部件
-                MEquipmentParts.ForEach(t => t.DelOrClearBIMIDSave());
-                //修改信标
-                MBeacons.ForEach(t => t.DelOrClearBIMIDSave());
-            }
-            catch (Exception e)
-            {
-                MessageShow.Show(e);
-                result = false;
-            }
-            return result;
-        }
+        
         /// <summary>
         /// 添加
         /// </summary>

+ 2 - 1
MBI/SAGA.MBI/ToolsData/CheckEquipCategory.cs

@@ -181,8 +181,9 @@ namespace SAGA.MBI.ToolsData
         /// <param name="addContext"></param>
         private static void RebuildCloudData(CalcContext delcontext, CalcContext addContext)
         {
+            delcontext.SetState(DocumentChangedOperator.Delete);
             //删除
-            delcontext.Del();
+            delcontext.Upload();
             //添加
             addContext.Upload();
             //var tip =

+ 3 - 1
MBI/SAGA.MBI/ToolsData/CorrectLossDuty.cs

@@ -108,7 +108,9 @@ namespace SAGA.MBI.ToolsData
         /// <param name="addContext"></param>
         private static void RebuildCloudData(CalcContext delcontext, CalcContext addContext)
         {
-            delcontext.Del();
+            delcontext.SetState(DocumentChangedOperator.Delete);
+            delcontext.Upload();
+            addContext.SetState(DocumentChangedOperator.Add);
             addContext.Upload();
             //var tip =
             //    $"{addContext.MEquipments} 个设备受到影响;{string.Join(addContext.MEquipments.Select(t => t.BimID).ToArray())}";