diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000000000000000000000000000000000..6511dd1868f68711f3b47e1131067db44f534672 --- /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/EOM.Client.TopSkyHotelManagerSystem.sln b/EOM.Client.TopSkyHotelManagerSystem.sln index b84723af9dfc3e9fac7f3aa3667587134b6b8381..99291d3beb121afb644ff21c3694bb9de7f24432 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 88cdffe2c6f63a25329d30c32419276a6e5224e7..d8355ec4c2dc26087fd74d72d03645044487cfdd 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 3de539230f651074c2804620df16b8f6e216b7fc..6b385fa43e6c4571d4d55e2604afc145d05d298f 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 bfd7c182b1b06823e0ddbf2ecc286f5101e88a1f..2c9c7b629fb8d3915a28053af198851edfe8bfc4 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 ba2d410ceffd5f620407508600c3c0a26fe4150f..0000000000000000000000000000000000000000 --- 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 acaa36f28a3fa654a2d4b1b1232a0f3aafff0082..3b68a15dacc49b2212dd83effe8803201a952d9a 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 6ff76a59354aeec739f9c71af4cf0a1b5688e4d7..54cd53dab72a7232b6cb571141b8249bce681fdf 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 423d66e96d9931572f9861c76bdcf89b6d65c71c..9a4da4f322544ee8240ac4e3febd2efef98fdbdc 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 34e7302bcef2eabb3fc041a2ada20aa98982b3de..721932897c50ebff1c06ee6bc3917e1ae279845a 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 f6b1232e7418566efa86553a305c0cded0c2ecf3..c60ed8dfb7b555f68822bfeb2aa9f65b4863a682 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 d8977f95daf937de26b71946e7b8051a2f9c5990..c1f313ce435769df79f2120bd97265b78d8a4704 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 8c9faaa55a2be9b4d86149509117d3e10ac34890..4db1cd6391b22986f920dc34b3149cae6b950e85 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 d2c6ec001c39348b653c8c2fd69cbfb0091c4f6f..da81724958f4801b6022e757dc23cd5955c94fc4 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 a40abedf79ecbd38a8eb8e8fc32a9af82f2e8d0c..536938660ed8b583b925516d50d1573b5ceee505 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 150230fbf81393ad538de639710cbab0dfa8fc2f..d77ce291d2f98ca79b71fba05a13fc0def888ad4 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 7e4f24b4ccd205ba8a6c5491e083cfce83df5f48..9060c04ca52519d5a24d0ca3ccab7393b80b1153 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 33b41b765ee298684fe32d1d63ba77e2ebd23201..794767c0b0310cb27abb122cb1f66eeb2e43dce4 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 0bcf46db31cc6a7e017480c4a57f1d45c39ed05c..187343d459a1dc3a4818959d37bb4c5d62dfc61a 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 bbbd9613208a4822dd5b7fd9ab3a876e3f441a1f..596169a3be812320e1ff8e42da9862be032ed099 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 9e8f8b83e8e75d1e073fcf6105a0c580ab681c20..4df867e74e6f86fcae89f056044ae4c844981ba2 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 a14be72c4447810925df5208a097c30a7d936cd4..d547e99b39e192775eba788e6e1c472a7bd50f22 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 6bdcc1245ae2e2bc6de04c829e84e66ed82129cb..baf8e586444883e9e3c85cbb43a34da470184ae6 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 f820504067d82848998196b0ee191913ce171155..20414806c60c082ef529ec976fd60bbaf4f91c55 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 78d5c476d212a48ecb806885b5b8269c4d0e243e..7c5ec46641734a403407b91f61b132dafa7c411b 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 ab4119c2a1c581202271e6e9c9fb6a80d6d443e0..48851bd647645f7cbff43eb3275878e64973b434 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 d8dc0d13ed01bde9d4d2c5b98456e1448b8d175a..56fd1fbc535b84677bf6eb21a92aacf057742608 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 b44a48c1e3efbf518f617de7cbe773f86595b570..473b137140c0fab2618884e25b4ab00a3d5363e8 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 481b6e9447956dcb66d2eb6df13e496e50c57a57..0bfe9aa06d13f76f5381c17cfaf2ab61b6ddf02e 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 65ccd11f803fa7b29aa962c0ed6ece35a9924324..239507754287a2d2a3ecd129112d203fe6f068d9 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 89cd72237ffe433c00fbbec8ef8b75e6209ce320..f10b01839c7b8557c2b3213f246799a7b128ed56 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 f53188aee10ab168f0804e17b78142b1538b1ec6..628fffda68250761aaea4e4fa5b7f726d5b42bea 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 2aa1f91b3d4e468a0154c38bb90ac8f7ade8a95d..6c7f9ffdf6ae0bcca8f7a2cc3ad5b18a24bee494 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 0c3236544daa7be1aecd6b9191cfb0208bd3a07b..c744afe08c5b12719505e3b58b0299dbab7dc63c 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 382ed08b9d5789f41cbb33aa72fcfcd858c0cce8..0d1cf3b7cddcdb4159cea8e9781ea4b393d1cf77 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 ac4a7347ebce926fe03f706031d0b9fac692821b..f0473364ed3b15e61bd304b14e3cccd1f18c2c3b 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 986b4598bb56d1616a86fd6be5f90f30e7df857e..2f932f554ac0b366a0b59d81e0e10b2f37c2a1b6 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 038d3c0385047142ee94494c513b11a87f732d19..93f425d3a0482e8a80f664d6fa4fb628240b60a7 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 a8fc69f4c1c785ead0aaa5dadbfc9bb76bc52d1c..0e9b5b1448dc44160ccecaf379166967ed52e83e 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 2a6f99e106661837631f6929147252774c7ba68c..b248ad38dd887a9290e27023a443adc1e3281352 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 80a370a730a0ea49df75ca59732f9e66f187dc61..b0042daf109804f5cf8b15f0fabe806a3496cebc 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 7f6a75023c07f16ab11402bf63e5df46964b1634..369cdb0f320e4dcc245540583cf7378f50038b9b 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 388c67fd3e03461d6fec0431bd92d0835467c132..6ff8afdeeea365424c077eb13df7d5649c0a5aae 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 4ed90a329caac35914c32aa8e9d4bf0241d3df1b..1dc014d2c42ef2df3ea7528d73129d7bfe090bd9 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 92199880343053ddd237b42e61af9c436ca5e6b6..a424ad75f3635642ce306f21a0b375421fbb571b 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 eca6a18301b7458812cf1793e54b2c71730c1001..df209cdb8c5804e7d202be6212b5124054cc0d1f 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 be26cef893fdcbf8561eb793ac0a0fe13df25a1b..d43d3cfa9e089fc08c4d72ce2d73f7d393bf9de0 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 f486664fc06d19cb9adb6f59530f5fc381291e92..1c30a96cfa86b96d6d1c1c2cb670cc27bd17bd32 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 8da8d98802a4bd8d71eb67490cdd5883c72acf35..2fc246c87669506af13b51425bfcfc953d2297ee 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 5d7630fb29edc15d029d02986a8fa2863394ee39..5df4b70c52787fcb9b5064bca2380f09e1290c1e 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 6b11cd41d2c738bdbcc9f2b9c5214cdac0f902e4..397b43e8b0f3e7f59d7145dd73f04fa93c187d21 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 cc2756c99a9bbbbddf0fe64b311606728b91a8af..6deebbb5d833cb8fa8593136ec0aeee2415ec373 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 adab67c13ce0d17a7438e767bfd4f1f07e55f161..a730ed5f8baf3f8a4f993303d6557cb448b8eebb 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 2e317a6d7398d44e30a1523e047fe78901c831d6..bd9d08bd311e1206c1b1c02f9e498be95cfab697 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 c6cf5216b885178f432c31f1a566a31922d6a8de..fa354ede05bf7b7f38d57dba4440d96759dbdb0d 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 Binary files /dev/null and b/SYS.Library/EOM.TSHotelManager.Common.Core.dll differ diff --git a/SYS.Library/SYS.Library.csproj b/SYS.Library/SYS.Library.csproj index 205a5d2ddacdf6409348e4b7b052cb9bcf51a6b7..071224a201d0e80498af0566c7920a8be7d82dbb 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 new file mode 160000 index 0000000000000000000000000000000000000000..dc690e01b91b469ad4c2427f36f99ba0b374edba --- /dev/null +++ b/topsky-hotel-manager-system-web-api @@ -0,0 +1 @@ +Subproject commit dc690e01b91b469ad4c2427f36f99ba0b374edba