1

source/AssemblyLineClient/FrmFeedingEquip.cs

@@ -284,6 +284,7 @@ namespace OnlineStore.AssemblyLine
 
         private void btnStart_Click(object sender, EventArgs e)
         {
+
             StartDebug();
         }
         private void btnStop_Click(object sender, EventArgs e)

source/DeviceLibrary/assemblyLine/FeedingEquip_Partial.cs

@@ -14,19 +14,17 @@ namespace OnlineStore.DeviceLibrary
         {
             if (wait.WaitType.Equals(WaitEnum.W101_BatchAxisMove))
             {
-                string msg = "";
                 if (IOValue(TargetIoType).Equals(TargetIoValue))
                 {
                     return true;
                 }
                 else
                 {
-                    bool result = AxisBean.ACAxisMoveIsEnd(moveInfo, wait.AxisInfo, wait.TargetPosition, wait.TargetSpeed, out msg);
-                    if (!result)
+                    bool isOk = ACServerManager.GetBusyStatus(wait.AxisInfo.DeviceName, wait.AxisInfo.GetAxisValue()).Equals(0);
+                    if (isOk)
                     {
-                        LogUtil.error(msg);
+                        return true;
                     }
-                    return result;
                 }
             }
             else if (wait.WaitType.Equals(WaitEnum.W102_FeedScanCode))
@@ -38,6 +36,7 @@ namespace OnlineStore.DeviceLibrary
             }
             return false;
         }
+        
         #region 托盘检测
         private void StartCheckFixture()
         {
@@ -48,6 +47,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                     if (NeedCurrTray())
                     {
+                        SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
                         TrayManager.UpdateSWState(Config.SidesWayNum, 2);
                         CheckLog("托盘检测（流水线阻挡）SecondStoreMove：(MIO_06_TopCylinderUp 横移顶升气缸上 升 ）");
                         SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_06_TopCylinderUp);
@@ -64,6 +64,7 @@ namespace OnlineStore.DeviceLibrary
                     //判断是否是需要的托盘
                     if (NeedCurrTray())
                     {
+                        SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
                         TrayManager.UpdateSWState(Config.SidesWayNum, 2);
                         CheckLog("托盘检测（流水线阻挡）SecondStoreMove：(MIO_06_TopCylinderUp 横移顶升气缸上 升 ）");
                         SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_06_TopCylinderUp);
@@ -783,7 +784,7 @@ namespace OnlineStore.DeviceLibrary
         private void BatchAxisToP3()
         {
             MoveInfo.TimeOutSeconds = 200;
-            MoveInfo.CanWhileCount = 3;
+            MoveInfo.CanWhileCount = 0;
             //  需要增加定时器，获取验证信号并停止伺服
             StartMovePosition = BatchAxis.GetAclPosition();
             MoveInfo.WaitList.Add(WaitResultInfo.WaitBatchAxis(Config.Batch_Axis, Config.BatchAxisP3, Config.BatchAxis_P3Speed));
@@ -858,6 +859,7 @@ namespace OnlineStore.DeviceLibrary
             bool isFull = TrayManager.TrayIsFull(trayNum);
             TrayInfo info = TrayManager.GetTrayInfo(trayNum);
             InOutParam param = new InOutParam(trayNum, info.WareCode, info.PosId, info.PlateH, info.PlateW);
+
             //是出料的模块
             if (Config.IsCanOut.Equals(1))
             {
@@ -866,6 +868,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                     if (isFull && runStatus.Equals(LineRunStatus.Runing) && MoveInfo.MoveType.Equals(LineMoveType.OutStore))
                     {
+                       
                         lastOutParam = param;
                         if (checkAndMove)
                         {

source/DeviceLibrary/assemblymanager/TrayManager.cs

@@ -71,7 +71,9 @@ namespace OnlineStore.DeviceLibrary
             {
                 return fixtureCodeFullMap[trayNum];
             }
-            return null;
+            TrayInfo tray = new TrayInfo(trayNum,false,0);
+            
+            return tray;
         }