From 564d1fcca01d3c528e283c9feef3ea1a05140e17 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 29 九月 2024 22:36:46 +0800
Subject: [PATCH] 优化API架构，修复GET需要全部参数赋值的问题
---
Tiger.Controllers.WMS/Controllers/WMSController.SaleOutInfo.cs | 0
Tiger.Controllers.System/Controllers/Base/CacheController.CodeRule.cs | 0
Tiger.Controllers.System/Controllers/Base/UpgradeController.cs | 4
Tiger.Controllers.WMS/Controllers/WMSController.MqSNData.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.ProductionMaterialReq.cs | 0
Tiger.Business.MESTests/Tiger.Business.MESTests.csproj | 11 +-
Tiger.Model.Net/Tiger.Model.Net.csproj | 4
Tiger.Controllers.MES/Controllers/MESController.MES_WORKSHOP.cs | 0
Tiger.Controllers.WMS/Controllers/T100ToWMS/MaterialInfoController.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.CustSupplyChecking.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.CustomerSupplyNew.cs | 0
Tiger.Controllers.MES/Controllers/MESController.PackingNode.cs | 1
Tiger.Controllers.WMS/Controllers/WMSController.OtherInLocationChecking.cs | 0
Tiger.Controllers.MES/Controllers/MESController.BAS_LABEL_TEMP.cs | 0
Tiger.Controllers.System/Controllers/SYS/SYSController.Org.cs | 4
Tiger.Controllers.WMS/Controllers/WMSController.OtherInLocation.cs | 0
Tiger.Controllers.System/Controllers/Base/CacheController.SysParam.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.WmsItem.cs | 2
Tiger.Controllers.WMS/Controllers/WMSController.ShelfRemote.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.CustomerSupply.cs | 0
Tiger.Controllers.System/Controllers/SYS/SYSController.cs | 0
Tiger.Controllers.WMS/Controllers/KanBanController.cs | 0
Tiger.Controllers.MES/Autofac/MES.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.ReceiptInfo.cs | 0
Tiger.Dependencies/Tiger.Dependencies.csproj | 22 +++++
Tiger.Business/BizSettings.json | 10 +-
Tiger.Controllers.WMS/Tiger.Controllers.WMS.csproj | 4 -
Tiger.Controllers.WMS/Controllers/WMSController.InMatStorage.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.T100Service.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.OutSplit.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.User.cs | 0
Tiger.Controllers.WMS/Controllers/SrmController.SrmDataToSiHua.cs | 0
Tiger.Controllers.WMS/Controllers/KanBanController.Warehousing.cs | 0
Tiger.Controllers.WMS/Autofac/WMS.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.Agv.cs | 0
Tiger.Controllers.MES/Controllers/MESController.DoUnPack.cs | 0
Tiger.Controllers.MES/Controllers/MESController.TestNode.cs | 1
Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs | 0
Tiger.Api/Controllers/Test/TestController.R.cs | 2
Tiger.Controllers.System/Controllers/TSK/TskController.QQTSrm.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.Vender.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.PDACount.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.OutNoBillcode.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.OutOther.cs | 0
Tiger.Controllers.System/Controllers/Base/ClientController.cs | 0
Tiger.Controllers.System/Controllers/TSK/TskController.Base.cs | 0
Tiger.Controllers.MES/Controllers/SMTController.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.MqModelInfo.cs | 0
Tiger.Controllers.System/Controllers/SYS/SYSController.User.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.cs | 0
Tiger.IBusiness/Tiger.IBusiness.csproj | 13 ---
Tiger.Controllers.System/Controllers/SYS/SYSController.Sys_Params.cs | 2
Tiger.Controllers.WMS/Controllers/WMSController.WareHouseModeling.cs | 6
Tiger.Controllers.WMS/Controllers/WMSController.ItemQuery.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.MaterialReq.cs | 2
Tiger.Controllers.MES/Controllers/MESController.CollectNode.cs | 0
Tiger.Controllers.MES/Controllers/MESController.CodeVerification.cs | 0
Tiger.Controllers.WMS/Controllers/SrmController.cs | 0
Tiger.Api/iBiz/Biz.cs | 4
Tiger.Controllers.System/Controllers/Base/BaseController.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.OtherOutInfo.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.Tranfer.cs | 2
Tiger.Controllers.System/Controllers/Base/LoginController.cs | 6
Tiger.Api/Tiger.Api.csproj | 12 --
Tiger.Controllers.System/Controllers/TSK/TskController.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.OutTransfer.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.MaterialResale.cs | 0
Tiger.Controllers.MES/Controllers/MESController.cs | 0
Tiger.Controllers.System/Controllers/BAS/BASController.cs | 0
Tiger.Controllers.MES/Tiger.Controllers.MES.csproj | 2
Tiger.Controllers.WMS/Controllers/WMSController.InFinished.cs | 0
Tiger.Controllers.System/Controllers/Base/CacheController.cs | 0
Tiger.Api.Core/Tiger.Api.Core.csproj | 9 ++
Tiger.Controllers.WMS/Controllers/WMSController.OutSale.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.Minsun.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.MqCustomer.cs | 0
Tiger.Api.sln | 41 +++++++++
Tiger.Controllers.WMS/Controllers/WMSController.CustSupplyCheckingNew.cs | 0
Tiger.Controllers.WMS/Controllers/WMSTestController.cs | 8 +
Tiger.Controllers.MES/Controllers/MESController.BizBaseRule.cs | 0
Tiger.Model.Net/packages.config | 2
Tiger.Controllers.WMS/Controllers/WMSController.LocationTransfer.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.RePrintBarcode.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.OutWordOrder.cs | 0
Tiger.Api/Startup.cs | 4
Tiger.Controllers.MES/Controllers/SMTController.Tool.cs | 0
Tiger.Controllers.WMS/Controllers/WMSController.InProductionReturn.cs | 0
Tiger.Controllers.System/Controllers/SYS/SYSController.Role.cs | 0
Tiger.Controllers.MES/Controllers/MESController.Transaction.cs | 1
Tiger.Controllers.MES/Controllers/MESController.Route.cs | 12 +-
Tiger.Controllers.WMS/Controllers/WMSController.Resell.cs | 0
Tiger.Controllers.System/Tiger.Controllers.System.csproj | 21 +++++
Tiger.Controllers.WMS/Controllers/WMSController.Count.cs | 0
Tiger.Controllers.System/Controllers/Base/SystemController.cs | 2
Tiger.Controllers.System/Controllers/SYS/SYSController.Menu.cs | 4
Tiger.Controllers.WMS/Controllers/WMSController.InReceipt.cs | 0
Tiger.Controllers.System/Controllers/Base/LanguageController.cs | 2
97 files changed, 143 insertions(+), 77 deletions(-)
diff --git a/Tiger.Api.Core/Tiger.Api.Core.csproj b/Tiger.Api.Core/Tiger.Api.Core.csproj
new file mode 100644
index 0000000..132c02c
--- /dev/null
+++ b/Tiger.Api.Core/Tiger.Api.Core.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
+</Project>
diff --git a/Tiger.Api.sln b/Tiger.Api.sln
index c7b3b6f..c3b08f3 100644
--- a/Tiger.Api.sln
+++ b/Tiger.Api.sln
@@ -22,7 +22,7 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tiger.Business", "Tiger.Business\Tiger.Business.csproj", "{60FA322B-9B03-4380-803C-63B1F240E453}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "05-鍗曞厓娴嬭瘯", "05-鍗曞厓娴嬭瘯", "{CF29B377-FE5A-488A-AF99-DF9D9C6FCA95}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "06-鍗曞厓娴嬭瘯", "06-鍗曞厓娴嬭瘯", "{CF29B377-FE5A-488A-AF99-DF9D9C6FCA95}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tiger.Business.MES", "Tiger.Business.MES\Tiger.Business.MES.csproj", "{3848BCAB-4E77-4D5E-8BF0-2A747981C1B4}"
EndProject
@@ -38,9 +38,17 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tiger.Controllers.WMS", "Tiger.Controllers.WMS\Tiger.Controllers.WMS.csproj", "{0B65AB5A-2D97-4292-8210-8E0D0BD227BB}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tiger.Controllers.MES", "Tiger.Controllers.MES\Tiger.Controllers.MES.csproj", "{016ABAEC-75DE-4553-B828-AA45C237B485}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tiger.Controllers.MES", "Tiger.Controllers.MES\Tiger.Controllers.MES.csproj", "{016ABAEC-75DE-4553-B828-AA45C237B485}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tiger.IBusiness.MES", "Tiger.IBusiness.MES\Tiger.IBusiness.MES.csproj", "{07B13ED4-77D9-4B9C-9375-91B7ED371422}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tiger.IBusiness.MES", "Tiger.IBusiness.MES\Tiger.IBusiness.MES.csproj", "{07B13ED4-77D9-4B9C-9375-91B7ED371422}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "05-寮曠敤渚濊禆", "05-寮曠敤渚濊禆", "{80347AC9-C069-4DF6-B3D3-E8B242E741F5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tiger.Dependencies", "Tiger.Dependencies\Tiger.Dependencies.csproj", "{25510DCE-19CC-4FF6-926B-3036120D37B6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tiger.Api.Core", "Tiger.Api.Core\Tiger.Api.Core.csproj", "{FE25D100-75C9-4DE3-8CDA-EA9AA4677CF4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tiger.Controllers.System", "Tiger.Controllers.System\Tiger.Controllers.System.csproj", "{10DF128C-B6BB-496B-96B0-64512D0E1D00}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -146,6 +154,30 @@
{07B13ED4-77D9-4B9C-9375-91B7ED371422}.Release|Any CPU.Build.0 = Release|Any CPU
{07B13ED4-77D9-4B9C-9375-91B7ED371422}.Release|x86.ActiveCfg = Release|Any CPU
{07B13ED4-77D9-4B9C-9375-91B7ED371422}.Release|x86.Build.0 = Release|Any CPU
+ {25510DCE-19CC-4FF6-926B-3036120D37B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {25510DCE-19CC-4FF6-926B-3036120D37B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {25510DCE-19CC-4FF6-926B-3036120D37B6}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {25510DCE-19CC-4FF6-926B-3036120D37B6}.Debug|x86.Build.0 = Debug|Any CPU
+ {25510DCE-19CC-4FF6-926B-3036120D37B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {25510DCE-19CC-4FF6-926B-3036120D37B6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {25510DCE-19CC-4FF6-926B-3036120D37B6}.Release|x86.ActiveCfg = Release|Any CPU
+ {25510DCE-19CC-4FF6-926B-3036120D37B6}.Release|x86.Build.0 = Release|Any CPU
+ {FE25D100-75C9-4DE3-8CDA-EA9AA4677CF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FE25D100-75C9-4DE3-8CDA-EA9AA4677CF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FE25D100-75C9-4DE3-8CDA-EA9AA4677CF4}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {FE25D100-75C9-4DE3-8CDA-EA9AA4677CF4}.Debug|x86.Build.0 = Debug|Any CPU
+ {FE25D100-75C9-4DE3-8CDA-EA9AA4677CF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FE25D100-75C9-4DE3-8CDA-EA9AA4677CF4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FE25D100-75C9-4DE3-8CDA-EA9AA4677CF4}.Release|x86.ActiveCfg = Release|Any CPU
+ {FE25D100-75C9-4DE3-8CDA-EA9AA4677CF4}.Release|x86.Build.0 = Release|Any CPU
+ {10DF128C-B6BB-496B-96B0-64512D0E1D00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {10DF128C-B6BB-496B-96B0-64512D0E1D00}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {10DF128C-B6BB-496B-96B0-64512D0E1D00}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {10DF128C-B6BB-496B-96B0-64512D0E1D00}.Debug|x86.Build.0 = Debug|Any CPU
+ {10DF128C-B6BB-496B-96B0-64512D0E1D00}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {10DF128C-B6BB-496B-96B0-64512D0E1D00}.Release|Any CPU.Build.0 = Release|Any CPU
+ {10DF128C-B6BB-496B-96B0-64512D0E1D00}.Release|x86.ActiveCfg = Release|Any CPU
+ {10DF128C-B6BB-496B-96B0-64512D0E1D00}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -164,6 +196,9 @@
{0B65AB5A-2D97-4292-8210-8E0D0BD227BB} = {457563B5-E42C-448A-A924-FBEE9B585A81}
{016ABAEC-75DE-4553-B828-AA45C237B485} = {457563B5-E42C-448A-A924-FBEE9B585A81}
{07B13ED4-77D9-4B9C-9375-91B7ED371422} = {A994D516-643A-4543-B781-540E81F1DE55}
+ {25510DCE-19CC-4FF6-926B-3036120D37B6} = {80347AC9-C069-4DF6-B3D3-E8B242E741F5}
+ {FE25D100-75C9-4DE3-8CDA-EA9AA4677CF4} = {FF44BF62-08C5-4B52-B24F-54CD79E96848}
+ {10DF128C-B6BB-496B-96B0-64512D0E1D00} = {457563B5-E42C-448A-A924-FBEE9B585A81}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {797A1D83-9F3C-4AEC-8A83-E3468102DBD1}
diff --git a/Tiger.Api/Controllers/Test/TestController.R.cs b/Tiger.Api/Controllers/Test/TestController.R.cs
index 462deb6..0b48c83 100644
--- a/Tiger.Api/Controllers/Test/TestController.R.cs
+++ b/Tiger.Api/Controllers/Test/TestController.R.cs
@@ -306,7 +306,7 @@
public partial class _TestController : ControllerBase
{
[HttpGet]
- public async Task<IActionResult> DoSomething(int duration)
+ public async Task<IActionResult> DoSomething(int duration, string code)
{
Barcode b = new("asdasd");
var begin = DateTime.Now;
diff --git a/Tiger.Api/Startup.cs b/Tiger.Api/Startup.cs
index 5a9aace..98cd967 100644
--- a/Tiger.Api/Startup.cs
+++ b/Tiger.Api/Startup.cs
@@ -56,13 +56,13 @@
{
//services.RegisterAssembly("Tiger.Service");
//services.AddTransient(typeof(IBaseService<>), typeof(BaseService<>));
- services.AddControllersWithViews().AddNewtonsoftJson(opt =>
+ services.AddControllersWithViews().AddExtraControllers().AddNewtonsoftJson(opt =>
{
opt.SerializerSettings.ContractResolver = new Newtonsoft.Json.Serialization.DefaultContractResolver();
opt.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
});
//services.AddControllers().AddApplicationPart(typeof(_WMSTestController).Assembly);
- services.AddControllers().AddExtraControllers();
+ //services.AddControllers();
//閰嶇疆璺ㄥ煙澶勭悊cors
聽 聽 聽 聽 聽 聽 services.AddCors(options =>
diff --git a/Tiger.Api/Tiger.Api.csproj b/Tiger.Api/Tiger.Api.csproj
index 2b363fc..e348f37 100644
--- a/Tiger.Api/Tiger.Api.csproj
+++ b/Tiger.Api/Tiger.Api.csproj
@@ -77,17 +77,9 @@
<Content Include="Icons\HonghuApi64.ico" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Autofac" Version="8.0.0" />
- <PackageReference Include="Autofac.Configuration" Version="6.0.0" />
- <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
- <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
- <PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="6.0.14" />
- <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
- <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.14" />
- <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="6.0.33" />
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.33" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
- <PackageReference Include="SharpZipLib" Version="1.4.2" />
- <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Tiger.IBusiness.MES\Tiger.IBusiness.MES.csproj" />
diff --git a/Tiger.Api/iBiz/Biz.cs b/Tiger.Api/iBiz/Biz.cs
index 6b1333c..8f3b307 100644
--- a/Tiger.Api/iBiz/Biz.cs
+++ b/Tiger.Api/iBiz/Biz.cs
@@ -19,12 +19,12 @@
public static IDbBase Base => _Biz.DbBase();
/// <summary>
- /// 涓绘暟鎹簱瀹㈡埛绔�
+ /// 鎸囧畾鍚嶇О鏁版嵁搴撳鎴风
/// </summary>
public static DbClient DB(string name = "") => _Biz.DB(name);
/// <summary>
- /// 涓绘暟鎹簱鍩虹鏂规硶
+ /// 鎸囧畾鍚嶇О鏁版嵁搴撳熀纭�鏂规硶
/// </summary>
public static IDbBase DbBase(string name = "") => _Biz.DbBase(name);
}
diff --git a/Tiger.Business.MESTests/Tiger.Business.MESTests.csproj b/Tiger.Business.MESTests/Tiger.Business.MESTests.csproj
index 4aae2e0..fd91b2f 100644
--- a/Tiger.Business.MESTests/Tiger.Business.MESTests.csproj
+++ b/Tiger.Business.MESTests/Tiger.Business.MESTests.csproj
@@ -10,10 +10,13 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="coverlet.collector" Version="6.0.0" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
- <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
- <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+ <PackageReference Include="coverlet.collector" Version="6.0.2">
+ <PrivateAssets>all</PrivateAssets>
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+ </PackageReference>
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+ <PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
+ <PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
</ItemGroup>
<ItemGroup>
diff --git a/Tiger.Business/BizSettings.json b/Tiger.Business/BizSettings.json
index a5653c5..9c0b1a0 100644
--- a/Tiger.Business/BizSettings.json
+++ b/Tiger.Business/BizSettings.json
@@ -26,10 +26,10 @@
"Main": {
"DbType": "SqlServer",
//"ConnectionString": "server=172.18.8.57;uid=sa;pwd=bmsEia9IS4VByWJr;database=SharetronicWmsDb_DGSC;",
- //"ConnectionString": "server=172.16.80.40;uid=sa;pwd=Yada@321654;database=MES;"
- //"ConnectionString": "server=localhost;uid=sa;pwd=p@ssw0rd;database=MES;"
- //"ConnectionString": "server=(localdb)\\ProjectsV13;uid=sa;pwd=p@ssw0rd;database=MES;",
- "ConnectionString": "server=47.115.28.255;uid=sa;pwd=p@ssw0rd;database=MES;"
+ //"ConnectionString": "server=172.16.80.40;uid=sa;pwd=Yada@321654;database=MES;Encrypt=True;TrustServerCertificate=True;"
+ //"ConnectionString": "server=localhost;uid=sa;pwd=p@ssw0rd;database=MES;Encrypt=True;TrustServerCertificate=True;"
+ //"ConnectionString": "server=(localdb)\\ProjectsV13;uid=sa;pwd=p@ssw0rd;database=MES;Encrypt=True;TrustServerCertificate=True;",
+ "ConnectionString": "server=47.115.28.255;uid=sa;pwd=p@ssw0rd;database=MES;Encrypt=True;TrustServerCertificate=True;"
//"DbType": "Sqlite",
//"ConnectionString": "DataSource=..\\apidata\\Automate.db"
//"DbType": "MySql",
@@ -45,7 +45,7 @@
},
"YadaU9C": {
"DbType": "SqlServer",
- "ConnectionString": "server=172.16.80.20;uid=Mes_View;pwd=yd@123456;database=20240703;"
+ "ConnectionString": "server=172.16.80.20;uid=Mes_View;pwd=yd@123456;database=20240703;Encrypt=True;TrustServerCertificate=True;"
//"ConnectionString": "server=172.18.8.55;database=wms;uid=root;pwd=Share@123;charset='utf8';SslMode=None;AllowLoadLocalInfile=true;"
},
"Test": {
diff --git a/Tiger.Api/iBiz/MES.cs b/Tiger.Controllers.MES/Autofac/MES.cs
similarity index 100%
rename from Tiger.Api/iBiz/MES.cs
rename to Tiger.Controllers.MES/Autofac/MES.cs
diff --git a/Tiger.Controllers.MES/MESController.BAS_LABEL_TEMP.cs b/Tiger.Controllers.MES/Controllers/MESController.BAS_LABEL_TEMP.cs
similarity index 100%
rename from Tiger.Controllers.MES/MESController.BAS_LABEL_TEMP.cs
rename to Tiger.Controllers.MES/Controllers/MESController.BAS_LABEL_TEMP.cs
diff --git a/Tiger.Controllers.MES/MESController.BIZ_MES_WO.cs b/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
similarity index 100%
rename from Tiger.Controllers.MES/MESController.BIZ_MES_WO.cs
rename to Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
diff --git a/Tiger.Controllers.MES/MESController.BizBaseRule.cs b/Tiger.Controllers.MES/Controllers/MESController.BizBaseRule.cs
similarity index 100%
rename from Tiger.Controllers.MES/MESController.BizBaseRule.cs
rename to Tiger.Controllers.MES/Controllers/MESController.BizBaseRule.cs
diff --git a/Tiger.Controllers.MES/MESController.CodeVerification.cs b/Tiger.Controllers.MES/Controllers/MESController.CodeVerification.cs
similarity index 100%
rename from Tiger.Controllers.MES/MESController.CodeVerification.cs
rename to Tiger.Controllers.MES/Controllers/MESController.CodeVerification.cs
diff --git a/Tiger.Controllers.MES/MESController.CollectNode.cs b/Tiger.Controllers.MES/Controllers/MESController.CollectNode.cs
similarity index 100%
rename from Tiger.Controllers.MES/MESController.CollectNode.cs
rename to Tiger.Controllers.MES/Controllers/MESController.CollectNode.cs
diff --git a/Tiger.Controllers.MES/MESController.DoUnPack.cs b/Tiger.Controllers.MES/Controllers/MESController.DoUnPack.cs
similarity index 100%
rename from Tiger.Controllers.MES/MESController.DoUnPack.cs
rename to Tiger.Controllers.MES/Controllers/MESController.DoUnPack.cs
diff --git a/Tiger.Controllers.MES/MESController.MES_WORKSHOP.cs b/Tiger.Controllers.MES/Controllers/MESController.MES_WORKSHOP.cs
similarity index 100%
rename from Tiger.Controllers.MES/MESController.MES_WORKSHOP.cs
rename to Tiger.Controllers.MES/Controllers/MESController.MES_WORKSHOP.cs
diff --git a/Tiger.Controllers.MES/MESController.PackingNode.cs b/Tiger.Controllers.MES/Controllers/MESController.PackingNode.cs
similarity index 99%
rename from Tiger.Controllers.MES/MESController.PackingNode.cs
rename to Tiger.Controllers.MES/Controllers/MESController.PackingNode.cs
index 49fb4cd..38895a7 100644
--- a/Tiger.Controllers.MES/MESController.PackingNode.cs
+++ b/Tiger.Controllers.MES/Controllers/MESController.PackingNode.cs
@@ -5,7 +5,6 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using System.Xml.Linq;
-using Tiger.Api.iBiz;
using Tiger.IBusiness;
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;
diff --git a/Tiger.Controllers.MES/MESController.Route.cs b/Tiger.Controllers.MES/Controllers/MESController.Route.cs
similarity index 96%
rename from Tiger.Controllers.MES/MESController.Route.cs
rename to Tiger.Controllers.MES/Controllers/MESController.Route.cs
index f1030aa..5e45036 100644
--- a/Tiger.Controllers.MES/MESController.Route.cs
+++ b/Tiger.Controllers.MES/Controllers/MESController.Route.cs
@@ -251,7 +251,7 @@
/// <returns></returns>
[HttpGet]
[Route("api/[controller]/[action]")]
- public async Task<IActionResult> GetRoutePTreeAsync(string prodCode, string orgCode) {
+ public async Task<IActionResult> GetRoutePTreeAsync(string? prodCode, string? orgCode) {
SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { PROD_CODE = prodCode,ORG_CODE = orgCode });
var data = Biz.Db.Ado.UseStoredProcedure().SqlQuery<V_MES_ROUTE_PTREE>("SP_MES_GET_ROUTE_PTREE", pars);//杩斿洖List
return Ok(data);
@@ -259,7 +259,7 @@
[HttpGet]
[Route("api/[controller]/[action]")]
- public async Task<IActionResult> GetWoPTreeAsync(string wo)
+ public async Task<IActionResult> GetWoPTreeAsync(string? wo)
{
SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { WO = wo });
var data = Biz.Db.Ado.UseStoredProcedure().SqlQuery<V_MES_WO_PTREE>("SP_MES_GET_WO_PTREE", pars);//杩斿洖List
@@ -274,7 +274,7 @@
/// <returns></returns>
[HttpGet]
[Route("api/[controller]/[action]")]
- public async Task<IActionResult> RouteToProd(string rotId, string prodCode)
+ public async Task<IActionResult> RouteToProd(string? rotId, string? prodCode)
{
ApiAction response = new();
try
@@ -303,7 +303,7 @@
/// <returns></returns>
[HttpGet]
[Route("api/[controller]/[action]")]
- public async Task<IActionResult> RouteToCust(string rotId, string prodCode, string custCode)
+ public async Task<IActionResult> RouteToCust(string? rotId, string? prodCode, string? custCode)
{
ApiAction response = new();
try
@@ -331,7 +331,7 @@
/// <returns></returns>
[HttpGet]
[Route("api/[controller]/[action]")]
- public async Task<IActionResult> SP_MES_PROD2WO(string rotId, string wo)
+ public async Task<IActionResult> SP_MES_PROD2WO(string? rotId, string? wo)
{
ApiAction response = new();
try
@@ -358,7 +358,7 @@
/// <returns></returns>
[HttpGet]
[Route("api/[controller]/[action]")]
- public async Task<IActionResult> SP_MES_WO2CUST(string wo)
+ public async Task<IActionResult> SP_MES_WO2CUST(string? wo)
{
ApiAction response = new();
try
diff --git a/Tiger.Controllers.MES/MESController.TestNode.cs b/Tiger.Controllers.MES/Controllers/MESController.TestNode.cs
similarity index 99%
rename from Tiger.Controllers.MES/MESController.TestNode.cs
rename to Tiger.Controllers.MES/Controllers/MESController.TestNode.cs
index 935a283..c4bc10b 100644
--- a/Tiger.Controllers.MES/MESController.TestNode.cs
+++ b/Tiger.Controllers.MES/Controllers/MESController.TestNode.cs
@@ -5,7 +5,6 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using System.Xml.Linq;
-using Tiger.Api.iBiz;
using Tiger.IBusiness;
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;
diff --git a/Tiger.Controllers.MES/MESController.Transaction.cs b/Tiger.Controllers.MES/Controllers/MESController.Transaction.cs
similarity index 98%
rename from Tiger.Controllers.MES/MESController.Transaction.cs
rename to Tiger.Controllers.MES/Controllers/MESController.Transaction.cs
index 34fc0d2..0e643b8 100644
--- a/Tiger.Controllers.MES/MESController.Transaction.cs
+++ b/Tiger.Controllers.MES/Controllers/MESController.Transaction.cs
@@ -5,7 +5,6 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using System.Xml.Linq;
-using Tiger.Api.iBiz;
using Tiger.IBusiness;
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;
diff --git a/Tiger.Controllers.MES/MESController.cs b/Tiger.Controllers.MES/Controllers/MESController.cs
similarity index 100%
rename from Tiger.Controllers.MES/MESController.cs
rename to Tiger.Controllers.MES/Controllers/MESController.cs
diff --git a/Tiger.Controllers.MES/SMTController.Tool.cs b/Tiger.Controllers.MES/Controllers/SMTController.Tool.cs
similarity index 100%
rename from Tiger.Controllers.MES/SMTController.Tool.cs
rename to Tiger.Controllers.MES/Controllers/SMTController.Tool.cs
diff --git a/Tiger.Controllers.MES/SMTController.cs b/Tiger.Controllers.MES/Controllers/SMTController.cs
similarity index 100%
rename from Tiger.Controllers.MES/SMTController.cs
rename to Tiger.Controllers.MES/Controllers/SMTController.cs
diff --git a/Tiger.Controllers.MES/Tiger.Controllers.MES.csproj b/Tiger.Controllers.MES/Tiger.Controllers.MES.csproj
index 87b14d8..b19503a 100644
--- a/Tiger.Controllers.MES/Tiger.Controllers.MES.csproj
+++ b/Tiger.Controllers.MES/Tiger.Controllers.MES.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+锘�<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
diff --git a/Tiger.Api/Controllers/BAS/BASController.cs b/Tiger.Controllers.System/Controllers/BAS/BASController.cs
similarity index 100%
rename from Tiger.Api/Controllers/BAS/BASController.cs
rename to Tiger.Controllers.System/Controllers/BAS/BASController.cs
diff --git a/Tiger.Api/Controllers/Base/BaseController.cs b/Tiger.Controllers.System/Controllers/Base/BaseController.cs
similarity index 100%
rename from Tiger.Api/Controllers/Base/BaseController.cs
rename to Tiger.Controllers.System/Controllers/Base/BaseController.cs
diff --git a/Tiger.Api/Controllers/Base/CacheController.CodeRule.cs b/Tiger.Controllers.System/Controllers/Base/CacheController.CodeRule.cs
similarity index 100%
rename from Tiger.Api/Controllers/Base/CacheController.CodeRule.cs
rename to Tiger.Controllers.System/Controllers/Base/CacheController.CodeRule.cs
diff --git a/Tiger.Api/Controllers/Base/CacheController.SysParam.cs b/Tiger.Controllers.System/Controllers/Base/CacheController.SysParam.cs
similarity index 100%
rename from Tiger.Api/Controllers/Base/CacheController.SysParam.cs
rename to Tiger.Controllers.System/Controllers/Base/CacheController.SysParam.cs
diff --git a/Tiger.Api/Controllers/Base/CacheController.cs b/Tiger.Controllers.System/Controllers/Base/CacheController.cs
similarity index 100%
rename from Tiger.Api/Controllers/Base/CacheController.cs
rename to Tiger.Controllers.System/Controllers/Base/CacheController.cs
diff --git a/Tiger.Api/Controllers/Base/ClientController.cs b/Tiger.Controllers.System/Controllers/Base/ClientController.cs
similarity index 100%
rename from Tiger.Api/Controllers/Base/ClientController.cs
rename to Tiger.Controllers.System/Controllers/Base/ClientController.cs
diff --git a/Tiger.Api/Controllers/Base/LanguageController.cs b/Tiger.Controllers.System/Controllers/Base/LanguageController.cs
similarity index 92%
rename from Tiger.Api/Controllers/Base/LanguageController.cs
rename to Tiger.Controllers.System/Controllers/Base/LanguageController.cs
index 9b9dc95..b3e4515 100644
--- a/Tiger.Api/Controllers/Base/LanguageController.cs
+++ b/Tiger.Controllers.System/Controllers/Base/LanguageController.cs
@@ -23,7 +23,7 @@
/// <param name="locale"></param>
/// <returns></returns>
[HttpGet]
- public async Task<IActionResult> Get(string locale)
+ public async Task<IActionResult> Get(string? locale)
{
//return Ok(Biz.Language.GetJson(locale));
return Ok(DI.Resolve<ILanguage>().GetJson(locale));
diff --git a/Tiger.Api/Controllers/Base/LoginController.cs b/Tiger.Controllers.System/Controllers/Base/LoginController.cs
similarity index 92%
rename from Tiger.Api/Controllers/Base/LoginController.cs
rename to Tiger.Controllers.System/Controllers/Base/LoginController.cs
index 69b4b4d..c6b3adf 100644
--- a/Tiger.Api/Controllers/Base/LoginController.cs
+++ b/Tiger.Controllers.System/Controllers/Base/LoginController.cs
@@ -34,7 +34,7 @@
/// <param name="action"></param>
/// <returns></returns>
[HttpGet]
- public async Task<IActionResult> SwitchOrgCode(string token, string org, string fty)
+ public async Task<IActionResult> SwitchOrgCode(string? token, string? org, string? fty)
{
return Ok(await DI.Resolve<ILogin>().BSSwitchOrgCode(token,org, fty));
}
@@ -44,7 +44,7 @@
/// <param name="token"></param>
/// <returns></returns>
[HttpGet]
- public async Task<IActionResult> GetLoginInfo(string token)
+ public async Task<IActionResult> GetLoginInfo(string? token)
{
var _token =string.IsNullOrEmpty(token)?Request.Headers["Authorization"].ToString(): token;
return Ok(await DI.Resolve<ILogin>().GetBSLoginInfo(_token));
@@ -80,7 +80,7 @@
/// <param name="token"></param>
/// <returns></returns>
[HttpGet]
- public async Task<IActionResult> CSGetLoginInfo(string token)
+ public async Task<IActionResult> CSGetLoginInfo(string? token)
{
var _token = string.IsNullOrEmpty(token) ? Request.Headers["Authorization"].ToString() : token;
return Ok(await DI.Resolve<ILogin>().GetCSLoginInfo(_token));
diff --git a/Tiger.Api/Controllers/Base/SystemController.cs b/Tiger.Controllers.System/Controllers/Base/SystemController.cs
similarity index 99%
rename from Tiger.Api/Controllers/Base/SystemController.cs
rename to Tiger.Controllers.System/Controllers/Base/SystemController.cs
index 5e506d3..71b2260 100644
--- a/Tiger.Api/Controllers/Base/SystemController.cs
+++ b/Tiger.Controllers.System/Controllers/Base/SystemController.cs
@@ -104,7 +104,7 @@
/// <returns></returns>
[HttpGet]
[Route("System/Entitys/Get")]
- public IActionResult GetEntitys(string Namespace, string StartWith)
+ public IActionResult GetEntitys(string? Namespace, string? StartWith)
{
Assembly assembly = Assembly.Load("Tiger.Model");
Type[] types = assembly.GetTypes();
diff --git a/Tiger.Api/Controllers/Base/UpgradeController.cs b/Tiger.Controllers.System/Controllers/Base/UpgradeController.cs
similarity index 99%
rename from Tiger.Api/Controllers/Base/UpgradeController.cs
rename to Tiger.Controllers.System/Controllers/Base/UpgradeController.cs
index b9c851c..a47b8e3 100644
--- a/Tiger.Api/Controllers/Base/UpgradeController.cs
+++ b/Tiger.Controllers.System/Controllers/Base/UpgradeController.cs
@@ -27,7 +27,7 @@
/// <param name="path"></param>
/// <returns></returns>
[HttpGet]
- public async Task<IActionResult> GetFileListAsync(string path)
+ public async Task<IActionResult> GetFileListAsync(string? path)
{
var filePath = UpgradeFileSystem.UpgradeRootPath + path;
var allFiles = new List<UpgradeFileSystem>();
@@ -51,7 +51,7 @@
/// <param name="path"></param>
/// <returns></returns>
[HttpGet]
- public async Task<IActionResult> GetFileAsync(string path)
+ public async Task<IActionResult> GetFileAsync(string? path)
{
var filePath = UpgradeFileSystem.UpgradeRootPath + path;
if (System.IO.File.Exists(filePath))
diff --git a/Tiger.Api/Controllers/SYS/SYSController.Menu.cs b/Tiger.Controllers.System/Controllers/SYS/SYSController.Menu.cs
similarity index 80%
rename from Tiger.Api/Controllers/SYS/SYSController.Menu.cs
rename to Tiger.Controllers.System/Controllers/SYS/SYSController.Menu.cs
index 602bbf9..67ba62e 100644
--- a/Tiger.Api/Controllers/SYS/SYSController.Menu.cs
+++ b/Tiger.Controllers.System/Controllers/SYS/SYSController.Menu.cs
@@ -12,13 +12,13 @@
public partial class SYSController : ControllerBase
{
[HttpGet]
- public async Task<IActionResult> getMenuList(string userId,string rootCode)
+ public async Task<IActionResult> getMenuList(string? userId,string? rootCode)
{
return Ok(await DI.Resolve<ISystem>().getMenuList(userId, rootCode));
}
[HttpGet]
- public async Task<IActionResult> getMenuListAll(string menuName, string status)
+ public async Task<IActionResult> getMenuListAll(string? menuName, string? status)
{
return Ok(await DI.Resolve<ISystem>().getMenuListAll(menuName, status));
}
diff --git a/Tiger.Api/Controllers/SYS/SYSController.Org.cs b/Tiger.Controllers.System/Controllers/SYS/SYSController.Org.cs
similarity index 84%
rename from Tiger.Api/Controllers/SYS/SYSController.Org.cs
rename to Tiger.Controllers.System/Controllers/SYS/SYSController.Org.cs
index 028aaf9..eaf10d1 100644
--- a/Tiger.Api/Controllers/SYS/SYSController.Org.cs
+++ b/Tiger.Controllers.System/Controllers/SYS/SYSController.Org.cs
@@ -18,7 +18,7 @@
/// <param name="status"></param>
/// <returns></returns>
[HttpGet]
- public async Task<IActionResult> getOrgTreeList(string deptName, string status)
+ public async Task<IActionResult> getOrgTreeList(string? deptName, string? status)
{
return Ok(await DI.Resolve<ISystem>().getOrgTreeList(deptName, status));
}
@@ -30,7 +30,7 @@
/// <param name="status"></param>
/// <returns></returns>
[HttpGet]
- public async Task<IActionResult> getProdTreeList(string deptName)
+ public async Task<IActionResult> getProdTreeList(string? deptName)
{
return Ok(await DI.Resolve<ISystem>().getProdTreeList(deptName));
}
diff --git a/Tiger.Api/Controllers/SYS/SYSController.Role.cs b/Tiger.Controllers.System/Controllers/SYS/SYSController.Role.cs
similarity index 100%
rename from Tiger.Api/Controllers/SYS/SYSController.Role.cs
rename to Tiger.Controllers.System/Controllers/SYS/SYSController.Role.cs
diff --git a/Tiger.Api/Controllers/SYS/SYSController.Sys_Params.cs b/Tiger.Controllers.System/Controllers/SYS/SYSController.Sys_Params.cs
similarity index 87%
rename from Tiger.Api/Controllers/SYS/SYSController.Sys_Params.cs
rename to Tiger.Controllers.System/Controllers/SYS/SYSController.Sys_Params.cs
index 383af0d..3763981 100644
--- a/Tiger.Api/Controllers/SYS/SYSController.Sys_Params.cs
+++ b/Tiger.Controllers.System/Controllers/SYS/SYSController.Sys_Params.cs
@@ -18,7 +18,7 @@
/// <param name="code"></param>
/// <returns></returns>
[HttpGet]
- public async Task<IActionResult> getSysParam(string group, string code)
+ public async Task<IActionResult> getSysParam(string? group, string? code)
{
return Ok(await DI.Resolve<ISystem>().getSysParam(group, code));
}
diff --git a/Tiger.Api/Controllers/SYS/SYSController.User.cs b/Tiger.Controllers.System/Controllers/SYS/SYSController.User.cs
similarity index 100%
rename from Tiger.Api/Controllers/SYS/SYSController.User.cs
rename to Tiger.Controllers.System/Controllers/SYS/SYSController.User.cs
diff --git a/Tiger.Api/Controllers/SYS/SYSController.cs b/Tiger.Controllers.System/Controllers/SYS/SYSController.cs
similarity index 100%
rename from Tiger.Api/Controllers/SYS/SYSController.cs
rename to Tiger.Controllers.System/Controllers/SYS/SYSController.cs
diff --git a/Tiger.Api/Controllers/TSK/TskController.Base.cs b/Tiger.Controllers.System/Controllers/TSK/TskController.Base.cs
similarity index 100%
rename from Tiger.Api/Controllers/TSK/TskController.Base.cs
rename to Tiger.Controllers.System/Controllers/TSK/TskController.Base.cs
diff --git a/Tiger.Api/Controllers/TSK/TskController.QQTSrm.cs b/Tiger.Controllers.System/Controllers/TSK/TskController.QQTSrm.cs
similarity index 100%
rename from Tiger.Api/Controllers/TSK/TskController.QQTSrm.cs
rename to Tiger.Controllers.System/Controllers/TSK/TskController.QQTSrm.cs
diff --git a/Tiger.Api/Controllers/TSK/TskController.cs b/Tiger.Controllers.System/Controllers/TSK/TskController.cs
similarity index 100%
rename from Tiger.Api/Controllers/TSK/TskController.cs
rename to Tiger.Controllers.System/Controllers/TSK/TskController.cs
diff --git a/Tiger.Controllers.System/Tiger.Controllers.System.csproj b/Tiger.Controllers.System/Tiger.Controllers.System.csproj
new file mode 100644
index 0000000..573d403
--- /dev/null
+++ b/Tiger.Controllers.System/Tiger.Controllers.System.csproj
@@ -0,0 +1,21 @@
+锘�<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\Tiger.Api\Tiger.Api.csproj" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Folder Include="Autofac\" />
+ </ItemGroup>
+
+ <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+ <Exec Command="xcopy /r/y/i $(ProjectDir)$(OutDir)$(AssemblyName).dll $(SolutionDir)Tiger.Api\$(OutDir)
xcopy /r/y/i $(ProjectDir)$(OutDir)$(AssemblyName).pdb $(SolutionDir)Tiger.Api\$(OutDir)" />
+ </Target>
+
+</Project>
diff --git a/Tiger.Api/iBiz/WMS.cs b/Tiger.Controllers.WMS/Autofac/WMS.cs
similarity index 100%
rename from Tiger.Api/iBiz/WMS.cs
rename to Tiger.Controllers.WMS/Autofac/WMS.cs
diff --git a/Tiger.Controllers.WMS/KanBanController.Warehousing.cs b/Tiger.Controllers.WMS/Controllers/KanBanController.Warehousing.cs
similarity index 100%
rename from Tiger.Controllers.WMS/KanBanController.Warehousing.cs
rename to Tiger.Controllers.WMS/Controllers/KanBanController.Warehousing.cs
diff --git a/Tiger.Controllers.WMS/KanBanController.cs b/Tiger.Controllers.WMS/Controllers/KanBanController.cs
similarity index 100%
rename from Tiger.Controllers.WMS/KanBanController.cs
rename to Tiger.Controllers.WMS/Controllers/KanBanController.cs
diff --git a/Tiger.Controllers.WMS/SrmController.SrmDataToSiHua.cs b/Tiger.Controllers.WMS/Controllers/SrmController.SrmDataToSiHua.cs
similarity index 100%
rename from Tiger.Controllers.WMS/SrmController.SrmDataToSiHua.cs
rename to Tiger.Controllers.WMS/Controllers/SrmController.SrmDataToSiHua.cs
diff --git a/Tiger.Controllers.WMS/SrmController.cs b/Tiger.Controllers.WMS/Controllers/SrmController.cs
similarity index 100%
rename from Tiger.Controllers.WMS/SrmController.cs
rename to Tiger.Controllers.WMS/Controllers/SrmController.cs
diff --git a/Tiger.Controllers.WMS/T100ToWMS/MaterialInfoController.cs b/Tiger.Controllers.WMS/Controllers/T100ToWMS/MaterialInfoController.cs
similarity index 100%
rename from Tiger.Controllers.WMS/T100ToWMS/MaterialInfoController.cs
rename to Tiger.Controllers.WMS/Controllers/T100ToWMS/MaterialInfoController.cs
diff --git a/Tiger.Controllers.WMS/WMSController.Agv.cs b/Tiger.Controllers.WMS/Controllers/WMSController.Agv.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.Agv.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.Agv.cs
diff --git a/Tiger.Controllers.WMS/WMSController.Count.cs b/Tiger.Controllers.WMS/Controllers/WMSController.Count.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.Count.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.Count.cs
diff --git a/Tiger.Controllers.WMS/WMSController.CustSupplyChecking.cs b/Tiger.Controllers.WMS/Controllers/WMSController.CustSupplyChecking.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.CustSupplyChecking.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.CustSupplyChecking.cs
diff --git a/Tiger.Controllers.WMS/WMSController.CustSupplyCheckingNew.cs b/Tiger.Controllers.WMS/Controllers/WMSController.CustSupplyCheckingNew.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.CustSupplyCheckingNew.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.CustSupplyCheckingNew.cs
diff --git a/Tiger.Controllers.WMS/WMSController.CustomerSupply.cs b/Tiger.Controllers.WMS/Controllers/WMSController.CustomerSupply.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.CustomerSupply.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.CustomerSupply.cs
diff --git a/Tiger.Controllers.WMS/WMSController.CustomerSupplyNew.cs b/Tiger.Controllers.WMS/Controllers/WMSController.CustomerSupplyNew.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.CustomerSupplyNew.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.CustomerSupplyNew.cs
diff --git a/Tiger.Controllers.WMS/WMSController.InFinished.cs b/Tiger.Controllers.WMS/Controllers/WMSController.InFinished.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.InFinished.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.InFinished.cs
diff --git a/Tiger.Controllers.WMS/WMSController.InMatStorage.cs b/Tiger.Controllers.WMS/Controllers/WMSController.InMatStorage.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.InMatStorage.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.InMatStorage.cs
diff --git a/Tiger.Controllers.WMS/WMSController.InProductionReturn.cs b/Tiger.Controllers.WMS/Controllers/WMSController.InProductionReturn.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.InProductionReturn.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.InProductionReturn.cs
diff --git a/Tiger.Controllers.WMS/WMSController.InReceipt.cs b/Tiger.Controllers.WMS/Controllers/WMSController.InReceipt.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.InReceipt.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.InReceipt.cs
diff --git a/Tiger.Controllers.WMS/WMSController.ItemQuery.cs b/Tiger.Controllers.WMS/Controllers/WMSController.ItemQuery.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.ItemQuery.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.ItemQuery.cs
diff --git a/Tiger.Controllers.WMS/WMSController.LocationTransfer.cs b/Tiger.Controllers.WMS/Controllers/WMSController.LocationTransfer.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.LocationTransfer.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.LocationTransfer.cs
diff --git a/Tiger.Controllers.WMS/WMSController.MaterialReq.cs b/Tiger.Controllers.WMS/Controllers/WMSController.MaterialReq.cs
similarity index 90%
rename from Tiger.Controllers.WMS/WMSController.MaterialReq.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.MaterialReq.cs
index 18979f6..6d82976 100644
--- a/Tiger.Controllers.WMS/WMSController.MaterialReq.cs
+++ b/Tiger.Controllers.WMS/Controllers/WMSController.MaterialReq.cs
@@ -19,7 +19,7 @@
/// <returns></returns>
[HttpGet]
[Route("api/[controller]/[action]")]
- public async Task<IActionResult> UpdateReq(string User,string BillCode,string Auth_Org)
+ public async Task<IActionResult> UpdateReq(string? User,string? BillCode,string? Auth_Org)
{
ApiAction response = new();
try
diff --git a/Tiger.Controllers.WMS/WMSController.MaterialResale.cs b/Tiger.Controllers.WMS/Controllers/WMSController.MaterialResale.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.MaterialResale.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.MaterialResale.cs
diff --git a/Tiger.Controllers.WMS/WMSController.Minsun.cs b/Tiger.Controllers.WMS/Controllers/WMSController.Minsun.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.Minsun.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.Minsun.cs
diff --git a/Tiger.Controllers.WMS/WMSController.MqCustomer.cs b/Tiger.Controllers.WMS/Controllers/WMSController.MqCustomer.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.MqCustomer.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.MqCustomer.cs
diff --git a/Tiger.Controllers.WMS/WMSController.MqModelInfo.cs b/Tiger.Controllers.WMS/Controllers/WMSController.MqModelInfo.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.MqModelInfo.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.MqModelInfo.cs
diff --git a/Tiger.Controllers.WMS/WMSController.MqSNData.cs b/Tiger.Controllers.WMS/Controllers/WMSController.MqSNData.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.MqSNData.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.MqSNData.cs
diff --git a/Tiger.Controllers.WMS/WMSController.OtherInLocation.cs b/Tiger.Controllers.WMS/Controllers/WMSController.OtherInLocation.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.OtherInLocation.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.OtherInLocation.cs
diff --git a/Tiger.Controllers.WMS/WMSController.OtherInLocationChecking.cs b/Tiger.Controllers.WMS/Controllers/WMSController.OtherInLocationChecking.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.OtherInLocationChecking.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.OtherInLocationChecking.cs
diff --git a/Tiger.Controllers.WMS/WMSController.OtherOutInfo.cs b/Tiger.Controllers.WMS/Controllers/WMSController.OtherOutInfo.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.OtherOutInfo.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.OtherOutInfo.cs
diff --git a/Tiger.Controllers.WMS/WMSController.OutNoBillcode.cs b/Tiger.Controllers.WMS/Controllers/WMSController.OutNoBillcode.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.OutNoBillcode.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.OutNoBillcode.cs
diff --git a/Tiger.Controllers.WMS/WMSController.OutOther.cs b/Tiger.Controllers.WMS/Controllers/WMSController.OutOther.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.OutOther.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.OutOther.cs
diff --git a/Tiger.Controllers.WMS/WMSController.OutSale.cs b/Tiger.Controllers.WMS/Controllers/WMSController.OutSale.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.OutSale.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.OutSale.cs
diff --git a/Tiger.Controllers.WMS/WMSController.OutSplit.cs b/Tiger.Controllers.WMS/Controllers/WMSController.OutSplit.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.OutSplit.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.OutSplit.cs
diff --git a/Tiger.Controllers.WMS/WMSController.OutTransfer.cs b/Tiger.Controllers.WMS/Controllers/WMSController.OutTransfer.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.OutTransfer.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.OutTransfer.cs
diff --git a/Tiger.Controllers.WMS/WMSController.OutWordOrder.cs b/Tiger.Controllers.WMS/Controllers/WMSController.OutWordOrder.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.OutWordOrder.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.OutWordOrder.cs
diff --git a/Tiger.Controllers.WMS/WMSController.PDACount.cs b/Tiger.Controllers.WMS/Controllers/WMSController.PDACount.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.PDACount.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.PDACount.cs
diff --git a/Tiger.Controllers.WMS/WMSController.ProductionMaterialReq.cs b/Tiger.Controllers.WMS/Controllers/WMSController.ProductionMaterialReq.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.ProductionMaterialReq.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.ProductionMaterialReq.cs
diff --git a/Tiger.Controllers.WMS/WMSController.RePrintBarcode.cs b/Tiger.Controllers.WMS/Controllers/WMSController.RePrintBarcode.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.RePrintBarcode.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.RePrintBarcode.cs
diff --git a/Tiger.Controllers.WMS/WMSController.ReceiptInfo.cs b/Tiger.Controllers.WMS/Controllers/WMSController.ReceiptInfo.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.ReceiptInfo.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.ReceiptInfo.cs
diff --git a/Tiger.Controllers.WMS/WMSController.Resell.cs b/Tiger.Controllers.WMS/Controllers/WMSController.Resell.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.Resell.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.Resell.cs
diff --git a/Tiger.Controllers.WMS/WMSController.SaleOutInfo.cs b/Tiger.Controllers.WMS/Controllers/WMSController.SaleOutInfo.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.SaleOutInfo.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.SaleOutInfo.cs
diff --git a/Tiger.Controllers.WMS/WMSController.ShelfRemote.cs b/Tiger.Controllers.WMS/Controllers/WMSController.ShelfRemote.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.ShelfRemote.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.ShelfRemote.cs
diff --git a/Tiger.Controllers.WMS/WMSController.T100Service.cs b/Tiger.Controllers.WMS/Controllers/WMSController.T100Service.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.T100Service.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.T100Service.cs
diff --git a/Tiger.Controllers.WMS/WMSController.Tranfer.cs b/Tiger.Controllers.WMS/Controllers/WMSController.Tranfer.cs
similarity index 89%
rename from Tiger.Controllers.WMS/WMSController.Tranfer.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.Tranfer.cs
index a742723..4b996ad 100644
--- a/Tiger.Controllers.WMS/WMSController.Tranfer.cs
+++ b/Tiger.Controllers.WMS/Controllers/WMSController.Tranfer.cs
@@ -19,7 +19,7 @@
/// <returns></returns>
[HttpGet]
[Route("api/[controller]/[action]")]
- public async Task<IActionResult> MaterialResale(string billcode,string whcode, string org_code)
+ public async Task<IActionResult> MaterialResale(string? billcode,string? whcode, string? org_code)
{
ApiAction response = new();
try
diff --git a/Tiger.Controllers.WMS/WMSController.User.cs b/Tiger.Controllers.WMS/Controllers/WMSController.User.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.User.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.User.cs
diff --git a/Tiger.Controllers.WMS/WMSController.Vender.cs b/Tiger.Controllers.WMS/Controllers/WMSController.Vender.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.Vender.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.Vender.cs
diff --git a/Tiger.Controllers.WMS/WMSController.WareHouseModeling.cs b/Tiger.Controllers.WMS/Controllers/WMSController.WareHouseModeling.cs
similarity index 94%
rename from Tiger.Controllers.WMS/WMSController.WareHouseModeling.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.WareHouseModeling.cs
index debad7d..cb17a87 100644
--- a/Tiger.Controllers.WMS/WMSController.WareHouseModeling.cs
+++ b/Tiger.Controllers.WMS/Controllers/WMSController.WareHouseModeling.cs
@@ -19,7 +19,7 @@
/// <returns></returns>
[HttpGet]
[Route("api/[controller]/[action]")]
- public async Task<IActionResult> GetHouseModel(string houseName, string status)
+ public async Task<IActionResult> GetHouseModel(string? houseName, string? status)
{
return Ok(await DI.Resolve<IBS>().GetHouseModel(houseName, status));
}
@@ -101,7 +101,7 @@
/// <returns></returns>
[HttpGet]
[Route("api/[controller]/[action]")]
- public async Task<IActionResult> GetUpdateOrg(string id)
+ public async Task<IActionResult> GetUpdateOrg(string? id)
{
return Ok(await DI.Resolve<IBS>().GetUpdateOrg(id));
}
@@ -112,7 +112,7 @@
/// <returns></returns>
[HttpGet]
[Route("api/[controller]/[action]")]
- public async Task<IActionResult> GetWmsCode(string id)
+ public async Task<IActionResult> GetWmsCode(string? id)
{
return Ok(await DI.Resolve<IBS>().GetWmsCode(id));
}
diff --git a/Tiger.Controllers.WMS/WMSController.WmsItem.cs b/Tiger.Controllers.WMS/Controllers/WMSController.WmsItem.cs
similarity index 96%
rename from Tiger.Controllers.WMS/WMSController.WmsItem.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.WmsItem.cs
index 4a098a5..e4200d4 100644
--- a/Tiger.Controllers.WMS/WMSController.WmsItem.cs
+++ b/Tiger.Controllers.WMS/Controllers/WMSController.WmsItem.cs
@@ -22,7 +22,7 @@
/// <returns></returns>
[HttpGet]
[Route("api/[controller]/Item/GetQRCode")]
- public IActionResult Item_GetQRCode(string sn)
+ public IActionResult Item_GetQRCode(string? sn)
{
ApiAction response = new();
try
diff --git a/Tiger.Controllers.WMS/WMSController.cs b/Tiger.Controllers.WMS/Controllers/WMSController.cs
similarity index 100%
rename from Tiger.Controllers.WMS/WMSController.cs
rename to Tiger.Controllers.WMS/Controllers/WMSController.cs
diff --git a/Tiger.Controllers.WMS/WMSTestController.cs b/Tiger.Controllers.WMS/Controllers/WMSTestController.cs
similarity index 80%
rename from Tiger.Controllers.WMS/WMSTestController.cs
rename to Tiger.Controllers.WMS/Controllers/WMSTestController.cs
index 27ebd9d..7e4dac5 100644
--- a/Tiger.Controllers.WMS/WMSTestController.cs
+++ b/Tiger.Controllers.WMS/Controllers/WMSTestController.cs
@@ -1,4 +1,5 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
+锘縰sing Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
using System.Runtime.InteropServices;
using Tiger.Api;
using Tiger.IBusiness;
@@ -9,11 +10,12 @@
/// MQTT娴嬭瘯鎺у埗鍣�
/// </summary>
[ApiController]
+ [EnableCors("Any")]
[Route("api/[controller]/[action]")]
public partial class _WMSTestController : ControllerBase
{
[HttpGet]
- public async Task<IActionResult> DoSomething(int duration)
+ public async Task<IActionResult> DoSomething(int duration, string code)
{
var begin = DateTime.Now;
@@ -25,7 +27,7 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- public async Task<IActionResult> D1Async(string param)
+ public async Task<IActionResult> D1Async(string? param)
{
var data = DI.Resolve<ITest>().show();
return Ok(data);
diff --git a/Tiger.Controllers.WMS/Tiger.Controllers.WMS.csproj b/Tiger.Controllers.WMS/Tiger.Controllers.WMS.csproj
index fb36fef..87b14d8 100644
--- a/Tiger.Controllers.WMS/Tiger.Controllers.WMS.csproj
+++ b/Tiger.Controllers.WMS/Tiger.Controllers.WMS.csproj
@@ -7,10 +7,6 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
- </ItemGroup>
-
- <ItemGroup>
<ProjectReference Include="..\Tiger.Api\Tiger.Api.csproj" />
</ItemGroup>
diff --git a/Tiger.Dependencies/Tiger.Dependencies.csproj b/Tiger.Dependencies/Tiger.Dependencies.csproj
new file mode 100644
index 0000000..72fcc8d
--- /dev/null
+++ b/Tiger.Dependencies/Tiger.Dependencies.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Autofac" Version="8.1.0" />
+ <PackageReference Include="Autofac.Configuration" Version="7.0.0" />
+ <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
+ <PackageReference Include="MailKit" Version="4.7.1.1" />
+ <PackageReference Include="NLog" Version="5.3.4" />
+ <PackageReference Include="NLog.Database" Version="5.3.4" />
+ <PackageReference Include="Rhea.Common" Version="6.1.7.1359" />
+ <PackageReference Include="SharpZipLib" Version="1.4.2" />
+ <PackageReference Include="Sundial" Version="2.64.0" />
+ <PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.0" />
+ </ItemGroup>
+
+</Project>
diff --git a/Tiger.IBusiness/Tiger.IBusiness.csproj b/Tiger.IBusiness/Tiger.IBusiness.csproj
index c8648e2..446bfa5 100644
--- a/Tiger.IBusiness/Tiger.IBusiness.csproj
+++ b/Tiger.IBusiness/Tiger.IBusiness.csproj
@@ -11,18 +11,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Autofac" Version="8.0.0" />
- <PackageReference Include="Autofac.Configuration" Version="6.0.0" />
- <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
- <PackageReference Include="MailKit" Version="4.5.0" />
- <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
- <PackageReference Include="NLog" Version="5.2.8" />
- <PackageReference Include="NLog.Database" Version="5.2.8" />
- <PackageReference Include="Rhea.Common" Version="6.1.7.1358" />
- <PackageReference Include="Sundial" Version="2.45.0" />
- </ItemGroup>
-
- <ItemGroup>
+ <ProjectReference Include="..\Tiger.Dependencies\Tiger.Dependencies.csproj" />
<ProjectReference Include="..\Tiger.Model.Net\Tiger.Model.Net.csproj" />
</ItemGroup>
diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index db09706..0ef238d 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -58,8 +58,8 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="SqlSugar, Version=5.1.4.149, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\SqlSugar.5.1.4.149\lib\SqlSugar.dll</HintPath>
+ <Reference Include="SqlSugar, Version=5.1.4.168, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\SqlSugar.5.1.4.169\lib\SqlSugar.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
diff --git a/Tiger.Model.Net/packages.config b/Tiger.Model.Net/packages.config
index b3ede61..4b69700 100644
--- a/Tiger.Model.Net/packages.config
+++ b/Tiger.Model.Net/packages.config
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
- <package id="SqlSugar" version="5.1.4.149" targetFramework="net48" />
+ <package id="SqlSugar" version="5.1.4.169" targetFramework="net48" />
</packages>
\ No newline at end of file
--
Gitblit v1.9.3