出库修改

source/DeviceLibrary/storeBean/inputBean/InputEquip_InStore.cs

@@ -807,8 +807,19 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
             }else if (MoveInfo.IsStep(StepEnum.IO23_MiddleToP2))
             }else if (MoveInfo.IsStep(StepEnum.IO23_MiddleToP2))
             {
             {
+                //清空暂存区
+                int startp = MoveInfo.MoveParam.PosInfo.GetPosType();
+                if (startp.Equals(1))
+                {
+                    BufferDataManager.AOutStoreInfo = null;
+                }
+                else
+                {
+                    BufferDataManager.BOutStoreInfo = null;
+                }
+
                 MoveInfo.NextMoveStep(StepEnum.IO24_UpdownToP2);
                 MoveInfo.NextMoveStep(StepEnum.IO24_UpdownToP2);
-                MoveLog($"出库->A料串 {MoveInfo.SLog}: 升降轴到P2（A料口取料点）{Config.Updown_P2_ATake}");
+                MoveLog($"出库->A料串 {MoveInfo.SLog}: 料盘已离开，清楚暂存区信息。升降轴到P2（A料口取料点）{Config.Updown_P2_ATake}");
                 UpdownAxis.AbsMove(MoveInfo, Config.Updown_P2_ATake, Config.Updown_P2_Speed);
                 UpdownAxis.AbsMove(MoveInfo, Config.Updown_P2_ATake, Config.Updown_P2_Speed);
             }
             }
             else if (MoveInfo.IsStep(StepEnum.IO27_MiddleToP3))
             else if (MoveInfo.IsStep(StepEnum.IO27_MiddleToP3))

source/XLRStoreClient/FrmXLRStore.cs

@@ -105,9 +105,9 @@ namespace OnlineStore.XLRStore
             ReelControlB1.ShowData("B上暂存区物料", BufferDataManager.BInStoreInfo);
             ReelControlB1.ShowData("B上暂存区物料", BufferDataManager.BInStoreInfo);
             ReelControlB2.ShowData("B下暂存区物料", BufferDataManager.BOutStoreInfo);
             ReelControlB2.ShowData("B下暂存区物料", BufferDataManager.BOutStoreInfo);
             ReelControlA1.linkClear.Click += LinkClear_ClickA1;
             ReelControlA1.linkClear.Click += LinkClear_ClickA1;
-            ReelControlA1.linkClear.Click += LinkClear_ClickA2;
-            ReelControlA1.linkClear.Click += LinkClear_ClickB1;
-            ReelControlA1.linkClear.Click += LinkClear_ClickB2;
+            ReelControlA2.linkClear.Click += LinkClear_ClickA2;
+            ReelControlB1.linkClear.Click += LinkClear_ClickB1;
+            ReelControlB2.linkClear.Click += LinkClear_ClickB2;
             BoxControl.InitData(StoreManager.XLRStore.boxEquip.Name);
             BoxControl.InitData(StoreManager.XLRStore.boxEquip.Name);
             InputControl.InitData(StoreManager.XLRStore.inputEquip.Name);
             InputControl.InitData(StoreManager.XLRStore.inputEquip.Name);
             ShelfAControl.InitData(StoreManager.XLRStore.inputEquip.BatchMove_A.Name);
             ShelfAControl.InitData(StoreManager.XLRStore.inputEquip.BatchMove_A.Name);