冲突

Shuxia Ning

2024-07-23 b95862489ab29fb811948c4dbec0d155d5f5f602

冲突

 Desktop/HStation.DeskTop.Xhs.Main/HStation.Desktop.Xhs.Main.csproj

@@ -18,7 +18,6 @@
        <ProjectReference Include="..\..\WinFrmUI\HStation.WinFrmUI.Basic\HStation.WinFrmUI.Basic.csproj" />
        <ProjectReference Include="..\..\WinFrmUI\HStation.WinFrmUI.Organize.Core\HStation.WinFrmUI.Organize.Core.csproj" />
        <ProjectReference Include="..\..\WinFrmUI\HStation.WinFrmUI.Xhs.Core\HStation.WinFrmUI.Xhs.Core.csproj" />
        <ProjectReference Include="..\..\WinFrmUI\HStation.WinFrmUI.Xhs.Curve\HStation.WinFrmUI.Xhs.Curve.csproj" />
    </ItemGroup>

    <ItemGroup>

 HStation.Xhs.Desktop.sln

@@ -33,8 +33,6 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.WinFrmUI.Basic", "WinFrmUI\HStation.WinFrmUI.Basic\HStation.WinFrmUI.Basic.csproj", "{2DFEFAC8-58AC-443D-8FCD-EF7EA9DFBB2F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.WinFrmUI.Xhs.Curve", "WinFrmUI\HStation.WinFrmUI.Xhs.Curve\HStation.WinFrmUI.Xhs.Curve.csproj", "{2B355DD2-D6A5-4C64-AB17-64A6AEBB6EEC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Model", "Model", "{435C0A58-EE2A-4DDD-A8D8-48DD384B5210}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Model.Xhs.Project", "Model\HStation.Model.Xhs.Project\HStation.Model.Xhs.Project.csproj", "{6046AC77-595C-49B6-90E1-B4DE3877E11C}"
@@ -89,6 +87,14 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.WinFrmUI.Organize.Core", "WinFrmUI\HStation.WinFrmUI.Organize.Core\HStation.WinFrmUI.Organize.Core.csproj", "{2D93FE29-3FBA-4E0A-B706-6BCFD093FD23}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.WinFrmUI.Phart.Core", "WinFrmUI\HStation.WinFrmUI.Phart.Core\HStation.WinFrmUI.Phart.Core.csproj", "{BF7563BE-C9FF-48B9-9268-FC0F1DA96B57}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yw.WinFrmUI.Phart.Core", "WinFrmUI\Yw.WinFrmUI.Phart.Core\Yw.WinFrmUI.Phart.Core.csproj", "{35F63598-AA2A-49EE-AE93-A3F1253C3967}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Component", "Component", "{6A2A28EE-EEC1-42C1-BADB-F9368252807A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yw.BIMFace.SDK.Core", "Component\Yw.BIMFace.SDK.Core\Yw.BIMFace.SDK.Core.csproj", "{2DA24A3A-6D57-46FF-8086-0B6C00E250CE}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
        Debug|Any CPU = Debug|Any CPU
@@ -131,10 +137,6 @@
        {2DFEFAC8-58AC-443D-8FCD-EF7EA9DFBB2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {2DFEFAC8-58AC-443D-8FCD-EF7EA9DFBB2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {2DFEFAC8-58AC-443D-8FCD-EF7EA9DFBB2F}.Release|Any CPU.Build.0 = Release|Any CPU
        {2B355DD2-D6A5-4C64-AB17-64A6AEBB6EEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {2B355DD2-D6A5-4C64-AB17-64A6AEBB6EEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {2B355DD2-D6A5-4C64-AB17-64A6AEBB6EEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {2B355DD2-D6A5-4C64-AB17-64A6AEBB6EEC}.Release|Any CPU.Build.0 = Release|Any CPU
        {6046AC77-595C-49B6-90E1-B4DE3877E11C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {6046AC77-595C-49B6-90E1-B4DE3877E11C}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {6046AC77-595C-49B6-90E1-B4DE3877E11C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -235,6 +237,18 @@
        {2D93FE29-3FBA-4E0A-B706-6BCFD093FD23}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {2D93FE29-3FBA-4E0A-B706-6BCFD093FD23}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {2D93FE29-3FBA-4E0A-B706-6BCFD093FD23}.Release|Any CPU.Build.0 = Release|Any CPU
        {BF7563BE-C9FF-48B9-9268-FC0F1DA96B57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {BF7563BE-C9FF-48B9-9268-FC0F1DA96B57}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {BF7563BE-C9FF-48B9-9268-FC0F1DA96B57}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {BF7563BE-C9FF-48B9-9268-FC0F1DA96B57}.Release|Any CPU.Build.0 = Release|Any CPU
        {35F63598-AA2A-49EE-AE93-A3F1253C3967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {35F63598-AA2A-49EE-AE93-A3F1253C3967}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {35F63598-AA2A-49EE-AE93-A3F1253C3967}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {35F63598-AA2A-49EE-AE93-A3F1253C3967}.Release|Any CPU.Build.0 = Release|Any CPU
        {2DA24A3A-6D57-46FF-8086-0B6C00E250CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {2DA24A3A-6D57-46FF-8086-0B6C00E250CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {2DA24A3A-6D57-46FF-8086-0B6C00E250CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {2DA24A3A-6D57-46FF-8086-0B6C00E250CE}.Release|Any CPU.Build.0 = Release|Any CPU
    EndGlobalSection
    GlobalSection(SolutionProperties) = preSolution
        HideSolutionNode = FALSE
@@ -248,7 +262,6 @@
        {84266C68-21C0-4F2D-8569-18B0CB96669D} = {2AE8DD9B-A07B-44C4-B5C4-A9D98C49D633}
        {435871C0-4F2F-4D7D-824D-8E7D53C88756} = {D5B088B2-E69E-4B43-838B-080B9F012077}
        {2DFEFAC8-58AC-443D-8FCD-EF7EA9DFBB2F} = {D5B088B2-E69E-4B43-838B-080B9F012077}
        {2B355DD2-D6A5-4C64-AB17-64A6AEBB6EEC} = {D5B088B2-E69E-4B43-838B-080B9F012077}
        {6046AC77-595C-49B6-90E1-B4DE3877E11C} = {435C0A58-EE2A-4DDD-A8D8-48DD384B5210}
        {BD5A6F12-4274-4334-9AD9-736138D41439} = {435C0A58-EE2A-4DDD-A8D8-48DD384B5210}
        {DA7418A4-7ABA-48C0-B7D8-4C5642BE53C1} = {67608112-BE07-493C-8240-E084CF461482}
@@ -274,6 +287,9 @@
        {2D203C5B-53AE-4C45-A1E6-2BA0DFE1B6F1} = {60068812-89D4-4DAB-A41B-0334B8D76A0B}
        {432C669D-8D03-432A-AB08-E716B956CC96} = {60068812-89D4-4DAB-A41B-0334B8D76A0B}
        {2D93FE29-3FBA-4E0A-B706-6BCFD093FD23} = {D5B088B2-E69E-4B43-838B-080B9F012077}
        {BF7563BE-C9FF-48B9-9268-FC0F1DA96B57} = {D5B088B2-E69E-4B43-838B-080B9F012077}
        {35F63598-AA2A-49EE-AE93-A3F1253C3967} = {D5B088B2-E69E-4B43-838B-080B9F012077}
        {2DA24A3A-6D57-46FF-8086-0B6C00E250CE} = {6A2A28EE-EEC1-42C1-BADB-F9368252807A}
    EndGlobalSection
    GlobalSection(ExtensibilityGlobals) = postSolution
        SolutionGuid = {E02989A8-9B6F-43E5-AACA-790328215089}

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

@@ -22,6 +22,11 @@
                this.dxErrorProvider1.SetError(this.NameTextEdit, "必填项");
                return false;
            }
            if (this.TextEditCatalogChoice.EditValue==null)
            {
                this.dxErrorProvider1.SetError(this.TextEditCatalogChoice, "必填项");
                return false;
            }
            if (string.IsNullOrEmpty(TextEditCatalogChoice.Text.Trim()))
            {
                this.dxErrorProvider1.SetError(this.TextEditCatalogChoice, "必填项");
@@ -37,7 +42,7 @@
            model.Name = NameTextEdit.Text.Trim();
            model.TagName = TagNameTextEdit.Text.Trim();
            model.MotorFrequency = MotorFrequencyTextEdit.Text.Trim();
            if (long.TryParse(TextEditCatalogChoice.EditValue.ToString(), out long catalogID))
            if (long.TryParse(TextEditCatalogChoice.EditValue?.ToString()??"", out long catalogID))
            {
                model.CatalogID = catalogID;
            }

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

@@ -170,6 +170,7 @@
                }

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

 WinFrmUI/HStation.WinFrmUI.Phart.Core/HStation.WinFrmUI.Phart.Core.csproj

@@ -12,6 +12,7 @@

  <ItemGroup>
    <ProjectReference Include="..\..\BLL\HStation.BLL.Phart.Core\HStation.BLL.Phart.Core.csproj" />
    <ProjectReference Include="..\..\Dto\HStation.Dto.Assets.Core\HStation.Dto.Assets.Core.csproj" />
    <ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
    <ProjectReference Include="..\Yw.WinFrmUI.Phart.Core\Yw.WinFrmUI.Phart.Core.csproj" />
  </ItemGroup>

 WinFrmUI/HStation.WinFrmUI.Phart.Core/XhsPumpCurveMainPanel.cs

@@ -1,4 +1,4 @@
using DevExpress.XtraEditors; 
using DevExpress.XtraEditors;

namespace HStation.WinFrmUI.Phart
{
@@ -11,13 +11,13 @@
        }


        private Model.PumpMain _pump_main = null;
        private HStation.Dto.Assets.PumpMainDto _pump_main = null;
        private Dto.XhsPumpPhartMappingExtensionsStdDto _xhs_phart_diagram_ex_dto = null;
        private BLL.XhsPumpPhartMappingExtensions _bll_ex = new(); 
        private BLL.XhsPumpPhartMappingExtensionsStd _bll_ex_std = new();


        public async void InitialDataSource(Model.PumpMain pump_main)
        public async void InitialDataSource(HStation.Dto.Assets.PumpMainDto pump_main)
        {
            _pump_main = pump_main;
            if (_pump_main == null)