1

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -264,7 +264,7 @@ namespace OnlineStore.DeviceLibrary
                 MoveInfo.NextMoveStep(LineMoveStep.MI_06_CylinderDown);
                 InLog("入库 " + MoveInfo.SLog + ":  升降下降");
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200));
-                UpdownDownP2Move(MoveInfo.MoveParam.PlateH,MoveInfo.MoveParam.PlateW);
+                UpdownDownP2Move(MoveInfo.MoveParam.PlateH, MoveInfo.MoveParam.PlateW);
             }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.MI_06_CylinderDown))
             {
@@ -284,7 +284,16 @@ namespace OnlineStore.DeviceLibrary
                 MoveInfo.NextMoveStep(LineMoveStep.MI_09_CylinderUp);
                 InLog("入库 " + MoveInfo.SLog + ":  上下气缸上升");
                 UpdownUpMove();
-                CylinderMove(null, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
+                //if (MoveInfo.MoveParam.PlateW.Equals(7))
+                //{
+                //    InLog("放托盘（放开阻挡）： " + MoveInfo.SLog + " 7寸盘已移走，气缸1下降");
+                //    SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_TopDown);
+                //    CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
+                //}
+                //else
+                //{
+                    CylinderMove(null, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
+                //}
             }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.MI_09_CylinderUp))
             {
@@ -295,10 +304,13 @@ namespace OnlineStore.DeviceLibrary
                 TrayManager.UpdateTrayInfo(num);
 
                 //阻挡气缸移动
-                SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
-                InLog("放托盘（放开阻挡）： " + MoveInfo.SLog + " 物品已移走，顶升气缸1下降");
-                SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_TopDown);
-                CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
+                //if (SecondMoveInfo.MoveStep < LineMoveStep.MO_14_TopDown)
+                //{
+                    //  SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
+                    InLog("放托盘（放开阻挡）： " + MoveInfo.SLog + " 物品已移走，顶升气缸1下降");
+                    SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_TopDown);
+                    CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
+                //}
             }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.MI_10_WaitBox))
             {

source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs

@@ -494,7 +494,7 @@ namespace OnlineStore.DeviceLibrary
                 LogInfo("出料 【" + posId + "】" + MoveInfo.SLog + " 更新托盘【" + num + "】为空");
                 // MoveInfo.WaitList.Add(WaitResultInfo.WaitProvidingEquipCanOut());
                 TrayManager.UpdateTrayInfo(num);
-                 
+
                 //阻挡气缸移动
                 MO_14_TopCylinder_Down();
             }

source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs

@@ -132,17 +132,18 @@ namespace OnlineStore.DeviceLibrary
                     {
                         continue;
                     }
-                    LogUtil.info(deviceName + " 【" + cameraName + "】开始打开相机获取图片");
+                    DateTime startTime = DateTime.Now;
+                    LogUtil.info(deviceName + " 【" + cameraName + "】开始取图片");
                     using (Bitmap bitmap = GetCamerImage(cameraName))
                     {
                         if (bitmap == null)
                         {
-                            LogUtil.error(deviceName + "  【" + cameraName + "】获取图片失败[" + Camera._cam.ErrInfo + "]，关闭相机");
+                            LogUtil.error(deviceName + "  【" + cameraName + "】取图片失败[" + Camera._cam.ErrInfo + "]，关闭相机");
                             CloseCamera(cameraName);
                             continue;
                         }
 
-                        LogUtil.info(deviceName + "  【" + cameraName + "】获取图片完成，开始转换图片，并扫码");
+                        LogUtil.info(deviceName + "  【" + cameraName + "】取图片完成，开始转换并扫码");
                         System.Threading.Thread.Sleep(1);
                         //转换托盘大概100-150ms,不打印日志
                         Bitmap bit = new Bitmap(bitmap);
@@ -174,9 +175,9 @@ namespace OnlineStore.DeviceLibrary
                         }
                         if (String.IsNullOrEmpty(r))
                         {
-                            SaveImageToFile(deviceName, cameraName, bit);
+                          //  SaveImageToFile(deviceName, cameraName, bit);
                         }
-                        LogUtil.info(deviceName + " 【" + cameraName + "】扫码完成：" + r);
+                        LogUtil.info(deviceName + " 【" + cameraName + "】扫码完成【" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "】：" + r);
                         bit.Dispose();
                         ho_Image.Dispose();
                         bitmap.Dispose();