皮带线3NG料bug修改

source/DeviceLibrary/assemblyLine/DischargeLine_Partial.cs

@@ -182,24 +182,32 @@ namespace OnlineStore.DeviceLibrary
                 }
                 else
                 {
-                    //NG料
-                    if (TrayProcessCanStartLine())
+                    //NG料 
+                    if (DeviceID.Equals(301))
+                    {
+                        MoveInfo.NextMoveStep(LineMoveStep.DO_10_StopSeparateLine);
+                        LogUtil.info(hengyiName + "扫码NG料， 先转动NG料到扫码后一个工位，需要停止接驳台皮带线");
+                        SeparateStopRun(MoveInfo); 
+                    }
+                    else if (TrayProcessCanStartLine())
                     {
                         MoveInfo.NextMoveStep(LineMoveStep.DO_11_NGToNextStation);
-                        if (DeviceID.Equals(301))
-                        {
-                            LogUtil.info(hengyiName + "扫码NG料， 先转动NG料到扫码后一个工位，需要停止接驳台皮带线");
-                            SeparateStopRun(MoveInfo);
-
-                        }
-                        else
-                        {
-                            LogUtil.info(hengyiName + "扫码NG料， 先转动NG料到扫码后一个工位");
-                        }
+                        LogUtil.info(hengyiName + "扫码NG料， 先转动NG料到扫码后一个工位");
                         Line3Turn.StartLineRun(IO_Type.DLine_Run3, IO_Type.Location_Check3, Line3EndProcess);
                         MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
                         MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Location_Check3, IO_VALUE.HIGH));
                     }
+
+                }
+            }else if (MoveInfo.MoveStep.Equals(LineMoveStep.DO_10_StopSeparateLine))
+            {
+                if (TrayProcessCanStartLine())
+                {
+                    MoveInfo.NextMoveStep(LineMoveStep.DO_11_NGToNextStation);
+                    LogUtil.info(hengyiName + "扫码NG料， 先转动NG料到扫码后一个工位");
+                    Line3Turn.StartLineRun(IO_Type.DLine_Run3, IO_Type.Location_Check3, Line3EndProcess);
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Location_Check3, IO_VALUE.HIGH));
                 }
             }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.DO_04_SUpDownMove))

source/DeviceLibrary/assemblyLine/LineBean_Partial.cs

@@ -253,7 +253,7 @@ namespace OnlineStore.DeviceLibrary
                     else
                     {
                         SW23WaitTrayNum = trayNum;
-                        LogInfo("Equip_TrayPEndEvent【" + swNum + "】【" + trayNum + "】失败，SW23_MoveInfo 忙碌中，记录 SW23WaitTrayNum=" + SW23WaitTrayNum);
+                        LogUtil.debug(Name+"Equip_TrayPEndEvent【" + swNum + "】【" + trayNum + "】失败，SW23_MoveInfo 忙碌中，记录 SW23WaitTrayNum=" + SW23WaitTrayNum);
                     }
                 }
                 else if (swNum.Equals(4))
@@ -272,7 +272,7 @@ namespace OnlineStore.DeviceLibrary
                     else
                     {
                         SW41WaitTrayNum = trayNum;
-                        LogInfo("Equip_TrayPEndEvent【" + swNum + "】【" + trayNum + "】失败，SW41_MoveInfo 忙碌中，记录 SW41WaitTrayNum =" + SW41WaitTrayNum);
+                        LogUtil.debug(Name + "Equip_TrayPEndEvent【" + swNum + "】【" + trayNum + "】失败，SW41_MoveInfo 忙碌中，记录 SW41WaitTrayNum =" + SW41WaitTrayNum);
                     }
                 }
             }

source/DeviceLibrary/model/StoreStep.cs

@@ -1009,7 +1009,10 @@ namespace OnlineStore.DeviceLibrary
         /// 出料皮带线开始扫码送出料盘，到达后再转动500
         /// </summary>
         DO_08_CRun = 30208,
-
+        /// <summary>
+        /// 停止接驳台皮带线
+        /// </summary>
+        DO_10_StopSeparateLine=30210,
         /// <summary>
         /// 出料皮带线获取尺寸NG，先转动料盘到扫码的下一个工位
         /// </summary>