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

lixiaojun

2024-07-30 f45bba0b5ecf73df67af6cb60e57ea956d82a8ab

 WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/PumpProductMainPanel.cs

@@ -150,33 +150,33 @@
        //泵曲线编辑
        private async void barBtnEditPumpCurve_ItemClickAsync(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var currentVm = this.gridView1.GetCurrentViewModel(_allBindingList);
            if (currentVm == null)
            {
                MessageBoxHelper.ShowWarning("请选择数据行！");
                return;
            }
            var guid = new PageGuid()
            {
                Function = "泵曲线管理",
                TagName = currentVm.ID.ToString(),
                Modular = ""
            };
            if (!IsExistPage(guid, true))
            {
                var model = await _bll.GetByID(currentVm.ID);
                if (model == null)
                {
                    MessageBoxHelper.ShowWarning($"{currentVm.Name}:PumpMainDto is null！");
                    return;
                }
            /*        var currentVm = this.gridView1.GetCurrentViewModel(_allBindingList);
                    if (currentVm == null)
                    {
                        MessageBoxHelper.ShowWarning("请选择数据行！");
                        return;
                    }
                    var guid = new PageGuid()
                    {
                        Function = "泵曲线管理",
                        TagName = currentVm.ID.ToString(),
                        Modular = ""
                    };
                    if (!IsExistPage(guid, true))
                    {
                        var model = await _bll.GetByID(currentVm.ID);
                        if (model == null)
                        {
                            MessageBoxHelper.ShowWarning($"{currentVm.Name}:PumpMainDto is null！");
                            return;
                        }

                var page = new Phart.XhsPumpCurveMainPanel();
                page.InitialDataSource(currentVm);
                page.PageTitle.Caption = guid.Function;
                page.PageGuid = guid;
                CreatePage(page, guid);
            }
                        var page = new Phart.XhsPumpCurveMainPanel();
                        page.InitialDataSource(currentVm);
                        page.PageTitle.Caption = guid.Function;
                        page.PageGuid = guid;
                        CreatePage(page, guid);
                    }*/
        }

        //泵产品编辑