1

source/Common/util/AcSerialBean.cs

@@ -211,7 +211,7 @@ namespace OnlineStore.Common
             if (_serialPort.IsOpen)
             {
                 //lock (lockObj)
-                if(Monitor.TryEnter(lockObj,10))
+                if(Monitor.TryEnter(lockObj,100))
                 {
                     //Monitor.Enter(lockObj);
                     try

source/DeviceLibrary/PackingStore/AC_BOX_Bean_OutStore.cs

@@ -483,30 +483,29 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.MoveStep == StoreMoveStep.SO_04_ToPos)
             {
                 MoveInfo.NextMoveStep(StoreMoveStep.SO_05_GetReel);
-                InOutStoreLog("拿起物品，升降轴至P6[" + moveP.UpDown_P6 + "]，压紧轴到压紧点P2 ：" + moveP.ComPress_P2);
-                ACAxisMove(Config.Comp_Axis, moveP.ComPress_P2, Config.CompAxis_P2_Speed);
+                InOutStoreLog("拿起物品，升降轴至P6[" + moveP.UpDown_P6 + "]，压紧轴开始缓慢压紧到P4  ：" + Config.CompAxis_P4_Position);
+                //ACAxisMove(Config.Comp_Axis, moveP.ComPress_P2, Config.CompAxis_P2_Speed);
+                MoveInfo.WaitList.Add(WaitResultInfo.WaitComAxis(Config.Comp_Axis, Config.CompAxis_P4_Position, Config.CompAxis_P4_Speed));
+                Config.Comp_Axis.TargetPosition = Config.CompAxis_P4_Position;
+                ACServerManager.AbsMove(Config.Comp_Axis.DeviceName, Config.Comp_Axis.GetAxisValue(), Config.CompAxis_P4_Position, Config.CompAxis_P4_Speed);
+                ComAxisStartCheck();
                 ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P6, Config.UpDownAxis_P6_Speed);
-                //MoveInfo.WaitList.Add(WaitResultInfo.WaitComAxis(Config.Comp_Axis, Config.CompAxis_P4_Position, Config.CompAxis_P4_Speed));
-                //Config.Comp_Axis.TargetPosition = Config.CompAxis_P4_Position;
-                //ACServerManager.AbsMove(Config.Comp_Axis.DeviceName, Config.Comp_Axis.GetAxisValue(), Config.CompAxis_P4_Position, Config.CompAxis_P4_Speed);
-                //ComAxisStartCheck(); 
             }
             else if (MoveInfo.MoveStep == StoreMoveStep.SO_05_GetReel)
             {
-                //    SO_06_StartCompress();
-
-                //}
-                //else if (MoveInfo.MoveStep.Equals(StoreMoveStep.SO_06_StartCompress))
-                //{
-                //    MoveInfo.NextMoveStep(StoreMoveStep.SO_07_ComDownMove);
-                //    int currPosition = ACServerManager.GetActualtPosition(Config.Comp_Axis);
-                //    int targetP = currPosition + Config.CompAxis_Down_Position;
-                //    InOutStoreLog("出库 " + MoveInfo.SLog + "： 再向下压紧 [" + Config.CompAxis_Down_Position + "] 目标 [" + targetP + "] ");
-                //    ACAxisMove(Config.Comp_Axis, targetP, Config.CompAxis_P1_Speed);
-                //}
-                //else if (MoveInfo.MoveStep == StoreMoveStep.SO_07_ComDownMove)
-                //{
-
+                MoveInfo.NextMoveStep(StoreMoveStep.SO_06_StartCompress);
+                InOutStoreLog("拿起物品，压紧信号亮");
+            }
+            else if (MoveInfo.MoveStep.Equals(StoreMoveStep.SO_06_StartCompress))
+            {
+                MoveInfo.NextMoveStep(StoreMoveStep.SO_07_ComDownMove);
+                int currPosition = ACServerManager.GetActualtPosition(Config.Comp_Axis);
+                int targetP = currPosition + Config.CompAxis_Down_Position;
+                InOutStoreLog("出库 " + MoveInfo.SLog + "： 再向下压紧 [" + Config.CompAxis_Down_Position + "] 目标 [" + targetP + "] ");
+                ACAxisMove(Config.Comp_Axis, targetP, Config.CompAxis_P1_Speed);
+            }
+            else if (MoveInfo.MoveStep == StoreMoveStep.SO_07_ComDownMove)
+            {
                 MoveInfo.NextMoveStep(StoreMoveStep.SO_08_InoutBack);
                 InOutStoreLog("进出轴至待机点P1[" + moveP.InOut_P1 + "] ");
                 InOutBackToP1(moveP.InOut_P1);
@@ -515,7 +514,6 @@ namespace OnlineStore.DeviceLibrary
                 lastPosId = posId;
                 lastPosIdStatus = StoreStatus.OutStoreBoxEnd;
                 storeStatus = StoreStatus.OutStoreBoxEnd;
-
             }
             else if (MoveInfo.MoveStep == StoreMoveStep.SO_08_InoutBack)
             {

source/DeviceLibrary/store/AutoInoutInfo.cs

@@ -51,10 +51,10 @@ namespace OnlineStore.DeviceLibrary
                 CurrInOutCount++;
                 CurrInOutACount++;
                 //是否自动进入出库状态
-                if (!autoNext)
-                {
-                    return;
-                }
+                //if (!autoNext)
+                //{
+                //    return;
+                //}
                 if (storeMoveType.Equals(StoreMoveType.InStore))
                 {
                     int newIndex = positionIndex - 1;

source/DeviceLibrary/store/StoreStep.cs

@@ -333,11 +333,11 @@ namespace OnlineStore.DeviceLibrary
         ///// <summary>
         ///// 料仓出库，，压紧轴开始缓慢压紧
         ///// </summary>
-        //SO_06_StartCompress,
+        SO_06_StartCompress,
         ///// <summary>
         ///// 料仓出库，，检测到料叉压紧确认信号，再次向下压紧指定的值
         ///// </summary>
-        //SO_07_ComDownMove,
+        SO_07_ComDownMove,
 
 
         /// <summary>