1.出口皮带线多转2s

2.图片名称+RID
3.两侧都需要取目标位置。

RC1266-AutoCountMachine/source/AutoCountClient/记录.txt

@@ -70,7 +70,7 @@ PRO,0,贴标机构Z轴旋转点P4,LabelZ_P4,2000,,,,,
 
 
 PRO,0,贴标机构Z轴P4速度,LabelZ_P4Speed,4500,,,,,
 PRO,0,贴标机构Z轴P4速度,LabelZ_P4Speed,4500,,,,,
 
 
-20200604
+20200603
 
 
 1.增加X光启用禁用功能
 1.增加X光启用禁用功能
 2.Xray料盘信息显示
 2.Xray料盘信息显示
@@ -84,3 +84,10 @@ PRO,0,贴标机构Z轴P4速度,LabelZ_P4Speed,4500,,,,,
 接口修改
 接口修改
 data=0，IFneed=不需要
 data=0，IFneed=不需要
 data=1，IFneed=需要
 data=1，IFneed=需要
+
+20200604
+
+1.出口皮带线多转2s
+2.图片名称+RID
+3.两侧都需要取目标位置。
+

RC1266-AutoCountMachine/source/DeviceLibrary/bean/InputEquip_InStore.cs

@@ -198,11 +198,11 @@ namespace OnlineStore.DeviceLibrary
                     MoveInfo.MoveParam.TargetPosType = 1;
                     MoveInfo.MoveParam.TargetPosType = 1;
                     WorkLog(" 无有效条码，从XRay放到NG箱：" + MoveInfo.MoveParam.ToStr());
                     WorkLog(" 无有效条码，从XRay放到NG箱：" + MoveInfo.MoveParam.ToStr());
                 }
                 }
-                else if (MoveInfo.MoveParam.InPosType.Equals(2))
-                {
-                    MoveInfo.MoveParam.TargetPosType = 1;
-                    WorkLog(" 右侧入口入料，直接放到XRay：" + MoveInfo.MoveParam.ToStr());
-                }
+                //else if (MoveInfo.MoveParam.InPosType.Equals(2))
+                //{
+                //    MoveInfo.MoveParam.TargetPosType = 1;
+                //    WorkLog(" 右侧入口入料，直接放到XRay：" + MoveInfo.MoveParam.ToStr());
+                //}
                 else if (SServerManager.CanConnect())
                 else if (SServerManager.CanConnect())
                 {
                 {
                     Task task = Task.Factory.StartNew(delegate
                     Task task = Task.Factory.StartNew(delegate

RC1266-AutoCountMachine/source/DeviceLibrary/bean/X_RAY_Equip_Partial.cs

@@ -117,11 +117,11 @@ namespace OnlineStore.DeviceLibrary
                 Work_ReelInfo = In_ReelInfo.GetReelInfo();
                 Work_ReelInfo = In_ReelInfo.GetReelInfo();
                 MoveInfo.MoveParam.SetReelInfo(Work_ReelInfo);
                 MoveInfo.MoveParam.SetReelInfo(Work_ReelInfo);
                 In_ReelInfo = new ReelInfo();
                 In_ReelInfo = new ReelInfo();
-                WorkLog("料盘处理：更新Work_ReelInfo【" + Work_ReelInfo.ToStr() + "】，清空 In_ReelInfo，再转动2秒钟");
+                WorkLog("料盘处理：更新Work_ReelInfo【" + Work_ReelInfo.ToStr() + "】，清空 In_ReelInfo，再转动5秒钟");
 
 
                 IOMove(IO_Type.X_InLine_Run, IO_VALUE.HIGH);
                 IOMove(IO_Type.X_InLine_Run, IO_VALUE.HIGH);
                 IOMove(IO_Type.X_MLine_Run, IO_VALUE.HIGH);
                 IOMove(IO_Type.X_MLine_Run, IO_VALUE.HIGH);
-                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
+                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.X_ReelCheck, IO_VALUE.HIGH));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.X_ReelCheck, IO_VALUE.HIGH));
             }
             }
             else if (MoveInfo.IsStep(StepEnum.XW06_WaitTime))
             else if (MoveInfo.IsStep(StepEnum.XW06_WaitTime))
@@ -323,7 +323,8 @@ namespace OnlineStore.DeviceLibrary
             carerayImage.WindowWidth = Config.WindowWidth;
             carerayImage.WindowWidth = Config.WindowWidth;
             carerayImage.WindowLevel = Config.WindowLevel;
             carerayImage.WindowLevel = Config.WindowLevel;
             Bitmap bmp = carerayImage.Get48bImage();
             Bitmap bmp = carerayImage.Get48bImage();
-            lastFileName = DateTime.Now.ToString("yyyyMMddHHmmss") + ".png";
+             
+            lastFileName =Work_ReelInfo.GetRealId()+"-"+ DateTime.Now.ToString("yyyyMMddHHmmss") + ".png";
             string fileP = path1_tif + @"\" + lastFileName;
             string fileP = path1_tif + @"\" + lastFileName;
             bmp.Save(fileP, System.Drawing.Imaging.ImageFormat.Png);
             bmp.Save(fileP, System.Drawing.Imaging.ImageFormat.Png);
             string backFile = path_XRAY + lastFileName;
             string backFile = path_XRAY + lastFileName;

RC1266-AutoCountMachine/source/DeviceLibrary/model/WorkParam.cs

@@ -191,5 +191,14 @@ namespace OnlineStore.DeviceLibrary
             ReelInfo reel = new ReelInfo(WareCode, PlateW, PlateH, WareCount, IsNgReel, NgMsg);
             ReelInfo reel = new ReelInfo(WareCode, PlateW, PlateH, WareCount, IsNgReel, NgMsg);
             return reel;
             return reel;
         }
         }
+
+        public string GetRealId()
+        {
+            string[] codeArray = WareCode.Split(';');
+            if (codeArray.Length == 2)
+            {
+                return codeArray[1];
+            }return "";
+        }
     }
     }
 }
 }