Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

xcd

2020-07-02 9cedbf3a4e9cc7c18df0b5424891f77c9dcb2988

 src/Bro.M071.Process/M071Process.cs

@@ -154,6 +154,8 @@
            }
        }

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

        [ProcessMethod("", "StartJob", "开始扫描", InvokeType.TestInvoke)]
        public ProcessResponse StartJob(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
        {
@@ -161,6 +163,12 @@
            {
                throw new ProcessException("未输入产品条码，请勿开始测量");
            }

            //检查产品放置OK

            //气缸推动压板移动到产品上方

            //压板压紧产品

            OnMeasureStart?.BeginInvoke(null, null);

@@ -175,6 +183,16 @@
                Barcode = BarCode,
                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;
@@ -201,10 +219,6 @@
                      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 +229,9 @@
                  });

            BarCode = "";



            return new ProcessResponse(true);
        }

@@ -294,8 +311,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 +330,6 @@
                        return;
                    }



                    //MES输出 todo

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

                    SaveWholeImage(pMeasure);

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