From bbb8cc3c15b677e05d0840de0d97db0ec9b230c2 Mon Sep 17 00:00:00 2001
From: Tongg <tongguibina@163.com>
Date: Tue, 18 Mar 2025 16:15:55 +0800
Subject: [PATCH] fix bug

---
 App.config                                    |  2 +-
 .../Configuration/SettingsPages/SettingsVM.cs |  6 ++-
 ViewModel/Grading/GradingResultVM.cs          | 42 ++++++++++++-------
 Views/Grading/GradingResult.xaml.cs           |  1 +
 .../ViewportData/Helper/ViewportHelperPro.cs  |  4 +-
 5 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/App.config b/App.config
index cb1b6f9..293721d 100644
--- a/App.config
+++ b/App.config
@@ -18,7 +18,7 @@
         <add key="ProgressTime" value="50000"/>
         
         <add key="RunModel" value="0" />
-        <add key="AppVersion" value="1.0.20250311" />
+        <add key="AppVersion" value="1.0.20250318" />
     </appSettings>
     <connectionStrings>
         <add name="" connectionString=""/>
diff --git a/ViewModel/Configuration/SettingsPages/SettingsVM.cs b/ViewModel/Configuration/SettingsPages/SettingsVM.cs
index 68dabc2..64be23d 100644
--- a/ViewModel/Configuration/SettingsPages/SettingsVM.cs
+++ b/ViewModel/Configuration/SettingsPages/SettingsVM.cs
@@ -61,7 +61,10 @@ namespace SparkClient.ViewModel.Configuration.SettingsPages
         public string NowRunMode
         {
             get { return _nowRunMode; }
-            set { _nowRunMode = value; OnPropertyChanged(nameof(NowRunMode)); }
+            set { 
+                _nowRunMode = value; 
+                OnPropertyChanged(nameof(NowRunMode));
+            }
         }
 
         public SettingsVM()
@@ -232,6 +235,7 @@ namespace SparkClient.ViewModel.Configuration.SettingsPages
                     ItemName = "运行模式",
                     Value = NowRunMode,
                 };
+                Common.RunMode = int.Parse(NowRunMode);
                 runModeData.insert();
             }
             catch (Exception ex)
diff --git a/ViewModel/Grading/GradingResultVM.cs b/ViewModel/Grading/GradingResultVM.cs
index bd9d067..609d2c6 100644
--- a/ViewModel/Grading/GradingResultVM.cs
+++ b/ViewModel/Grading/GradingResultVM.cs
@@ -1625,19 +1625,27 @@ public class GradingResultVM : BaseViewModel
     [Log]
     public RowDetail getSelectData(string testItemId)
     {
-        RowDetail row = new RowDetail();
-        row.itemName = GetName(testItemId);
-        ViewportData.mockSel(testItemId);
-        var data = DtResults.Where(x => x.TestItemId == testItemId).FirstOrDefault();
-        row.Avg = data != null ? data.Avg : "";
-        row.Dev = data != null ? data.Dev : "";
-        row.Max = data != null ? data.Max : "";
-        row.Min = data != null ? data.Min : "";
-        row.CutLevel = data != null ? data.CutLevel : "";
-        row.SymLevel = GetGradeName(data != null ? data.SymLevel??0 : 0);
-        setDetailItems(row, testItemId);
-        this.SelRowDataDetail = row;
-        return row;
+        try
+        {
+            RowDetail row = new RowDetail();
+            row.itemName = GetName(testItemId);
+            ViewportData.mockSel(testItemId);
+            var data = DtResults.Where(x => x.TestItemId == testItemId).FirstOrDefault();
+            row.Avg = data != null ? data.Avg : "";
+            row.Dev = data != null ? data.Dev : "";
+            row.Max = data != null ? data.Max : "";
+            row.Min = data != null ? data.Min : "";
+            row.CutLevel = data != null ? data.CutLevel : "";
+            row.SymLevel = GetGradeName(data != null ? data.SymLevel ?? 0 : 0);
+            setDetailItems(row, testItemId);
+            this.SelRowDataDetail = row;
+            return row;
+        }
+        catch (Exception ex)
+        {
+            Logger.Error($"虾集霸点：{ex.Message}");
+            return null;
+        }
     }
     [Log]
     private void setDetailItems(RowDetail row,string TestItemId)
@@ -1963,7 +1971,13 @@ public class GradingResultVM : BaseViewModel
     // 执行热敏打印的方法
     [Log]
     private void ExecuteThermalPrint(object parameter)
-    {        
+    {
+        if (Common.RunMode == 1)
+        {
+            new MessageBox().Show("打印功能不可用");
+            return;
+        }
+
         Microsoft.Office.Interop.Excel.Application excelApp = null;
         string tempFilePath = string.Empty;
         try
diff --git a/Views/Grading/GradingResult.xaml.cs b/Views/Grading/GradingResult.xaml.cs
index 44fbd94..08db731 100644
--- a/Views/Grading/GradingResult.xaml.cs
+++ b/Views/Grading/GradingResult.xaml.cs
@@ -207,6 +207,7 @@ public partial class GradingResult
         if(oo == null) return;
         var d = DataContext as GradingResultVM;
         RowDetail rowDetail = d.getSelectData((oo.Item as DataInfo).TestItemId);
+        if (rowDetail == null) return;
       
         if (!_allPopups.Contains(popup))
         {
diff --git a/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs b/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs
index a1487da..2e18be1 100644
--- a/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs
+++ b/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs
@@ -589,7 +589,7 @@ public class ViewportHelperPro
     {
         var result = new List<GeometryModel3D>();
         string steps = ViewportManager.DiamondType.Split(" ").Last();
-        if (Common.RunMode == 0 && steps.StartsWith("S"))
+        if (Common.RunMode == 0)
         {
             Logger.Info("【面文本生成】开始生成面相关文本信息");
             var selFacet = entities;
@@ -1037,7 +1037,7 @@ public class ViewportHelperPro
             var selFacetType = entities.First().PlaneType;
             
             string step = ViewportManager.DiamondType.Split(" ").Last();
-            if ("S1".Equals(step))
+            if ("S1".Equals(step) && selFacetType == PlaneType.CrownIncomplete)
             {
                 try
                 {