From 1fe41eb1c9f2b2914b4a66a145f1ad0a75b9c915 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 18 十月 2024 11:18:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddPipeMainDlg.cs | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddPipeMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddPipeMainDlg.cs
index 26c3e16..b310f56 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddPipeMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddPipeMainDlg.cs
@@ -2,20 +2,20 @@
namespace HStation.WinFrmUI.Assets
{
- public partial class AddPipeMainDlg : DevExpress.XtraEditors.XtraForm
+ public partial class AddAssetsPipeMainDlg : DevExpress.XtraEditors.XtraForm
{
- public AddPipeMainDlg()
+ public AddAssetsPipeMainDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
}
- private Vmo.PipeLineMainVmo _PipeLineVmo = null;
+ private Vmo.AssetsPipeMainVmo _PipeVmo = null;
public async void SetBindingData(long SeriesID)
{
- _PipeLineVmo = new Vmo.PipeLineMainVmo();
- _PipeLineVmo.SeriesID = SeriesID;
+ _PipeVmo = new Vmo.AssetsPipeMainVmo();
+ _PipeVmo.SeriesID = SeriesID;
var allCaliber = await new Yw.BLL.SysDictData().GetByTypeCode("1");
if (allCaliber != null)
{
@@ -38,7 +38,7 @@
TextEditMaterial.SelectedIndex = 0;
}
- public event Func<Vmo.PipeLineMainVmo, Task<bool>> ReloadDataEvent = null;
+ public event Func<Vmo.AssetsPipeMainVmo, Task<bool>> ReloadDataEvent = null;
//鏁版嵁楠岃瘉
private bool Valid()
@@ -62,27 +62,30 @@
{
if (!(Valid()))
return;
- _PipeLineVmo.MaterialName = TextEditMaterial.Text.Trim();
+ if (TextEditMaterial.Text != "榛樿")
+ {
+ _PipeVmo.MaterialName = TextEditMaterial.Text.Trim();
+ }
if (double.TryParse(TextEditHazenValue.Text, out double hazen))
{
- _PipeLineVmo.Hazen = hazen;
+ _PipeVmo.Hazen = hazen;
}
- _PipeLineVmo.Description = DescriptionTextEdit.Text.Trim();
- _PipeLineVmo.Name = TextEditName.Text.Trim();
+ _PipeVmo.Description = DescriptionTextEdit.Text.Trim();
+ _PipeVmo.Name = TextEditName.Text.Trim();
if (double.TryParse(TextEditCaliber.Text, out double caliber))
{
- _PipeLineVmo.Caliber = caliber;
+ _PipeVmo.Caliber = caliber;
}
if (double.TryParse(TextEditDarcyValue.Text, out double darcy))
{
- _PipeLineVmo.Darcy = darcy;
+ _PipeVmo.Darcy = darcy;
}
if (double.TryParse(TextEditManningValue.Text, out double manning))
{
- _PipeLineVmo.Manning = manning;
+ _PipeVmo.Manning = manning;
}
- _PipeLineVmo.KeyWord = this.TextEditKeyWorld.Text.Trim();
- if (await this.ReloadDataEvent.Invoke(_PipeLineVmo))
+ _PipeVmo.KeyWord = this.TextEditKeyWorld.Text.Trim();
+ if (await this.ReloadDataEvent.Invoke(_PipeVmo))
{
TipFormHelper.ShowSucceed("娣诲姞鎴愬姛!");
}
@@ -99,7 +102,7 @@
TextEditManningValue.Text = null;
TextEditHazenValue.Text = null;
TextEditDarcyValue.Text = null;
- var bll = new BLL.PipeLineRoughnessCoefficient();
+ var bll = new BLL.AssetsPipeRoughnessCoefficient();
var materialid = Convert.ToInt64(TextEditMaterial.EditValue);
var alllist = await bll.GetByPipeID(materialid);
if (alllist == null || alllist.Count == 0)
--
Gitblit v1.9.3