1

SGGL/BLL/Common/YunMouHelper.cs

@@ -80,7 +80,7 @@ namespace BLL.Common
         /// <param name="validateCode"></param>
         /// <param name="access_token"></param>
         /// <returns></returns>
-        public static string addDevices(string deviceSerial, string groupNo, string validateCode, string access_token)
+        public static string addDevices(string deviceSerial, string groupNo, string validateCode, string access_token,out string res)
         {
             string data = "{\"deviceSerial\":\"" + deviceSerial + "\",\"groupNo\":\"" + groupNo + "\",\"validateCode\":\"" + validateCode + "\"}";
             string result = Post(YunMouUrl + "api/v1/open/basic/devices/create", data, "application/json;charset=UTF-8", access_token);
@@ -88,9 +88,13 @@ namespace BLL.Common
           
             var j2 = JsonConvert.DeserializeObject<dynamic>(result);
             if (j2.code == "200")
+            {
+                res = j2.message;
                 return j2.data.groupId;
+            }
             else
             {
+                res = j2.message; 
                 return "";
             }
         }

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -16894,7 +16894,7 @@
     </COMReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs

@@ -127,8 +127,8 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
-            var table = this.GetPagedDataTable(Grid1, tb);
+           // var table = this.GetPagedDataTable(Grid1, tb);
-            Grid1.DataSource = table;
+            Grid1.DataSource = tb;
             Grid1.DataBind();
         }
 

SGGL/FineUIPro.Web/ProjectData/ProjectDevices.aspx.cs

@@ -169,9 +169,10 @@ namespace FineUIPro.Web.ProjectData
             {
                 var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId);
                 var token = YunMouHelper.getToken();
+                string addMessage = "";
                 string data;
                 data = Regex.Replace(project.ProjectCode, "[^0-9A-Fa-f]", "", RegexOptions.IgnoreCase);
-                var YunMouDeviceId = YunMouHelper.addDevices(device.DeviceSerial, data, device.ValidateCode, token);//添加设备
+                var YunMouDeviceId = YunMouHelper.addDevices(device.DeviceSerial, data, device.ValidateCode, token,out addMessage);//添加设备
                 if (!string.IsNullOrEmpty(YunMouDeviceId))
                 {
                     device.YunMouDeviceId = YunMouDeviceId;
@@ -181,7 +182,7 @@ namespace FineUIPro.Web.ProjectData
                 }
                 else
                 {
-                    Alert.ShowInTop("同步设备出错！", MessageBoxIcon.Warning);
+                    Alert.ShowInTop("同步设备出错:"+ addMessage, MessageBoxIcon.Warning);
 
                 }
             }

SGGL/FineUIPro.Web/ProjectData/ProjectDevicesEdit.aspx.cs

@@ -109,7 +109,8 @@ namespace FineUIPro.Web.ProjectData
                 var token = YunMouHelper.getToken();
                 string data;
                 data = Regex.Replace(project.ProjectCode, "[^0-9A-Fa-f]", "", RegexOptions.IgnoreCase);
-                device.YunMouDeviceId = YunMouHelper.addDevices(device.DeviceSerial, data, device.ValidateCode, token);//添加设备之后，将权限添加到权限组
+                string addMessage = "";
+                device.YunMouDeviceId = YunMouHelper.addDevices(device.DeviceSerial, data, device.ValidateCode, token,out addMessage);//添加设备之后，将权限添加到权限组
                 var res = YunMouHelper.addDevicesToGroups(project.YunMouGroupId, new string[] { device.DeviceSerial }, token);//添加到权限组 
                 if (!string.IsNullOrEmpty(res))
                 {