AGV异常不删除缓存及上报加type

source/DeviceLibrary/ESS/WebService.cs

@@ -146,7 +146,7 @@ namespace OnlineStore.DeviceLibrary.ESS
             ErrorStateInfo essModel = JsonHelper.DeserializeJsonToObject<ErrorStateInfo>(s);
             ErrorStateInfo essModel = JsonHelper.DeserializeJsonToObject<ErrorStateInfo>(s);
             if (ContainerManager.CheckContainerCode(essModel.containerCode))
             if (ContainerManager.CheckContainerCode(essModel.containerCode))
             {
             {
-                ContainerManager.UpdateTaskStatus(essModel.containerCode, TaskStatus.ERROR);
+                //ContainerManager.UpdateTaskStatus(essModel.containerCode, TaskStatus.ERROR);
             }
             }
             else
             else
             {
             {

source/DeviceLibrary/lineManager/ALineManager.cs

@@ -28,10 +28,10 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             int take_x = ConfigHelper.Config.Get("takePosX", 23781);
             int take_x = ConfigHelper.Config.Get("takePosX", 23781);
             int take_y = ConfigHelper.Config.Get("takePosY", 20612);
             int take_y = ConfigHelper.Config.Get("takePosY", 20612);
-            AgvPoints.Add("TAKE", new List<Point>() { new Point { X=take_x,Y= take_y} });//取料点
+            AgvPoints.Add("TAKE", new List<Point>() { new Point { X = take_x, Y = take_y } });//取料点
             int put_x = ConfigHelper.Config.Get("putPosX", 23781);
             int put_x = ConfigHelper.Config.Get("putPosX", 23781);
             int put_y = ConfigHelper.Config.Get("putPosY", 22812);
             int put_y = ConfigHelper.Config.Get("putPosY", 22812);
-            AgvPoints.Add("PUT", new List<Point>() { new Point { X=put_x,Y=put_y} });//放料点
+            AgvPoints.Add("PUT", new List<Point>() { new Point { X = put_x, Y = put_y } });//放料点
             int standby_x = ConfigHelper.Config.Get("standbyPosX", 27564);
             int standby_x = ConfigHelper.Config.Get("standbyPosX", 27564);
             int standby_y = ConfigHelper.Config.Get("standbyPosY", 20282);
             int standby_y = ConfigHelper.Config.Get("standbyPosY", 20282);
             AgvPoints.Add("STANDBY", new List<Point>() { new Point { X = standby_x, Y = standby_y } });
             AgvPoints.Add("STANDBY", new List<Point>() { new Point { X = standby_x, Y = standby_y } });
@@ -239,11 +239,13 @@ namespace OnlineStore.DeviceLibrary
                 if (robotStates != null && robotStates.robots != null)
                 if (robotStates != null && robotStates.robots != null)
                 {
                 {
                     List<AgvStatus> agvs = new List<AgvStatus>();
                     List<AgvStatus> agvs = new List<AgvStatus>();
-                    foreach (var item in robotStates.robots)
+                    for (int j = 0; j < robotStates.robots.Count; j++)
                     {
                     {
+                        var item = robotStates.robots[j];
                         AgvStatus status = new AgvStatus();
                         AgvStatus status = new AgvStatus();
                         status.elec = item.energyLevel.ToString();
                         status.elec = item.energyLevel.ToString();
                         status.name = item.robotCode;
                         status.name = item.robotCode;
+                        status.type = j + 1;
                         foreach (var key in AgvPoints.Keys)
                         foreach (var key in AgvPoints.Keys)
                         {
                         {
                             var find = AgvPoints[key].Find(s => s.X.Equals(item.positionX) && s.Y.Equals(item.positionY));
                             var find = AgvPoints[key].Find(s => s.X.Equals(item.positionX) && s.Y.Equals(item.positionY));

source/DeviceLibrary/lineManager/SServerManager.cs

@@ -997,6 +997,7 @@ namespace OnlineStore.DeviceLibrary
         /// 错误消息
         /// 错误消息
         /// </summary>
         /// </summary>
         public string message { get; set; }
         public string message { get; set; }
+        public int type { get; set; }
     }
     }
     public class OutTaskData
     public class OutTaskData
     {
     {