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> 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} 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; 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 => 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" /> 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); } 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> 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": { Tiger.Controllers.MES/Autofac/MES.cs
Tiger.Controllers.MES/Controllers/MESController.BAS_LABEL_TEMP.cs
Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
Tiger.Controllers.MES/Controllers/MESController.BizBaseRule.cs
Tiger.Controllers.MES/Controllers/MESController.CodeVerification.cs
Tiger.Controllers.MES/Controllers/MESController.CollectNode.cs
Tiger.Controllers.MES/Controllers/MESController.DoUnPack.cs
Tiger.Controllers.MES/Controllers/MESController.MES_WORKSHOP.cs
Tiger.Controllers.MES/Controllers/MESController.PackingNode.cs
ÎļþÃû´Ó Tiger.Controllers.MES/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; Tiger.Controllers.MES/Controllers/MESController.Route.cs
ÎļþÃû´Ó Tiger.Controllers.MES/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 Tiger.Controllers.MES/Controllers/MESController.TestNode.cs
ÎļþÃû´Ó Tiger.Controllers.MES/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; Tiger.Controllers.MES/Controllers/MESController.Transaction.cs
ÎļþÃû´Ó Tiger.Controllers.MES/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; Tiger.Controllers.MES/Controllers/MESController.cs
Tiger.Controllers.MES/Controllers/SMTController.Tool.cs
Tiger.Controllers.MES/Controllers/SMTController.cs
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> Tiger.Controllers.System/Controllers/BAS/BASController.cs
Tiger.Controllers.System/Controllers/Base/BaseController.cs
Tiger.Controllers.System/Controllers/Base/CacheController.CodeRule.cs
Tiger.Controllers.System/Controllers/Base/CacheController.SysParam.cs
Tiger.Controllers.System/Controllers/Base/CacheController.cs
Tiger.Controllers.System/Controllers/Base/ClientController.cs
Tiger.Controllers.System/Controllers/Base/LanguageController.cs
ÎļþÃû´Ó Tiger.Api/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)); Tiger.Controllers.System/Controllers/Base/LoginController.cs
ÎļþÃû´Ó Tiger.Api/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)); Tiger.Controllers.System/Controllers/Base/SystemController.cs
ÎļþÃû´Ó Tiger.Api/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(); Tiger.Controllers.System/Controllers/Base/UpgradeController.cs
ÎļþÃû´Ó Tiger.Api/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)) Tiger.Controllers.System/Controllers/SYS/SYSController.Menu.cs
ÎļþÃû´Ó Tiger.Api/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)); } Tiger.Controllers.System/Controllers/SYS/SYSController.Org.cs
ÎļþÃû´Ó Tiger.Api/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)); } Tiger.Controllers.System/Controllers/SYS/SYSController.Role.cs
Tiger.Controllers.System/Controllers/SYS/SYSController.Sys_Params.cs
ÎļþÃû´Ó Tiger.Api/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)); } Tiger.Controllers.System/Controllers/SYS/SYSController.User.cs
Tiger.Controllers.System/Controllers/SYS/SYSController.cs
Tiger.Controllers.System/Controllers/TSK/TskController.Base.cs
Tiger.Controllers.System/Controllers/TSK/TskController.QQTSrm.cs
Tiger.Controllers.System/Controllers/TSK/TskController.cs
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> Tiger.Controllers.WMS/Autofac/WMS.cs
Tiger.Controllers.WMS/Controllers/KanBanController.Warehousing.cs
Tiger.Controllers.WMS/Controllers/KanBanController.cs
Tiger.Controllers.WMS/Controllers/SrmController.SrmDataToSiHua.cs
Tiger.Controllers.WMS/Controllers/SrmController.cs
Tiger.Controllers.WMS/Controllers/T100ToWMS/MaterialInfoController.cs
Tiger.Controllers.WMS/Controllers/WMSController.Agv.cs
Tiger.Controllers.WMS/Controllers/WMSController.Count.cs
Tiger.Controllers.WMS/Controllers/WMSController.CustSupplyChecking.cs
Tiger.Controllers.WMS/Controllers/WMSController.CustSupplyCheckingNew.cs
Tiger.Controllers.WMS/Controllers/WMSController.CustomerSupply.cs
Tiger.Controllers.WMS/Controllers/WMSController.CustomerSupplyNew.cs
Tiger.Controllers.WMS/Controllers/WMSController.InFinished.cs
Tiger.Controllers.WMS/Controllers/WMSController.InMatStorage.cs
Tiger.Controllers.WMS/Controllers/WMSController.InProductionReturn.cs
Tiger.Controllers.WMS/Controllers/WMSController.InReceipt.cs
Tiger.Controllers.WMS/Controllers/WMSController.ItemQuery.cs
Tiger.Controllers.WMS/Controllers/WMSController.LocationTransfer.cs
Tiger.Controllers.WMS/Controllers/WMSController.MaterialReq.cs
ÎļþÃû´Ó Tiger.Controllers.WMS/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 Tiger.Controllers.WMS/Controllers/WMSController.MaterialResale.cs
Tiger.Controllers.WMS/Controllers/WMSController.Minsun.cs
Tiger.Controllers.WMS/Controllers/WMSController.MqCustomer.cs
Tiger.Controllers.WMS/Controllers/WMSController.MqModelInfo.cs
Tiger.Controllers.WMS/Controllers/WMSController.MqSNData.cs
Tiger.Controllers.WMS/Controllers/WMSController.OtherInLocation.cs
Tiger.Controllers.WMS/Controllers/WMSController.OtherInLocationChecking.cs
Tiger.Controllers.WMS/Controllers/WMSController.OtherOutInfo.cs
Tiger.Controllers.WMS/Controllers/WMSController.OutNoBillcode.cs
Tiger.Controllers.WMS/Controllers/WMSController.OutOther.cs
Tiger.Controllers.WMS/Controllers/WMSController.OutSale.cs
Tiger.Controllers.WMS/Controllers/WMSController.OutSplit.cs
Tiger.Controllers.WMS/Controllers/WMSController.OutTransfer.cs
Tiger.Controllers.WMS/Controllers/WMSController.OutWordOrder.cs
Tiger.Controllers.WMS/Controllers/WMSController.PDACount.cs
Tiger.Controllers.WMS/Controllers/WMSController.ProductionMaterialReq.cs
Tiger.Controllers.WMS/Controllers/WMSController.RePrintBarcode.cs
Tiger.Controllers.WMS/Controllers/WMSController.ReceiptInfo.cs
Tiger.Controllers.WMS/Controllers/WMSController.Resell.cs
Tiger.Controllers.WMS/Controllers/WMSController.SaleOutInfo.cs
Tiger.Controllers.WMS/Controllers/WMSController.ShelfRemote.cs
Tiger.Controllers.WMS/Controllers/WMSController.T100Service.cs
Tiger.Controllers.WMS/Controllers/WMSController.Tranfer.cs
ÎļþÃû´Ó Tiger.Controllers.WMS/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 Tiger.Controllers.WMS/Controllers/WMSController.User.cs
Tiger.Controllers.WMS/Controllers/WMSController.Vender.cs
Tiger.Controllers.WMS/Controllers/WMSController.WareHouseModeling.cs
ÎļþÃû´Ó Tiger.Controllers.WMS/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)); } Tiger.Controllers.WMS/Controllers/WMSController.WmsItem.cs
ÎļþÃû´Ó Tiger.Controllers.WMS/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 Tiger.Controllers.WMS/Controllers/WMSController.cs
Tiger.Controllers.WMS/Controllers/WMSTestController.cs
ÎļþÃû´Ó Tiger.Controllers.WMS/WMSTestController.cs ÐÞ¸Ä @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; using 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); 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> 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> 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> 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" /> 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>