1

source/AssemblyLineClient/记录.txt

@@ -8,6 +8,28 @@
 
 
 
 
 
 
+20230816
+1.HY11优先处理出料线C5的托盘。
+2.HY15处，分盘料一盘去出料四，一盘去HY17，紧急料不需要处理。 
+3.HY9处，如果进仓14，进仓15和进仓16都有托盘，空托盘直接横移
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 20221125 :
 20221125 :
 增加关机功能。
 增加关机功能。

source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs

@@ -261,7 +261,9 @@ namespace OnlineStore.DeviceLibrary
                         else
                         else
                         {
                         {
                             bool check2IsOk = CheckStopWatch(trayCheckLowWait, TrayWaitTime, false)||String.IsNullOrEmpty(RFIDIP);
                             bool check2IsOk = CheckStopWatch(trayCheckLowWait, TrayWaitTime, false)||String.IsNullOrEmpty(RFIDIP);
-                            if (preTrayIsC1Line && Config.IsOutLineOut && IOValue(IO_Type.HY_OL_Tray_Check).Equals(IO_VALUE.HIGH))
+                           
+                            bool isHY11 = DeviceID.Equals(211);//HY11优先处理C5出来的托盘
+                            if ((preTrayIsC1Line||isHY11) && Config.IsOutLineOut && IOValue(IO_Type.HY_OL_Tray_Check).Equals(IO_VALUE.HIGH))
                             {
                             {
                                 StopDownCount = 0;
                                 StopDownCount = 0;
                                 //C1线和出料线交替处理
                                 //C1线和出料线交替处理
@@ -1034,11 +1036,11 @@ namespace OnlineStore.DeviceLibrary
                         else
                         else
                         {
                         {
                             //如果进仓15，进仓16有料，空料盘直接横移
                             //如果进仓15，进仓16有料，空料盘直接横移
+                            MoveEquip move14 = LineManager.Line.MoveEquipMap[14];
                             MoveEquip move15 = LineManager.Line.MoveEquipMap[15];
                             MoveEquip move15 = LineManager.Line.MoveEquipMap[15];
                             MoveEquip move16 = LineManager.Line.MoveEquipMap[16];
                             MoveEquip move16 = LineManager.Line.MoveEquipMap[16];
-                            if (move15.hasTray() && move16.hasTray())
+                            if (move14.hasTray()&& move15.hasTray() && move16.hasTray())
                             {
                             {
-
                                 return true;
                                 return true;
                             }
                             }
 
 
@@ -1058,7 +1060,11 @@ namespace OnlineStore.DeviceLibrary
                             //if (tray.InOrOutStore.Equals(2) && (!tray.InoutPar.cutReel) && (!tray.InoutPar.urgentReel))
                             //if (tray.InOrOutStore.Equals(2) && (!tray.InoutPar.cutReel) && (!tray.InoutPar.urgentReel))
                             if (tray.InOrOutStore.Equals(2))
                             if (tray.InOrOutStore.Equals(2))
                             {
                             {
-                                if (tray.InoutPar.cutReel || tray.InoutPar.urgentReel)
+                                if (tray.InoutPar.urgentReel)
+                                {
+                                    return false;
+                                }
+                                if (tray.InoutPar.cutReel )
                                 {
                                 {
 
 
                                     if (preToOut4)
                                     if (preToOut4)
@@ -1198,7 +1204,7 @@ namespace OnlineStore.DeviceLibrary
                             MoveInfo.MoveParam = param;
                             MoveInfo.MoveParam = param;
                             return true;
                             return true;
                         }
                         }
-                        else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && (param.urgentReel || param.cutReel) && this.DeviceID.Equals(216))
+                        else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) &&  param.cutReel && this.DeviceID.Equals(216))
                         {
                         {
                             string lName = param.urgentReel ? "紧急料" : "盘点料";
                             string lName = param.urgentReel ? "紧急料" : "盘点料";