From 3b08b5c772ffc0c10644c1aaa9f7b2447582c858 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 14 十月 2024 17:50:24 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj | 131 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 125 insertions(+), 6 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
index 4c7bf23..139a8f3 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
@@ -9,29 +9,148 @@
<ItemGroup>
<Compile Remove="02-UICore\**" />
+ <Compile Remove="10-equipment\**" />
<EmbeddedResource Remove="02-UICore\**" />
+ <EmbeddedResource Remove="10-equipment\**" />
<None Remove="02-UICore\**" />
+ <None Remove="10-equipment\**" />
<Page Remove="02-UICore\**" />
+ <Page Remove="10-equipment\**" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Compile Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.cs" />
+ <Compile Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.Designer.cs" />
+ <Compile Remove="01-pump\PumpProductMainPanel - 澶嶅埗.cs" />
+ <Compile Remove="01-pump\PumpProductMainPanel - 澶嶅埗.Designer.cs" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <EmbeddedResource Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="01-pump\PumpProductMainPanel - 澶嶅埗.resx" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" />
+ <PackageReference Include="Yw.BLL.Assets.Core" Version="3.0.1" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\BLL\HStation.BLL.Assets.Core\HStation.BLL.Assets.Core.csproj" />
<ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" />
+ <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.Dict.Core\HStation.WinFrmUI.Dict.Core.csproj" />
+ <ProjectReference Include="..\HStation.WinFrmUI.PhartRelation.Core\HStation.WinFrmUI.PhartRelation.Core.csproj" />
</ItemGroup>
<ItemGroup>
- <Compile Update="00-PumpProductManage\EditPumpProductMainDlg.cs" />
- <Compile Update="00-PumpProductManage\EditPumpProductGroupDlg.cs" />
- <Compile Update="00-PumpProductManage\AddPumpProductGroupDlg.cs" />
- <Compile Update="00-PumpProductManage\AddPumpProductMainDlg.cs" />
- <Compile Update="00-PumpProductManage\EditPumpProductSeriesDlg.cs" />
- <Compile Update="00-PumpProductManage\PumpProductMainPanel.cs" />
+ <Compile Update="02-adapting\EditAdaptingMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="02-adapting\AddAdaptingMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\03-AssetsPumpType\EditAssetsPumpTypeDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\EditPumpProductMainDlg.cs" />
+ <Compile Update="01-pump\EditPumpProductGroupDlg.cs" />
+ <Compile Update="01-pump\AddPumpProductGroupDlg.cs" />
+ <Compile Update="01-pump\AddPumpProductMainDlg.cs" />
+ <Compile Update="01-pump\EditPumpProductSeriesDlg.cs" />
+ <Compile Update="03-valve\01-series\EditAssetsValveSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-valve\01-series\AddAssetsValveSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-valve\ValveTypeTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="02-adapting\AdaptingManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="05-elbow\02-main\AddAssetsElbowMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="05-elbow\02-main\EditAssetsElbowMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\01-series\AddPipeLineSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\01-series\EditPipeLineSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\01-series\PipeLineTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\02-main\AddAssetsThreelinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\02-main\EditAssetsThreelinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\02-main\ThreeLinkManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="05-elbow\01-series\AddPipeLineSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="05-elbow\01-series\EditPipeLineSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="05-elbow\01-series\PipeLineTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="05-elbow\02-main\ElbowManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="04-pipe\01-series\AddPipeLineSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\01-series\EditPipeLineSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\02-main\EditAssetsPipeMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\02-main\AddAssetsPipeMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\02-main\PipeManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="04-pipe\01-series\PipeLineTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\02-main\AddAssetsFourlinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\02-main\EditAssetsFourlinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="08-nozzle\01-series\AddPipeLineSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="08-nozzle\01-series\EditPipeLineSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="08-nozzle\01-series\NozzleTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="08-nozzle\02-main\AddAssetsNozzleMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="08-nozzle\02-main\EditAssetsNozzleMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="08-nozzle\02-main\NozzleManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
--
Gitblit v1.9.3