Merge branch 'master' of http://106.15.194.121:8083/lina/SO908-XLRStore

source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs

@@ -385,7 +385,7 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         MoveInfo.NextMoveStep(StepEnum.BOX_H0103_ToAInputHighPos);
                         MoveInfo.NextMoveStep(StepEnum.BOX_H0103_ToAInputHighPos);
                         if (UpdownAxis.GetAclPosition() >= (Config.Updown_P5 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P4 + axisDiff)
                         if (UpdownAxis.GetAclPosition() >= (Config.Updown_P5 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P4 + axisDiff)
-                            && (IOValue(IO_Type.UnderArea_Check_A).Equals(IO_VALUE.LOW)|| BufferDataManager.AOutStoreInfo ==null))
+                            && (BufferDataManager.AOutStoreInfo == null || IOValue(IO_Type.UnderArea_Check_A).Equals(IO_VALUE.LOW)))
                         {
                         {
                             LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在A下暂存区低点和高点之间,到高点P4,A面移栽X轴去暂存区P2,A面压紧轴到压紧前点P2");
                             LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在A下暂存区低点和高点之间,到高点P4,A面移栽X轴去暂存区P2,A面压紧轴到压紧前点P2");
                             ComAxis_A.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComAxis_AB_P2, Config.ComAxis_A_P2_Speed);
                             ComAxis_A.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComAxis_AB_P2, Config.ComAxis_A_P2_Speed);
@@ -393,7 +393,7 @@ namespace OnlineStore.DeviceLibrary
                             UpdownAxis.AbsMove(MoveInfo, Config.Updown_P4, Config.Updown_P4_Speed);
                             UpdownAxis.AbsMove(MoveInfo, Config.Updown_P4, Config.Updown_P4_Speed);
                         }
                         }
                         else if (UpdownAxis.GetAclPosition() >= (Config.Updown_P3 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P2 + axisDiff)
                         else if (UpdownAxis.GetAclPosition() >= (Config.Updown_P3 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P2 + axisDiff)
-                            && (IOValue(IO_Type.UpperArea_Check_A).Equals(IO_VALUE.LOW) || BufferDataManager.AInStoreInfo==null))
+                            && (BufferDataManager.AInStoreInfo == null || IOValue(IO_Type.UpperArea_Check_A).Equals(IO_VALUE.LOW)))
                         {
                         {
                             LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在A上暂存区低点和高点之间,到高点P2,A面移栽X轴去暂存区P2，A面压紧轴到压紧前点P2");
                             LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在A上暂存区低点和高点之间,到高点P2,A面移栽X轴去暂存区P2，A面压紧轴到压紧前点P2");
                             ComAxis_A.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComAxis_AB_P2, Config.ComAxis_A_P2_Speed);
                             ComAxis_A.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComAxis_AB_P2, Config.ComAxis_A_P2_Speed);
@@ -440,7 +440,7 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         MoveInfo.NextMoveStep(StepEnum.BOX_H0105_ToBInputHighPos);
                         MoveInfo.NextMoveStep(StepEnum.BOX_H0105_ToBInputHighPos);
                         if (UpdownAxis.GetAclPosition() >= (Config.Updown_P11 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P10 + axisDiff)&&
                         if (UpdownAxis.GetAclPosition() >= (Config.Updown_P11 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P10 + axisDiff)&&
-                            (IOValue(IO_Type.UnderArea_Check_B).Equals(IO_VALUE.LOW)|| BufferDataManager.BOutStoreInfo ==null))
+                            (BufferDataManager.BOutStoreInfo == null || IOValue(IO_Type.UnderArea_Check_B).Equals(IO_VALUE.LOW)))
                         {
                         {
                             LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在B下暂存区低点和高点之间,到高点P10,B面移栽X轴去暂存区P2,B面压紧轴到压紧前点P2");
                             LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在B下暂存区低点和高点之间,到高点P10,B面移栽X轴去暂存区P2,B面压紧轴到压紧前点P2");
                             ComAxis_B.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComAxis_AB_P2, Config.ComAxis_B_P2_Speed);
                             ComAxis_B.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComAxis_AB_P2, Config.ComAxis_B_P2_Speed);
@@ -448,7 +448,7 @@ namespace OnlineStore.DeviceLibrary
                             UpdownAxis.AbsMove(MoveInfo, Config.Updown_P10, Config.Updown_P10_Speed);
                             UpdownAxis.AbsMove(MoveInfo, Config.Updown_P10, Config.Updown_P10_Speed);
                         }
                         }
                         else if (UpdownAxis.GetAclPosition() >= (Config.Updown_P9 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P8 + axisDiff)&&
                         else if (UpdownAxis.GetAclPosition() >= (Config.Updown_P9 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P8 + axisDiff)&&
-                            (IOValue(IO_Type.UpperArea_Check_B).Equals(IO_VALUE.LOW)|| BufferDataManager.BInStoreInfo==null))
+                            (BufferDataManager.BInStoreInfo == null || IOValue(IO_Type.UpperArea_Check_B).Equals(IO_VALUE.LOW)))
                         {
                         {
                             LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在B上暂存区低点和高点之间,到高点P8,B面移栽X轴去暂存区P2,B面压紧轴到压紧前点P2");
                             LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在B上暂存区低点和高点之间,到高点P8,B面移栽X轴去暂存区P2,B面压紧轴到压紧前点P2");
                             ComAxis_B.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComAxis_AB_P2, Config.ComAxis_B_P2_Speed);
                             ComAxis_B.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComAxis_AB_P2, Config.ComAxis_B_P2_Speed);