Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

Shuxia Ning

2024-09-11 5dbe0ca9fe177aa83779ebad921b5d1d2cae6278

 WinFrmUI/HStation.WinFrmUI.Assets.Core/01-PumpProductManage/AddPumpProductMainDlg.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/AddPumpProductMainDlg.cs ÐÞ¸Ä
@@ -1,4 +1,5 @@
using DevExpress.XtraEditors.Controls;
using HStation.Vmo;

namespace HStation.WinFrmUI.Xhs.PumpProduct
{
@@ -13,32 +14,15 @@

        private List<PropGroupChoiceViewModel> _proplist = null;

        private Vmo.PumpMain _PumpMain = null;   //泵型号
        private Vmo.PumpMainVmo _PumpMain = null;   //泵型号

        public async void SetBindingData(long ID)
        public async void SetBindingData(Vmo.PumpSeriesVmo pumpSeriesVmo)
        {
            var pumpseries = await new BLL.PumpSeries().GetByID(ID);
            if (pumpseries != null)
            {
                _PumpMain = new Vmo.PumpMain();
                _PumpMain.PumpSeriesID = pumpseries.ID;
                _bll = new Yw.BLL.SysCatalog();
                var alllist = await _bll.GetAll();
                /*  foreach (var item in alllist)
                  {
                      var imageItem = new ImageComboBoxItem(item.Name, item.ID);
                      TextEditCatalog.Properties.Items.Add(imageItem);
                  }
                  _proplist = new List<PropGroupChoiceViewModel>();
                  TextEditCatalog.EditValue = pumpseries.CatalogID;*/
            }
            else
            {
                return;
            }
            _PumpMain = new Vmo.PumpMainVmo();
            _PumpMain.PumpSeriesID = pumpSeriesVmo.ID;
        }

        public event Func<Vmo.PumpMain, Task<bool>> ReloadDataEvent = null;
        public event Func<Vmo.PumpMainVmo, Task<bool>> ReloadDataEvent = null;

        //数据验证
        private bool Valid()