From 8044d55d7b2ef859e926f6968b239fa3212552bb Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期二, 18 三月 2025 09:56:39 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.cs | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.cs b/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.cs
index 3864d07..8670af7 100644
--- a/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.cs
+++ b/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.cs
@@ -44,6 +44,11 @@
this.dxErrorProvider1.SetError(this.comboBoxCompletePlant, "蹇呭～椤�");
isExist = false;
}*/
+ if (this.textEditWaterModel.EditValue == null)
+ {
+ this.dxErrorProvider1.SetError(this.textEditWaterModel, "蹇呭～椤�");
+ isExist = false;
+ }
if (this.comboBoxWaterSupply.Text == "璇烽�夋嫨")
{
this.dxErrorProvider1.SetError(this.comboBoxWaterSupply, "蹇呭～椤�");
@@ -101,7 +106,10 @@
return null;
_facilityVmo.Floor = int.Parse(txtFloor.Text);
_facilityVmo.Name = txtName.Text;
- _facilityVmo.SupplyMode = HStation.PBS.eSupplyMode.WaterTank;
+ if (this.textEditWaterModel.EditValue != null)
+ {
+ _facilityVmo.SupplyMode = (HStation.PBS.eSupplyMode)this.textEditWaterModel.EditValue;
+ }
_facilityVmo.UseStatus = Yw.Vmo.eUseStatus.Enable;
_facilityVmo.FloorHeight = double.Parse(txtFloorHeight.Text);
_facilityVmo.Households = int.Parse(txtFloorHouseHolds.Text);
--
Gitblit v1.9.3