发送当前库位号给环形线

source/DeviceLibrary/bean/EquipBean.cs

@@ -1072,7 +1072,12 @@ namespace OnlineStore.DeviceLibrary
                         {
                         {
                             ss = (int)StoreStatus.Debugging;
                             ss = (int)StoreStatus.Debugging;
                         }
                         }
-                        StoreSendBean store = lineConn.GetBean((int)ss, (int)storeRunStatus, hasTray, (int)alarmType);
+                        string posId = "";
+                        if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore))
+                        {
+                            posId = MoveInfo.MoveParam?.PosInfo.BoxPosId;
+                        }
+                        StoreSendBean store = lineConn.GetBean((int)ss, (int)storeRunStatus, hasTray, (int)alarmType,posId);
                         lineConn.SendHeart(store);
                         lineConn.SendHeart(store);
                     }
                     }
 
 

source/DeviceLibrary/bean/EquipBean_Partial.cs

@@ -517,7 +517,7 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(MoveStep.SO_24_InoutBack))
             else if (MoveInfo.IsStep(MoveStep.SO_24_InoutBack))
             {
             {
                 MoveInfo.NextMoveStep(MoveStep.SO_25_GoBack);
                 MoveInfo.NextMoveStep(MoveStep.SO_25_GoBack);
-                MoveLog("  返回待机点，轴2/轴1/轴4动作至P1，判断料架是否需要离开");
+                MoveLog("  返回待机点，轴2/轴1动作至P1,轴4到压紧前点，判断料架是否需要离开");
                 foreach(WorkStation obj in StationMap.Values)
                 foreach(WorkStation obj in StationMap.Values)
                 {
                 {
                     if (obj.CurrShelf.IsBusy)
                     if (obj.CurrShelf.IsBusy)
@@ -527,7 +527,7 @@ namespace OnlineStore.DeviceLibrary
                         break;
                         break;
                     }
                     }
                 }
                 }
-                ComMoveToPosition(moveP.ComPress_P1, Config.CompAxis_P1_Speed);
+                ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed);
                 ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
                 ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
                 ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
                 ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
             }
             }
@@ -575,8 +575,8 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(MoveStep.SO_34_InoutToP1))
             else if (MoveInfo.IsStep(MoveStep.SO_34_InoutToP1))
             {
             {
                 MoveInfo.NextMoveStep(MoveStep.SO_35_GoBack);
                 MoveInfo.NextMoveStep(MoveStep.SO_35_GoBack);
-                MoveLog("  返回待机点，轴2/轴1/轴4动作至P1)");
-                ComMoveToPosition(moveP.ComPress_P1, Config.CompAxis_P1_Speed);
+                MoveLog("  返回待机点，轴2/轴1动作至P1，轴4回到压紧前点)");
+                ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed);
                 ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
                 ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
                 ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
                 ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
             }
             }

source/DeviceLibrary/lineConnect/LineConnect.cs

@@ -222,9 +222,9 @@ namespace OnlineStore.DeviceLibrary
         }
         }
 
 
 
 
-        public StoreSendBean GetBean(int ss, int runs, int doorHasTray, int alarmType)
+        public StoreSendBean GetBean(int ss, int runs, int doorHasTray, int alarmType,string currPosId)
         {
         {
-            StoreSendBean bean = new StoreSendBean(ss, runs, doorHasTray, alarmType);
+            StoreSendBean bean = new StoreSendBean(ss, runs, doorHasTray, alarmType, currPosId);
             bean.StoreId = StoreId;
             bean.StoreId = StoreId;
             bean.Cid = CID;
             bean.Cid = CID;
 
 
@@ -258,7 +258,7 @@ namespace OnlineStore.DeviceLibrary
     }
     }
     public class StoreSendBean
     public class StoreSendBean
     {
     {
-        public StoreSendBean(int ss, int runs, int doorHasTray, int alarmType)
+        public StoreSendBean(int ss, int runs, int doorHasTray, int alarmType,string currPosId)
         {
         {
             this.StoreId = 7;
             this.StoreId = 7;
             this.Cid = "";
             this.Cid = "";
@@ -282,7 +282,8 @@ namespace OnlineStore.DeviceLibrary
         public int SRunStatus = 0;
         public int SRunStatus = 0;
         public int DoorHasTray = 0;
         public int DoorHasTray = 0;
         public int AlarmType = 0;
         public int AlarmType = 0;
-
+         
+        public string CurrPosId = "";
         public List<string> WaitInStoreList = new List<string>();
         public List<string> WaitInStoreList = new List<string>();
         public Dictionary<string, string> data = new Dictionary<string, string>();
         public Dictionary<string, string> data = new Dictionary<string, string>();
 
 

source/HCSingleStore/FrmEquip.cs

@@ -617,7 +617,12 @@ namespace OnlineStore.ACSingleStore
                 {
                 {
                     ss = StoreStatus.Debugging;
                     ss = StoreStatus.Debugging;
                 }
                 }
-                StoreSendBean bean =  equip.lineConn.GetBean((int)ss, (int)StoreRunStatus.Runing, hasTray, (int)StoreAlarmType.None);
+                string posid = "";
+                if (equip.MoveInfo.MoveType.Equals(StoreMoveType.None))
+                {
+                    posid = equip.MoveInfo.MoveParam?.PosInfo.BoxPosId;
+                }
+                StoreSendBean bean =  equip.lineConn.GetBean((int)ss, (int)StoreRunStatus.Runing, hasTray, (int)StoreAlarmType.None,posid);
                 //bean.data.Add(ParamDefine.posId, cmbPosition.Text);
                 //bean.data.Add(ParamDefine.posId, cmbPosition.Text);
                 //bean.data.Add(ParamDefine.plateH, "8");
                 //bean.data.Add(ParamDefine.plateH, "8");
                 //bean.data.Add(ParamDefine.plateW, "7");
                 //bean.data.Add(ParamDefine.plateW, "7");