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/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs | 56 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs
index 888f1b9..865b3eb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs
@@ -11,28 +11,28 @@
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
}
- private BLL.PumpPartMain _bll = null;
+ private BLL.AssetsPumpPartMain _bll = null;
private List<PropGroupChoiceViewModel> _proplist = null;
private List<CurrentPartMainViewModel> _allBindingList = new List<CurrentPartMainViewModel>();
- private Vmo.PumpMainAndPartMapVmo _partmap = null;
+ private Vmo.AssetsPumpMainAndPartMapVmo _partmap = null;
- private Vmo.PumpPartMainVmo _pumpPart = null;
+ private Vmo.AssetsPumpPartMainVmo _pumpPart = null;
private long _catalogID; //鍒嗙被ID
private long _seriesID; //绯诲垪ID
- private List<Vmo.PumpPropContentVmo> _allPropList = null;
+ private List<Vmo.AssetsPumpPropContentVmo> _allPropList = null;
//鍥炶皟浜嬩欢
- public event Func<Vmo.PumpPartMainVmo, List<Vmo.PumpPropContentVmo>, Vmo.PumpMainAndPartMapVmo, Task<bool>> ReloadEvent;
+ public event Func<Vmo.AssetsPumpPartMainVmo, List<Vmo.AssetsPumpPropContentVmo>, Vmo.AssetsPumpMainAndPartMapVmo, Task<bool>> ReloadEvent;
//鏁版嵁缁戝畾
- public async void SetBindingData(Vmo.PumpMainVmo pumpMain)
+ public async void SetBindingData(Vmo.AssetsPumpMainVmo AssetsPumpMain)
{
- this.pumpProductListBox1.SetBindingData(pumpMain);
+ this.pumpProductListBox1.SetBindingData(AssetsPumpMain);
this.pumpProductListBox1.SelectReloadEvent += () =>
{
ListBoxPart_SelectedIndexChanged();
@@ -41,16 +41,16 @@
{
BarBtnAddPumpPart_ItemClick();
};
- _bll = new BLL.PumpPartMain();
- var allpartlist = await _bll.GetByPumpMainID(pumpMain.ID); //鑾峰彇鎵�鏈変骇鍝�
- var series = await new BLL.PumpSeries().GetByID(pumpMain.PumpSeriesID); //鑾峰彇绯诲垪
- _pumpPart = new Vmo.PumpPartMainVmo();
+ _bll = new BLL.AssetsPumpPartMain();
+ var allpartlist = await _bll.GetByPumpMainID(AssetsPumpMain.ID); //鑾峰彇鎵�鏈変骇鍝�
+ var series = await new BLL.AssetsPumpSeries().GetByID(AssetsPumpMain.PumpSeriesID); //鑾峰彇绯诲垪
+ _pumpPart = new Vmo.AssetsPumpPartMainVmo();
_seriesID = series.ID;
_pumpPart.SeriesID = _seriesID;
_catalogID = series.CatalogID;
_proplist = new List<PropGroupChoiceViewModel>();
- _partmap = new Vmo.PumpMainAndPartMapVmo();
- _partmap.PumpID = pumpMain.ID;
+ _partmap = new Vmo.AssetsPumpMainAndPartMapVmo();
+ _partmap.PumpID = AssetsPumpMain.ID;
_partmap.SeriesID = _seriesID;
// this.ListBoxPart.DataSource = _allBindingList;
@@ -110,17 +110,20 @@
var vm = this.pumpProductListBox1.GetCurrentVm();
if (vm == null)
return;
- var updatepart = new Vmo.PumpPartMainVmo();
+ var updatepart = new Vmo.AssetsPumpPartMainVmo();
updatepart.ID = vm.ID;
updatepart.Name = TextEditProductName.Text;
updatepart.NO = TextEditNo.Text;
updatepart.Code = TextEditProductCode.Text;
updatepart.SeriesID = _seriesID;
- var updateproplist = new List<UpdatePumpPropContentInput>();
- // var update = _allPropList.Select(x => x.Adapt<PumpPropContentDto, UpdatePumpPropContentInput>()).ToList();
+ var updateproplist = new List<UpdateAssetsPumpPropContentInput>();
+ // var update = _allPropList.Select(x => x.Adapt<AssetsPumpPropContentDto, UpdateAssetsPumpPropContentInput>()).ToList();
foreach (var item in _proplist)
{
- _allPropList.Find(x => x.PropID == item.ID).PropValue = item.Value;
+ if (_allPropList != null)
+ {
+ _allPropList.Find(x => x.PropID == item.ID).PropValue = item.Value;
+ }
}
if (await _bll.UpdateEx(updatepart, _allPropList))
{
@@ -144,18 +147,31 @@
}
}
+ private bool Vaild()
+ {
+ this.dxErrorProvider1.ClearErrors();
+ if (TextEditProductName.Text == null)
+ {
+ this.dxErrorProvider1.SetError(TextEditProductName, "蹇呭～椤�");
+ return false;
+ }
+ return true;
+ }
+
//娣诲姞浜у搧
private async void BtnAddPumpPart_Click(object sender, EventArgs e)
{
+ if (!Vaild())
+ return;
_pumpPart.Name = TextEditProductName.Text;
_pumpPart.NO = TextEditNo.Text;
_pumpPart.Code = TextEditProductCode.Text;
- var PumpPropContent = new List<Vmo.PumpPropContentVmo>();
+ var AssetsPumpPropContent = new List<Vmo.AssetsPumpPropContentVmo>();
foreach (var item in _proplist)
{
- PumpPropContent.Add(new Vmo.PumpPropContentVmo { PropID = item.ID, PropValue = item.Value, SeriesID = _pumpPart.SeriesID, MainID = _partmap.PumpID });
+ AssetsPumpPropContent.Add(new Vmo.AssetsPumpPropContentVmo { PropID = item.ID, PropValue = item.Value, SeriesID = _pumpPart.SeriesID });
}
- var id = await _bll.InsertEx(_pumpPart, PumpPropContent, _partmap);
+ var id = await _bll.InsertEx(_pumpPart, AssetsPumpPropContent, _partmap);
if (id > 0)
{
var pumppart = await _bll.GetByID(id);
--
Gitblit v1.9.3