更新获取出库的剩余任务数量API

AGVControl/BLL/AGVManager.cs

@@ -20,16 +20,15 @@ namespace BLL
             try
             try
             {
             {
                 //Common.log.OutInfo("URL:"  +  Common.webService["URL"]);
                 //Common.log.OutInfo("URL:"  +  Common.webService["URL"]);
-                string url = ConfigAppSettings.GetValue(Setting_Init.http_server) + "rest/api/qisda/device/getShelfLockInfo?rfid=" + agv.RFID;
-                Common.log.OutInfo("URL:  " + url);
+                string url = ConfigAppSettings.GetValue(Setting_Init.http_server) + "rest/api/qisda/device/shelfTaskCount? rfid =" + agv.RFID;
                 var client = new RestSharp.RestClient(url) { Timeout = -1 };
                 var client = new RestSharp.RestClient(url) { Timeout = -1 };
                 var request = new RestSharp.RestRequest(RestSharp.Method.GET);
                 var request = new RestSharp.RestRequest(RestSharp.Method.GET);
                 RestSharp.IRestResponse response = client.Execute(request);
                 RestSharp.IRestResponse response = client.Execute(request);
                 string json = response.Content;
                 string json = response.Content;
-                Common.log.OutInfo("Return:  " + json);
+                Common.log.OutInfo(agv.Name + " [URL:  " + url+"] [Return:  " + json+"]");
                 if (string.IsNullOrWhiteSpace(json)) return true;    //可以离开
                 if (string.IsNullOrWhiteSpace(json)) return true;    //可以离开
 
 
-                ShelfLockInfo serverResult = JsonHelper.DeserializeJsonToObject<ShelfLockInfo>(json);
+                ShelfTaskCount serverResult = JsonHelper.DeserializeJsonToObject<ShelfTaskCount>(json);
                 if (serverResult == null)
                 if (serverResult == null)
                 {
                 {
                     Common.log.OutInfo(" 没有收到服务器反馈");
                     Common.log.OutInfo(" 没有收到服务器反馈");
@@ -37,45 +36,20 @@ namespace BLL
                 }
                 }
                 if (serverResult.code != 0) return true;
                 if (serverResult.code != 0) return true;
 
 
-                if (serverResult.data.Count == 0) //该料架出库完成
+                if (serverResult.shelfTaskData.taskCount == 0) //该料架出库完成
                 {
                 {
-                    Common.log.OutInfo(agv.Name+" 料架【" + agv.RFID + "】 无剩余出库任务,data.Count="+serverResult.data.Count.ToString());
+                    Common.log.OutInfo(agv.Name+" 料架【" + agv.RFID + "】 无剩余出库任务,serverResult.shelfTaskData.taskCount=" + serverResult.shelfTaskData.taskCount.ToString());
                     return true;
                     return true;
                 }
                 }
                 else //该料架的出库任务未完成
                 else //该料架的出库任务未完成
                 {
                 {
                     //  foreach (ShelfLockData item in serverResult.data)
                     //  foreach (ShelfLockData item in serverResult.data)
                     //  {
                     //  {
-                    taskCount = serverResult.data[0].taskCount;
-                    Common.log.OutInfo(agv.Name + " [RFID=" + serverResult.data[0].rfid + "] [taskCount=" + serverResult.data[0].taskCount + "]");
+                    taskCount = serverResult.shelfTaskData.taskCount;
+                    Common.log.OutInfo(agv.Name + " [RFID=" + serverResult.shelfTaskData.rfid + "] [taskCount=" + serverResult.shelfTaskData.taskCount + "]");
                     // }
                     // }
                     return false;
                     return false;
                 }
                 }
-
-                //if (!obj.TryGetValue("data", out object value)) return true;    //可以离开
-                //// {"code":0,"msg":"ok","data":["":]}
-                //if (value.Equals(null))
-                //{
-                //    return true;
-                //}
-                //Dictionary<string, object> dic = (Dictionary<string, object>)value;
-                //if (dic.TryGetValue("taskCount", out object count))
-                //{
-                //    if (count.ToString() == "0")
-                //    {
-                //        return true;
-                //    }
-                //    else
-                //    {
-                //        int.TryParse(count.ToString(), out taskCount);
-                //        return false;
-                //    }
-
-                //}
-                //else
-                //{
-                //    return true;
-                //}
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {
@@ -200,4 +174,34 @@ namespace BLL
         public int taskCount { get; set; }
         public int taskCount { get; set; }
 
 
     }
     }
+
+    /// <summary>
+    /// 获取料架中的任务数
+    /// </summary>
+    public class ShelfTaskCount
+    {
+        // {"code":0,"msg":"ok","data":{"taskCount":0,"rfid":"A2"}}
+        /// <summary>
+        /// 0为正常,其他为异常
+        /// </summary>
+        public int code { get; set; }
+        /// <summary>
+        /// 消息
+        /// </summary>
+        public string msg { get; set; }
+
+        public ShelfTaskData shelfTaskData { get; set; }
+    }
+
+    public struct ShelfTaskData
+    {
+        /// <summary>
+        /// 当前料架剩余任务数(即还有几盘料没放上去)
+        /// </summary>
+        public int taskCount { get; set; }
+        /// <summary>
+        /// 料架RFID
+        /// </summary>
+        public string rfid { get; set; }
+    }
 }
 }