From 30e078df2eae453b8ea39680816d5abbf5c51b25 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 26 九月 2024 14:01:07 +0800
Subject: [PATCH] Xhs匹配改造,有错误

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
index bdeb386..97df4a5 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
@@ -31,7 +31,6 @@
     <Compile Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainChoicePage.Designer.cs" />
     <Compile Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainForm-bak.cs" />
     <Compile Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainForm-bak.Designer.cs" />
-    <Compile Remove="04-simulation\06-simulation\01-autoMatching\01-ViewModel\AdaptingViewModel.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -139,19 +138,19 @@
     <Compile Update="04-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="04-simulation\06-simulation\01-autoMatching\02-AsstesFormCtrl\PipeLineMatchingCtrl.cs">
+    <Compile Update="04-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="04-simulation\06-simulation\01-autoMatching\02-AsstesFormCtrl\ValveMatchingCtrl.cs">
+    <Compile Update="04-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="04-simulation\06-simulation\01-autoMatching\02-AsstesFormCtrl\PumpMatchingCtrl.cs">
+    <Compile Update="04-simulation\06-simulation\01-matching\02-pump\XhsProjectSimulationPumpMatchingListCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="04-simulation\06-simulation\01-autoMatching\02-AsstesFormCtrl\ThreeLinkMatchingCtrl.cs">
+    <Compile Update="04-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="04-simulation\06-simulation\01-autoMatching\02-AsstesFormCtrl\FourLinkMatchingCtrl.cs">
+    <Compile Update="04-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Update="04-simulation\06-simulation\04-unmatching\00-core\XhsProjectSimulationUnMatchingListCtrl.cs">

--
Gitblit v1.9.3