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

lixiaojun

2024-10-22 193bce5eb04ea94ba325d60bb2d8d23338f76a14

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

 WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/AddPumpPropDlg.cs

@@ -12,7 +12,7 @@
            InitializeComponent();
        }

        public event Func<Yw.Vmo.SysPropVmo, Task<bool>> ReloadDataEvent;
        public event Func<Yw.Vmo.SysPropVmo, string, string, Task<bool>> ReloadDataEvent; //属性类, 组名,属性值

        private Yw.Vmo.SysPropVmo _AddPropDto { get; set; }

@@ -90,7 +90,7 @@
            {
                _AddPropDto.Format = (Yw.Basic.ePropFormat)ePropFormat.Boolen;
            }
            if (await this.ReloadDataEvent.Invoke(_AddPropDto))
            if (await this.ReloadDataEvent.Invoke(_AddPropDto, this.imageComboBoxEditPropGroup.SelectedText, ""))
            {
                MessageBoxHelper.ShowSuccess("添加成功!");
            }

 WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs

@@ -277,16 +277,16 @@
        {
            var dlg = new AddPumpPropDlg();
            dlg.SetBindingData(_series.CatalogID);
            dlg.ReloadDataEvent += async (rhs) =>
            dlg.ReloadDataEvent += async (rhs, groupName, propValue) =>
            {
                var bll = new Yw.BLL.SysProp();
                var id = await bll.Insert(rhs);
                if (id > 0)
                {
                    var model = await bll.GetByID(id);
                    //  var partMain = new PropGroupChoiceViewModel() {PropGroupName= model.GroupID, };
                    //_propList.Add(partMain);
                    //  this.propViewModelBindingSource.ResetBindings(false);
                    var partMain = new PropGroupChoiceViewModel() { PropGroupName = groupName, PropName = model.Name, ID = model.ID, Value = propValue };
                    _propList.Add(partMain);
                    this.propGroupChoiceViewModelBindingSource.ResetBindings(false);
                    return true;
                }
                return false;

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingForm.cs

@@ -110,6 +110,11 @@
            if (vm != null)
            {
                _pumpMatchingViewModel.MatchingDbId = vm.ID.ToString();
                _pumpMatchingViewModel.MatchingModelType = vm.Name.ToString();
                _pumpMatchingViewModel.MatchingRatedH = vm.RatedHead;
                _pumpMatchingViewModel.MatchingRatedN = vm.RatedSpeed;
                _pumpMatchingViewModel.MatchingRatedP = vm.RatedPower;
                _pumpMatchingViewModel.MatchingRatedQ = vm.RatedFlow;
                var list = await _bll_ex.Value.GetByPumpMainID(vm.ID);
                if (list != null && list.Any())
                {

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs

@@ -35,6 +35,7 @@
            this.RatedPower = rhs.RatedPower;
            this.RatedFlow = rhs.RatedFlow;
            this.RatedSpeed = rhs.RatedSpeed;
            this.RatedHead = rhs.RatedHead;
            this.RatedEfficiency = rhs.RatedEfficiency;
            this.D2 = rhs.D2;
            this.Description = rhs.Description;