满料时暂不处理托盘

source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs

@@ -762,20 +762,20 @@ namespace OnlineStore.DeviceLibrary
         {
             try
             { 
-
+                if (Config.IsOutLineIn && trayNum > 0)
+                {    
                     //判断是否禁用
-                if(LineManager.DisLeftOutLine&&(DeviceID.Equals(204) || DeviceID.Equals(206)))
+                    if (LineManager.DisLeftOutLine && (DeviceID.Equals(204) || DeviceID.Equals(206)))
                     {
                         return false;
                     }
-                if(LineManager.DisRightOutLine&& (DeviceID.Equals(213) || DeviceID.Equals(216)))
+                    if (LineManager.DisRightOutLine && (DeviceID.Equals(213) || DeviceID.Equals(216)))
                     {
                         return false;
                     }
-                if (Config.IsOutLineIn && trayNum > 0)
-                {
+
                     //测线满时不需要横移
-                    if (!Config.DIList.ContainsKey(IO_Type.HY_OL_Full_Check) || IOValue(IO_Type.HY_OL_Full_Check).Equals(IO_VALUE.LOW))
+                    if (IOValue(IO_Type.HY_OL_Full_Check).Equals(IO_VALUE.LOW))
                     {
 
                         //TODO   
@@ -807,6 +807,8 @@ namespace OnlineStore.DeviceLibrary
                         { 
 
                             LogInfo(" 托盘需要横移到出料线：工单出库料" + "" + param.ToStr());
+                             List<int> leftLineList= new List<int> { 204, 206 };
+                            List<int> rightLineList = new List<int> { 213, 216 };
                             List<int> mustLine = new List<int>();
                             List<int> firstLine = new List<int>();
                             //urgentReel: true 表示紧急料,需要出到料串上
@@ -824,17 +826,17 @@ namespace OnlineStore.DeviceLibrary
                                 if (param.rfidLoc >= 70 && param.rfidLoc <= 72)
                                 {
                                     // 70,71,72时只能分配到3 / 4号皮带线; 
-                                    mustLine = new List<int> { 213, 216 };
+                                    mustLine = new List<int>(rightLineList);
                                 }
                                 else if (param.rfidLoc <= 46)
                                 {
                                     // 小料时,架位为1 - 46优先走1 / 2号皮带线
-                                    firstLine = new List<int> { 204, 206 };
+                                    firstLine = new List<int> (leftLineList);
                                 }
                                 else if (param.rfidLoc >= 47)
                                 {
                                     // ,47 - 92优先走3 / 4号皮带线,
-                                    firstLine = new List<int> { 213, 216 };
+                                    firstLine = new List<int>(rightLineList);
                                 }
                             }
                             else
@@ -845,15 +847,15 @@ namespace OnlineStore.DeviceLibrary
                                 if (param.rfidLoc.Equals(12))
                                 {
                                     // 大料12号只能走1号2后皮带线
-                                    mustLine = new List<int> { 204, 206 };
+                                    mustLine = new List<int>(leftLineList);
                                 }
                                 else if (param.rfidLoc <= 6)
                                 {
-                                    firstLine = new List<int> { 204, 206 };
+                                    firstLine = new List<int>(leftLineList);
                                 }
                                 else if (param.rfidLoc >= 7)
                                 {
-                                    firstLine = new List<int> { 213, 216 };
+                                    firstLine = new List<int>(rightLineList);
                                 }
                             }
                             

source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs

@@ -37,7 +37,7 @@ namespace OnlineStore.DeviceLibrary
                         LogUtil.error(Name + "  CheckFixture " + " 不在空闲中，直接返回 ");
                         return;
                     }
-                    if (SecondMoveInfo.MoveType.Equals(LineMoveType.None))
+                    if (SecondMoveInfo.MoveType.Equals(LineMoveType.None)&&IOValue(IO_Type.HY_OL_Full_Check).Equals(IO_VALUE.LOW))
                     {
                         bool canpro = true;
                         if (IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))

source/DeviceLibrary/assemblyLine/HY/HY_OutLine.cs

@@ -149,7 +149,7 @@ namespace OnlineStore.DeviceLibrary
                         LogUtil.error(Name + "  CheckFixture " + " 不在空闲中，直接返回 ");
                         return;
                     }
-                    if (MoveInfo.MoveType.Equals(LineMoveType.None))
+                    if (MoveInfo.MoveType.Equals(LineMoveType.None) && IOValue(IO_Type.HY_OL_Full_Check).Equals(IO_VALUE.LOW))
                     {
                         if (IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
                         {