未扫到码也需要获取库位

source/DeviceLibrary/assemblyLine/DischargeLine.cs

@@ -250,13 +250,14 @@ namespace OnlineStore.DeviceLibrary
                     StartOutStoreMove(new InOutParam());
                     StartOutStoreMove(new InOutParam());
                 }
                 }
             }
             }
-            if ((runStatus.Equals(LineRunStatus.Runing) || runStatus.Equals(LineRunStatus.Busy)) && NoAlarm())
+            if ((runStatus.Equals(LineRunStatus.Runing) || runStatus.Equals(LineRunStatus.Busy)) )
             {
             {
                 TrayLine1.TimerPro();
                 TrayLine1.TimerPro();
                 if (NgISBack())
                 if (NgISBack())
                 {
                 {
                     TrayLine2.TimerPro();
                     TrayLine2.TimerPro();
                 }
                 }
+                
                 Line3TimerPro();
                 Line3TimerPro();
 
 
                 //小皮带线常转
                 //小皮带线常转
@@ -298,7 +299,7 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         internal bool Line3TurnIsStop()
         internal bool Line3TurnIsStop()
         {
         {
-            if (Line3Turn.InTurn.Equals(false))
+            if (Line3Turn.InTurn.Equals(false)&& NoAlarm())
             {
             {
                 if (IOValue(IO_Type.DLine_Run3).Equals(IO_VALUE.LOW))
                 if (IOValue(IO_Type.DLine_Run3).Equals(IO_VALUE.LOW))
                 {
                 {

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -777,6 +777,7 @@ namespace OnlineStore.DeviceLibrary
                 MoveInfo.NextMoveStep(LineMoveStep.FI_34_OutCheck);
                 MoveInfo.NextMoveStep(LineMoveStep.FI_34_OutCheck);
                 InLog("上料完成" + MoveInfo.SLog + "，等待出料线体无料架");
                 InLog("上料完成" + MoveInfo.SLog + "，等待出料线体无料架");
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Out_Check, IO_VALUE.LOW));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Out_Check, IO_VALUE.LOW));
+                MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Out_StopDown, IO_VALUE.LOW));
             }
             }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_34_OutCheck))
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_34_OutCheck))
             {
             {

source/DeviceLibrary/assemblymanager/SServerManager.cs

@@ -65,10 +65,10 @@ namespace OnlineStore.DeviceLibrary
                     string code = "=" + width + "x" + height + "=" + str.Trim();
                     string code = "=" + width + "x" + height + "=" + str.Trim();
                     codeStr = codeStr + code + spiltStr;
                     codeStr = codeStr + code + spiltStr;
                 }
                 }
-                if (String.IsNullOrEmpty(codeStr))
-                {
-                    return msg = deviceName + "未扫到条码";
-                }
+                //if (String.IsNullOrEmpty(codeStr))
+                //{
+                //    return msg = deviceName + "未扫到条码";
+                //}
                 codeStr = CodeManager.ReplaceCode(codeStr);
                 codeStr = CodeManager.ReplaceCode(codeStr);
                 //http://localhost/myproject/service/store/emptyPosForPutin
                 //http://localhost/myproject/service/store/emptyPosForPutin
                 //                参数：cids: 多个 cid
                 //                参数：cids: 多个 cid