From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/AddAssetsBluntheadFactorDlg.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/AddAssetsBluntheadFactorDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/AddAssetsBluntheadFactorDlg.cs
index 4917ff2..f9ad3a1 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/AddAssetsBluntheadFactorDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/AddAssetsBluntheadFactorDlg.cs
@@ -68,7 +68,7 @@
}
_vmo.Name = this.txtName.Text.Trim();
_vmo.MinorLoss = double.Parse(this.txtMinorLoss.EditValue?.ToString());
- _vmo.Caliber = double.Parse(this.txtDiameter.EditValue?.ToString());
+ _vmo.Caliber = this.txtDiameter.EditValue == null ? null : double.Parse(this.txtDiameter.EditValue?.ToString());
_vmo.Material = this.txtMaterial.Text.Trim();
_vmo.Description = this.txtDescription.Text.Trim();
var id = await BLLFactory<HStation.BLL.AssetsBluntheadFactor>.Instance.Insert(_vmo);
--
Gitblit v1.9.3