Browse Source

mxg:更改上传文件提示信息错误

mengxiangge 6 years ago
parent
commit
71d70ba757

+ 1 - 1
MBI/SAGA.MBI/Common/MailLog.cs

@@ -29,7 +29,7 @@ namespace SAGA.MBI.Common
         public static string BuildProjectInfo()
         {
             StringBuilder message = new StringBuilder();
-            message.AppendFormat("项目:{0};用户:{1}", MBIControl.ProjectCur.Name,
+            message.AppendFormat("项目:{0};用户:{1}", MBIControl.ProjectCur.ToString(),
                 MBIControl.ManageInfo.Phone_Num);
             message.AppendLine();
             return message.ToString();

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

@@ -405,8 +405,6 @@ namespace SAGA.MBI.DataArrange
             {
                 //本地编码不可识别,删除服务器数据
                 //xls 新编码和旧编码一致,则不处理数据
-                string code1 = EquipmentCodeMap.GetOriginCode(mode.EquipClassCode);
-                string code2 = EquipmentCodeMap.GetOriginCode(tempmode.RevitCode);
                 if (EquipmentCodeMap.GetOriginCode(mode.EquipClassCode) == EquipmentCodeMap.GetOriginCode(tempmode.RevitCode))
                 {
                     mode.Operator = DocumentChangedOperator.Modified;
@@ -530,7 +528,6 @@ namespace SAGA.MBI.DataArrange
         /// <param name="context"></param>
         private static void CheckEquipSpaceRlt(CalcContext context)
         {
-            //由于空间Modify必定会引起设备更改,所以只处理设备就行
             //设备
             foreach (MEquipment equip in context.MEquipments)
             {

+ 6 - 3
MBI/SAGA.MBI/WinView/Upload/VMUploadModeManage.cs

@@ -115,12 +115,15 @@ namespace SAGA.MBI.WinView.Upload
                             t.IsUpload && t.MFloor.FloorLock.LockState == MFloorLockState.LockBySelf).ToList();
                         int i = 0, count = upfloors.Count();
                         List<string> successList = new List<string>();
-                        List<string> failList = UploadFloors.Select(t => t.FloorName).ToList();
+                        List<string> failList = new List<string>();
                         foreach (var ufloor in upfloors)
                         {
                             try
                             {
                                 i++;
+                                string floorName = ufloor.FloorName;
+                                failList.Add(floorName);
+
                                 CalcContext context = ufloor.CalcContext;
 
                                 if (context == null || !context.Upload())
@@ -138,8 +141,8 @@ namespace SAGA.MBI.WinView.Upload
                                     //删除备份文件
                                     FloorFileOperate.Del000BakFile(ufloor.MFloor.FullPath);
                                     //上传完日志反馈
-                                    successList.Add(ufloor.FloorName);
-                                    failList.Remove(ufloor.FloorName);
+                                    successList.Add(floorName);
+                                    failList.Remove(floorName);
                                 }
                             }
                             catch (Exception e)