Merge branch 'master' of http://39.108.87.45:3050/lhiven/Rs.SkyLine

Rs.SkyLine/Flow/WorkFlow.cs

@@ -464,7 +464,8 @@ namespace Rs.MotionPlat.Flow
                         {
                             foreach(Nozzle nl in NozzleManager.GetNozzlesByStatus(ENozzleStatus.ToUnload))
                             {
-                                nl.SN = nl.FromIndex.ToString().PadLeft(18, '0');
+                                if(string.IsNullOrEmpty(nl.SN))
+                                    nl.SN = nl.FromIndex.ToString().PadLeft(18, '0');
                                 //nl.SN = GuidHelper.Create();
                             }
                             flowStep = EWorkFlowStep.到放料位上方;
@@ -798,6 +799,10 @@ namespace Rs.MotionPlat.Flow
                     {
                         GlobalTray.TurnoverTray.ChangeStatus(curNozzle.ToIndex + 1, ESlotStatus.Have);
                     }
+                    else if (curNozzle.ToType == TurnoverType.ToBeTested)
+                    {
+                        GlobalTray.InputTray.ChangeStatus(downSlot.Index, ESlotStatus.Have);
+                    }
                     else if (curNozzle.ToType == TurnoverType.Passed)
                     {
                         GlobalTray.OkTary.ChangeStatus(downSlot.Index, ESlotStatus.Have);