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/PumpProductSeriesTreeListCtrl.cs

文件名从 WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/PumpProductSeriesTreeListCtrl.cs 修改
@@ -89,14 +89,14 @@
            var vm = this.treeList1.GetCurrentViewModel(_allBindingList);
            if (vm != null)
            {
                var series = vm.Model as Vmo.PumpSeries;
                var series = vm.Model as Vmo.PumpSeriesVmo;
                if (series != null)
                {
                    this.FocusedChangedEvent?.Invoke(series.ID, true);
                }
                else
                {
                    var group = vm.Model as Vmo.PumpGroup;
                    var group = vm.Model as Vmo.PumpGroupVmo;
                    if (group != null)
                    {
                        this.FocusedChangedEvent?.Invoke(group.ID, false);
@@ -176,7 +176,7 @@
        }

        //缂栬緫
        private void barBtnEdit_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        private async void barBtnEdit_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var currentVm = this.treeList1.GetCurrentViewModel(_allBindingList);
            if (currentVm == null)
@@ -188,7 +188,10 @@
            {
                var series = currentVm.Model as Model.PumpSeries;
                var dlg = new EditPumpProductSeriesDlg();
                dlg.SetBindingData(currentVm.ID);
                var model = await new BLL.PumpSeries().GetByID(currentVm.ID);
                if (model == null)
                    return;
                dlg.SetBindingData(model);
                dlg.ReloadDataEvent += async (model) =>
               {
                   if (await _seriesbll.Update(model))
@@ -204,17 +207,20 @@
            else
            {
                var dlg = new EditPumpProductGroupDlg();
                dlg.SetBindingData(currentVm.ID);
                var GroupDto = await new BLL.PumpGroup().GetByID(currentVm.ID);
                if (GroupDto == null)
                    return;
                dlg.SetBindingData(GroupDto);
                dlg.ReloadDataEvent += async (model) =>
                {
                    if (await _groupbll.Update(model))
                    {
                        currentVm.Reset(model);
                        this.treeList1.RefreshDataSource();
                        return true;
                    }
                    return false;
                };
               {
                   if (await _groupbll.Update(model))
                   {
                       currentVm.Reset(model);
                       this.treeList1.RefreshDataSource();
                       return true;
                   }
                   return false;
               };
                dlg.ShowDialog();
            }
        }