首盘料bug修改

source/AssemblyLineClient/记录.txt

@@ -48,7 +48,11 @@
 
 
 
-
+ 20201218
+ HY3等待HY0托盘检测和前阻挡检测都没信号时再放行空托盘。
+ 出料料盘更新的线体位置错误。
+ 接驳台托盘离开线体没转。
+ T4，缓冲阻挡去掉
 
 
 

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -226,6 +226,23 @@ namespace OnlineStore.DeviceLibrary
                     LogInfo("从调试状态切换到正常状态！");
                 }
             }
+            else if (baseConfig.DType.Equals(DeviceType.MoveEquip))
+            {
+                if (isDebug)
+                {
+                    IsDebug = true;
+                    IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.HIGH);
+                    IOMove(IO_Type.HY_StopDown, IO_VALUE.HIGH);
+                    LogInfo("从正常状态切换到调试状态！");
+                }
+                else
+                {
+                    IsDebug = false;
+                    IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.HIGH);
+                    IOMove(IO_Type.HY_StopDown, IO_VALUE.LOW);
+                    LogInfo("从调试状态切换到正常状态！");
+                }
+            }
             else
             {
                 if (isDebug)

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -133,7 +133,7 @@ namespace OnlineStore.DeviceLibrary
             IOMove(IO_Type.SL_RollerLine_Run, IO_VALUE.LOW);
 
             MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Entry_StopDown, IO_VALUE.LOW));
-            MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW));
+            //MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW));
             MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Out_StopDown, IO_VALUE.LOW));
             isInPro = false;
         }

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -136,7 +136,7 @@ namespace OnlineStore.DeviceLibrary
             IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.LOW);
             IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);
             IOMove(IO_Type.SL_Line_Run, IO_VALUE.HIGH);
-            MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW));
+            //MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW));
             MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
         }
 

source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs

@@ -187,7 +187,7 @@ namespace OnlineStore.DeviceLibrary
             IOMove(IO_Type.SL_Line_Run, IO_VALUE.HIGH);
             IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);
             IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.LOW);
-            MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW));
+            //MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW));
             MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
         }
 

source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs

@@ -412,7 +412,12 @@ namespace OnlineStore.DeviceLibrary
                     int lineId = DeviceID % 100;
                     LogInfo("C1线->出料线 【" + MoveInfo.MoveParam.ToShortStr() + "】" + MoveInfo.SLog + " 更新料盘位置【" + MoveInfo.MoveParam.WareCode + "】【INBELT】【" + lineId + "】");
                     //更新料盘位置
-                    SServerManager.UpdateTrayLoc(Name, MoveInfo.MoveParam.WareCode, LocStatus.INBELT, Config.LineName);
+                    string lineName = "C8";
+                    if (DeviceID.Equals(213) || DeviceID.Equals(216))
+                    {
+                        lineName = "C9";
+                    }
+                    SServerManager.UpdateTrayLoc(Name, MoveInfo.MoveParam.WareCode, LocStatus.INBELT, lineName);
                 }
             }
             else if (MoveInfo.IsStep(LineMoveStep.HY35_IOL_TopDown))
@@ -745,7 +750,7 @@ namespace OnlineStore.DeviceLibrary
                         {
 
                             //如果横移1和横移2都有托盘，需要横移
-                            if (IOManager.IOValue(IO_Type.HY_TrayCheck, 202).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.HY_TrayCheck, 201).Equals(IO_VALUE.HIGH))
+                            if (IOManager.IOValue(IO_Type.HY_TrayCheck, 202).Equals(IO_VALUE.HIGH) || IOManager.IOValue(IO_Type.HY_FrontStopCheck, 202).Equals(IO_VALUE.HIGH))
                             {
                                 return true;
                             }

source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs

@@ -208,7 +208,8 @@ namespace OnlineStore.DeviceLibrary
                 {
                     MoveTimeOut(SecondMoveInfo, "等待移栽机构开始抓料超时");
                 }
-            }else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_09_WaitProcessReel))
+            }
+            else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_09_WaitProcessReel))
             {
                 //等待料盘拿走
             }
@@ -230,8 +231,17 @@ namespace OnlineStore.DeviceLibrary
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_11_TopDown))
             {
                 SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_12_WaitTrayLeave);
-                CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：等待托盘检测无信号");
-                SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
+                if (IsNgPro())
+                {
+                    CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：，等待托盘检测无信号");
+                    SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
+                }
+                else
+                {
+                    CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：线体转动 ，等待托盘检测无信号");
+                    LineRun(MoveInfo);
+                    SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW)); 
+                }
             }
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_12_WaitTrayLeave))
             {