回退debug，取消空车位输出，取消业务线程过多退回指令的提示

parkMonitor/server/CoreThread/AbstractCmd.cs

@@ -209,7 +209,17 @@ namespace parkMonitor.server.CoreThread
             {
                 Robot.robot1.occupied = false;
             }
-            
+            if (!queueCmd.manual)
+            {
+                if (isParking)
+                {
+                    Robot.robot1.parkWaitCount -= 1;
+                }
+                else
+                {
+                    Robot.robot1.fetchWaitCount -= 1;
+                }
+            }
             //释放激光
             if (lm != null)
             {
@@ -225,7 +235,6 @@ namespace parkMonitor.server.CoreThread
             {
                 if (isParking)
                 {
-                    Robot.robot1.parkWaitCount -= 1;
                     //释放已分配车位
                     if (!ParkingSpaceManager.ins.SetParkingSpace(parkingSpaceID, 0))
                     {
@@ -236,7 +245,6 @@ namespace parkMonitor.server.CoreThread
                 }
                 else
                 {
-                    Robot.robot1.fetchWaitCount -= 1;
                     ////复原已释放的车位
                     //if (!ParkingSpaceManager.ins.SetParkingSpace(parkingSpaceID, 1))
                     //{
@@ -1020,7 +1028,7 @@ namespace parkMonitor.server.CoreThread
             int rearwheelbase;                           //后轮距
             int garageID;                                   //车库ID
             bool robotError = false;                  //机械手是否异常
-            //获取车辆表中车辆相关信息
+                                                      //获取车辆表中车辆相关信息
             if (queueCmd.manual)
             {
                 //vehiclelist = oper.GetLocalVehicle(connectionStr, queueCmd.LicenseNum, queueCmd.garageID);
@@ -1130,9 +1138,9 @@ namespace parkMonitor.server.CoreThread
             }
             if (ParkingBufferManager.ins == null || !ParkingBufferManager.ins.ReleaseParkingBuffer(ps.parkingSpaceX))
             {
-                Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "缓冲位编号"+ ps.parkingSpaceX + "未找到，请检查"); UILogServer.ins.error("缓冲位编号" + ps.parkingSpaceX + "未找到，请检查");
+                Log.WriteLog(LogType.NOT_DATABASE, LogFile.ERROR, "缓冲位编号" + ps.parkingSpaceX + "未找到，请检查"); UILogServer.ins.error("缓冲位编号" + ps.parkingSpaceX + "未找到，请检查");
             }
-            Log.WriteLog(LogType.NOT_DATABASE,LogFile.INFO ,"取车流程：号牌：" + queueCmd.LicenseNum + "取车完成");
+            Log.WriteLog(LogType.NOT_DATABASE, LogFile.INFO, "取车流程：号牌：" + queueCmd.LicenseNum + "取车完成");
             UILogServer.ins.info("取车流程：号牌：" + queueCmd.LicenseNum + "取车完成");
 
             //自动化测试用

parkMonitor/server/CoreThread/CoreThreadTest2.cs

@@ -143,7 +143,7 @@ namespace parkMonitor.server.CoreThread
                                             Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, "等待机械手1资源线程过多:" + Robot.robot1.parkWaitCount + "," + Robot.robot1.fetchWaitCount);
                                             queueCmd.returnedCount = 10000;
                                             queuingThread.SetMessage((Command)queueCmd.Clone());
-                                            Thread.Sleep(15000);
+                                            Thread.Sleep(5000);
                                             continue;
                                         }
                                     }
@@ -154,7 +154,7 @@ namespace parkMonitor.server.CoreThread
                                             Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, "等待机械手2资源线程过多:" + Robot.robot2.parkWaitCount + "," + Robot.robot2.fetchWaitCount);
                                             queueCmd.returnedCount = 10000;
                                             queuingThread.SetMessage((Command)queueCmd.Clone());
-                                            Thread.Sleep(15000);
+                                            Thread.Sleep(5000);
                                             continue;
                                         }
                                     }

parkMonitor/server/CoreThread/QueuingThread.cs

@@ -533,8 +533,11 @@ namespace parkMonitor.server.CoreThread
                             {
                                 ValidStoreCmdQueue.Enqueue((Command)command.Clone());
                             }
-                            UILogServer.ins.info("收到退回的停车指令：" + command.LicenseNum);
-                            Log.WriteLog(LogType.NOT_DATABASE, LogFile.INFO, "收到退回的停车指令：" + command.LicenseNum);
+                            if (command.returnedCount < 10000)
+                            {
+                                UILogServer.ins.info("收到退回的停车指令：" + command.LicenseNum);
+                                Log.WriteLog(LogType.NOT_DATABASE, LogFile.INFO, "收到退回的停车指令：" + command.LicenseNum);
+                            }
                         }
                         else if (command.commandType.Equals('f'))
                         {
@@ -542,8 +545,11 @@ namespace parkMonitor.server.CoreThread
                             {
                                 FetchCmdQueue.Enqueue((Command)command.Clone());
                             }
-                            UILogServer.ins.info("收到退回的取车指令：" + command.LicenseNum);
-                            Log.WriteLog(LogType.NOT_DATABASE, LogFile.INFO, "收到退回的取车指令：" + command.LicenseNum);
+                            if (command.returnedCount < 10000)
+                            {
+                                UILogServer.ins.info("收到退回的取车指令：" + command.LicenseNum);
+                                Log.WriteLog(LogType.NOT_DATABASE, LogFile.INFO, "收到退回的取车指令：" + command.LicenseNum);
+                            }
                         }
                     }
                     else

parkMonitor/server/CoreThread/SpaceManager.cs

@@ -133,7 +133,7 @@ namespace parkMonitor.server.CoreThread
                             }
                         }
                     }
-                    Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, log+"]");
+                    
                     if (temp != null && !booking)
                     {
                         //分配已预约的车位后将该车位置为占用
@@ -145,6 +145,7 @@ namespace parkMonitor.server.CoreThread
                     {
                         return null;
                     }
+                    Log.WriteLog(LogType.NOT_DATABASE, LogFile.LOG, log + "]");
                     //分配车位
                     Parking_Space rps = new Parking_Space();
                     float min_dis_sq = 100000000; //初始10000单位距离