diff --git a/SGGL/BLL/Common/YunMouHelper.cs b/SGGL/BLL/Common/YunMouHelper.cs
index 10691aad..5dd3896f 100644
--- a/SGGL/BLL/Common/YunMouHelper.cs
+++ b/SGGL/BLL/Common/YunMouHelper.cs
@@ -80,17 +80,21 @@ namespace BLL.Common
///
///
///
- 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);
ErrLogInfo.WriteLog(result);
-
+
var j2 = JsonConvert.DeserializeObject(result);
if (j2.code == "200")
+ {
+ res = j2.message;
return j2.data.groupId;
+ }
else
{
+ res = j2.message;
return "";
}
}
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 017734c8..36680653 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -16894,7 +16894,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs
index c8dd8055..b7d74af7 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs
+++ b/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);
- Grid1.DataSource = table;
+ // var table = this.GetPagedDataTable(Grid1, tb);
+ Grid1.DataSource = tb;
Grid1.DataBind();
}
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectDevices.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectDevices.aspx.cs
index 696c9dd8..69554fdf 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectDevices.aspx.cs
+++ b/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);
}
}
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectDevicesEdit.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectDevicesEdit.aspx.cs
index 13d8a6f3..01ed6b9c 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectDevicesEdit.aspx.cs
+++ b/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))
{