NG口问题修改。

source/DeviceLibrary/assemblyLine/OutTrayLineBean.cs

@@ -64,13 +64,18 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             if (LineTurnIsStop() && MoveInfo.MoveType.Equals(LineMoveType.None) && (equipBean.runStatus.Equals(LineRunStatus.Runing) || equipBean.runStatus.Equals(LineRunStatus.Busy)))
             if (LineTurnIsStop() && MoveInfo.MoveType.Equals(LineMoveType.None) && (equipBean.runStatus.Equals(LineRunStatus.Runing) || equipBean.runStatus.Equals(LineRunStatus.Busy)))
             {
             {
-                if (LastTrayPosition <= 1)
+                int needEmptyP = 1;
+                if (moveParam.InStoreNg)
+                {
+                    needEmptyP = 2;
+                }
+                if (LastTrayPosition <= needEmptyP)
                 {
                 {
                     LogUtil.error(Name + " 启动送料【" + moveParam.ToStr() + "】 失败，入口有料", Id * 1000 + 32);
                     LogUtil.error(Name + " 启动送料【" + moveParam.ToStr() + "】 失败，入口有料", Id * 1000 + 32);
                     return false;
                     return false;
                 }
                 }
                 //MoveInfo.MoveParam = moveParam;
                 //MoveInfo.MoveParam = moveParam;
-                MoveInfo.NewMove(LineMoveType.OutStore, moveParam);
+                MoveInfo.NewMove(LineMoveType.OutStore, moveParam);              
                 posId = "[" + moveParam.PosId + "][" + moveParam.WareCode + "][" + moveParam.rfid + "]";
                 posId = "[" + moveParam.PosId + "][" + moveParam.WareCode + "][" + moveParam.rfid + "]";
                 if (moveParam.InStoreNg)
                 if (moveParam.InStoreNg)
                 {
                 {
@@ -95,15 +100,15 @@ namespace OnlineStore.DeviceLibrary
                     }
                     }
                 }
                 }
                 else
                 else
-                {
-                    if (LastTrayPosition > 1)
+                { 
+                   if (LastTrayPosition > needEmptyP)
                     {
                     {
                         WaitReviceTray();
                         WaitReviceTray();
                     }
                     }
                     else
                     else
                     {
                     {
                         MoveInfo.NextMoveStep(LineMoveStep.DLO_02_WaitEnteryNoTray);
                         MoveInfo.NextMoveStep(LineMoveStep.DLO_02_WaitEnteryNoTray);
-                        LogUtil.info(Name + "送料【" + posId + "】：" + MoveInfo.SLog + "--- 等待入口无料-- ");
+                        LogUtil.info(Name + "送料【" + posId + "】：" + MoveInfo.SLog + "--- 等待入口 "+ needEmptyP + " 无料-- ");
                     }
                     }
                 }
                 }
                 return true;
                 return true;
@@ -144,13 +149,18 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.DLO_02_WaitEnteryNoTray))
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.DLO_02_WaitEnteryNoTray))
             {
             {
-                if (LastTrayPosition > 1)
+                int needEmptyP = 1;
+                if (MoveInfo.MoveParam.InStoreNg)
+                {
+                    needEmptyP = 2;
+                }
+                if (LastTrayPosition > needEmptyP)
                 {
                 {
                     WaitReviceTray();
                     WaitReviceTray();
                 }
                 }
                 else if (MoveInfo.IsTimeOut(180))
                 else if (MoveInfo.IsTimeOut(180))
                 {
                 {
-                    LogUtil.error(Name + "等待入口无料超时" + FormUtil.GetSpanStr(MoveInfo.StepSpan()), Id * 1000 + 33);
+                    LogUtil.error(Name + "等待入口"+ needEmptyP + "无料超时" + FormUtil.GetSpanStr(MoveInfo.StepSpan()), Id * 1000 + 33);
                 }
                 }
             }
             }
 
 
@@ -321,7 +331,7 @@ namespace OnlineStore.DeviceLibrary
                     StartBrush();
                     StartBrush();
                     lineRun.StartLineRun(LineEndProcess);
                     lineRun.StartLineRun(LineEndProcess);
                 }
                 }
-                else if (MoveInfo.MoveStep <= LineMoveStep.DLO_01_NGBack && MoveInfo.IsInWait.Equals(false) &&
+                else if (MoveInfo.MoveStep <= LineMoveStep.DLO_02_WaitEnteryNoTray && MoveInfo.IsInWait.Equals(false) &&
                     equipBean.IOValue(ExitTray_Check).Equals(IO_VALUE.HIGH))
                     equipBean.IOValue(ExitTray_Check).Equals(IO_VALUE.HIGH))
                 {
                 {
                     //皮带线1出口有料，皮带3入库无料，且在停止状态
                     //皮带线1出口有料，皮带3入库无料，且在停止状态