From abbe29e54421c136aa6eb4ef11935c70d818101a Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 20 九月 2024 11:59:09 +0800
Subject: [PATCH] 属性修改
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/AddPipeLineMainDlg.cs | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/AddPipeLineMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/AddPipeLineMainDlg.cs
index 5bd165b..0ad5a83 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;
}
@@ -79,16 +84,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 || manning.EndValue != string.Empty)
+ if (manning.EndValue != null && manning.EndValue != string.Empty)
{
this.toolTipController1.SetToolTip(TextEditManningValue, "姝ｇ‘鑼冨洿搴斿湪:" + string.Format("{0}~{1}", manning.StartValue, manning.EndValue));
}
@@ -97,10 +102,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 || hazen.EndValue != string.Empty)
+ if (hazen.EndValue != null && hazen.EndValue != string.Empty)
{
this.toolTipController1.SetToolTip(TextEditHazenValue, "姝ｇ‘鑼冨洿搴斿湪:" + string.Format("{0}~{1}", hazen.StartValue, hazen.EndValue));
}
@@ -109,16 +114,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 || darcy.EndValue != string.Empty)
+ 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