出料逻辑修改

source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs

@@ -1090,7 +1090,12 @@ namespace OnlineStore.DeviceLibrary
                             else
                             else
                             {
                             {
                                 if (DeviceID.Equals(216))
                                 if (DeviceID.Equals(216))
-                                {
+                                { 
+                                    if (LeftLinePriority())
+                                    {
+                                        return false;
+                                    }
+
                                     if (LastValue.Equals(2))
                                     if (LastValue.Equals(2))
                                     {
                                     {
                                         LogInfo(" C1->出料线：工单料，随意放" + LastValue + "," + "" + param.ToStr());
                                         LogInfo(" C1->出料线：工单料，随意放" + LastValue + "," + "" + param.ToStr());
@@ -1105,6 +1110,10 @@ namespace OnlineStore.DeviceLibrary
                                 }
                                 }
                                 else if (DeviceID.Equals(213))
                                 else if (DeviceID.Equals(213))
                                 {
                                 {
+                                    if (LeftLinePriority())
+                                    {
+                                        return false;
+                                    }
                                     if (LastValue.Equals(0))
                                     if (LastValue.Equals(0))
                                     {
                                     {
                                         LogInfo(" C1->出料线：工单料，随意放" + LastValue + "," + "" + param.ToStr());
                                         LogInfo(" C1->出料线：工单料，随意放" + LastValue + "," + "" + param.ToStr());
@@ -1119,6 +1128,10 @@ namespace OnlineStore.DeviceLibrary
                                 }
                                 }
                                 else
                                 else
                                 {
                                 {
+                                    if (RightLinePriority())
+                                    {
+                                        return false;
+                                    }
                                     LogInfo(" C1->出料线：工单料，随意放" + "" + param.ToStr());
                                     LogInfo(" C1->出料线：工单料，随意放" + "" + param.ToStr());
                                     MoveInfo.MoveParam = param;
                                     MoveInfo.MoveParam = param;
                                     return true;
                                     return true;
@@ -1134,6 +1147,35 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             return false;
             return false;
         }
         }
+
+        private bool LeftLinePriority()
+        {
+            if (!LineManager.DisLeftOutLine)
+            {
+                HYEquipBase hy14 = LineManager.Line.HYEquipMap[214];
+                HYEquipBase hy7 = LineManager.Line.HYEquipMap[207];
+                //如果右侧接驳台满，左侧未满，横移到左侧
+                if (hy14.IOValue(IO_Type.HY_OL_Full_Check).Equals(IO_VALUE.HIGH) && hy7.IOValue(IO_Type.HY_OL_Full_Check).Equals(IO_VALUE.LOW))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        private bool RightLinePriority()
+        {
+            if (!LineManager.DisRightOutLine)
+            {
+                HYEquipBase hy14 = LineManager.Line.HYEquipMap[214];
+                HYEquipBase hy7 = LineManager.Line.HYEquipMap[207]; 
+                if (hy7.IOValue(IO_Type.HY_OL_Full_Check).Equals(IO_VALUE.HIGH) && hy14.IOValue(IO_Type.HY_OL_Full_Check).Equals(IO_VALUE.LOW))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
         private int LastValue = 0;
         private int LastValue = 0;
 
 
         #region 阻挡气缸处理
         #region 阻挡气缸处理