From f2333318a31e92f6cbc3a572d8eb9fae9da0f892 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 13:59:15 +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 | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 cd3adee..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,19 +2,19 @@
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.PipeMainVmo _PipeVmo = null;
+ private Vmo.AssetsPipeMainVmo _PipeVmo = null;
public async void SetBindingData(long SeriesID)
{
- _PipeVmo = new Vmo.PipeMainVmo();
+ _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.PipeMainVmo, Task<bool>> ReloadDataEvent = null;
+ public event Func<Vmo.AssetsPipeMainVmo, Task<bool>> ReloadDataEvent = null;
//鏁版嵁楠岃瘉
private bool Valid()
@@ -102,7 +102,7 @@
TextEditManningValue.Text = null;
TextEditHazenValue.Text = null;
TextEditDarcyValue.Text = null;
- var bll = new BLL.PipeRoughnessCoefficient();
+ 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