From 21035167c86b0c844117bc527a7d8180d0acac9d Mon Sep 17 00:00:00 2001
From: lihanbo <lihanbo@sinvo.cn>
Date: Sat, 26 Oct 2024 14:01:32 +0800
Subject: [PATCH] =?UTF-8?q?105040=20=E4=BF=AE=E5=A4=8D=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=9A=84=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/MainViewModel.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/MainViewModel.cs b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/MainViewModel.cs
index 946202e..98bce55 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/MainViewModel.cs
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/MainViewModel.cs
@@ -159,7 +159,7 @@ public partial class MainViewModel : INotifyPropertyChanged
 
     public Task<List<ReportModel>> LoadReportDataAsync(IEnumerable<BaseReportEntry> data, List<ReportColumn> columns)
     {
-        var savedFlagType = FormUISettings.Instance.GetValue("FlagType");
+        var savedFlagType = FormUISettings.Instance.GetValue("FlagType") ?? WireFlagType.Dual;
         if (Enum.IsDefined(typeof(WireFlagType), savedFlagType))
         {
             FlagType = (WireFlagType)Enum.Parse(typeof(WireFlagType), savedFlagType.ToString());
@@ -454,7 +454,8 @@ public partial class MainViewModel : INotifyPropertyChanged
                 RearTerminalStripLength = stuffedDataModel.RearStripLength,
                 InsulationModel = stuffedDataModel.Insulation?.Specification,
                 InsulationMaterialNo = stuffedDataModel.Insulation?.MaterialCode,
-                OrderDate = nowDateStr
+                OrderDate = nowDateStr,
+                IsIgnoreError = stuffedDataModel.IsIgnore ? "是" : string.Empty
             };
             seqNo++;
             dataList.Add(exportModel);