From 630b88ea44380933602ae73b725b3772fc105c35 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 23 十二月 2024 17:11:15 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/03-point/ImportPumpChartPoint.cs | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/03-point/ImportPumpChartPoint.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/03-point/ImportPumpChartPoint.cs
index 25c792c..9ba4217 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/03-point/ImportPumpChartPoint.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/03-point/ImportPumpChartPoint.cs
@@ -27,6 +27,18 @@
private PhartDiagramRelationVmo _vmo;
+ //楠岃瘉
+ private bool Valid()
+ {
+ this.dxErrorProvider1.ClearErrors();
+ if (string.IsNullOrEmpty(this.textEditName.Text.Trim()))
+ {
+ this.dxErrorProvider1.SetError(this.textEditName, "蹇呴�夐」");
+ return false;
+ }
+ return true;
+ }
+
public void SetBindingData(AssetsPumpMainVmo pump)
{
if (pump == null)
@@ -38,6 +50,7 @@
_vmo.ObjectType = HStation.Assets.DataType.PumpMain;
_vmo.ObjectID = _pump.ID;
_vmo.Importance = 0;
+ this.textEditImportance.EditValue = 0;
this.pumpChartPointImportCtrl1.SetBindingData(_pump.RatedFlow, _pump.RatedHead, _pump.RatedSpeed, _pump.RatedEfficiency.Value);
}
@@ -57,6 +70,8 @@
return;
}
_vmo.DiagramID = diagramId;
+ _vmo.OtherName = this.textEditName.Text.Trim();
+ _vmo.Importance = int.Parse(this.textEditImportance.EditValue.ToString());
_vmo.ID = await BLLFactory<HStation.BLL.PhartDiagramRelation>.Instance.Insert(_vmo);
if (_vmo.ID < 1)
{
--
Gitblit v1.9.3