Переглянути джерело

Format Project build placement

Zixuan 4 днів тому
батько
коміт
69da50fe83

+ 1 - 1
DataBase/SqlSugarORM/SqlSugarCustom.cs

@@ -306,7 +306,7 @@ public class SqlSugarCustom
             {
                 if (this.Client.Updateable(data).Where(expression).AS(tableName).ExecuteCommand() == 0)
                 {
-                    isNewData = false;
+                    isNewData = true;
                     return this.Insert(tableName, data);
                 }
             }

+ 1 - 1
EEMSMain/EEMSMain.csproj

@@ -5,7 +5,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<OutputPath>$(SolutionDir)Binary</OutputPath>
+		<OutputPath>$(SolutionDir)Binary\EEMSMain</OutputPath>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 	</PropertyGroup>

+ 1 - 1
Module/ConfigFileManager/ConfigFileManager.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
 	  <OutputType>Library</OutputType>
 	  <TargetFramework>net8.0-windows</TargetFramework>
-	  <OutputPath>$(SolutionDir)Binary\Modules</OutputPath>
+	  <OutputPath>$(SolutionDir)Binary\EEMSMain\Modules</OutputPath>
 	  <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 	  <Nullable>enable</Nullable>
 	  <ImplicitUsings>enable</ImplicitUsings>

+ 1 - 1
Module/DashBoard/DashBoard.csproj

@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<OutputType>Library</OutputType>
 		<TargetFramework>net8.0-windows</TargetFramework>
-		<OutputPath>$(SolutionDir)Binary\Modules</OutputPath>
+		<OutputPath>$(SolutionDir)Binary\EEMSMain\Modules</OutputPath>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>

+ 1 - 1
Module/DeviceManagement/DeviceManagement.csproj

@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<OutputType>Library</OutputType>
 		<TargetFramework>net8.0-windows</TargetFramework>
-		<OutputPath>$(SolutionDir)Binary\Modules</OutputPath>
+		<OutputPath>$(SolutionDir)Binary\EEMSMain\Modules</OutputPath>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>

+ 1 - 1
Module/DeviceScanner/DeviceScanner.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
 	  <OutputType>Library</OutputType>
 	  <TargetFramework>net8.0-windows</TargetFramework>
-	  <OutputPath>$(SolutionDir)Binary\Modules</OutputPath>
+	  <OutputPath>$(SolutionDir)Binary\EEMSMain\Modules</OutputPath>
 	  <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 	  <Nullable>enable</Nullable>
 	  <ImplicitUsings>enable</ImplicitUsings>

+ 5 - 5
Module/DeviceScanner/ViewModels/Dialogs/CreateDeviceViewModel.cs

@@ -48,11 +48,11 @@ internal partial class CreateDeviceViewModel(DeviceCollection deviceCollection)
             return;
         }
 
-        if (deviceCollection.DeviceList.Values.Any(t => t.DeviceName == this.TempDevice.DeviceName))
-        {
-            MessageBox.Show($"Device Name \"{this.TempDevice.DeviceName}\" already exist", "Warning", MessageBoxButton.OK, MessageBoxImage.Error);
-            return;
-        }
+        //if (deviceCollection.DeviceList.Values.Any(t => t.DeviceName == this.TempDevice.DeviceName))
+        //{
+        //    MessageBox.Show($"Device Name \"{this.TempDevice.DeviceName}\" already exist", "Warning", MessageBoxButton.OK, MessageBoxImage.Error);
+        //    return;
+        //}
         //if (deviceCollection.DeviceList.Values.Any(t => t.IP == this.TempDevice.IP))
         //{
         //    MessageBox.Show($"IP Address \"{this.TempDevice.IP}\" already exist", "Warning", MessageBoxButton.OK, MessageBoxImage.Error);