1

DeviceLibrary/DeviceLibrary/CodeManager.cs

@@ -340,7 +340,7 @@ namespace DeviceLibrary
         private static string SaveImageToFile(string deviceName, string cameraName, Bitmap bitmap)
         private static string SaveImageToFile(string deviceName, string cameraName, Bitmap bitmap)
         {
         {
             string date = DateTime.Now.ToString("HH-mm-ss-") + DateTime.Now.Millisecond;
             string date = DateTime.Now.ToString("HH-mm-ss-") + DateTime.Now.Millisecond;
-            string dire = @"\image\" + deviceName.Trim().Replace('_', '-') + @"\" + cameraName.Trim().Replace('_', '-').Replace(':', '-') + @"\";
+            string dire = @"D:\image\" + deviceName.Trim().Replace('_', '-') + @"\" + cameraName.Trim().Replace('_', '-').Replace(':', '-') + @"\";
             string iamgeName = date + ".bmp";
             string iamgeName = date + ".bmp";
             try
             try
             {
             {
@@ -474,7 +474,7 @@ namespace DeviceLibrary
         /// </summary>
         /// </summary>
         /// <param name="dir"></param>
         /// <param name="dir"></param>
         /// <param name="days"></param>
         /// <param name="days"></param>
-        static void DeleteOldFiles(string path = "", int days = 7)
+        static void DeleteOldFiles(string path = "", int days = 5)
         {
         {
             if (path == "")
             if (path == "")
             {
             {

DeviceLibrary/theMachine/InReelBean.cs

@@ -145,15 +145,18 @@ namespace DeviceLibrary
         private Task ScanCodeTask = null;
         private Task ScanCodeTask = null;
         private Task GetPosTask = null;
         private Task GetPosTask = null;
 
 
+      private   int scanCount = 0;
+        private int getPosCount = 0;
         private void IN02_ScanCode()
         private void IN02_ScanCode()
         {
         {
             try
             try
             {
             {
                 MoveInfo.NextMoveStep(MoveStep.IN02_ScanCode);
                 MoveInfo.NextMoveStep(MoveStep.IN02_ScanCode);
-                MoveInfo.log("开始扫码");
+                MoveInfo.log("开始扫码,scanCount=0");
+                scanCount = 0;
                 ScanCodeTask = Task.Factory.StartNew(delegate
                 ScanCodeTask = Task.Factory.StartNew(delegate
                 {
                 {
-                    string[] cameraName=Setting_Init.CameraScan_IN_2;
+                    string[] cameraName = Setting_Init.CameraScan_IN_2;
                     if (Name.Contains("1"))
                     if (Name.Contains("1"))
                     {
                     {
                         cameraName = Setting_Init.CameraScan_IN_1;
                         cameraName = Setting_Init.CameraScan_IN_1;
@@ -161,18 +164,28 @@ namespace DeviceLibrary
                     //循环扫码，扫到条码才进入下一步
                     //循环扫码，扫到条码才进入下一步
                     while (MoveInfo.MoveStep.Equals(MoveStep.IN02_ScanCode))
                     while (MoveInfo.MoveStep.Equals(MoveStep.IN02_ScanCode))
                     {
                     {
+                        scanCount++;
                         LastCode = CodeManager.CameraScan(cameraName.ToList());
                         LastCode = CodeManager.CameraScan(cameraName.ToList());
                         if (LastCode.Count > 0)
                         if (LastCode.Count > 0)
                         {
                         {
-                            MoveInfo.log("扫码完成："+CodeManager.ProcessCode(LastCode)+"");
+                            MoveInfo.log("扫码完成：" + CodeManager.ProcessCode(LastCode) + "");
                             break;
                             break;
                         }
                         }
                         else
                         else
                         {
                         {
                             SetWarnMsg($"{Name}： 扫码失败");
                             SetWarnMsg($"{Name}： 扫码失败");
-                            MoveInfo.errlog("扫码失败 , 等待2秒后重新扫码");
+                            if (IOManager.IOValue(Reel_Check).Equals(IO_VALUE.HIGH))
+                            {
+                                MoveInfo.errlog($"扫码{scanCount}次失败 , 等待2秒后重新扫码");
                                 Thread.Sleep(2000);
                                 Thread.Sleep(2000);
                             }
                             }
+                            else
+                            {
+                                MoveInfo.errlog($"扫码{scanCount}次失败 , 未检测到料盘信号 ，结束扫码"); 
+                                MoveInfo.EndMove();
+                            }
+                            break;
+                        }
                     }
                     }
                 });
                 });
             }
             }
@@ -194,11 +207,13 @@ namespace DeviceLibrary
                 }
                 }
                 else
                 else
                 {
                 {
-                    MoveInfo.log("获取库位号: " + codestr);
+                    MoveInfo.log("获取库位号: " + codestr + ",getPosCount=0");
+                    getPosCount = 0;
                     GetPosTask = Task.Factory.StartNew(delegate
                     GetPosTask = Task.Factory.StartNew(delegate
                     { 
                     { 
                         while (MoveInfo.MoveStep.Equals(MoveStep.IN03_GetPos))
                         while (MoveInfo.MoveStep.Equals(MoveStep.IN03_GetPos))
                         {
                         {
+                            getPosCount++;
                             string shelfRfid = RobotManage.mainMachine.getReadyShelf();
                             string shelfRfid = RobotManage.mainMachine.getReadyShelf();
                             if (String.IsNullOrEmpty(shelfRfid))
                             if (String.IsNullOrEmpty(shelfRfid))
                             {
                             {
@@ -223,9 +238,17 @@ namespace DeviceLibrary
                                 else
                                 else
                                 {
                                 {
                                     SetWarnMsg( " getLocation " + outMsg);
                                     SetWarnMsg( " getLocation " + outMsg);
-                                    MoveInfo.errlog("获取位置失败: " + outMsg + ", 等待3秒后重新获取");
+                                    if (IOManager.IOValue(Reel_Check).Equals(IO_VALUE.HIGH))
+                                    { 
+                                        MoveInfo.errlog($"获取位置{getPosCount}次失败: " + outMsg + ", 等待3秒后重新获取");
                                         Thread.Sleep(3000);
                                         Thread.Sleep(3000);
                                     }
                                     }
+                                    else
+                                    { 
+                                        MoveInfo.errlog($"获取位置{getPosCount}次失败: " + outMsg + ", 未检测到料盘信号，重置"); 
+                                        Reset("获取位置失败且未检测到料盘");
+                                    }
+                                } 
                             }
                             }
                         } 
                         } 
                     });
                     });