From 9ffb31c233f3b4891550293294c2ee716f77b42a Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期日, 22 九月 2024 19:08:49 +0800
Subject: [PATCH] 完善自动匹配
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/AddPipeLineMainDlg.cs | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/AddPipeLineMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/AddPipeLineMainDlg.cs
index aee272d..98995df 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/AddPipeLineMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/AddPipeLineMainDlg.cs
@@ -47,6 +47,11 @@
this.dxErrorProvider1.SetError(this.TextEditName, "蹇呭～椤�");
return false;
}
+ if (string.IsNullOrEmpty(TextEditHazenValue.Text.Trim()))
+ {
+ this.dxErrorProvider1.SetError(this.TextEditHazenValue, "蹇呭～椤�");
+ return false;
+ }
return true;
}
@@ -56,13 +61,24 @@
if (!(Valid()))
return;
_PipeLineVmo.Material = TextEditMaterial.Text.Trim();
- _PipeLineVmo.Coefficient = TextEditHazenValue.Text.Trim();
+ if (double.TryParse(TextEditHazenValue.Text, out double hazen))
+ {
+ _PipeLineVmo.Hazen = hazen;
+ }
_PipeLineVmo.Description = DescriptionTextEdit.Text.Trim();
_PipeLineVmo.Name = TextEditName.Text.Trim();
- _PipeLineVmo.Caliber = TextEditCaliber.Text.Trim();
- _PipeLineVmo.Hazen = TextEditHazenValue.Text;
- _PipeLineVmo.Darcy = TextEditDarcyValue.Text;
- _PipeLineVmo.Manning = TextEditManningValue.Text;
+ if (double.TryParse(TextEditCaliber.Text, out double caliber))
+ {
+ _PipeLineVmo.Caliber = caliber;
+ }
+ if (double.TryParse(TextEditDarcyValue.Text, out double darcy))
+ {
+ _PipeLineVmo.Darcy = darcy;
+ }
+ if (double.TryParse(TextEditManningValue.Text, out double manning))
+ {
+ _PipeLineVmo.Manning = manning;
+ }
if (await this.ReloadDataEvent.Invoke(_PipeLineVmo))
{
TipFormHelper.ShowSucceed("娣诲姞鎴愬姛!");
@@ -79,16 +95,16 @@
{
TextEditManningValue.Text = null;
TextEditHazenValue.Text = null;
- TextEditManningValue.Text = null;
+ TextEditDarcyValue.Text = null;
var bll = new BLL.PipeLineRoughnessCoefficient();
var materialid = Convert.ToInt64(TextEditMaterial.EditValue);
var alllist = await bll.GetByPipeID(materialid);
if (alllist == null || alllist.Count == 0)
return;
- var manning = alllist.Find(x => x.eAlgorithmType == Service.Assets.eAlgorithmType.Manning);
+ var manning = alllist.Find(x => x.eAlgorithmType == HStation.Assets.eAlgorithmType.Manning);
if (manning != null)
{
- if (manning.EndValue != null)
+ if (manning.EndValue != null && manning.EndValue != string.Empty)
{
this.toolTipController1.SetToolTip(TextEditManningValue, "姝ｇ‘鑼冨洿搴斿湪:" + string.Format("{0}~{1}", manning.StartValue, manning.EndValue));
}
@@ -97,10 +113,10 @@
this.TextEditManningValue.Text = manning.StartValue.ToString();
}
}
- var hazen = alllist.Find(x => x.eAlgorithmType == Service.Assets.eAlgorithmType.Hazen);
+ var hazen = alllist.Find(x => x.eAlgorithmType == HStation.Assets.eAlgorithmType.Hazen);
if (hazen != null)
{
- if (hazen.EndValue != null)
+ if (hazen.EndValue != null && hazen.EndValue != string.Empty)
{
this.toolTipController1.SetToolTip(TextEditHazenValue, "姝ｇ‘鑼冨洿搴斿湪:" + string.Format("{0}~{1}", hazen.StartValue, hazen.EndValue));
}
@@ -109,16 +125,19 @@
this.TextEditHazenValue.Text = hazen.StartValue.ToString();
}
}
- var darcy = alllist.Find(x => x.eAlgorithmType == Service.Assets.eAlgorithmType.Darcy);
+ var darcy = alllist.Find(x => x.eAlgorithmType == HStation.Assets.eAlgorithmType.Darcy);
if (darcy != null)
{
- if (darcy.EndValue != null)
+ if (darcy.EndValue != null && darcy.EndValue != string.Empty)
{
this.toolTipController1.SetToolTip(TextEditDarcyValue, "姝ｇ‘鑼冨洿搴斿湪:" + string.Format("{0}~{1}", darcy.StartValue, darcy.EndValue));
}
else
{
- this.TextEditDarcyValue.Text = darcy.StartValue.ToString();
+ if (darcy.StartValue != null)
+ {
+ this.TextEditDarcyValue.Text = darcy.StartValue.ToString();
+ }
}
}
}
--
Gitblit v1.9.3