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> LoadReportDataAsync(IEnumerable data, List 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);