diff --git a/ViewModel/Grading/GradingLoadingVM.cs b/ViewModel/Grading/GradingLoadingVM.cs index 8d6df9b..92f4cb0 100644 --- a/ViewModel/Grading/GradingLoadingVM.cs +++ b/ViewModel/Grading/GradingLoadingVM.cs @@ -342,6 +342,8 @@ public class GradingLoadingVM : BaseViewModel,IDisposable new JProperty("algo_config", JObject.Parse(algo_config)) ); Logger.Info($"算法启动,输入参数(Encrypt):{AESHelper.Encrypt(jsonData.ToString())}"); + //算法启动前关闭气泵,算法执行完毕时按需打开,确保算法导致程序闪退后气泵未关闭 + SOCClientService.Service.OpenPump(false); _scanner = new Scanner(diamond); var detectTask = _scanner.DetectAsyncByJsonStr(jsonData.ToString()); Logger.Info($"开始等待算法结果"); @@ -429,10 +431,12 @@ public class GradingLoadingVM : BaseViewModel,IDisposable parameter.ErrorMsg = _diamnondType; //实验室模式关闭气泵 - if (Common.RunMode == 0) + if (Common.RunMode == 1) { - SOCClientService.Service.OpenPump(false); + //工厂模式下再打开 + SOCClientService.Service.OpenPump(true); } + _monitorTimer.Dispose(); try { diff --git a/ViewModel/Grading/GradingResultVM.cs b/ViewModel/Grading/GradingResultVM.cs index 0bbecf3..88ad1d9 100644 --- a/ViewModel/Grading/GradingResultVM.cs +++ b/ViewModel/Grading/GradingResultVM.cs @@ -1844,7 +1844,11 @@ public class GradingResultVM : BaseViewModel [Log] public void ChangeSym(object norm) { - decimal? order = this.DtResults.Where(x => x.TestItemId != "TWIST").Select(x => x.SymLevel).Max(); + //&& x.TestItemId != "GIRDLE_BEZEL" && x.TestItemId != "GIRDLE_BONE" && x.TestItemId != "GIRDLE" + decimal? order = this.DtResults.Where(x => + x.TestItemId != "TWIST"&& x.TestItemId != "GIRDLE_BEZEL" && + x.TestItemId != "GIRDLE_BONE" && x.TestItemId != "GIRDLE" ) + .Select(x => x.SymLevel).Max(); if (order.HasValue) { totalSymGrade = order.Value;