From b06ab50bba7ba5f3bb51adee1fca01e91e307195 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 11 十月 2024 17:20:55 +0800
Subject: [PATCH] 型号匹配

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj |   56 ++++++++++++++++++++++++++++++++------------------------
 1 files changed, 32 insertions(+), 24 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 ae9be49..83d8665 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
@@ -15,20 +15,24 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Remove="01-pumpProduct\AddPumpProductMainDlg - 澶嶅埗.cs" />
-    <Compile Remove="01-pumpProduct\AddPumpProductMainDlg - 澶嶅埗.Designer.cs" />
-    <Compile Remove="01-pumpProduct\PumpProductMainPanel - 澶嶅埗.cs" />
-    <Compile Remove="01-pumpProduct\PumpProductMainPanel - 澶嶅埗.Designer.cs" />
+    <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" />
+    <Compile Remove="10-equipment\ManufacturerMainPanel.cs" />
+    <Compile Remove="10-equipment\ManufacturerMainPanel.designer.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Remove="01-pumpProduct\AddPumpProductMainDlg - 澶嶅埗.resx" />
-    <EmbeddedResource Remove="01-pumpProduct\PumpProductMainPanel - 澶嶅埗.resx" />
+    <EmbeddedResource Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.resx" />
+    <EmbeddedResource Remove="01-pump\PumpProductMainPanel - 澶嶅埗.resx" />
+    <EmbeddedResource Remove="10-equipment\ManufacturerMainPanel.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>
@@ -48,14 +52,14 @@
     <Compile Update="02-adapting\AddAdaptingMainDlg.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="01-pumpProduct\03-PumpType\EditPumpTypeDlg.cs">
+    <Compile Update="01-pump\03-PumpType\EditPumpTypeDlg.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="01-pumpProduct\EditPumpProductMainDlg.cs" />
-    <Compile Update="01-pumpProduct\EditPumpProductGroupDlg.cs" />
-    <Compile Update="01-pumpProduct\AddPumpProductGroupDlg.cs" />
-    <Compile Update="01-pumpProduct\AddPumpProductMainDlg.cs" />
-    <Compile Update="01-pumpProduct\EditPumpProductSeriesDlg.cs" />
+    <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\EditValveSeriesDlg.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -104,22 +108,22 @@
     <Compile Update="05-elbow\02-main\ElbowManageMainPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="04-pipeline\01-series\AddPipeLineSeriesDlg.cs">
+    <Compile Update="04-pipe\01-series\AddPipeLineSeriesDlg.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="04-pipeline\01-series\EditPipeLineSeriesDlg.cs">
+    <Compile Update="04-pipe\01-series\EditPipeLineSeriesDlg.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="04-pipeline\02-main\EditPipeLineMainDlg.cs">
+    <Compile Update="04-pipe\02-main\EditPipeMainDlg.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="04-pipeline\02-main\AddPipeLineMainDlg.cs">
+    <Compile Update="04-pipe\02-main\AddPipeMainDlg.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="04-pipeline\02-main\PipelineManageMainPanel.cs">
+    <Compile Update="04-pipe\02-main\PipeManageMainPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="04-pipeline\01-series\PipeLineTreeListCtrl.cs">
+    <Compile Update="04-pipe\01-series\PipeLineTreeListCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Update="07-fourLink\02-main\AddFourLinkMainDlg.cs">
@@ -128,22 +132,22 @@
     <Compile Update="07-fourLink\02-main\EditFourLinkMainDlg.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="08-Nozzle\01-series\AddPipeLineSeriesDlg.cs">
+    <Compile Update="08-nozzle\01-series\AddPipeLineSeriesDlg.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="08-Nozzle\01-series\EditPipeLineSeriesDlg.cs">
+    <Compile Update="08-nozzle\01-series\EditPipeLineSeriesDlg.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="08-Nozzle\01-series\NozzleTreeListCtrl.cs">
+    <Compile Update="08-nozzle\01-series\NozzleTreeListCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="08-Nozzle\02-main\AddNozzleMainDlg.cs">
+    <Compile Update="08-nozzle\02-main\AddNozzleMainDlg.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="08-Nozzle\02-main\EditNozzleMainDlg.cs">
+    <Compile Update="08-nozzle\02-main\EditNozzleMainDlg.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="08-Nozzle\02-main\NozzleManageMainPanel.cs">
+    <Compile Update="08-nozzle\02-main\NozzleManageMainPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Update="Properties\Resources.Designer.cs">
@@ -160,4 +164,8 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="10-equipment\" />
+  </ItemGroup>
+
 </Project>

--
Gitblit v1.9.3