整理文件

duheng

2024-09-27 355222d6bd72a004db00b875cc9263b7e433dc73

整理文件

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/00-DocumentPage/DocumentPage.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/00-DocumentPage/DocumentPage.resx

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/00-DocumentPage/MainForm.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/00-DocumentPage/MainForm.resx

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/00-DocumentPage/ObjectType.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/00-DocumentPage/PageDataSync.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/00-DocumentPage/PageFunctionItem.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/00-DocumentPage/PageMenu.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/00-DocumentPage/PageTitle.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/00-DocumentPage/SurfaceGuid.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/00-DocumentPage/ePageDataOperation.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/BandGridViewExtend.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/ButtonEditExtend.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/ClassUpdateVailDataHelper.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/ControlExtend.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/ControlNavigatorExtend.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/DateEditExtend.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/DevHelper.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/ExtensionsDev.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/FormExtend.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/GridContorlExtend.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/GridViewExtend.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/ImageExtend.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/LayoutControlExtensions.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/ListBoxControlExtend.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/LookUpEditExtend.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/MessageBoxShow.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/RibbonControlExtend.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/SearchLookUpEditExtend.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/TextEditExtend.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/TileControlExtensions.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/TilePeekItemsExtensions.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/TokenEditExtend.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/TreeListExtend.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/XtraChartHelper.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/01-扩展类/XtraFormExtend.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/02-提示弹窗/MessageBoxHelper.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/03-文件帮助类/DataTabelToList.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-UICore/03-文件帮助类/ExcelSaveFilePathHelper.cs

文件已删除

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/00-viewmodel/ValveMainViewModel.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/00-viewmodel/ValveSeriesViewModel.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/01-series/AddValveSeriesDlg.Designer.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/01-series/AddValveSeriesDlg.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/01-series/AddValveSeriesDlg.resx

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/01-series/EditValveSeriesDlg.Designer.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/01-series/EditValveSeriesDlg.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/01-series/EditValveSeriesDlg.resx

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/02-main/AddValveMainDlg.Designer.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/02-main/AddValveMainDlg.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/02-main/AddValveMainDlg.resx

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/02-main/EditValveMainDlg.Designer.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/02-main/EditValveMainDlg.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/02-main/EditValveMainDlg.resx

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/ValveManageMainPanel.Designer.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/ValveManageMainPanel.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/ValveManageMainPanel.resx

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/ValveTypeTreeListCtrl.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/ValveTypeTreeListCtrl.designer.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/ValveTypeTreeListCtrl.resx

 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/AddPipeLineMainDlg.Designer.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/AddPipeLineMainDlg.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/AddPipeLineMainDlg.resx

 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/CoefficientDisplayNameHelper.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/DescriptionDlg.Designer.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/DescriptionDlg.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/DescriptionDlg.resx

 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/EditPipeLineMainDlg.Designer.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/EditPipeLineMainDlg.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/EditPipeLineMainDlg.resx

 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/PipeLineViewModel.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/PipelineManageMainPanel.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/pipelineManageMainPanel.Designer.cs

 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/pipelineManageMainPanel.resx

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

@@ -56,31 +56,31 @@
    <Compile Update="01-pumpProductManage\AddPumpProductGroupDlg.cs" />
    <Compile Update="01-pumpProductManage\AddPumpProductMainDlg.cs" />
    <Compile Update="01-pumpProductManage\EditPumpProductSeriesDlg.cs" />
    <Compile Update="05-valveManage\01-series\EditValveSeriesDlg.cs">
    <Compile Update="03-valveManage\01-series\EditValveSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="05-valveManage\01-series\AddValveSeriesDlg.cs">
    <Compile Update="03-valveManage\01-series\AddValveSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="05-valveManage\02-main\EditValveMainDlg.cs">
    <Compile Update="03-valveManage\02-main\EditValveMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="05-valveManage\02-main\AddValveMainDlg.cs">
    <Compile Update="03-valveManage\02-main\AddValveMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="05-valveManage\ValveTypeTreeListCtrl.cs">
    <Compile Update="03-valveManage\ValveTypeTreeListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-AdaptingManage\AdaptingManageMainPanel.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="06-pipelineManage\EditPipeLineMainDlg.cs">
    <Compile Update="04-pipelineManage\EditPipeLineMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="06-pipelineManage\AddPipeLineMainDlg.cs">
    <Compile Update="04-pipelineManage\AddPipeLineMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="06-pipelineManage\PipelineManageMainPanel.cs">
    <Compile Update="04-pipelineManage\PipelineManageMainPanel.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="Properties\Resources.Designer.cs">

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

@@ -38,16 +38,10 @@
    <Compile Update="01-pumpProductManage\PumpProductSeriesTreeListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="05-valveManage\ValveManageMainPanel.cs">
    <Compile Update="03-valveManage\ValveManageMainPanel.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-UICore\00-DocumentPage\DocumentPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-UICore\00-DocumentPage\MainForm.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="06-pipelineManage\DescriptionDlg.cs">
    <Compile Update="04-pipelineManage\DescriptionDlg.cs">
      <SubType>Form</SubType>
    </Compile>
  </ItemGroup>

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

文件名从 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-PumpMainCurveChoice/ChoicePumpMainDlg.Designer.cs 修改
@@ -29,7 +29,7 @@
        private void InitializeComponent()
        {
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            xtraUserControl11 = new Core.PumpMainForm();
            xtraUserControl11 = new Core.XhsProjectSimulationPumpSingleMatchingForm();
            btnComplete = new SimpleButton();
            btnCancel = new SimpleButton();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -176,7 +176,7 @@
        private DevExpress.XtraLayout.LayoutControlItem itemForComplete;
        private DevExpress.XtraLayout.LayoutControlItem itemForCancel;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
        private Core.PumpMainForm xtraUserControl11;
        private Core.XhsProjectSimulationPumpSingleMatchingForm xtraUserControl11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
    }
}

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

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/XhsProjectSimulationPumpSingleMatchingDlg.resx

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

文件名从 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-PumpMainCurveChoice/PumpMainForm.Designer.cs 修改
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI.Xhs.Core
{
    partial class PumpMainForm
    partial class XhsProjectSimulationPumpSingleMatchingForm
    {
        /// <summary> 
        /// Required designer variable.

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

文件名从 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-PumpMainCurveChoice/PumpMainForm.cs 修改
@@ -4,9 +4,9 @@

namespace HStation.WinFrmUI.Xhs.Core
{
    public partial class PumpMainForm : DevExpress.XtraEditors.XtraUserControl
    public partial class XhsProjectSimulationPumpSingleMatchingForm : DevExpress.XtraEditors.XtraUserControl
    {
        public PumpMainForm()
        public XhsProjectSimulationPumpSingleMatchingForm()
        {
            InitializeComponent();
            this.gridView1.SetNormalView();
@@ -28,7 +28,7 @@
            public Vmo.XhsPumpMainPhartMappingExtensions Curveinfo { get; set; }
        }

        private List<PumpMainChoieViewModel> _allBindingList = null;
        private List<XhsProjectSimulationPumpSingleMatchingViewModel> _allBindingList = null;

        private BLL.PumpMain _pumpBll = null;

@@ -40,12 +40,12 @@
        public async void SetBindingData(PumpMatchingViewModel pumpMatchingViewModel)
        {
            _pumpMatchingViewModel = pumpMatchingViewModel;
            _allBindingList = new List<PumpMainChoieViewModel>();
            _allBindingList = new List<XhsProjectSimulationPumpSingleMatchingViewModel>();
            _pumpBll = new BLL.PumpMain();
            var allPumpMain = await _pumpBll.GetAll();
            foreach (var Main in allPumpMain)
            {
                _allBindingList.Add(new PumpMainChoieViewModel(Main));
                _allBindingList.Add(new XhsProjectSimulationPumpSingleMatchingViewModel(Main));
            }
            for (int i = 0; i < _allBindingList.Count; i++)
            {

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/XhsProjectSimulationPumpSingleMatchingForm.resx

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

文件名从 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-PumpMainCurveChoice/PumpMainChoieViewModel.cs 修改
@@ -1,15 +1,15 @@
锘縩amespace HStation.WinFrmUI.Xhs
{
    public class PumpMainChoieViewModel
    public class XhsProjectSimulationPumpSingleMatchingViewModel
    {
        public PumpMainChoieViewModel(Vmo.PumpSeriesVmo rhs)
        public XhsProjectSimulationPumpSingleMatchingViewModel(Vmo.PumpSeriesVmo rhs)
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;
            this.IsPump = false;
        }

        public PumpMainChoieViewModel(Vmo.PumpGroupVmo rhs)
        public XhsProjectSimulationPumpSingleMatchingViewModel(Vmo.PumpGroupVmo rhs)
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;
@@ -17,7 +17,7 @@
            this.IsPump = false;
        }

        public PumpMainChoieViewModel(Vmo.PumpMainVmo rhs, long GroupID)
        public XhsProjectSimulationPumpSingleMatchingViewModel(Vmo.PumpMainVmo rhs, long GroupID)
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;
@@ -25,7 +25,7 @@
            this.IsPump = true;
        }

        public PumpMainChoieViewModel(Vmo.PumpMainVmo rhs)
        public XhsProjectSimulationPumpSingleMatchingViewModel(Vmo.PumpMainVmo rhs)
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj

@@ -27,17 +27,17 @@
    <Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.Designer.cs" />
    <Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.cs" />
    <Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.Designer.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-PumpMainCurveChoice\PumpMainChoicePage.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-PumpMainCurveChoice\PumpMainChoicePage.Designer.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-PumpMainCurveChoice\PumpMainForm-bak.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-PumpMainCurveChoice\PumpMainForm-bak.Designer.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpMainChoicePage.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpMainChoicePage.Designer.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpMainForm-bak.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpMainForm-bak.Designer.cs" />
  </ItemGroup>

  <ItemGroup>
    <EmbeddedResource Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.resx" />
    <EmbeddedResource Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.resx" />
    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-PumpMainCurveChoice\PumpMainChoicePage.resx" />
    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-PumpMainCurveChoice\PumpMainForm-bak.resx" />
    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpMainChoicePage.resx" />
    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpMainForm-bak.resx" />
  </ItemGroup>

  <ItemGroup>
@@ -98,7 +98,7 @@
    <Compile Update="02-project\04-dlg\EditProjectDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-PumpMainCurveChoice\ChoicePumpMainDlg.cs">
    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\XhsProjectSimulationPumpSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs">

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user

@@ -46,7 +46,7 @@
    <Compile Update="03-simulation\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-PumpMainCurveChoice\PumpMainForm.cs">
    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\XhsProjectSimulationPumpSingleMatchingForm.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\01-property\XhsProjectSimulationPropertyCtrl.cs">