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

lixiaojun

2024-07-23 a99a3974be061a99d11306e75d9820de59cdc374

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

@@ -1,11 +1,4 @@
using DevExpress.XtraRichEdit.Import.Html;
using HStation.BLL;
using HStation.Dto;
using HStation.Model;
using Mapster;
using SQLitePCL;

namespace HStation.WinFrmUI.Xhs.PumpProduct
namespace HStation.WinFrmUI.Xhs.PumpProduct
{
    public partial class PumpProductMainPanel : DocumentPage
    {
@@ -88,9 +81,9 @@
                map.PumpGroupID = groupid;
            }
            dlg.SetBindingData(id);
            dlg.ReloadDataEvent += async (main, part, content, mainmap) =>
            dlg.ReloadDataEvent += async (main) =>
            {
                var id = await _bll.InsertEx(main, map, part, content, mainmap);
                var id = await _bll.InsertEx(main, map);
                if (id > 0)
                {
                    var model = await _bll.GetByID(id);
@@ -171,10 +164,10 @@
                var model = await _bll.GetByID(currentVm.ID);
                if (model != null)
                {
               /*     var page = new ModelManageCtrl(_PumpMain);
                    page.PageTitle.Caption = guid.Function;
                    page.SurfaceGuid = guid;
                    CreatePage(page, guid);*/
                    /*     var page = new ModelManageCtrl(_PumpMain);
                         page.PageTitle.Caption = guid.Function;
                         page.SurfaceGuid = guid;
                         CreatePage(page, guid);*/
                }
            }
        }