From 5c14c9686d2bd7c99fdd6cc6fc19404e6e4b8e4d Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 29 十一月 2024 15:02:20 +0800
Subject: [PATCH] 增加用水当量和用水器具界面

---
 WinFrmUI/HStation.WinFrmUI.WE.Core/WaterUtensil/EditWaterUtensilDlg.cs |  107 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.WE.Core/WaterUtensil/EditWaterUtensilDlg.cs b/WinFrmUI/HStation.WinFrmUI.WE.Core/WaterUtensil/EditWaterUtensilDlg.cs
index 5ea1359..6bebb6f 100644
--- a/WinFrmUI/HStation.WinFrmUI.WE.Core/WaterUtensil/EditWaterUtensilDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.WE.Core/WaterUtensil/EditWaterUtensilDlg.cs
@@ -15,79 +15,84 @@
         /// <summary>
         /// 鍥炶皟浜嬩欢
         /// </summary>
-   //     public event Func<Model.WaterUtensil, bool> ReloadDataEvent;
+        public event Func<Vmo.WE.UtensilVmo, Task<bool>> ReloadDataEvent;
 
         /// <summary>
         /// 楠岃瘉璇嗗埆鐮佹槸鍚﹀瓨鍦ㄤ簨浠�
         /// </summary>
-        public event Func<string, long, bool> VerifyTagNameExistEvent;
+        public event Func<string, long, Task<bool>> VerifyTagNameExistEvent;
 
-        //private Model.WaterUtensil _model = null;
+        private Vmo.WE.UtensilVmo _model = null;
 
         /// <summary>
         /// 缁戝畾
         /// </summary>
-      /*  public void SetBindingData(Model.WaterUtensil model)
+        public void SetBindingData(Vmo.WE.UtensilVmo model)
         {
-            _model = new Model.WaterUtensil(model);
+            _model = model;
             this.NameTextEdit.EditValue = _model.Name;
             this.TagNameTextEdit.EditValue = _model.TagName;
             this.DescriptionTextEdit.EditValue = _model.Description;
-            this.selectFlagsPopupCtrl1.SetBindingData(_model.Flags);
-        }*/
+            this.textEditRatedFlow.EditValue = _model.RatedFlow;
+            this.textEditMinRatedFlow.EditValue = _model.MinRatedFlow;
+        }
 
         //楠岃瘉
-        private bool Valid()
+        private async Task<bool> Valid()
         {
-            /*  this.dxErrorProvider1.ClearErrors();
-              if (string.IsNullOrEmpty(this.NameTextEdit.Text.Trim()))
-              {
-                  this.dxErrorProvider1.SetError(this.NameTextEdit, "蹇呭～椤�");
-                  return false;
-              }
+            this.dxErrorProvider1.ClearErrors();
+            if (string.IsNullOrEmpty(this.NameTextEdit.Text.Trim()))
+            {
+                this.dxErrorProvider1.SetError(this.NameTextEdit, "蹇呭～椤�");
+                return false;
+            }
+            var tagName = this.TagNameTextEdit.Text.Trim();
+            if (!string.IsNullOrEmpty(tagName))
+            {
+                if (_model.TagName != tagName)
+                {
+                    if (VerifyTagNameExistEvent != null)
+                    {
+                        if (await VerifyTagNameExistEvent(tagName, _model.ID))
+                        {
+                            this.dxErrorProvider1.SetError(this.TagNameTextEdit, "閲嶅");
+                            return false;
+                        }
+                    }
+                }
+            }
 
-              var tagName = this.TagNameTextEdit.Text.Trim();
-              if (!string.IsNullOrEmpty(tagName))
-              {
-                  if (_model.TagName != tagName)
-                  {
-                      if (VerifyTagNameExistEvent != null)
-                      {
-                          if (VerifyTagNameExistEvent(tagName, _model.ID))
-                          {
-                              this.dxErrorProvider1.SetError(this.TagNameTextEdit, "閲嶅");
-                              return false;
-                          }
-                      }
-                  }
-              }
-
-              return true;*/
             return true;
         }
 
         //纭畾
-        private void btnOk_Click(object sender, EventArgs e)
+        private async void btnOk_Click(object sender, EventArgs e)
         {
-            /* if (_model == null)
-                 return;
-             if (!Valid())
-                 return;
-             _model.Name = this.NameTextEdit.Text.Trim();
-             _model.Description = this.DescriptionTextEdit.Text.Trim();
-             _model.TagName = this.TagNameTextEdit.Text.Trim();
-             _model.Flags = this.selectFlagsPopupCtrl1.SelectedFlags;
-
-             if (this.ReloadDataEvent == null)
-                 return;
-             if (!this.ReloadDataEvent(_model))
-             {
-                 MessageBoxHelper.ShowError("鏇存柊澶辫触锛�");
-                 return;
-             }
-             MessageBoxHelper.ShowSuccess("鏇存柊鎴愬姛锛�");
-             this.DialogResult = System.Windows.Forms.DialogResult.OK;
-             this.Close();*/
+            if (_model == null)
+                return;
+            if (!await Valid())
+                return;
+            _model.Name = this.NameTextEdit.Text.Trim();
+            _model.Description = this.DescriptionTextEdit.Text.Trim();
+            _model.TagName = this.TagNameTextEdit.Text.Trim();
+            if (double.TryParse(this.textEditMinRatedFlow.Text, out double minRatedFlow))
+            {
+                _model.MinRatedFlow = minRatedFlow;
+            }
+            if (double.TryParse(this.textEditRatedFlow.Text, out double ratedFlow))
+            {
+                _model.RatedFlow = ratedFlow;
+            }
+            if (this.ReloadDataEvent == null)
+                return;
+            if (!await this.ReloadDataEvent(_model))
+            {
+                MessageBoxHelper.ShowError("鏇存柊澶辫触锛�");
+                return;
+            }
+            MessageBoxHelper.ShowSuccess("鏇存柊鎴愬姛锛�");
+            this.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.Close();
         }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3