Merge branch 'MIMO_PLUS_NV' of http://106.15.194.121:8083/liutao/1069_MIMO_PlUS into MIMO_PLUS_NV

DeviceLibrary/DeviceLibrary/CodeManager.cs

@@ -695,5 +695,28 @@ namespace DeviceLibrary
 
             return inside;
         }
+
+        public static bool HasRightCode(List<CodeInfo> codeInfos)
+        {
+            foreach (var codeInfo in codeInfos)
+            {
+                if (HasRightCode(codeInfo.CodeStr))
+                {
+                    return true;
+                }
+            }
+            return false;
+
+        }
+        public static bool HasRightCode(string codestr)
+        {
+            if (codestr.Length == 12 && codestr.Contains("-"))
+            {
+                LogUtil.info("找到有效条码：" + codestr);
+                return true;
+            }
+            return false;
+
+        }
     }
 }

DeviceLibrary/theMachine/MainMachine.cs

@@ -415,6 +415,7 @@ namespace DeviceLibrary
             runStatus = RunStatus.HomeReset;
             ResetMoveInfo.NewMove(MoveStep.H01_HomeReset);
             ResetMoveInfo.log("开始回原，记录最后一次回原时间");
+            SoundsController.StopPlay();
             RobotManage.LastResetTime = DateTime.Now;
             ResetMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
         }

DeviceLibrary/theMachine/MainMachine_Clamp.cs

@@ -202,7 +202,7 @@ namespace DeviceLibrary
                     if (ScanTask.IsCompleted)
                     {
                         IOMove(IO_Type.Device_Led, IO_VALUE.HIGH);
-                        var x = ScanTask.Result;
+                        var x = ScanTask.Result;                       
                         if (x.Count == 0)
                         {
                             
@@ -214,22 +214,38 @@ namespace DeviceLibrary
                                 ClampMoveInfo.MoveParam.NgMsg = crc.GetString(L.not_detect_reel_code, "未识别到有效二维码");
                                 return;
                             }
-                            else {
+                            else
+                            {
+                                ClampMoveInfo.NextMoveStep(MoveStep.ReelClamp_10);
                                 IOMove(IO_Type.Device_Led, IO_VALUE.LOW);
                                 scantrytimes++;
+                                ClampMoveInfo.log($"未识别到有效二维码,重新扫码,第{scantrytimes}次");
                                 ScanCode();
                                 return;
                             }
-                        }
+                        }                         
                         else
                         {
-                            ClampMoveInfo.NextMoveStep(MoveStep.InWaitServerCallback);
-                            ClampMoveInfo.log($"已完成扫码,等待服务器反馈库位 Count={x.Count}");
-                            ClampMoveInfo.MoveParam.IsNg = false;
-                            ClampMoveInfo.MoveParam.codeInfos = x;
-                            var cc = x.Select((a) => a.CodeStr);
-                            LastCode = String.Join("##", cc);
-                            ServerCM.SendInStoreRequest(cc.ToArray(), ClampMoveInfo.MoveParam, true);
+                            scantrytimes++;
+                            //bool hasRight = CodeManager.HasRightCode(x);
+                            //if (!hasRight&& scantrytimes < 3)
+                            //{
+                            //    ClampMoveInfo.NextMoveStep(MoveStep.ReelClamp_10);
+                            //    IOMove(IO_Type.Device_Led, IO_VALUE.LOW); 
+                            //    ClampMoveInfo.log($"未找到正确条码,重新扫码,第{scantrytimes}次");
+                            //    ScanCode();
+                            //    return;
+                            //}else 
+                            {
+
+                                ClampMoveInfo.NextMoveStep(MoveStep.InWaitServerCallback);
+                                ClampMoveInfo.log($"已完成扫码,等待服务器反馈库位 Count={x.Count}");
+                                ClampMoveInfo.MoveParam.IsNg = false;
+                                ClampMoveInfo.MoveParam.codeInfos = x;
+                                var cc = x.Select((a) => a.CodeStr);
+                                LastCode = String.Join("##", cc);
+                                ServerCM.SendInStoreRequest(cc.ToArray(), ClampMoveInfo.MoveParam, true);
+                            }
                         }
                     }
                     else if (ClampMoveInfo.IsTimeOut(15))

DeviceLibrary/theMachine/MainMachine_String.cs

@@ -65,7 +65,8 @@ namespace DeviceLibrary
 
             if (StringState == StringStateE.OutStore && StringMoveInfo.MoveStep == MoveStep.StringOut_Released)
             {
-                StringMoveInfo.log($"升起待机料串");
+                StringMoveInfo.log($"升起待机料串"); 
+                SoundsController.StopPlay();
                 StringMoveInfo.NextMoveStep(MoveStep.StringLoad_03);
                 CylinderMove(StringMoveInfo, IO_Type.StringPosChecker_Home, IO_Type.StringPosChecker_Work, IO_VALUE.HIGH);
                 CylinderMove(StringMoveInfo, IO_Type.StringFix_Bottom, IO_Type.StringFix_Top, IO_VALUE.HIGH);
@@ -486,12 +487,17 @@ namespace DeviceLibrary
                     if (IOValue(IO_Type.StringBack_Check).Equals(IO_VALUE.LOW) && IOValue(IO_Type.StringFront_Check).Equals(IO_VALUE.LOW))
                     {
                         StringMoveInfo.NextMoveStep(MoveStep.Wait);
+                        SoundsController.StopPlay();
                         LastStringState = StringStateE.None;
                         StringState = StringStateE.None;
-                        StringMoveInfo.log($"料串已离开");
+                        StringMoveInfo.log($"料串已离开,关闭提示音");
                         StringMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
                     }
-                    break;
+                    else
+                    {
+                        SoundsController.StartStringIsFull();
+                    }
+                        break;
                 //            StringOut11_OpenDoor,
                 //StringOut12_LineRun,
                 //StringOut13_WaitLeave,
@@ -596,7 +602,8 @@ namespace DeviceLibrary
             if (StringMoveInfo.IsStep(MoveStep.StringOut_Released))
             {
                 StringMoveInfo.NextMoveStep(MoveStep.StringOut10_WaitOut);
-                StringMoveInfo.log($"{msg}，料串开始离开，500秒后打开折叠门");
+                StringMoveInfo.log($"{msg}，料串开始离开，500秒后打开折叠门，关闭提示音"); 
+                SoundsController.StopPlay();
                 StringMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
                 return true;
                 

DeviceLibrary/theMachine/SoundsController.cs

@@ -18,6 +18,7 @@ namespace DeviceLibrary
 
         private  static string openDoorFile = @"\sounds\doorOpen.wav";
         private static string closeDoorFile = @"\sounds\doorClose.wav";
+        private static string stringIsFullFile = @"\sounds\stringIsFull.wav";
 
         private static SoundPlayer alarmPlayer = new SoundPlayer();
         private static bool InPlay = false;
@@ -32,6 +33,11 @@ namespace DeviceLibrary
         public static void StartClose() {
             StartPlay(closeDoorFile);
         }
+        public static void StartStringIsFull()
+        {
+            StartPlay(stringIsFullFile);
+
+        }
 
         private static void StartPlay(string fileName)
         {

TheMachine/TheMachine.csproj

@@ -309,6 +309,15 @@
     <EmbeddedResource Include="ledColor\yellow.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
+    <Content Include="sounds\doorClose.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="sounds\doorOpen.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="sounds\stringIsFull.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="更新记录.txt" />
   </ItemGroup>
   <ItemGroup>

TheMachineNView/TheMachineNView.csproj

@@ -307,6 +307,15 @@
     <EmbeddedResource Include="ledColor\yellow.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
+    <Content Include="sounds\doorClose.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="sounds\doorOpen.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="sounds\stringIsFull.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="更新记录.txt" />
   </ItemGroup>
   <ItemGroup>