From 9211ec11c112e18cd99e77f889a01110a70031ce Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 24 十一月 2025 17:47:15 +0800
Subject: [PATCH] 优化项目结构
---
WPFProject/WPFProject.csproj | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/WPFProject/WPFProject.csproj b/WPFProject/WPFProject.csproj
index f219855..7880d4c 100644
--- a/WPFProject/WPFProject.csproj
+++ b/WPFProject/WPFProject.csproj
@@ -444,6 +444,14 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\HMI.Old\Plugin_TestResult\CellStepSender\CellStepSender.csproj">
+ <Project>{84edeac7-6763-46cd-b098-0b508aaa705f}</Project>
+ <Name>CellStepSender</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\S7Driver\S7Driver.csproj">
+ <Project>{628ef12b-9ed2-4b20-950f-dc3ecc3fd15f}</Project>
+ <Name>S7Driver</Name>
+ </ProjectReference>
<ProjectReference Include="..\HMI.AlermInfoManage\HMI.AlarmInfoManage.csproj">
<Project>{945c2577-4558-45e3-891a-096cb3047304}</Project>
<Name>HMI.AlarmInfoManage</Name>
@@ -455,10 +463,6 @@
<ProjectReference Include="..\HMI.DataViewer\HMI.DataViewer.csproj">
<Project>{a580de4a-34e7-4efe-ad2c-0871396000e9}</Project>
<Name>HMI.DataViewer</Name>
- </ProjectReference>
- <ProjectReference Include="..\HMI.IOMonitor\HMI.IOMonitor.csproj">
- <Project>{f7663c79-7047-42f3-b129-73a2575ee7c6}</Project>
- <Name>HMI.IOMonitor</Name>
</ProjectReference>
<ProjectReference Include="..\HMI.LogViewer\HMI.LogViewer.csproj">
<Project>{20c23602-b029-4e21-8c11-b9e5f2223237}</Project>
@@ -484,9 +488,9 @@
<Project>{de4205c6-5923-46fd-a4b9-65169bf61c75}</Project>
<Name>HMI.MenuManage</Name>
</ProjectReference>
- <ProjectReference Include="..\Plugin.ChangeModel\Plugin.ChangeModel.csproj">
- <Project>{ef5972b1-dd20-404d-b2b3-37e70e2a478a}</Project>
- <Name>Plugin.ChangeModel</Name>
+ <ProjectReference Include="..\Plugin.CurrentSensorControl\Plugin.CurrentSensorControl.csproj">
+ <Project>{e4505d51-248b-4c21-b0e3-a4b2a7551d6a}</Project>
+ <Name>Plugin.CurrentSensorControl</Name>
</ProjectReference>
<ProjectReference Include="..\Plugin.DataBoard\Plugin.DataBoard.csproj">
<Project>{be42ab26-3270-43e1-84b8-6929d862ff8d}</Project>
@@ -504,10 +508,6 @@
<Project>{968fe602-22d6-42bd-981c-601ad518a896}</Project>
<Name>Plugin.JarUI</Name>
</ProjectReference>
- <ProjectReference Include="..\Plugin.MaterialOpt\Plugin.MaterialOpt.csproj">
- <Project>{e1f90cbd-a0d4-48da-ab25-7f490935aa4a}</Project>
- <Name>Plugin.MaterialOpt</Name>
- </ProjectReference>
<ProjectReference Include="..\Plugin.ModelManage\Plugin.ModelManage.csproj">
<Project>{76ce4d21-702c-416f-95b4-f4f4c5b2d162}</Project>
<Name>Plugin.ModelManage</Name>
@@ -515,10 +515,6 @@
<ProjectReference Include="..\Plugin.SeqEditor\Plugin.SeqEditor.csproj">
<Project>{717fd815-ff95-4f30-b4d9-9cea978ca40e}</Project>
<Name>Plugin.SeqEditor</Name>
- </ProjectReference>
- <ProjectReference Include="..\Plugin.ServoManage\Plugin.ServoManage.csproj">
- <Project>{1853e00f-6865-4bc6-974b-6a5e1c00bafe}</Project>
- <Name>Plugin.ServoManage</Name>
</ProjectReference>
<ProjectReference Include="..\Plugin.TestResult\Plugin.TestResult.csproj">
<Project>{7375b74c-b6bf-4814-9838-e1caacad1897}</Project>
@@ -539,6 +535,10 @@
<ProjectReference Include="..\SimpleUtil\HMI.Simple.Util\HMI.Simple.Util.csproj">
<Project>{cf5bebe9-2803-49c3-b773-73d082e0984a}</Project>
<Name>HMI.Simple.Util</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\SimpleUtil\HMI.Util.Base\HMI.Util.Base.csproj">
+ <Project>{d59e25d1-9b27-46a1-8438-92661dd23fae}</Project>
+ <Name>HMI.Util.Base</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -568,11 +568,14 @@
move /y "$(TargeDir)HMI.UI.dll" $(TargeDir)Libs\HMI.UI.dll"
move /y "$(TargeDir)HMI.Util.dll" $(TargeDir)Libs\HMI.Util.dll"
move /y "$(TargeDir)ConnectionUtil.dll" $(TargeDir)Libs\ConnectionUtil.dll"
+move /y "$(TargeDir)HMI.StdControl.dll" $(TargeDir)Libs\HMI.StdControl.dll"
+move /y "$(TargeDir)S7Driver.dll" $(TargeDir)Libs\S7Driver.dll"
move /y "$(TargeDir)HMI.LogUtil.dll" $(TargeDir)Api\HMI.LogUtil.dll"
move /y "$(TargeDir)HMI.SerialData.Util.dll" $(TargeDir)Api\HMI.SerialData.Util.dll"
move /y "$(TargeDir)HMI.Simple.Util.dll" $(TargeDir)Api\HMI.Simple.Util.dll"
move /y "$(TargeDir)HMI.Util.Base.dll" $(TargeDir)Api\HMI.Util.Base.dll"
+move /y "$(TargeDir)CellStepSender.dll" $(TargeDir)Api\CellStepSender.dll"
move /y "$(TargeDir)HMI.AlarmInfoManage.dll" $(TargeDir)Plugin\HMI.AlarmInfoManage.dll"
move /y "$(TargeDir)HMI.DataViewer.dll" $(TargeDir)Plugin\HMI.DataViewer.dll"
@@ -593,6 +596,7 @@
move /y "$(TargeDir)Plugin.MaterialOpt.dll" $(TargeDir)Plugin\Plugin.MaterialOpt.dll"
move /y "$(TargeDir)Plugin.DODriverControl.dll" $(TargeDir)Plugin\Plugin.DODriverControl.dll"
move /y "$(TargeDir)Plugin.ModelManage.dll" $(TargeDir)Plugin\Plugin.ModelManage.dll"
+move /y "$(TargeDir)Plugin.CurrentSensorControl.dll" $(TargeDir)Plugin\Plugin.CurrentSensorControl.dll"
setlocal enabledelayedexpansion
--
Gitblit v1.9.1