FIX:

ViewModel/BaseWindow/HomeWindowVM.cs

@@ -58,18 +58,18 @@ public class HomeWindowVM : BaseViewModel
            //WindowManager.mainViewModel.Content = vm;
            //WindowManager.openContent.Add(vm);
 
-            MessageBox messageBox = new MessageBox();
+            //MessageBox messageBox = new MessageBox();
-            MessageBoxResult result = messageBox.ShowInput(MultilingualHelper.getString("UpdateDiamondCode"),out string inputStr,
+            //MessageBoxResult result = messageBox.ShowInput(MultilingualHelper.getString("UpdateDiamondCode"),out string inputStr,
-                MultilingualHelper.getString("ok"),
+            //    MultilingualHelper.getString("ok"),
-                MultilingualHelper.getString("Skip")
+            //    MultilingualHelper.getString("Skip")
-                );
+            //    );
-            if (result != MessageBoxResult.None)
+            //if (result != MessageBoxResult.None)
-            {
+            //{
-                BaseControlVM vm = new BaseControlVM(new DiamondSelectVM(inputStr), MultilingualHelper.getString("DiamondSelect"));
+                BaseControlVM vm = new BaseControlVM(new DiamondSelectVM(), MultilingualHelper.getString("DiamondSelect"));
                 vm.ShowFunctionButton = System.Windows.Visibility.Hidden;
                 WindowManager.mainViewModel.Content = vm;
                 WindowManager.openContent.Add(vm);
-            }
+            //}
        }
        catch (Exception e)
        {

ViewModel/Dialog/StartDialogVM.cs

@@ -34,7 +34,7 @@ namespace SparkClient.ViewModel.Dialog
 
         public void Skip(object parameter)
         {
-            BaseControlVM vm = new BaseControlVM(new DiamondSelectVM(""), MultilingualHelper.getString("DiamondSelect"));
+            BaseControlVM vm = new BaseControlVM(new DiamondSelectVM(), MultilingualHelper.getString("DiamondSelect"));
             vm.ShowFunctionButton = System.Windows.Visibility.Hidden;
             WindowManager.mainViewModel.Content = vm;
             WindowManager.openContent.Add(vm);
@@ -43,7 +43,7 @@ namespace SparkClient.ViewModel.Dialog
         public void Ok(object parameter)
         {
             if (InputText != null && InputText.Trim().Length > 0) { 
-                BaseControlVM vm = new BaseControlVM(new DiamondSelectVM(InputText), MultilingualHelper.getString("DiamondSelect"));
+                BaseControlVM vm = new BaseControlVM(new DiamondSelectVM(), MultilingualHelper.getString("DiamondSelect"));
                 vm.ShowFunctionButton = System.Windows.Visibility.Hidden;
                 WindowManager.mainViewModel.Content = vm;
                 WindowManager.openContent.Add(vm);

ViewModel/Grading/DiamondSelectVM.cs

@@ -50,11 +50,10 @@ public class DiamondSelectVM : BaseViewModel
         }
     }
     
-    public DiamondSelectVM(string DiamondCode)
+    public DiamondSelectVM()
     {
         ChangeDiamondTypeCommand = new RelayCommand(ChangeDiamondType);
         StartGradingCommand = new RelayCommand(StartGrading);
-        this.DiamondCode = DiamondCode;
         List<ButtonViewModel> tempButtons = new List<ButtonViewModel>();
         List<ButtonInfo> buttonInfos = GetButtonInfos();
         foreach (var buttonInfo in buttonInfos)
@@ -114,8 +113,21 @@ public class DiamondSelectVM : BaseViewModel
     /// <param name="param"></param>
     public async void StartGrading(object param)
     {
-        #if DEBUG
+        MessageBox messageBox = new MessageBox();
-        DoStartGrading(param);
+        MessageBoxResult result = messageBox.ShowInput(MultilingualHelper.getString("UpdateDiamondCode"), out string inputStr,
+            MultilingualHelper.getString("ok"),
+            MultilingualHelper.getString("Skip")
+            );
+        if (result == MessageBoxResult.None)
+        {
+            return;
+        }
+        if (result == MessageBoxResult.OK)
+        {
+            DiamondCode = inputStr.Trim();
+        }
+#if DEBUG
+            DoStartGrading(param);
 #else
         LoadingDialog loading = new LoadingDialog();
         try

ViewModel/Grading/GradingResultVM.cs

@@ -286,11 +286,12 @@ public class GradingResultVM : BaseViewModel
             }
             if (isThisGrade)
             {
+                order = gradeInfo.gradeOrder;
                 break;
             }
             else
             {
-                order++;
+                order = gradeInfo.gradeOrder;
             }
         }
         totalCutGrade = Math.Max(order, totalCutGrade);