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/EditAssetsPipeFactorDlg.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/EditAssetsPipeFactorDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/EditAssetsPipeFactorDlg.cs
index cbb98ed..a46fed8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/EditAssetsPipeFactorDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/EditAssetsPipeFactorDlg.cs
@@ -64,8 +64,9 @@
}
_vmo.Name = this.txtName.Text.Trim();
_vmo.MinorLoss = double.Parse(this.txtMinorLoss.EditValue?.ToString());
- _vmo.Description = this.txtDescription.Text.Trim();
- var bol = await BLLFactory<HStation.BLL.AssetsPipeFactor>.Instance.Update(_vmo);
+ _vmo.Caliber = double.Parse(this.txtCaliber.EditValue?.ToString());
+ _vmo.Material = this.txtMaterial.EditValue?.ToString();
+ _vmo.Description = this.txtDescription.Text.Trim(); var bol = await BLLFactory<HStation.BLL.AssetsPipeFactor>.Instance.Update(_vmo);
if (!bol)
{
TipFormHelper.ShowError("鏇存柊澶辫触锛�");
--
Gitblit v1.9.3