首盘料平均分配。扫码更新。T3_2出两个料架修改。

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -931,38 +931,38 @@ namespace OnlineStore.DeviceLibrary
             //AGV已到达，将料架送入AGV中
             //AGV已到达，将料架送入AGV中
             Task.Factory.StartNew(delegate
             Task.Factory.StartNew(delegate
             {
             {
-
+                int StopDownMS = 0;
                  string checkIo = IO_Type.SL_Out_Check;
                  string checkIo = IO_Type.SL_Out_Check;
                 string lineDo = IO_Type.SL_OutSideWay_Run;
                 string lineDo = IO_Type.SL_OutSideWay_Run;
                 string stopDo = IO_Type.SL_Out_StopDown;
                 string stopDo = IO_Type.SL_Out_StopDown;
                 if (HasOutLine)
                 if (HasOutLine)
                 {
                 {
+                    StopDownMS = 1500;
                     checkIo = IO_Type.SL_OutLine_Check;
                     checkIo = IO_Type.SL_OutLine_Check;
                     lineDo = IO_Type.SL_OutLine_Run;
                     lineDo = IO_Type.SL_OutLine_Run;
                 }
                 }
                 string logName = Name + "[" + Config.AgvOutName + "] 料架送入AGV ";
                 string logName = Name + "[" + Config.AgvOutName + "] 料架送入AGV ";
                 try
                 try
                 {
                 {
-                    LogUtil.info(logName + "开始，先设置状态为None");
+                    LogUtil.info(logName + "开始，先设置状态为None，阻挡下降"+StopDownMS);
                     AgvClient.SetStatus(Config.AgvOutName, LastOutShelfId, ClientAction.None, ClientLevel.High, true);
                     AgvClient.SetStatus(Config.AgvOutName, LastOutShelfId, ClientAction.None, ClientLevel.High, true);
                     if (IOValue(checkIo).Equals(IO_VALUE.HIGH))
                     if (IOValue(checkIo).Equals(IO_VALUE.HIGH))
                     { 
                     { 
-                        //    AgvClient.SetStatus(Config.AgvOutName,"",ClientAction.MayLeave,ClientLevel.High);
                         ProcessShelfOut = true;
                         ProcessShelfOut = true;
                         //出口阻挡下降，出口线体转动 
                         //出口阻挡下降，出口线体转动 
-                        IOMove(stopDo, IO_VALUE.HIGH);
+                        IOMove(stopDo, IO_VALUE.HIGH, StopDownMS);
                         IOMove(lineDo, IO_VALUE.HIGH);
                         IOMove(lineDo, IO_VALUE.HIGH);
 
 
                         bool result = WaitIo(checkIo, IO_VALUE.LOW, 60000);
                         bool result = WaitIo(checkIo, IO_VALUE.LOW, 60000);
                         if (!result)
                         if (!result)
                         {
                         {
-                            LogUtil.info(logName + "  等待 "+ checkIo + "=LOW超时，等待8000后停止"+lineDo+"转动，发送FinishLeave");
+                            LogUtil.info(logName + "  等待 "+ checkIo + "=LOW超时，等待8000后停止" + lineDo+"转动，发送FinishLeave");
                         }
                         }
                         else
                         else
                         {
                         {
                             LogUtil.info(logName + "  已收到" + checkIo + "=LOW ，等待8000后停止" + lineDo + "转动，发送FinishLeave");
                             LogUtil.info(logName + "  已收到" + checkIo + "=LOW ，等待8000后停止" + lineDo + "转动，发送FinishLeave");
                         }
                         }
-                        //再转动2000
+                        //再转动8000
                         Thread.Sleep(8000);
                         Thread.Sleep(8000);
                         //停止转动 ,阻挡上升
                         //停止转动 ,阻挡上升
                         IOMove(lineDo, IO_VALUE.LOW);
                         IOMove(lineDo, IO_VALUE.LOW);

source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs

@@ -1112,7 +1112,8 @@ namespace OnlineStore.DeviceLibrary
                                     firstLine = new List<int>(rightLineList);
                                     firstLine = new List<int>(rightLineList);
                                 }
                                 }
                             }
                             }
-
+                            mustLine = new List<int>();
+                            firstLine = new List<int>();
                             if (mustLine.Count > 0)
                             if (mustLine.Count > 0)
                             {
                             {
                                 if (mustLine.Contains(DeviceID))
                                 if (mustLine.Contains(DeviceID))