D7放料逻辑优化

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -482,7 +482,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                     yellowShanShuo = true;
                 }
-                if (isInSuddenDown||isNoAirCheck||alarmType>LineAlarmType.AxisAlarm  )
+                if (isInSuddenDown||isNoAirCheck||alarmType>=LineAlarmType.IoSingleTimeOut)
                 {
                     isNeedAlarmLed = true;
                 }
@@ -493,7 +493,7 @@ namespace OnlineStore.DeviceLibrary
 
                 foreach (EquipBase moveEquip in AllEquipMap.Values)
                 { 
-                    if (moveEquip.isNoAirCheck || moveEquip.isInSuddenDown || moveEquip.alarmType > LineAlarmType.AxisAlarm)
+                    if (moveEquip.isNoAirCheck || moveEquip.isInSuddenDown || moveEquip.alarmType >= LineAlarmType.IoSingleTimeOut)
                     {
                         isNeedAlarmLed = true;
                     }

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -645,20 +645,10 @@ namespace OnlineStore.DeviceLibrary
                     InLog("入库 " + MoveInfo.SLog + "，前后气缸后退，等待300 ");
                     CylinderMove(MoveInfo, IO_Type.BeforeAfterCylinder_Before, IO_Type.BeforeAfterCylinder_After);
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
-                }
-                else
-                {
-                    MoveInfo.NextMoveStep(LineMoveStep.MI_13_UpdownCylinderUp);
-                    InLog("入库 " + MoveInfo.SLog + "，上下气缸上升");
-                    UpdownUpMove();
-                }
-            }
-            else if (MoveInfo.IsStep(LineMoveStep.MI_14_CylinderAfter))
-            {
-                MoveInfo.NextMoveStep(LineMoveStep.MI_15_SendPosToStore);
-                string code = MoveInfo.MoveParam.WareCode;
+
                     if (OnlyProOutTray)
                     {
+                        string code = MoveInfo.MoveParam.WareCode;
                         if (MoveInfo.MoveParam.IsNG)
                         {
                             OutLog(MoveInfo.SLog + "，NG料已放到出料口，发送 cancelPutInTask  ");
@@ -671,12 +661,46 @@ namespace OnlineStore.DeviceLibrary
                             string msg = SServerManager.arrive3fRobotLocation(Name, 1, code);
                             afterPutCutOK = true;
                         }
+                        InLog("出料移栽 " + MoveInfo.SLog + "，提前通知出料机构取料");
+                        LineServer.StartInStore(DeviceID, MoveInfo.MoveParam);
                     }
                     else
                     {
                         afterPutCutOK = true;
                     }
  
+                }
+                else
+                {
+                    MoveInfo.NextMoveStep(LineMoveStep.MI_13_UpdownCylinderUp);
+                    InLog("入库 " + MoveInfo.SLog + "，上下气缸上升");
+                    UpdownUpMove();
+                }
+            }
+            else if (MoveInfo.IsStep(LineMoveStep.MI_14_CylinderAfter))
+            {
+                MoveInfo.NextMoveStep(LineMoveStep.MI_15_SendPosToStore);
+                //string code = MoveInfo.MoveParam.WareCode;
+                //if (OnlyProOutTray)
+                //{
+                //    if (MoveInfo.MoveParam.IsNG)
+                //    {
+                //        OutLog(MoveInfo.SLog + "，NG料已放到出料口，发送 cancelPutInTask  ");
+                //        string msg = SServerManager.cancelPutInTask(Name, code);
+                //        afterPutCutOK = true;
+                //    }
+                //    else
+                //    {
+                //        OutLog(MoveInfo.SLog + "，工单料到达接驳台，发送 arrive3fRobotLocation ");
+                //        string msg = SServerManager.arrive3fRobotLocation(Name, 1, code);
+                //        afterPutCutOK = true;
+                //    }
+                //}
+                //else
+                //{
+                //    afterPutCutOK = true;
+                //}
+
                 InLog("入库 " + MoveInfo.SLog + "，通知BOX开始入库，等待3000");
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
                 LineServer.StartInStore(DeviceID, MoveInfo.MoveParam);