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/03-valve/03-factor/AddAssetsValveFactorDlg.cs | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/AddAssetsValveFactorDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/AddAssetsValveFactorDlg.cs
index f2c64c4..55e30e5 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/AddAssetsValveFactorDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/AddAssetsValveFactorDlg.cs
@@ -46,11 +46,6 @@
this.dxErrorProvider1.SetError(this.txtName, "蹇呭～椤�");
return false;
}
- if (string.IsNullOrEmpty(this.txtMaterial.Text.Trim()))
- {
- this.dxErrorProvider1.SetError(this.txtMaterial, "蹇呭～椤�");
- return false;
- }
if (string.IsNullOrEmpty(this.txtMinorLoss.Text.Trim()))
{
this.dxErrorProvider1.SetError(this.txtMinorLoss, "蹇呭～椤�");
@@ -74,6 +69,7 @@
_vmo.Material = this.txtMaterial.Text.Trim();
_vmo.Caliber = this.txtCaliber.EditValue == null ? null : double.Parse(this.txtCaliber.EditValue?.ToString());
_vmo.MinorLoss = double.Parse(this.txtMinorLoss.EditValue?.ToString());
+ _vmo.Description = this.txtDescription.EditValue?.ToString();
var id = await BLLFactory<HStation.BLL.AssetsValveFactor>.Instance.Insert(_vmo);
if (id < 1)
{
--
Gitblit v1.9.3