入库获取库位时若服务端没有反馈，则一直获取

source/DeviceLibrary/manager/SServerManager.cs

@@ -855,11 +855,12 @@ namespace OnlineStore.DeviceLibrary
 
 
                 if (serverResult == null)
                 if (serverResult == null)
                 {
                 {
-                    result.Msg = deviceName + "  【" + codeStr + "】结果：没有收到服务器反馈，调用 cancelPutInTask ";
-                    cancelPutInTask(deviceName, codeStr);
-                    result.Param = InOutPosInfo.NewNgPos(codeStr, "", width, height, "没有收到服务器反馈");
-                    result.Param.rfid = rfid;
-                    result.Param.IsNG = true;
+                    result.Msg = deviceName + "  【" + codeStr + "】结果：没有收到服务器反馈,等待下一次请求";
+                    result.Result = 100;
+                    //cancelPutInTask(deviceName, codeStr);
+                    //result.Param = InOutPosInfo.NewNgPos(codeStr, "", width, height, "没有收到服务器反馈");
+                   // result.Param.rfid = rfid;
+                   // result.Param.IsNG = true;
                     return result;
                     return result;
                 }
                 }
                 else if ((!string.IsNullOrEmpty(serverResult.msg)) && serverResult.result.Equals(98))
                 else if ((!string.IsNullOrEmpty(serverResult.msg)) && serverResult.result.Equals(98))

source/DeviceLibrary/storeBean/inputBean/InputEquip_InStore.cs

@@ -489,7 +489,8 @@ namespace OnlineStore.DeviceLibrary
                                 ms = 1000;
                                 ms = 1000;
                             }
                             }
                             Thread.Sleep(ms);
                             Thread.Sleep(ms);
-                            LogUtil.error(Name + "【" + pos.barcode + "】第[" + count + "]次 " + MoveInfo.SLog + " 超时，等待" + ms + "后重新获取");
+                            LogUtil.error(Name + "【" + pos.barcode + "】 " + MoveInfo.SLog + " 超时，等待" + ms + "后重新获取");
+                            continue;
                         }
                         }
                         else if (result.Result.Equals(99) || result.Result.Equals(100))
                         else if (result.Result.Equals(99) || result.Result.Equals(100))
                         {
                         {
@@ -499,7 +500,7 @@ namespace OnlineStore.DeviceLibrary
                             }
                             }
                             getPosIdMsg = result.Msg;
                             getPosIdMsg = result.Msg;
                             Thread.Sleep(ms);
                             Thread.Sleep(ms);
-                            break;
+                            continue;
                             //LogUtil.error(Name + "【" + pos.barcode + "】第[" + count + "]次  " + MoveInfo.SLog + "  结果【" + result.Result + "】，等待" + ms + "后重新获取");
                             //LogUtil.error(Name + "【" + pos.barcode + "】第[" + count + "]次  " + MoveInfo.SLog + "  结果【" + result.Result + "】，等待" + ms + "后重新获取");
                         }
                         }
                         else if (!result.Msg.Equals(""))
                         else if (!result.Msg.Equals(""))