From d1807075581920a8c94a409b11a9c88dd869be1e Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期四, 20 三月 2025 16:57:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/03-waterbox/SetHydroWaterboxDlg.cs | 105 +++++++++++++++++++++++++++++++---------------------
1 files changed, 62 insertions(+), 43 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/03-waterbox/SetHydroWaterboxDlg.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/03-waterbox/SetHydroWaterboxDlg.cs
index a2d05e3..bdf20be 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/03-waterbox/SetHydroWaterboxDlg.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/03-waterbox/SetHydroWaterboxDlg.cs
@@ -7,6 +7,7 @@
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
this.layoutControl1.SetupLayoutControl();
+ this.generalOkAndCancelCtrl1.OkEvent += GeneralOkAndCancelCtrl1_OkEvent;
}
/// <summary>
@@ -14,101 +15,119 @@
/// </summary>
public event Action<List<Yw.Model.HydroWaterboxInfo>> ReloadDataEvent;
- //鎵�鏈夐儴浠跺垪琛�
- private List<Yw.Model.HydroWaterboxInfo> _allVisualList = null;
+
+ private List<Yw.Model.HydroWaterboxInfo> _allVisualList = null;//鎵�鏈夐儴浠跺垪琛�
+ private HydroChangeHelper _changeHelper = null;//鏀瑰彉杈呭姪绫�
+ private HydroPropStatusHelper _propStatusHelper = null;//灞炴�х姸鎬佽緟鍔╃被
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(Yw.Model.HydroWaterboxInfo visual)
+ public void SetBindingData
+ (
+ Yw.Model.HydroWaterboxInfo visual,
+ HydroChangeHelper changeHelper = null,
+ HydroPropStatusHelper propStatusHelper = null
+ )
{
var allVisualList = visual == null ? null : new List<Yw.Model.HydroWaterboxInfo>() { visual };
- SetBindingData(allVisualList);
+ SetBindingData(allVisualList, changeHelper, propStatusHelper);
}
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(List<Yw.Model.HydroWaterboxInfo> allVisualList)
+ public void SetBindingData
+ (
+ List<Yw.Model.HydroWaterboxInfo> allVisualList,
+ HydroChangeHelper changeHelper = null,
+ HydroPropStatusHelper propStatusHelper = null
+ )
{
_allVisualList = allVisualList;
+ _changeHelper = changeHelper;
+ _propStatusHelper = propStatusHelper;
if (_allVisualList != null && _allVisualList.Count == 1)
{
var visual = _allVisualList.First();
- this.txtPoolElev.EditValue = Math.Round(visual.PoolElev, 4);
+ this.txtBeginGroup.EditValue = visual.BeginGroup;
this.txtInitLevel.EditValue = Math.Round(visual.InitLevel, 4);
this.txtMinLevel.EditValue = Math.Round(visual.MinLevel, 4);
this.txtMaxLevel.EditValue = Math.Round(visual.MaxLevel, 4);
this.txtDN.EditValue = Math.Round(visual.DN, 4);
+ this.txtMinVol.EditValue = Math.Round(visual.MinVol, 2);
}
}
- //楠岃瘉
- private bool Valid()
- {
- this.dxErrorProvider1.ClearErrors();
- if (this.txtPoolElev.EditValue == null)
- {
- this.dxErrorProvider1.SetError(this.txtPoolElev, "蹇呭～椤�");
- return false;
- }
- if (this.txtInitLevel.EditValue == null)
- {
- this.dxErrorProvider1.SetError(this.txtInitLevel, "蹇呭～椤�");
- return false;
- }
- if (this.txtMinLevel.EditValue == null)
- {
- this.dxErrorProvider1.SetError(this.txtMinLevel, "蹇呭～椤�");
- return false;
- }
- if (this.txtMaxLevel.EditValue == null)
- {
- this.dxErrorProvider1.SetError(this.txtMaxLevel, "蹇呭～椤�");
- return false;
- }
- if (this.txtDN.EditValue == null)
- {
- this.dxErrorProvider1.SetError(this.txtDN, "蹇呭～椤�");
- return false;
- }
- return true;
- }
-
- //
- private void btnOk_Click(object sender, EventArgs e)
+ //纭畾
+ private void GeneralOkAndCancelCtrl1_OkEvent()
{
if (_allVisualList == null || _allVisualList.Count < 1)
{
return;
}
- double? poolElev = this.txtPoolElev.EditValue == null ? null : double.Parse(this.txtPoolElev.EditValue.ToString());
+ var beginGroup = this.txtBeginGroup.Text.Trim();
double? initLevel = this.txtInitLevel.EditValue == null ? null : double.Parse(this.txtInitLevel.EditValue.ToString());
double? minLevel = this.txtMinLevel.EditValue == null ? null : double.Parse(this.txtMinLevel.EditValue.ToString());
double? maxLevel = this.txtMaxLevel.EditValue == null ? null : double.Parse(this.txtMaxLevel.EditValue.ToString());
double? dn = this.txtDN.EditValue == null ? null : double.Parse(this.txtDN.EditValue.ToString());
+ double? minVol = this.txtMinVol.EditValue == null ? null : double.Parse(this.txtMinVol.EditValue.ToString());
_allVisualList.ForEach(x =>
{
- if (poolElev.HasValue)
+ if (!string.IsNullOrEmpty(beginGroup))
{
- x.PoolElev = poolElev.Value;
+ if (x.BeginGroup != beginGroup)
+ {
+ _changeHelper.Append(x, eChangeType.Update);
+ _propStatusHelper?.UpdatePropStatus(x.Code, nameof(x.BeginGroup), Yw.Hydro.ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}閫氳繃璁剧疆缁勪欢淇敼");
+ }
+ x.BeginGroup = beginGroup;
}
if (initLevel.HasValue)
{
+ if (x.InitLevel != initLevel.Value)
+ {
+ _changeHelper.Append(x, eChangeType.Update);
+ _propStatusHelper?.UpdatePropStatus(x.Code, nameof(x.InitLevel), Yw.Hydro.ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}閫氳繃璁剧疆缁勪欢淇敼");
+ }
x.InitLevel = initLevel.Value;
}
if (minLevel.HasValue)
{
+ if (x.MinLevel != minLevel.Value)
+ {
+ _changeHelper.Append(x, eChangeType.Update);
+ _propStatusHelper?.UpdatePropStatus(x.Code, nameof(x.MinLevel), Yw.Hydro.ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}閫氳繃璁剧疆缁勪欢淇敼");
+ }
x.MinLevel = minLevel.Value;
}
if (maxLevel.HasValue)
{
+ if (x.MaxLevel != maxLevel.Value)
+ {
+ _changeHelper.Append(x, eChangeType.Update);
+ _propStatusHelper?.UpdatePropStatus(x.Code, nameof(x.MaxLevel), Yw.Hydro.ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}閫氳繃璁剧疆缁勪欢淇敼");
+ }
x.MaxLevel = maxLevel.Value;
}
if (dn.HasValue)
{
+ if (x.DN != dn.Value)
+ {
+ _changeHelper.Append(x, eChangeType.Update);
+ _propStatusHelper?.UpdatePropStatus(x.Code, nameof(x.DN), Yw.Hydro.ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}閫氳繃璁剧疆缁勪欢淇敼");
+ }
x.DN = dn.Value;
}
+ if (minVol.HasValue)
+ {
+ if (x.MinVol != minVol.Value)
+ {
+ _changeHelper.Append(x, eChangeType.Update);
+ _propStatusHelper?.UpdatePropStatus(x.Code, nameof(x.MinVol), Yw.Hydro.ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}閫氳繃璁剧疆缁勪欢淇敼");
+ }
+ x.MinVol = minVol.Value;
+ }
});
this.ReloadDataEvent?.Invoke(_allVisualList);
this.DialogResult = DialogResult.OK;
--
Gitblit v1.9.3