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

lixiaojun

2024-07-30 f45bba0b5ecf73df67af6cb60e57ea956d82a8ab

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

# Conflicts:
#	Entry/HStation.Entry.Xhs.Core/HStation.Entry.Xhs.Core.csproj

 Desktop/HStation.DeskTop.Xhs.Main/Program.cs

@@ -62,7 +62,7 @@
                if (!loginHelper.Login())
                    return;
                var result = HStation.Service.Organize.DbFirstHelper.Initial(out string msg);
                var result_phart = HStation.Service.Phart.DbFirstHelper.Initial(out msg);
                //  var result_phart = HStation.Service.Phart.DbFirstHelper.Initial(out msg);
                Application.Run(new GuideMain());
            }
        }

 HStation.Xhs.Core.sln

@@ -87,6 +87,14 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.WinFrmUI.Phart.Core", "WinFrmUI\HStation.WinFrmUI.Phart.Core\HStation.WinFrmUI.Phart.Core.csproj", "{18F47941-D07D-4142-9F17-075BC21F89BC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.WinFrmUI.Organize.Core", "WinFrmUI\HStation.WinFrmUI.Organize.Core\HStation.WinFrmUI.Organize.Core.csproj", "{DE1A6B54-91EF-4C1A-98F5-3F0A65B4BAC8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.BLL.Organize.Core", "BLL\HStation.BLL.Organize.Core\HStation.BLL.Organize.Core.csproj", "{63571345-19C8-46B2-A50E-095AEBE0E725}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Dto.Organize.Core", "Dto\HStation.Dto.Organize.Core\HStation.Dto.Organize.Core.csproj", "{9FD5A1AB-FF38-4207-AC73-C4F53B0C9E82}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Service.Organize.Core", "Service\HStation.Service.Organize.Core\HStation.Service.Organize.Core.csproj", "{1808ADF5-93D9-4F62-B60C-0E5993FC4350}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
        Debug|Any CPU = Debug|Any CPU
@@ -221,6 +229,22 @@
        {18F47941-D07D-4142-9F17-075BC21F89BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {18F47941-D07D-4142-9F17-075BC21F89BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {18F47941-D07D-4142-9F17-075BC21F89BC}.Release|Any CPU.Build.0 = Release|Any CPU
        {DE1A6B54-91EF-4C1A-98F5-3F0A65B4BAC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {DE1A6B54-91EF-4C1A-98F5-3F0A65B4BAC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {DE1A6B54-91EF-4C1A-98F5-3F0A65B4BAC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {DE1A6B54-91EF-4C1A-98F5-3F0A65B4BAC8}.Release|Any CPU.Build.0 = Release|Any CPU
        {63571345-19C8-46B2-A50E-095AEBE0E725}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {63571345-19C8-46B2-A50E-095AEBE0E725}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {63571345-19C8-46B2-A50E-095AEBE0E725}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {63571345-19C8-46B2-A50E-095AEBE0E725}.Release|Any CPU.Build.0 = Release|Any CPU
        {9FD5A1AB-FF38-4207-AC73-C4F53B0C9E82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {9FD5A1AB-FF38-4207-AC73-C4F53B0C9E82}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {9FD5A1AB-FF38-4207-AC73-C4F53B0C9E82}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {9FD5A1AB-FF38-4207-AC73-C4F53B0C9E82}.Release|Any CPU.Build.0 = Release|Any CPU
        {1808ADF5-93D9-4F62-B60C-0E5993FC4350}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {1808ADF5-93D9-4F62-B60C-0E5993FC4350}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {1808ADF5-93D9-4F62-B60C-0E5993FC4350}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {1808ADF5-93D9-4F62-B60C-0E5993FC4350}.Release|Any CPU.Build.0 = Release|Any CPU
    EndGlobalSection
    GlobalSection(SolutionProperties) = preSolution
        HideSolutionNode = FALSE
@@ -258,6 +282,10 @@
        {0AFD5926-BBB4-4DC9-92B3-5FCD15C84A42} = {CF8E0A6C-9342-430D-BD10-6E1B5DE18571}
        {80A54B20-D3FF-450D-86DC-DCF11E4A6B82} = {CF8E0A6C-9342-430D-BD10-6E1B5DE18571}
        {18F47941-D07D-4142-9F17-075BC21F89BC} = {4F0A7BA1-6ED6-4F4F-A3B4-B9B3A133D869}
        {DE1A6B54-91EF-4C1A-98F5-3F0A65B4BAC8} = {4F0A7BA1-6ED6-4F4F-A3B4-B9B3A133D869}
        {63571345-19C8-46B2-A50E-095AEBE0E725} = {4D3764D7-19DE-4C77-8F75-0EFB19D64B3F}
        {9FD5A1AB-FF38-4207-AC73-C4F53B0C9E82} = {929B3BD5-B817-4EAF-ADA4-3DFBD1580DA6}
        {1808ADF5-93D9-4F62-B60C-0E5993FC4350} = {CF8E0A6C-9342-430D-BD10-6E1B5DE18571}
    EndGlobalSection
    GlobalSection(ExtensibilityGlobals) = postSolution
        SolutionGuid = {E02989A8-9B6F-43E5-AACA-790328215089}

 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);
                    }*/
        }

        //泵产品编辑

 WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj

@@ -34,7 +34,6 @@
    <ProjectReference Include="..\..\Dto\HStation.Dto.Assets.Core\HStation.Dto.Assets.Core.csproj" />
    <ProjectReference Include="..\HStation.WinFrmUI.Basic\HStation.WinFrmUI.Basic.csproj" />
    <ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
    <ProjectReference Include="..\HStation.WinFrmUI.Phart.Core\HStation.WinFrmUI.Phart.Core.csproj" />
  </ItemGroup>

  <ItemGroup>