From 7478521aaf42999b2068e3186010649ffab55d45 Mon Sep 17 00:00:00 2001 From: Chunkit Yeung Date: Tue, 20 Feb 2024 21:48:44 +0800 Subject: [PATCH 1/3] refator entitys --- .gitmodules | 3 +++ topsky-hotel-manager-system-web-api | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 topsky-hotel-manager-system-web-api diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..6511dd1 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "topsky-hotel-manager-system-web-api"] + path = topsky-hotel-manager-system-web-api + url = https://gitee.com/java-and-net/topsky-hotel-manager-system-web-api.git diff --git a/topsky-hotel-manager-system-web-api b/topsky-hotel-manager-system-web-api new file mode 160000 index 0000000..f875422 --- /dev/null +++ b/topsky-hotel-manager-system-web-api @@ -0,0 +1 @@ +Subproject commit f87542289fa2a6a14496814b17f419054631bb15 -- Gitee From 834f12cd99b336d8dcd2359f02f0d5b6194913fb Mon Sep 17 00:00:00 2001 From: Chunkit Yeung Date: Tue, 20 Feb 2024 21:49:33 +0800 Subject: [PATCH 2/3] Refator entity --- EOM.Client.TopSkyHotelManagerSystem.sln | 45 ++++++++++++++++++ SYS.Common/RecordHelper.cs | 2 +- SYS.Common/SYS.Common.csproj | 9 +++- .../{OperationLog.cs => Temp_OperationLog.cs} | 2 +- .../Business/Customer/OSelectCustoAllDto.cs | 44 ----------------- SYS.Core/SYS.Core.csproj | 1 - SYS.FormUI/AppFunction/FrmAddAdmin.cs | 4 +- SYS.FormUI/AppFunction/FrmAddRoom.cs | 4 +- SYS.FormUI/AppFunction/FrmAddWorker.cs | 5 +- SYS.FormUI/AppFunction/FrmAdminManager.cs | 4 +- SYS.FormUI/AppFunction/FrmAuthority.cs | 4 +- SYS.FormUI/AppFunction/FrmCash.cs | 4 +- SYS.FormUI/AppFunction/FrmChangeAdminPwd.cs | 4 +- SYS.FormUI/AppFunction/FrmChangePosition.cs | 4 +- SYS.FormUI/AppFunction/FrmChangeRoom.cs | 4 +- SYS.FormUI/AppFunction/FrmChangeWorker.cs | 4 +- SYS.FormUI/AppFunction/FrmChart.cs | 4 +- SYS.FormUI/AppFunction/FrmCheckIn.cs | 4 +- SYS.FormUI/AppFunction/FrmCheckList.cs | 4 +- SYS.FormUI/AppFunction/FrmCheckOutForm.cs | 4 +- SYS.FormUI/AppFunction/FrmCustoManager.cs | 4 +- SYS.FormUI/AppFunction/FrmCustoSpend.cs | 4 +- SYS.FormUI/AppFunction/FrmCustomerManager.cs | 4 +- SYS.FormUI/AppFunction/FrmDepartment.cs | 4 +- SYS.FormUI/AppFunction/FrmEditInputs.cs | 4 +- SYS.FormUI/AppFunction/FrmEducation.cs | 4 +- SYS.FormUI/AppFunction/FrmGoodOrBad.cs | 4 +- SYS.FormUI/AppFunction/FrmMySpace.cs | 4 +- SYS.FormUI/AppFunction/FrmNation.cs | 4 +- SYS.FormUI/AppFunction/FrmNotice.cs | 4 +- SYS.FormUI/AppFunction/FrmOperation.cs | 3 +- SYS.FormUI/AppFunction/FrmPosition.cs | 4 +- SYS.FormUI/AppFunction/FrmReserList.cs | 4 +- SYS.FormUI/AppFunction/FrmReserManager.cs | 4 +- SYS.FormUI/AppFunction/FrmRoomManager.cs | 4 +- SYS.FormUI/AppFunction/FrmRoomMap.cs | 4 +- SYS.FormUI/AppFunction/FrmRoomStateManager.cs | 4 +- SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs | 4 +- SYS.FormUI/AppFunction/FrmSellThing.cs | 4 +- SYS.FormUI/AppFunction/FrmSellThingManager.cs | 4 +- SYS.FormUI/AppFunction/FrmUnLockSystem.cs | 4 +- SYS.FormUI/AppFunction/FrmUpLoadNotice.cs | 4 +- SYS.FormUI/AppFunction/FrmVipRule.cs | 4 +- SYS.FormUI/AppFunction/FrmWorkerCheckInfo.cs | 4 +- SYS.FormUI/AppFunction/FrmWorkerManager.cs | 4 +- SYS.FormUI/AppFunction/FrmWtiInfo.cs | 4 +- SYS.FormUI/AppInterface/FrmAdminEnter.cs | 4 +- SYS.FormUI/AppInterface/FrmLoading.cs | 2 +- SYS.FormUI/AppInterface/FrmLogin.cs | 4 +- SYS.FormUI/AppMain/FrmBackgroundSystem.cs | 4 +- SYS.FormUI/AppMain/FrmMain.cs | 4 +- SYS.FormUI/AppUserControls/ucRoom.cs | 4 +- SYS.FormUI/AppUserControls/ucRoomList.cs | 4 +- SYS.FormUI/SYS.FormUI.csproj | 6 +-- .../EOM.TSHotelManager.Common.Core.dll | Bin 0 -> 45056 bytes SYS.Library/SYS.Library.csproj | 1 + topsky-hotel-manager-system-web-api | 2 +- 57 files changed, 151 insertions(+), 147 deletions(-) rename SYS.Common/{OperationLog.cs => Temp_OperationLog.cs} (98%) delete mode 100644 SYS.Core/Business/Customer/OSelectCustoAllDto.cs create mode 100644 SYS.Library/EOM.TSHotelManager.Common.Core.dll diff --git a/EOM.Client.TopSkyHotelManagerSystem.sln b/EOM.Client.TopSkyHotelManagerSystem.sln index b84723a..99291d3 100644 --- a/EOM.Client.TopSkyHotelManagerSystem.sln +++ b/EOM.Client.TopSkyHotelManagerSystem.sln @@ -11,6 +11,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SYS.Library", "SYS.Library\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SYS.Common", "SYS.Common\SYS.Common.csproj", "{65501AF6-C629-448A-847E-1BCD60665865}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Api", "Api", "{6A3E4936-8B95-49E0-842B-E002C0E024CE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{3B8902EC-CAB9-406A-AAF7-24DABD885AC0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.Application", "topsky-hotel-manager-system-web-api\EOM.TSHotelManager.Application\EOM.TSHotelManager.Application.csproj", "{B55975AB-2C89-4C01-B107-D87FCA21A5E3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.EntityFramework", "topsky-hotel-manager-system-web-api\EOM.TSHotelManager.EntityFramework\EOM.TSHotelManager.EntityFramework.csproj", "{8F5CF88A-1111-44CC-AFFA-4637EA10E191}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.WebApi", "topsky-hotel-manager-system-web-api\EOM.TSHotelManager.WebApi\EOM.TSHotelManager.WebApi.csproj", "{566D7064-EA90-45C1-93B7-F512BBAD7BA1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Library", "topsky-hotel-manager-system-web-api\Library\Library.csproj", "{5C7B9A47-90AD-4300-BF7F-64D9EBA9705C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.Common.Core", "topsky-hotel-manager-system-web-api\EOM.TSHotelManager.Common.Core\EOM.TSHotelManager.Common.Core.csproj", "{48B3F864-88D2-4BD1-A766-B9EBF342AED1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -33,10 +47,41 @@ Global {65501AF6-C629-448A-847E-1BCD60665865}.Debug|Any CPU.Build.0 = Debug|Any CPU {65501AF6-C629-448A-847E-1BCD60665865}.Release|Any CPU.ActiveCfg = Release|Any CPU {65501AF6-C629-448A-847E-1BCD60665865}.Release|Any CPU.Build.0 = Release|Any CPU + {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B55975AB-2C89-4C01-B107-D87FCA21A5E3}.Release|Any CPU.Build.0 = Release|Any CPU + {8F5CF88A-1111-44CC-AFFA-4637EA10E191}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8F5CF88A-1111-44CC-AFFA-4637EA10E191}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8F5CF88A-1111-44CC-AFFA-4637EA10E191}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8F5CF88A-1111-44CC-AFFA-4637EA10E191}.Release|Any CPU.Build.0 = Release|Any CPU + {566D7064-EA90-45C1-93B7-F512BBAD7BA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {566D7064-EA90-45C1-93B7-F512BBAD7BA1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {566D7064-EA90-45C1-93B7-F512BBAD7BA1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {566D7064-EA90-45C1-93B7-F512BBAD7BA1}.Release|Any CPU.Build.0 = Release|Any CPU + {5C7B9A47-90AD-4300-BF7F-64D9EBA9705C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5C7B9A47-90AD-4300-BF7F-64D9EBA9705C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5C7B9A47-90AD-4300-BF7F-64D9EBA9705C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5C7B9A47-90AD-4300-BF7F-64D9EBA9705C}.Release|Any CPU.Build.0 = Release|Any CPU + {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {8854DCB7-F2D7-4276-8D10-C7A124436145} = {3B8902EC-CAB9-406A-AAF7-24DABD885AC0} + {CD039D0F-BD50-4FBF-B9CD-CDFAB25C7DFA} = {3B8902EC-CAB9-406A-AAF7-24DABD885AC0} + {BCEA3E3C-E6D2-4210-95DD-42B461D5F22A} = {3B8902EC-CAB9-406A-AAF7-24DABD885AC0} + {65501AF6-C629-448A-847E-1BCD60665865} = {3B8902EC-CAB9-406A-AAF7-24DABD885AC0} + {B55975AB-2C89-4C01-B107-D87FCA21A5E3} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} + {8F5CF88A-1111-44CC-AFFA-4637EA10E191} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} + {566D7064-EA90-45C1-93B7-F512BBAD7BA1} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} + {5C7B9A47-90AD-4300-BF7F-64D9EBA9705C} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} + {48B3F864-88D2-4BD1-A766-B9EBF342AED1} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B93ABE6D-89AD-45B3-94FB-65BD98597CC6} EndGlobalSection diff --git a/SYS.Common/RecordHelper.cs b/SYS.Common/RecordHelper.cs index 88cdffe..d8355ec 100644 --- a/SYS.Common/RecordHelper.cs +++ b/SYS.Common/RecordHelper.cs @@ -20,7 +20,7 @@ namespace SYS.Common public static void Record(string operationLog, int level) { string api = "App/AddLog"; - var logDetail = new OperationLog + var logDetail = new Temp_OperationLog { OperationTime = DateTime.Now, LogContent = operationLog, diff --git a/SYS.Common/SYS.Common.csproj b/SYS.Common/SYS.Common.csproj index 3de5392..6b385fa 100644 --- a/SYS.Common/SYS.Common.csproj +++ b/SYS.Common/SYS.Common.csproj @@ -87,7 +87,7 @@ - + @@ -97,7 +97,12 @@ - + + + {48b3f864-88d2-4bd1-a766-b9ebf342aed1} + EOM.TSHotelManager.Common.Core + + diff --git a/SYS.Common/OperationLog.cs b/SYS.Common/Temp_OperationLog.cs similarity index 98% rename from SYS.Common/OperationLog.cs rename to SYS.Common/Temp_OperationLog.cs index bfd7c18..2c9c7b6 100644 --- a/SYS.Common/OperationLog.cs +++ b/SYS.Common/Temp_OperationLog.cs @@ -50,7 +50,7 @@ namespace SYS.Common /// /// 操作日志 /// - public class OperationLog + public class Temp_OperationLog { /// /// 操作时间 diff --git a/SYS.Core/Business/Customer/OSelectCustoAllDto.cs b/SYS.Core/Business/Customer/OSelectCustoAllDto.cs deleted file mode 100644 index ba2d410..0000000 --- a/SYS.Core/Business/Customer/OSelectCustoAllDto.cs +++ /dev/null @@ -1,44 +0,0 @@ -/* - * MIT License - *Copyright (c) 2021 易开元(Easy-Open-Meta) - - *Permission is hereby granted, free of charge, to any person obtaining a copy - *of this software and associated documentation files (the "Software"), to deal - *in the Software without restriction, including without limitation the rights - *to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - *copies of the Software, and to permit persons to whom the Software is - *furnished to do so, subject to the following conditions: - - *The above copyright notice and this permission notice shall be included in all - *copies or substantial portions of the Software. - - *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - *IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - *FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - *AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - *LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - *OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - *SOFTWARE. - * - */ -using System.Collections.Generic; - -namespace SYS.Core -{ - /// - /// 查询所有客户信息 - /// 输出DTO - /// - public class OSelectCustoAllDto - { - /// - /// 数据源 - /// - public List listSource { get; set; } - - /// - /// 总数 - /// - public int total { get; set; } - } -} \ No newline at end of file diff --git a/SYS.Core/SYS.Core.csproj b/SYS.Core/SYS.Core.csproj index acaa36f..3b68a15 100644 --- a/SYS.Core/SYS.Core.csproj +++ b/SYS.Core/SYS.Core.csproj @@ -87,7 +87,6 @@ - diff --git a/SYS.FormUI/AppFunction/FrmAddAdmin.cs b/SYS.FormUI/AppFunction/FrmAddAdmin.cs index 6ff76a5..54cd53d 100644 --- a/SYS.FormUI/AppFunction/FrmAddAdmin.cs +++ b/SYS.FormUI/AppFunction/FrmAddAdmin.cs @@ -1,7 +1,7 @@ using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/SYS.FormUI/AppFunction/FrmAddRoom.cs b/SYS.FormUI/AppFunction/FrmAddRoom.cs index 423d66e..9a4da4f 100644 --- a/SYS.FormUI/AppFunction/FrmAddRoom.cs +++ b/SYS.FormUI/AppFunction/FrmAddRoom.cs @@ -25,8 +25,8 @@ using System; using System.Data; using System.Windows.Forms; -using SYS.Core; -using SYS.Application; +using EOM.TSHotelManager.Common.Core; + using System.Collections.Generic; using Sunny.UI; using SYS.Common; diff --git a/SYS.FormUI/AppFunction/FrmAddWorker.cs b/SYS.FormUI/AppFunction/FrmAddWorker.cs index 34e7302..7219328 100644 --- a/SYS.FormUI/AppFunction/FrmAddWorker.cs +++ b/SYS.FormUI/AppFunction/FrmAddWorker.cs @@ -23,12 +23,11 @@ */ using System; using System.Collections.Generic; - using System.Drawing; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Application; + using System.Net; using System.Configuration; using System.IO; diff --git a/SYS.FormUI/AppFunction/FrmAdminManager.cs b/SYS.FormUI/AppFunction/FrmAdminManager.cs index f6b1232..c60ed8d 100644 --- a/SYS.FormUI/AppFunction/FrmAdminManager.cs +++ b/SYS.FormUI/AppFunction/FrmAdminManager.cs @@ -1,8 +1,8 @@  using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/SYS.FormUI/AppFunction/FrmAuthority.cs b/SYS.FormUI/AppFunction/FrmAuthority.cs index d8977f9..c1f313c 100644 --- a/SYS.FormUI/AppFunction/FrmAuthority.cs +++ b/SYS.FormUI/AppFunction/FrmAuthority.cs @@ -1,8 +1,8 @@ using jvncorelib_fr.EntityLib; using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/SYS.FormUI/AppFunction/FrmCash.cs b/SYS.FormUI/AppFunction/FrmCash.cs index 8c9faaa..4db1cd6 100644 --- a/SYS.FormUI/AppFunction/FrmCash.cs +++ b/SYS.FormUI/AppFunction/FrmCash.cs @@ -25,9 +25,9 @@ using System; using System.Linq; using System.Windows.Forms; using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; namespace SYS.FormUI { diff --git a/SYS.FormUI/AppFunction/FrmChangeAdminPwd.cs b/SYS.FormUI/AppFunction/FrmChangeAdminPwd.cs index d2c6ec0..da81724 100644 --- a/SYS.FormUI/AppFunction/FrmChangeAdminPwd.cs +++ b/SYS.FormUI/AppFunction/FrmChangeAdminPwd.cs @@ -23,9 +23,9 @@ */ using jvncorelib_fr.EntityLib; using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/SYS.FormUI/AppFunction/FrmChangePosition.cs b/SYS.FormUI/AppFunction/FrmChangePosition.cs index a40abed..5369386 100644 --- a/SYS.FormUI/AppFunction/FrmChangePosition.cs +++ b/SYS.FormUI/AppFunction/FrmChangePosition.cs @@ -24,9 +24,9 @@ using System; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Application; + using SYS.Common; using System.Collections.Generic; diff --git a/SYS.FormUI/AppFunction/FrmChangeRoom.cs b/SYS.FormUI/AppFunction/FrmChangeRoom.cs index 150230f..d77ce29 100644 --- a/SYS.FormUI/AppFunction/FrmChangeRoom.cs +++ b/SYS.FormUI/AppFunction/FrmChangeRoom.cs @@ -23,11 +23,11 @@ */ using System; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using Sunny.UI; using System.Transactions; using System.Collections.Generic; -using SYS.Application; + using SYS.Common; namespace SYS.FormUI diff --git a/SYS.FormUI/AppFunction/FrmChangeWorker.cs b/SYS.FormUI/AppFunction/FrmChangeWorker.cs index 7e4f24b..9060c04 100644 --- a/SYS.FormUI/AppFunction/FrmChangeWorker.cs +++ b/SYS.FormUI/AppFunction/FrmChangeWorker.cs @@ -26,9 +26,9 @@ using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using SYS.FormUI.Properties; namespace SYS.FormUI diff --git a/SYS.FormUI/AppFunction/FrmChart.cs b/SYS.FormUI/AppFunction/FrmChart.cs index 33b41b7..794767c 100644 --- a/SYS.FormUI/AppFunction/FrmChart.cs +++ b/SYS.FormUI/AppFunction/FrmChart.cs @@ -26,9 +26,9 @@ using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; namespace SYS.FormUI { diff --git a/SYS.FormUI/AppFunction/FrmCheckIn.cs b/SYS.FormUI/AppFunction/FrmCheckIn.cs index 0bcf46d..187343d 100644 --- a/SYS.FormUI/AppFunction/FrmCheckIn.cs +++ b/SYS.FormUI/AppFunction/FrmCheckIn.cs @@ -24,9 +24,9 @@ using System; using System.Collections.Generic; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Application; + using System.Transactions; using System.Linq; using SYS.Common; diff --git a/SYS.FormUI/AppFunction/FrmCheckList.cs b/SYS.FormUI/AppFunction/FrmCheckList.cs index bbbd961..596169a 100644 --- a/SYS.FormUI/AppFunction/FrmCheckList.cs +++ b/SYS.FormUI/AppFunction/FrmCheckList.cs @@ -23,9 +23,9 @@ */ using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using System; using System.Windows.Forms; diff --git a/SYS.FormUI/AppFunction/FrmCheckOutForm.cs b/SYS.FormUI/AppFunction/FrmCheckOutForm.cs index 9e8f8b8..4df867e 100644 --- a/SYS.FormUI/AppFunction/FrmCheckOutForm.cs +++ b/SYS.FormUI/AppFunction/FrmCheckOutForm.cs @@ -24,11 +24,11 @@ using System; using System.Drawing; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using SYS.FormUI.Properties; using System.Collections.Generic; using Sunny.UI; -using SYS.Application; + using SYS.Common; using System.Transactions; diff --git a/SYS.FormUI/AppFunction/FrmCustoManager.cs b/SYS.FormUI/AppFunction/FrmCustoManager.cs index a14be72..d547e99 100644 --- a/SYS.FormUI/AppFunction/FrmCustoManager.cs +++ b/SYS.FormUI/AppFunction/FrmCustoManager.cs @@ -24,10 +24,10 @@ using System; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using SYS.FormUI.Properties; using System.Collections.Generic; -using SYS.Application; + using Sunny.UI; using SYS.Common; using System.Linq; diff --git a/SYS.FormUI/AppFunction/FrmCustoSpend.cs b/SYS.FormUI/AppFunction/FrmCustoSpend.cs index 6bdcc12..baf8e58 100644 --- a/SYS.FormUI/AppFunction/FrmCustoSpend.cs +++ b/SYS.FormUI/AppFunction/FrmCustoSpend.cs @@ -23,9 +23,9 @@ */ using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using System; using System.Windows.Forms; diff --git a/SYS.FormUI/AppFunction/FrmCustomerManager.cs b/SYS.FormUI/AppFunction/FrmCustomerManager.cs index f820504..2041480 100644 --- a/SYS.FormUI/AppFunction/FrmCustomerManager.cs +++ b/SYS.FormUI/AppFunction/FrmCustomerManager.cs @@ -25,11 +25,11 @@ using System; using System.Text.RegularExpressions; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using SYS.FormUI.Properties; using System.Collections.Generic; using System.Linq; -using SYS.Application; + using Sunny.UI; using SYS.Common; diff --git a/SYS.FormUI/AppFunction/FrmDepartment.cs b/SYS.FormUI/AppFunction/FrmDepartment.cs index 78d5c47..7c5ec46 100644 --- a/SYS.FormUI/AppFunction/FrmDepartment.cs +++ b/SYS.FormUI/AppFunction/FrmDepartment.cs @@ -22,9 +22,9 @@ * */ using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using SYS.FormUI.Properties; using System; using System.Collections.Generic; diff --git a/SYS.FormUI/AppFunction/FrmEditInputs.cs b/SYS.FormUI/AppFunction/FrmEditInputs.cs index ab4119c..48851bd 100644 --- a/SYS.FormUI/AppFunction/FrmEditInputs.cs +++ b/SYS.FormUI/AppFunction/FrmEditInputs.cs @@ -1,8 +1,8 @@  using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/SYS.FormUI/AppFunction/FrmEducation.cs b/SYS.FormUI/AppFunction/FrmEducation.cs index d8dc0d1..56fd1fb 100644 --- a/SYS.FormUI/AppFunction/FrmEducation.cs +++ b/SYS.FormUI/AppFunction/FrmEducation.cs @@ -23,9 +23,9 @@ */ using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using SYS.FormUI.Properties; using System; using System.Collections.Generic; diff --git a/SYS.FormUI/AppFunction/FrmGoodOrBad.cs b/SYS.FormUI/AppFunction/FrmGoodOrBad.cs index b44a48c..473b137 100644 --- a/SYS.FormUI/AppFunction/FrmGoodOrBad.cs +++ b/SYS.FormUI/AppFunction/FrmGoodOrBad.cs @@ -30,9 +30,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Application; + using SYS.Common; namespace SYS.FormUI diff --git a/SYS.FormUI/AppFunction/FrmMySpace.cs b/SYS.FormUI/AppFunction/FrmMySpace.cs index 481b6e9..0bfe9aa 100644 --- a/SYS.FormUI/AppFunction/FrmMySpace.cs +++ b/SYS.FormUI/AppFunction/FrmMySpace.cs @@ -24,9 +24,9 @@ using jvncorelib_fr.EncryptorLib; using jvncorelib_fr.EntityLib; using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/SYS.FormUI/AppFunction/FrmNation.cs b/SYS.FormUI/AppFunction/FrmNation.cs index 65ccd11..2395077 100644 --- a/SYS.FormUI/AppFunction/FrmNation.cs +++ b/SYS.FormUI/AppFunction/FrmNation.cs @@ -22,10 +22,10 @@ * */ using Sunny.UI; -using SYS.Application; + using SYS.Common; //using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using SYS.FormUI.Properties; using System; using System.Collections.Generic; diff --git a/SYS.FormUI/AppFunction/FrmNotice.cs b/SYS.FormUI/AppFunction/FrmNotice.cs index 89cd722..f10b018 100644 --- a/SYS.FormUI/AppFunction/FrmNotice.cs +++ b/SYS.FormUI/AppFunction/FrmNotice.cs @@ -22,9 +22,9 @@ * */ using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/SYS.FormUI/AppFunction/FrmOperation.cs b/SYS.FormUI/AppFunction/FrmOperation.cs index f53188a..628fffd 100644 --- a/SYS.FormUI/AppFunction/FrmOperation.cs +++ b/SYS.FormUI/AppFunction/FrmOperation.cs @@ -21,10 +21,9 @@ *SOFTWARE. * */ +using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Application; using SYS.Common; -using SYS.Core; using System; using System.Collections.Generic; using System.Windows.Forms; diff --git a/SYS.FormUI/AppFunction/FrmPosition.cs b/SYS.FormUI/AppFunction/FrmPosition.cs index 2aa1f91..6c7f9ff 100644 --- a/SYS.FormUI/AppFunction/FrmPosition.cs +++ b/SYS.FormUI/AppFunction/FrmPosition.cs @@ -22,9 +22,9 @@ * */ using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using SYS.FormUI.Properties; using System; using System.Collections.Generic; diff --git a/SYS.FormUI/AppFunction/FrmReserList.cs b/SYS.FormUI/AppFunction/FrmReserList.cs index 0c32365..c744afe 100644 --- a/SYS.FormUI/AppFunction/FrmReserList.cs +++ b/SYS.FormUI/AppFunction/FrmReserList.cs @@ -1,11 +1,11 @@ using System; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using Sunny.UI; using System.Transactions; using System.Collections.Generic; -using SYS.Application; + using System.Web.Script.Services; using SYS.Common; using System.Linq; diff --git a/SYS.FormUI/AppFunction/FrmReserManager.cs b/SYS.FormUI/AppFunction/FrmReserManager.cs index 382ed08..0d1cf3b 100644 --- a/SYS.FormUI/AppFunction/FrmReserManager.cs +++ b/SYS.FormUI/AppFunction/FrmReserManager.cs @@ -1,8 +1,8 @@ using System; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Application; + using SYS.Common; using System.Linq; using System.Collections.Generic; diff --git a/SYS.FormUI/AppFunction/FrmRoomManager.cs b/SYS.FormUI/AppFunction/FrmRoomManager.cs index ac4a734..f047336 100644 --- a/SYS.FormUI/AppFunction/FrmRoomManager.cs +++ b/SYS.FormUI/AppFunction/FrmRoomManager.cs @@ -24,9 +24,9 @@ using System; using System.Collections.Generic; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using SYS.FormUI.Properties; -using SYS.Application; + using System.Drawing; using SYS.Common; using Sunny.UI; diff --git a/SYS.FormUI/AppFunction/FrmRoomMap.cs b/SYS.FormUI/AppFunction/FrmRoomMap.cs index 986b459..2f932f5 100644 --- a/SYS.FormUI/AppFunction/FrmRoomMap.cs +++ b/SYS.FormUI/AppFunction/FrmRoomMap.cs @@ -23,9 +23,9 @@ */ using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/SYS.FormUI/AppFunction/FrmRoomStateManager.cs b/SYS.FormUI/AppFunction/FrmRoomStateManager.cs index 038d3c0..93f425d 100644 --- a/SYS.FormUI/AppFunction/FrmRoomStateManager.cs +++ b/SYS.FormUI/AppFunction/FrmRoomStateManager.cs @@ -23,9 +23,9 @@ */ using System; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Application; + using System.Collections.Generic; using SYS.Common; diff --git a/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs b/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs index a8fc69f..0e9b5b1 100644 --- a/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs +++ b/SYS.FormUI/AppFunction/FrmSelectCustoInfo.cs @@ -23,10 +23,10 @@ */ using System; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using Sunny.UI; using System.Collections.Generic; -using SYS.Application; + using SYS.Common; namespace SYS.FormUI diff --git a/SYS.FormUI/AppFunction/FrmSellThing.cs b/SYS.FormUI/AppFunction/FrmSellThing.cs index 2a6f99e..b248ad3 100644 --- a/SYS.FormUI/AppFunction/FrmSellThing.cs +++ b/SYS.FormUI/AppFunction/FrmSellThing.cs @@ -25,9 +25,9 @@ using System; using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using Sunny.UI; -using SYS.Application; + using SYS.Common; using jvncorelib_fr.EntityLib; using System.Linq; diff --git a/SYS.FormUI/AppFunction/FrmSellThingManager.cs b/SYS.FormUI/AppFunction/FrmSellThingManager.cs index 80a370a..b0042da 100644 --- a/SYS.FormUI/AppFunction/FrmSellThingManager.cs +++ b/SYS.FormUI/AppFunction/FrmSellThingManager.cs @@ -24,9 +24,9 @@ using System; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using SYS.FormUI.Properties; -using SYS.Application; + using Sunny.UI; using SYS.Common; using System.Collections.Generic; diff --git a/SYS.FormUI/AppFunction/FrmUnLockSystem.cs b/SYS.FormUI/AppFunction/FrmUnLockSystem.cs index 7f6a750..369cdb0 100644 --- a/SYS.FormUI/AppFunction/FrmUnLockSystem.cs +++ b/SYS.FormUI/AppFunction/FrmUnLockSystem.cs @@ -29,9 +29,9 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Windows.Forms; using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; namespace SYS.FormUI { diff --git a/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs b/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs index 388c67f..6ff8afd 100644 --- a/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs +++ b/SYS.FormUI/AppFunction/FrmUpLoadNotice.cs @@ -24,8 +24,8 @@ using System; using System.Windows.Forms; -using SYS.Core; -using SYS.Application; +using EOM.TSHotelManager.Common.Core; + using Sunny.UI; using SYS.Common; using System.Linq; diff --git a/SYS.FormUI/AppFunction/FrmVipRule.cs b/SYS.FormUI/AppFunction/FrmVipRule.cs index 4ed90a3..1dc014d 100644 --- a/SYS.FormUI/AppFunction/FrmVipRule.cs +++ b/SYS.FormUI/AppFunction/FrmVipRule.cs @@ -1,8 +1,8 @@  using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using SYS.FormUI.Properties; using System; using System.Collections.Generic; diff --git a/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.cs b/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.cs index 9219988..a424ad7 100644 --- a/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.cs +++ b/SYS.FormUI/AppFunction/FrmWorkerCheckInfo.cs @@ -22,9 +22,9 @@ * */ using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; using System.Windows.Forms; diff --git a/SYS.FormUI/AppFunction/FrmWorkerManager.cs b/SYS.FormUI/AppFunction/FrmWorkerManager.cs index eca6a18..df209cd 100644 --- a/SYS.FormUI/AppFunction/FrmWorkerManager.cs +++ b/SYS.FormUI/AppFunction/FrmWorkerManager.cs @@ -26,9 +26,9 @@ using System.Collections.Generic; using System.ComponentModel; using System.Windows.Forms; using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; namespace SYS.FormUI { diff --git a/SYS.FormUI/AppFunction/FrmWtiInfo.cs b/SYS.FormUI/AppFunction/FrmWtiInfo.cs index be26cef..d43d3cf 100644 --- a/SYS.FormUI/AppFunction/FrmWtiInfo.cs +++ b/SYS.FormUI/AppFunction/FrmWtiInfo.cs @@ -25,9 +25,9 @@ using System; using System.Collections.Generic; using System.Windows.Forms; using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; namespace SYS.FormUI { diff --git a/SYS.FormUI/AppInterface/FrmAdminEnter.cs b/SYS.FormUI/AppInterface/FrmAdminEnter.cs index f486664..1c30a96 100644 --- a/SYS.FormUI/AppInterface/FrmAdminEnter.cs +++ b/SYS.FormUI/AppInterface/FrmAdminEnter.cs @@ -23,10 +23,10 @@ */ using System; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using Sunny.UI; using System.Text.RegularExpressions; -using SYS.Application; + using SYS.Common; using System.Net; using System.Diagnostics; diff --git a/SYS.FormUI/AppInterface/FrmLoading.cs b/SYS.FormUI/AppInterface/FrmLoading.cs index 8da8d98..2fc246c 100644 --- a/SYS.FormUI/AppInterface/FrmLoading.cs +++ b/SYS.FormUI/AppInterface/FrmLoading.cs @@ -1,6 +1,6 @@ using Sunny.UI; using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/SYS.FormUI/AppInterface/FrmLogin.cs b/SYS.FormUI/AppInterface/FrmLogin.cs index 5d7630f..5df4b70 100644 --- a/SYS.FormUI/AppInterface/FrmLogin.cs +++ b/SYS.FormUI/AppInterface/FrmLogin.cs @@ -25,11 +25,11 @@ using System; using System.Drawing; using System.Threading; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using SYS.FormUI.Properties; using System.Collections.Generic; using Sunny.UI; -using SYS.Application; + using SYS.Common; using System.Net; diff --git a/SYS.FormUI/AppMain/FrmBackgroundSystem.cs b/SYS.FormUI/AppMain/FrmBackgroundSystem.cs index 6b11cd4..397b43e 100644 --- a/SYS.FormUI/AppMain/FrmBackgroundSystem.cs +++ b/SYS.FormUI/AppMain/FrmBackgroundSystem.cs @@ -23,9 +23,9 @@ */ using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using SYS.FormUI.AppFunction; using System; using System.Collections.Generic; diff --git a/SYS.FormUI/AppMain/FrmMain.cs b/SYS.FormUI/AppMain/FrmMain.cs index cc2756c..6deebbb 100644 --- a/SYS.FormUI/AppMain/FrmMain.cs +++ b/SYS.FormUI/AppMain/FrmMain.cs @@ -28,11 +28,11 @@ using System.Drawing; using System.Net; using System.Runtime.InteropServices; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using SYS.FormUI.Properties; using Sunny.UI; using System.Management; -using SYS.Application; + using SYS.Common; using SYS.FormUI.AppUserControls; diff --git a/SYS.FormUI/AppUserControls/ucRoom.cs b/SYS.FormUI/AppUserControls/ucRoom.cs index adab67c..a730ed5 100644 --- a/SYS.FormUI/AppUserControls/ucRoom.cs +++ b/SYS.FormUI/AppUserControls/ucRoom.cs @@ -1,7 +1,7 @@ using Sunny.UI; -using SYS.Application; + using SYS.Common; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/SYS.FormUI/AppUserControls/ucRoomList.cs b/SYS.FormUI/AppUserControls/ucRoomList.cs index 2e317a6..bd9d08b 100644 --- a/SYS.FormUI/AppUserControls/ucRoomList.cs +++ b/SYS.FormUI/AppUserControls/ucRoomList.cs @@ -4,9 +4,9 @@ using System.Drawing; using System.Drawing.Drawing2D; using System.Runtime.InteropServices; using System.Windows.Forms; -using SYS.Core; +using EOM.TSHotelManager.Common.Core; using SYS.FormUI.Properties; -using SYS.Application; + using Sunny.UI; using SYS.Common; using System.Collections.Generic; diff --git a/SYS.FormUI/SYS.FormUI.csproj b/SYS.FormUI/SYS.FormUI.csproj index c6cf521..fa354ed 100644 --- a/SYS.FormUI/SYS.FormUI.csproj +++ b/SYS.FormUI/SYS.FormUI.csproj @@ -1073,9 +1073,9 @@ {65501AF6-C629-448A-847E-1BCD60665865} SYS.Common - - {cd039d0f-bd50-4fbf-b9cd-cdfab25c7dfa} - SYS.Core + + {48b3f864-88d2-4bd1-a766-b9ebf342aed1} + EOM.TSHotelManager.Common.Core diff --git a/SYS.Library/EOM.TSHotelManager.Common.Core.dll b/SYS.Library/EOM.TSHotelManager.Common.Core.dll new file mode 100644 index 0000000000000000000000000000000000000000..d86d4edb47c2991823e00f6704f55f98fda59875 GIT binary patch literal 45056 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 literal 0 HcmV?d00001 diff --git a/SYS.Library/SYS.Library.csproj b/SYS.Library/SYS.Library.csproj index 205a5d2..071224a 100644 --- a/SYS.Library/SYS.Library.csproj +++ b/SYS.Library/SYS.Library.csproj @@ -54,6 +54,7 @@ + diff --git a/topsky-hotel-manager-system-web-api b/topsky-hotel-manager-system-web-api index f875422..94f0fd4 160000 --- a/topsky-hotel-manager-system-web-api +++ b/topsky-hotel-manager-system-web-api @@ -1 +1 @@ -Subproject commit f87542289fa2a6a14496814b17f419054631bb15 +Subproject commit 94f0fd4fc0a977fcda8f636590d52bf1142869c3 -- Gitee From 30a52701e3335f7a9730af6e71015358726f929d Mon Sep 17 00:00:00 2001 From: Chunkit Yeung Date: Tue, 20 Feb 2024 21:49:58 +0800 Subject: [PATCH 3/3] add submodule --- topsky-hotel-manager-system-web-api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topsky-hotel-manager-system-web-api b/topsky-hotel-manager-system-web-api index 94f0fd4..dc690e0 160000 --- a/topsky-hotel-manager-system-web-api +++ b/topsky-hotel-manager-system-web-api @@ -1 +1 @@ -Subproject commit 94f0fd4fc0a977fcda8f636590d52bf1142869c3 +Subproject commit dc690e01b91b469ad4c2427f36f99ba0b374edba -- Gitee