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

lixiaojun

2024-12-05 84820e6296602b263633ff9a960bfd15cf0618de

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.cs

@@ -15,7 +15,7 @@

        private long _valve_main_id;
        private Vmo.AssetsValveCoefficientVmo _xhs_phart_diagram_ex_std_dto = null;
        private readonly BLL.XhsValveMainPhartMappingExtensions _bll_ex = new();
        private readonly BLL.AssetsValveCoefficient _bll = new();

        /// <summary>
        /// 初始化数据
@@ -43,7 +43,6 @@
        {
            _xhs_phart_diagram_ex_std_dto = obj;
            this.xtrPerform2dChart1.SetBindingData(obj.MinorLossCurve);

            //  InitChart(_xhs_phart_diagram_ex_std_dto);
        }

@@ -114,11 +113,12 @@
                XtraMessageBox.Show("ValveMain is null!");
                return false;
            }
            var bll = new BLL.AssetsValveCoefficient();
            var model = new Vmo.AssetsValveCoefficientVmo();
            model.MainID = _valve_main_id;
            model.MinorLossCurve = pt_list_json;
            return await bll.Insert(model) > 0;
            this.xtrPerform2dChart1.SetBindingData(pt_list_json);
            _xhs_phart_diagram_ex_std_dto = model;
            return await _bll.Insert(model) > 0;
        }

        #endregion 导入
@@ -164,7 +164,7 @@
                  {
                      graph_ql
                  };
                  var bol = await _bll_ex.Update(_xhs_phart_diagram_ex_std_dto);
                   var bol = await _bll.Update(_xhs_phart_diagram_ex_std_dto);
                  if (bol)
                  {
                      InitChart(_xhs_phart_diagram_ex_std_dto);
@@ -186,7 +186,7 @@
               dlg.VerifyValueChanged += async (value) =>
               {
                   _xhs_phart_diagram_ex_std_dto.OtherName = value;
                   var bol = await _bll_ex.Update(_xhs_phart_diagram_ex_std_dto);
                   var bol = await _bll.Update(_xhs_phart_diagram_ex_std_dto);
                   if (!bol)
                   {
                       XtraMessageBox.Show("更新失败!");
@@ -208,7 +208,7 @@
               dlg.VerifyValueChanged += async (value) =>
               {
                   _xhs_phart_diagram_ex_std_dto.Importance = value;
                   var bol = await _bll_ex.Update(_xhs_phart_diagram_ex_std_dto);
                   var bol = await _bll.Update(_xhs_phart_diagram_ex_std_dto);
                   if (!bol)
                   {
                       XtraMessageBox.Show("更新失败!");
@@ -227,18 +227,17 @@
        //删除
        private async void barBtnDelete_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            //    await Delete();
            await Delete();
        }

        /*       //删除
        //删除
               private async Task<bool> Delete()
               {
              *//*     if (_xhs_phart_diagram_ex_std_dto == null)
            if (_xhs_phart_diagram_ex_std_dto == null)
                   {
                       return false;
                   }
                   var diagramId = _xhs_phart_diagram_ex_std_dto.Diagram.ID;
                   var bol = await _bll_ex.DeleteByDiagramID(diagramId);
            var bol = await _bll.DeleteByID(_xhs_phart_diagram_ex_std_dto.ID);
                   if (!bol)
                   {
                       XtraMessageBox.Show("删除失败!");
@@ -246,10 +245,9 @@
                   }
                   XtraMessageBox.Show("删除成功!");
                   ClearChart();
                   this.xhsValveMainPhartListCtrl1.Delete(_xhs_phart_diagram_ex_std_dto.ID);

                   return true;*//*
               }*/
            //   this.xhsValveMainPhartListCtrl1.Delete(_xhs_phart_diagram_ex_std_dto.ID);
            return true;
        }

        #endregion 删除