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/04-pipe/03-factor/AddAssetsPipeFactorDlg.cs |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AddAssetsPipeFactorDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AddAssetsPipeFactorDlg.cs
index af33445..8155bdd 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AddAssetsPipeFactorDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AddAssetsPipeFactorDlg.cs
@@ -66,6 +66,8 @@
             }
             _vmo.Name = this.txtName.Text.Trim();
             _vmo.MinorLoss = double.Parse(this.txtMinorLoss.EditValue?.ToString());
+            _vmo.Caliber = this.txtCaliber.EditValue == null ? null : double.Parse(this.txtCaliber.EditValue?.ToString());
+            _vmo.Material = this.txtMaterial.EditValue == null ? null : this.txtMaterial.EditValue?.ToString();
             _vmo.Description = this.txtDescription.Text.Trim();
             var id = await BLLFactory<HStation.BLL.AssetsPipeFactor>.Instance.Insert(_vmo);
             if (id < 1)

--
Gitblit v1.9.3