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

wells.liu

2020-07-06 f9c7928bff92596686e05a15fef21d499e954088

 src/Bro.M071.Process/M071Process.cs

@@ -47,6 +47,11 @@

            base.Open();

            SwitchBeep(false);
            SwitchLightGreen(false);
            SwitchLightRed(false);
            SwitchLightYellow(false);

            Reset(null, null, null);
            FullReset(null);
        }
@@ -55,6 +60,8 @@
        {
            //数据库迁移检查
            DatabaseInitialize.Initialize();

            MotionCardSettingCheck();

            Config.SnapshotPointCollection.ForEach(u =>
            {
@@ -353,28 +360,28 @@
                    {
                        return;
                    }

                    pMeasure.EndTime = DateTime.Now;
                    bool pResult = pMeasure.Measurements.All(u => u.Spec.MeasureResult == true);
                    OnUpdateResult?.Invoke(DateTime.Now, pResult ? 1 : 0);
                    OnUpdateCT?.Invoke((float)(pMeasure.EndTime.Value - pMeasure.StartTime.Value).TotalSeconds);

                    LogAsync(DateTime.Now, $"{pMeasure.Barcode} 检测完成，结果 {(pResult ? "OK" : "NG")}", "");

                    if (MachineState == MachineState.Running)
                        MachineState = MachineState.Ready;

                    //MES输出 todo

                    //Excel报表输出 todo

                    //数据库保存 todo

                    SaveWholeImage(pMeasure);

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

                pMeasure.EndTime = DateTime.Now;
                bool pResult = pMeasure.Measurements.All(u => u.Spec.MeasureResult == true);
                OnUpdateResult?.Invoke(DateTime.Now, pResult ? 1 : 0);
                OnUpdateCT?.Invoke((float)(pMeasure.EndTime.Value - pMeasure.StartTime.Value).TotalSeconds);

                LogAsync(DateTime.Now, $"{pMeasure.Barcode} 检测完成，结果 {(pResult ? "OK" : "NG")}", "");

                if (MachineState == MachineState.Running)
                    MachineState = MachineState.Ready;

                //MES输出 todo

                //Excel报表输出 todo

                //数据库保存 todo

                SaveWholeImage(pMeasure);

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