入库bug修改

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -564,7 +564,7 @@ namespace OnlineStore.DeviceLibrary
                             //判断是否验证成功，如果验证失败，不入库
                             if (LineServer.RightInPosId(DeviceID, currCode.PosId))
                             {
-                                waitInStoreList.RemoveAt(reIndex);
+                                //waitInStoreList.RemoveAt(reIndex);
                                 LogInfo("*******托盘" + currTrayNum + "需要入库【" + currCode.ToStr() + "】 ，开始入库移栽");
                                 return true;
                             }
@@ -572,7 +572,7 @@ namespace OnlineStore.DeviceLibrary
                             {
                                 LogUtil.error(Name + "托盘号【" + currTrayNum + "】入库信息【" + currCode.ToStr() + "】料仓未验证成功，不拦截托盘，更新此托盘为NG，从waitInStoreList中删除，取消入库任务");
                                 TrayManager.UpdateInStoreNG(currTrayNum, true, "Box验证入库失败");
-                                //waitInStoreList.RemoveAt(reIndex);
+                                 waitInStoreList.RemoveAt(reIndex);
                                 SServerManager.cancelPutInTask(Name, currCode.WareCode);
                                 return false;
                             }

source/DeviceLibrary/assemblymanager/TrayManager.cs

@@ -168,7 +168,7 @@ namespace OnlineStore.DeviceLibrary
                         LogUtil.info("加载到缓存托盘：" + tray.ToStr());
                         TrayInfoMap.TryAdd(tray.TrayNum, tray);
                         if (tray.InOrOutStore.Equals(1) && tray.InoutPar.InStoreNg.Equals(false) && (!tray.InoutPar.PosId.Equals("")))
-                        { 
+                        {  
                             int storeId = tray.InoutPar.GetStoreId();
                             if (storeId > 0 && LineManager.Line.MoveEquipMap.ContainsKey(storeId))
                             {

source/DeviceLibrary/model/TrayInfo.cs

@@ -30,7 +30,7 @@ namespace OnlineStore.DeviceLibrary
 
             if (InOrOutStore.Equals(1))
             {
-                type = inoutPar.InStoreNg ? "入料失败：" + ShowMsg+ "[" + inoutPar.WareCode + "] [" + inoutPar.PlateW + "x" + inoutPar.PlateH + "] " : "入料：" + "" + inoutPar.ToStr() + "";
+                type = inoutPar.InStoreNg ? "入料失败：" + ShowMsg + "[" + inoutPar.PosId + "][" + inoutPar.WareCode + "] [" + inoutPar.PlateW + "x" + inoutPar.PlateH + "] " : "入料：" + "" + inoutPar.ToStr() + "";
             }
             else if (InOrOutStore.Equals(2))
             {