调试问题修改

source/DeviceLibrary/storeBean/inputBean/InputEquip_InStore.cs

@@ -160,6 +160,7 @@ namespace OnlineStore.DeviceLibrary
                 if (MoveInfo.MoveParam.PosInfo.barcode.EndsWith("TEST"))
                 {
                     MoveLog($"入库取料{shelf}{MoveInfo.SLog}:  条码 {MoveInfo.MoveParam.PosInfo.barcode}为测试料，直接去目标位置");
+                    LastPosInfo = MoveInfo.MoveParam.PosInfo;
                     StrartToTargetP(MoveInfo.MoveParam.PosInfo);
                 }
                 else
@@ -404,25 +405,25 @@ namespace OnlineStore.DeviceLibrary
             }
         }
         private void StrartToTargetP(InOutPosInfo lastPosInfo)
-        {
+        { 
             int shelf = MoveInfo.MoveParam.ShelfType;
             //判断是A还是B
-            if (LastPosInfo.IsNG)
+            if (lastPosInfo.IsNG)
             {
                 MoveInfo.NextMoveStep(StepEnum.II81_UpdownToP8);
-                MoveLog($"入库取料{shelf}{MoveInfo.SLog}:  NG料{LastPosInfo.ToStr()} 升降轴到P8（NG料区放料高点）{Config.Updown_P8_NGH}");
+                MoveLog($"入库取料{shelf}{MoveInfo.SLog}:  NG料{lastPosInfo.ToStr()} 升降轴到P8（NG料区放料高点）{Config.Updown_P8_NGH}");
                 UpdownAxis.AbsMove(MoveInfo, Config.Updown_P8_NGH, Config.Updown_P8_Speed);
             }
-            else if (LastPosInfo.GetPosSide().Equals("A"))
+            else if (lastPosInfo.GetPosSide().Equals("A"))
             {
                 MoveInfo.NextMoveStep(StepEnum.II41_WaitNoReel);
-                MoveLog($"入库取料{shelf}{MoveInfo.SLog}:  A侧入库料{LastPosInfo.ToStr()} 等待A上暂存区无料");
+                MoveLog($"入库取料{shelf}{MoveInfo.SLog}:  A侧入库料{lastPosInfo.ToStr()} 等待A上暂存区无料");
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.UpperArea_Check_A, IO_VALUE.LOW));
             }
             else
             {
                 MoveInfo.NextMoveStep(StepEnum.II61_WaitNoReel);
-                MoveLog($"入库取料{shelf}{MoveInfo.SLog}:  B侧入库料{LastPosInfo.ToStr()} 等待B上暂存区无料");
+                MoveLog($"入库取料{shelf}{MoveInfo.SLog}:  B侧入库料{lastPosInfo.ToStr()} 等待B上暂存区无料");
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.UpperArea_Check_B, IO_VALUE.LOW));
             }
         }
@@ -481,6 +482,15 @@ namespace OnlineStore.DeviceLibrary
                             LastPosInfo = result.Param;
                             break;
                         }
+
+                        if (count >= 3)
+                        {
+                            //自动NG
+                            LastPosInfo = new InOutPosInfo(pos.barcode, "");
+                            LastPosInfo.IsNG = true;
+                            LastPosInfo.NgMsg = "获取库位超过三次，直接NG";
+                            break;
+                        }
                         count++;
                     }
                 }

source/XLRStoreClient/FrmXLRStore.cs

@@ -474,9 +474,13 @@ namespace OnlineStore.XLRStore
             InputControl.ShowData(input.IsDebug, input.GetRunStr(), input.WarnMsg, input.MoveInfo, input.GetShowColor());
             ShelfAControl.ShowData(true, "", input.BatchMove_A.WarnMsg, input.BatchMove_A.MoveInfo, input.BatchMove_A.GetShowColor(), input.BatchMove_A.CurrShelf?.ToStr());
             ShelfBControl.ShowData(true, "", input.BatchMove_B.WarnMsg, input.BatchMove_B.MoveInfo, input.BatchMove_B.GetShowColor(), input.BatchMove_B.CurrShelf?.ToStr());
-             
 
 
+            ReelControlA1.ShowData("A上暂存区物料", BufferDataManager.AInStoreInfo);
+            ReelControlA2.ShowData("A下暂存区物料", BufferDataManager.AOutStoreInfo);
+            ReelControlB1.ShowData("B上暂存区物料", BufferDataManager.BInStoreInfo);
+            ReelControlB2.ShowData("B下暂存区物料", BufferDataManager.BOutStoreInfo);
+
             if (StoreBean.runStatus > RunStatus.Wait)
             {
                 if (启动AToolStripMenuItem.Enabled.Equals(true))

source/XLRStoreClient/inputForm/FrmBatchMove.Designer.cs

@@ -236,7 +236,7 @@
             this.batchAxisP2.Name = "batchAxisP2";
             this.batchAxisP2.PointBackColor = System.Drawing.Color.Transparent;
             this.batchAxisP2.PointForeColor = System.Drawing.Color.Blue;
-            this.batchAxisP2.PointText = "上升待机点P2：";
+            this.batchAxisP2.PointText = "上料目标位置P2：";
             this.batchAxisP2.PointValue = 0;
             this.batchAxisP2.Size = new System.Drawing.Size(233, 41);
             this.batchAxisP2.TabIndex = 325;
@@ -248,7 +248,7 @@
             this.batchAxisP1.Name = "batchAxisP1";
             this.batchAxisP1.PointBackColor = System.Drawing.Color.Transparent;
             this.batchAxisP1.PointForeColor = System.Drawing.Color.Blue;
-            this.batchAxisP1.PointText = "上升待机点P1：";
+            this.batchAxisP1.PointText = "待机点P1：";
             this.batchAxisP1.PointValue = 0;
             this.batchAxisP1.Size = new System.Drawing.Size(233, 41);
             this.batchAxisP1.TabIndex = 324;