bug修改

source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Partial.cs

@@ -262,8 +262,6 @@ namespace OnlineStore.DeviceLibrary
                 LogUtil.error(Name + " 启动入库【" + param.ToStr() + "】出错，找不到库位信息");
                 return;
             }
-            //param.NeedEnterShelf = false;
-            //param.NeedOutShelf = false;
             LogInfo(" 启动入库【" + param.ToStr() + "】，压紧点P2【" + param.MoveP.ComPress_P2 + "】压紧前点P3【" + param.MoveP.ComPress_P3 + "】");
             storeRunStatus = StoreRunStatus.Busy;
             storeStatus = StoreStatus.InStoreExecute;

source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Shelf.cs

@@ -112,7 +112,7 @@ namespace OnlineStore.DeviceLibrary
                 if (CurrShelfID.EndsWith("00") && MoveInfo.MoveType.Equals(StoreMoveType.OutStore))
                 {
                     LogInfo(" 执行出库【" + MoveInfo.MoveParam.ToStr() + "】失败，料架号[" + CurrShelfID + "]无效，加入等待队列");
-                    waitOutStoreList.Enqueue(MoveInfo.MoveParam);
+                    waitOutStoreList.Enqueue(MoveInfo.MoveParam.NewParam());
                     LogUtil.error(Name + "出库 料架号[" + CurrShelfID + "]无效，送出料架，稍后重新出库");
 
                     MoveInfo.MoveParam.rfid = CurrShelfID;

source/DeviceLibrary/agvClient/AgvClient.cs

@@ -73,9 +73,13 @@ namespace OnlineStore.DeviceLibrary
             agvClient.CancelState = isCancel;
             LogUtil.info("设置 agvClient.CancelState = " + isCancel);
         }
-        public static bool getState()
+        public static string  getState()
         {
-            return agvClient.CancelState;
+            if (agvClient == null)
+            {
+                return "";
+            }
+            return agvClient.CancelState.ToString();
         }
         public  static Dictionary<string, DateTime> closeDoorTimeMap = new Dictionary<string, DateTime>(); 
         private static void AgvClient_CloseDoor(string id, string rfid)

source/DeviceLibrary/store/InOutParam.cs

@@ -15,12 +15,6 @@ namespace OnlineStore.DeviceLibrary
     /// </summary>
     public class InOutParam
     {
-  //      public static readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        //public InOutParam()
-        //{ 
-        //    this.WareCode = "";
-        //    MoveP = null;   
-        //} 
         public InOutParam(string wareNo="", string posId="", string ShelfPosID="", string platew = "", string plateh = "", bool urgentReel = false, bool cutReel = false, bool smallReel = false, string rfid = "", int rfidLoc = 0,int taskCount=0,string realRfid="")
         {
             this.ShelfPosID = ShelfPosID;
@@ -54,6 +48,11 @@ namespace OnlineStore.DeviceLibrary
             this.realRfid = "";
 
         }  
+        public InOutParam NewParam()
+        {
+            InOutParam newp = new InOutParam(WareCode,PosID,ShelfPosID, PlateW, PlateH, urgentReel,cutReel,smallReel,rfid,rfidLoc,taskCount,realRfid);
+            return newp;
+        }
         /// <summary>
         /// 物品二维码信息
         /// </summary>
@@ -76,15 +75,6 @@ namespace OnlineStore.DeviceLibrary
         /// </summary>
         public string PlateW { get; set; }
        
-
-        ///// <summary>
-        ///// 出入库时需要进入新料架
-        ///// </summary>
-        //public bool NeedEnterShelf = true;
-        ///// <summary>
-        ///// 出入库结束后需要将料架送出
-        ///// </summary>
-        //public bool NeedOutShelf = true;
         /// <summary>
         /// urgentReel: true 表示紧急料,需要出到料串上
         /// </summary>
@@ -156,7 +146,6 @@ namespace OnlineStore.DeviceLibrary
         public string ToStr()
         {
             return " 库位 [" + PosID + "] [" + ShelfPosID + "], [" + WareCode + "], [" + PlateW + "x" + PlateH + "] ," +
-           //    "NeedEnterShelf【" +  NeedEnterShelf + "】NeedOutShelf【" +  NeedOutShelf + "】"+
                 "urgentReel [" + urgentReel + "],cutReel [" + cutReel + "],smallReel [" + smallReel + "],rfid [" + rfid + "],rfidLoc [" + rfidLoc + "],taskCount ["+ taskCount + "]";
         }
         public string ToShortStr()
@@ -193,7 +182,6 @@ namespace OnlineStore.DeviceLibrary
                 LogUtil.error( "GetPositon[" + posId + "] =null,没有库位不能执行出入库"); 
             } 
              
-         //   MoveP.InOut_P11= position.InOutAxis_P11;
 
             MoveP.ComPress_P2 = comP2;
             MoveP.ComPress_P3 = comP3;