添加Enum描述转换器 板卡IO添加预定义配置

xcd

2020-07-03 cf4babd9a65efdb44163822f0b9137bef83a0bbf

 src/Bro.M071.Process/M071Process.cs

@@ -42,6 +42,16 @@
            InitialSetting();

            base.Open();

            CheckMachineState();
        }

        /// <summary>
        /// 检查设备状态
        /// </summary>
        private void CheckMachineState()
        {
            throw new NotImplementedException();
        }

        private void InitialSetting()
@@ -154,6 +164,8 @@
            }
        }

        List<ProductionMeasurement> productionList = new List<ProductionMeasurement>();

        [ProcessMethod("", "StartJob", "开始扫描", InvokeType.TestInvoke)]
        public ProcessResponse StartJob(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
        {
@@ -176,6 +188,16 @@
                Measurements = measurements,
            };

            var existedProduction = productionList.FirstOrDefault(u => u.Barcode == pMeasure.Barcode);
            if (existedProduction != null)
            {
                productionList.Remove(existedProduction);
                existedProduction.Dispose();
                existedProduction = null;
            }

            productionList.Add(pMeasure);

            pMeasure.InitialMeasurementsPropertyChanged();
            pMeasure.PropertyChanged += MeasureProduction_PropertyChanged;

@@ -183,27 +205,24 @@
                  {
                      _pauseHandle.WaitHandle.WaitOne();

                      IDevice device = DeviceCollection.FirstOrDefault(u => u.Id == s.MotionDevice);
                      IDevice device = DeviceCollection.FirstOrDefault(u => u.Id == s.MotionOp.Device);
                      if (device == null)
                          throw new ProcessException($"{s.Name}拍照点位未设置运动设备");

                      IMotion motionDevice = device as IMotion;
                      IMotionCard motionDevice = device as IMotionCard;

                      if (motionDevice == null)
                          throw new ProcessException($"{s.Name}拍照点位设置{device.Name}不是运动设备");

                      if (!motionDevice.MoveToPoint(null))
                      var response = motionDevice.Run(s.MotionOp.OpConfig);
                      if (!response.Result)
                      {
                          throw new ProcessException("运动中止", null, ExceptionLevel.Info);
                          throw new ProcessException($"{device.Name}异常，{response.Message}", null, ExceptionLevel.Info);
                      }

                      CameraBase camera = DeviceCollection.FirstOrDefault(u => u.Id == s.CameraOp.Device) as CameraBase;
                      if (camera == null)
                          return;

                      //IImageSet imgSet = camera.Snapshot(s.CameraOp.OpConfig);
                      //if (imgSet == null)
                      //    return;

                      HImage hImage = CollectHImage(camera, s.CameraOp.OpConfig, out string imgSetId);
                      if (string.IsNullOrWhiteSpace(imgSetId))
@@ -215,6 +234,7 @@
                  });

            BarCode = "";

            return new ProcessResponse(true);
        }

@@ -294,8 +314,12 @@
                                    }
                                }

                                LogAsync(DateTime.Now, $"{m.GetDisplayText()}检测结果", $"{((m.Spec.MeasureResult ?? false) ? "OK" : "NG")}");

                                IShapeElement indicator = null;
                                pMeasure.ElementList.Add(indicator);
                                //输出图形基元到界面 todo
                                OnElementUpdated?.BeginInvoke(null, null, null);
                                OnElementUpdated?.BeginInvoke(indicator, null, null);

                                SaveKeyImages(pMeasure.Barcode, m);

@@ -309,8 +333,6 @@
                        return;
                    }



                    //MES输出 todo

                    //Excel报表输出 todo
@@ -318,6 +340,8 @@
                    //数据库保存 todo

                    SaveWholeImage(pMeasure);

                    productionList.RemoveAll(p => p.Barcode == pMeasure.Barcode);
                    pMeasure.Dispose();
                }
            }