From e3034dbd4d96e244af376ba36842edf1f732a76c Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期二, 24 九月 2024 10:35:12 +0800 Subject: [PATCH] 优化API框架,分离项目业务逻辑 --- Tiger.IBusiness.WMS/IWMSContext.cs | 0 Tiger.IBusiness.WMS/Transaction/IInProductionReturn.cs | 0 Tiger.IBusiness.WMS/IRePrintBarcode.cs | 0 Tiger.Controllers.WMS/WMSController.T100Service.cs | 0 Tiger.Controllers.WMS/WMSController.Resell.cs | 0 Tiger.Controllers.WMS/WMSController.CustomerSupplyNew.cs | 0 Tiger.IBusiness.WMS/Minsun/ICustSupplyChecking.cs | 0 Tiger.IBusiness.WMS/Transaction/IOutSale.cs | 0 Tiger.IBusiness.WMS/T100ToWMS/IReworkBusiness.cs | 0 Tiger.Api/Controllers/Extension.cs | 36 +++++++++ Tiger.Controllers.MES/SMTController.cs | 0 Tiger.IBusiness.WMS/Transaction/IInReceipt.cs | 0 Tiger.IBusiness.WMS/IProdMaterialReq.cs | 0 Tiger.Controllers.WMS/WMSController.Minsun.cs | 0 Tiger.Controllers.WMS/WMSController.OutNoBillcode.cs | 0 Tiger.Controllers.WMS/WMSController.SaleOutInfo.cs | 0 Tiger.IBusiness.WMS/MengQi/IUser.cs | 0 Tiger.IBusiness.WMS/iSRM/ISrmDataToSiHua.cs | 0 Tiger.Controllers.WMS/WMSController.MqModelInfo.cs | 0 Tiger.Controllers.WMS/Tiger.Controllers.WMS.csproj | 21 +++++ Tiger.IBusiness.WMS/Transaction/IOutOther.cs | 0 Tiger.Controllers.WMS/WMSController.OutSplit.cs | 0 Tiger.IBusiness.WMS/Transaction/IOutWorkOrder.cs | 0 Tiger.Controllers.WMS/WMSController.InMatStorage.cs | 0 Tiger.IBusiness.WMS/Tiger.IBusiness.WMS.csproj | 13 +++ Tiger.Controllers.WMS/WMSController.OtherOutInfo.cs | 0 Tiger.IBusiness.WMS/Minsun/ICustomerSupplyIn.cs | 0 Tiger.Controllers.MES/MESController.TestNode.cs | 0 Tiger.Controllers.WMS/WMSController.WareHouseModeling.cs | 0 Tiger.Controllers.WMS/WMSController.MqCustomer.cs | 0 Tiger.Controllers.WMS/WMSController.OutSale.cs | 0 Tiger.IBusiness.WMS/Transaction/IOtherInLocation.cs | 0 Tiger.IBusiness.WMS/Transaction/IInMatStorage.cs | 0 Tiger.Controllers.MES/MESController.BizBaseRule.cs | 0 Tiger.IBusiness.WMS/IiWMS.cs | 0 Tiger.Controllers.WMS/WMSController.MqSNData.cs | 0 Tiger.IBusiness.WMS/Transaction/IShelfRemote.cs | 0 Tiger.Controllers.MES/MESController.Transaction.cs | 0 Tiger.IBusiness.WMS/DigitalTwin/Sharetronic/IBiz_Shelf.cs | 0 Tiger.Controllers.WMS/WMSController.RePrintBarcode.cs | 0 Tiger.Controllers.WMS/WMSController.ItemQuery.cs | 0 Tiger.IBusiness.WMS/iSRM/ISrmToWms.cs | 0 Tiger.Controllers.WMS/KanBanController.cs | 0 Tiger.Controllers.WMS/WMSController.WmsItem.cs | 0 Tiger.IBusiness.WMS/Transaction/IResell.cs | 0 Tiger.Controllers.WMS/WMSController.Count.cs | 0 Tiger.Controllers.WMS/WMSController.Agv.cs | 0 Tiger.IBusiness.WMS/T100ToWMS/ISaleOutInfoBusiness.cs | 0 Tiger.Business.MES/Tiger.Business.MES.csproj | 2 Tiger.IBusiness.WMS/T100ToWMS/ITrasferInfoBusiness.cs | 0 Tiger.Controllers.WMS/WMSController.ProductionMaterialReq.cs | 0 Tiger.IBusiness/Tiger.IBusiness.csproj | 4 + Tiger.IBusiness.WMS/Transaction/IWMSTransaction.cs | 0 Tiger.Controllers.WMS/WMSController.OutOther.cs | 0 Tiger.IBusiness.WMS/Transaction/IItemQuery.cs | 0 Tiger.Controllers.WMS/WMSController.ShelfRemote.cs | 0 Tiger.Controllers.MES/MESController.PackingNode.cs | 0 Tiger.IBusiness.WMS/IKanBan.cs | 0 Tiger.Controllers.WMS/WMSController.LocationTransfer.cs | 0 Tiger.Controllers.WMS/WMSController.MaterialReq.cs | 0 Tiger.Controllers.WMS/WMSController.OutWordOrder.cs | 0 Tiger.Controllers.WMS/KanBanController.Warehousing.cs | 0 Tiger.Business.WMS/Tiger.Business.WMS.csproj | 3 Tiger.Controllers.WMS/WMSController.OutTransfer.cs | 0 Tiger.IBusiness.WMS/Agv/IAGV.cs | 0 Tiger.Controllers.WMS/WMSController.InFinished.cs | 0 Tiger.IBusiness.WMS/Transaction/ILocationTransfer.cs | 0 Tiger.Controllers.WMS/SrmController.cs | 0 Tiger.IBusiness.WMS/IInventroyInfo.cs | 0 Tiger.Controllers.WMS/WMSController.OtherInLocation.cs | 0 Tiger.IBusiness.WMS/MengQi/ICustomer.cs | 0 Tiger.Controllers.WMS/T100ToWMS/MaterialInfoController.cs | 0 Tiger.IBusiness.WMS/IWmsItem.cs | 0 Tiger.IBusiness.WMS/IErpT100.cs | 0 Tiger.IBusiness.WMS/Transaction/ICustSupplyCheckingNew.cs | 0 Tiger.Api/Tiger.Api.csproj | 13 ++- Tiger.IBusiness.WMS/iSRM/IiSRM.cs | 0 Tiger.Controllers.WMS/WMSController.CustSupplyChecking.cs | 0 Tiger.Controllers.WMS/WMSController.CustomerSupply.cs | 0 Tiger.Controllers.MES/MESController.CodeVerification.cs | 0 Tiger.IBusiness.WMS/MengQi/IModelInfo.cs | 0 Tiger.Controllers.WMS/WMSController.PDACount.cs | 0 Tiger.IBusiness.WMS/IBS.cs | 0 Tiger.Controllers.WMS/WMSController.OtherInLocationChecking.cs | 0 Tiger.Controllers.MES/MESController.Route.cs | 0 Tiger.IBusiness.WMS/Transaction/ICustomerSupplyInNew.cs | 0 Tiger.Business.MengQi/Tiger.Business.MengQi.csproj | 3 Tiger.IBusiness.WMS/Transaction/IOutTransfer.cs | 0 Tiger.Controllers.WMS/WMSController.Vender.cs | 0 Tiger.Api/Autofac/SingleInstance.json | 18 ++-- Tiger.Controllers.MES/MESController.BAS_LABEL_TEMP.cs | 0 Tiger.IBusiness.WMS/Transaction/IInFinished.cs | 0 Tiger.Controllers.MES/Tiger.Controllers.MES.csproj | 17 ++++ Tiger.Controllers.MES/MESController.MES_WORKSHOP.cs | 0 Tiger.IBusiness.WMS/T100ToWMS/IProductOutputBusiness.cs | 0 Tiger.Controllers.WMS/WMSController.cs | 0 Tiger.Controllers.MES/MESController.CollectNode.cs | 0 Tiger.Controllers.MES/MESController.DoUnPack.cs | 0 Tiger.Controllers.WMS/WMSController.InProductionReturn.cs | 0 Tiger.IBusiness.WMS/T100ToWMS/IProductInputBusiness.cs | 0 Tiger.IBusiness.WMS/T100ToWMS/IStockInfoBusiness.cs | 0 Tiger.Api.sln | 38 +++++++++ Tiger.IBusiness.WMS/IReceiptInfo.cs | 0 Tiger.IBusiness.WMS/Transaction/IWmsCount.cs | 0 Tiger.Controllers.MES/SMTController.Tool.cs | 0 Tiger.Controllers.WMS/WMSController.CustSupplyCheckingNew.cs | 0 Tiger.IBusiness.WMS/T100ToWMS/IOtherOutInfoBusiness.cs | 0 Tiger.IBusiness.WMS/T100ToWMS/IMaterialInfoBusiness.cs | 0 Tiger.Controllers.MES/MESController.BIZ_MES_WO.cs | 0 Tiger.Controllers.WMS/WMSTestController.cs | 34 ++++++++ Tiger.Api/Startup.cs | 3 Tiger.Controllers.MES/MESController.cs | 0 Tiger.IBusiness.WMS/MengQi/IMqSNData.cs | 0 Tiger.IBusiness.WMS/T100ToWMS/ISplitBoxBusiness.cs | 0 Tiger.IBusiness.WMS/Transaction/IOtherInLocationChecking.cs | 0 Tiger.Controllers.WMS/WMSController.Tranfer.cs | 0 Tiger.Controllers.WMS/WMSController.MaterialResale.cs | 0 Tiger.IBusiness.WMS/Transaction/IOutNoBillcode.cs | 0 Tiger.IBusiness.WMS/Transaction/IOutSplit.cs | 0 Tiger.Controllers.WMS/WMSController.User.cs | 0 Tiger.Controllers.WMS/WMSController.InReceipt.cs | 0 Tiger.Controllers.WMS/WMSController.ReceiptInfo.cs | 0 Tiger.Controllers.WMS/SrmController.SrmDataToSiHua.cs | 0 Tiger.IBusiness.WMS/Transaction/IProductionMaterialReq.cs | 0 124 files changed, 188 insertions(+), 17 deletions(-) diff --git a/Tiger.Api.sln b/Tiger.Api.sln index 9e7b9d2..2a21ce2 100644 --- a/Tiger.Api.sln +++ b/Tiger.Api.sln @@ -30,7 +30,15 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tiger.Business.WMS", "Tiger.Business.WMS\Tiger.Business.WMS.csproj", "{83F123C4-3E7A-485E-A99C-3FE66CA5867E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tiger.Business.MESTests", "Tiger.Business.MESTests\Tiger.Business.MESTests.csproj", "{2E20369F-54FD-4197-B2F8-761F651143EC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tiger.Business.MESTests", "Tiger.Business.MESTests\Tiger.Business.MESTests.csproj", "{2E20369F-54FD-4197-B2F8-761F651143EC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tiger.IBusiness.WMS", "Tiger.IBusiness.WMS\Tiger.IBusiness.WMS.csproj", "{73C870E0-119D-4D09-B7B2-146411ED4A9E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Controllers", "Controllers", "{457563B5-E42C-448A-A924-FBEE9B585A81}" +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}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -104,6 +112,30 @@ {2E20369F-54FD-4197-B2F8-761F651143EC}.Release|Any CPU.Build.0 = Release|Any CPU {2E20369F-54FD-4197-B2F8-761F651143EC}.Release|x86.ActiveCfg = Release|Any CPU {2E20369F-54FD-4197-B2F8-761F651143EC}.Release|x86.Build.0 = Release|Any CPU + {73C870E0-119D-4D09-B7B2-146411ED4A9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {73C870E0-119D-4D09-B7B2-146411ED4A9E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {73C870E0-119D-4D09-B7B2-146411ED4A9E}.Debug|x86.ActiveCfg = Debug|Any CPU + {73C870E0-119D-4D09-B7B2-146411ED4A9E}.Debug|x86.Build.0 = Debug|Any CPU + {73C870E0-119D-4D09-B7B2-146411ED4A9E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {73C870E0-119D-4D09-B7B2-146411ED4A9E}.Release|Any CPU.Build.0 = Release|Any CPU + {73C870E0-119D-4D09-B7B2-146411ED4A9E}.Release|x86.ActiveCfg = Release|Any CPU + {73C870E0-119D-4D09-B7B2-146411ED4A9E}.Release|x86.Build.0 = Release|Any CPU + {0B65AB5A-2D97-4292-8210-8E0D0BD227BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0B65AB5A-2D97-4292-8210-8E0D0BD227BB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0B65AB5A-2D97-4292-8210-8E0D0BD227BB}.Debug|x86.ActiveCfg = Debug|Any CPU + {0B65AB5A-2D97-4292-8210-8E0D0BD227BB}.Debug|x86.Build.0 = Debug|Any CPU + {0B65AB5A-2D97-4292-8210-8E0D0BD227BB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0B65AB5A-2D97-4292-8210-8E0D0BD227BB}.Release|Any CPU.Build.0 = Release|Any CPU + {0B65AB5A-2D97-4292-8210-8E0D0BD227BB}.Release|x86.ActiveCfg = Release|Any CPU + {0B65AB5A-2D97-4292-8210-8E0D0BD227BB}.Release|x86.Build.0 = Release|Any CPU + {016ABAEC-75DE-4553-B828-AA45C237B485}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {016ABAEC-75DE-4553-B828-AA45C237B485}.Debug|Any CPU.Build.0 = Debug|Any CPU + {016ABAEC-75DE-4553-B828-AA45C237B485}.Debug|x86.ActiveCfg = Debug|Any CPU + {016ABAEC-75DE-4553-B828-AA45C237B485}.Debug|x86.Build.0 = Debug|Any CPU + {016ABAEC-75DE-4553-B828-AA45C237B485}.Release|Any CPU.ActiveCfg = Release|Any CPU + {016ABAEC-75DE-4553-B828-AA45C237B485}.Release|Any CPU.Build.0 = Release|Any CPU + {016ABAEC-75DE-4553-B828-AA45C237B485}.Release|x86.ActiveCfg = Release|Any CPU + {016ABAEC-75DE-4553-B828-AA45C237B485}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -117,6 +149,10 @@ {DD5B5282-B673-45CB-8608-3AAEB4A469B9} = {70881CAB-17ED-4C46-895A-62F2CE39A607} {83F123C4-3E7A-485E-A99C-3FE66CA5867E} = {70881CAB-17ED-4C46-895A-62F2CE39A607} {2E20369F-54FD-4197-B2F8-761F651143EC} = {CF29B377-FE5A-488A-AF99-DF9D9C6FCA95} + {73C870E0-119D-4D09-B7B2-146411ED4A9E} = {A994D516-643A-4543-B781-540E81F1DE55} + {457563B5-E42C-448A-A924-FBEE9B585A81} = {FF44BF62-08C5-4B52-B24F-54CD79E96848} + {0B65AB5A-2D97-4292-8210-8E0D0BD227BB} = {457563B5-E42C-448A-A924-FBEE9B585A81} + {016ABAEC-75DE-4553-B828-AA45C237B485} = {457563B5-E42C-448A-A924-FBEE9B585A81} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {797A1D83-9F3C-4AEC-8A83-E3468102DBD1} diff --git a/Tiger.Api/Autofac/SingleInstance.json b/Tiger.Api/Autofac/SingleInstance.json index 11ee3d7..bb34f00 100644 --- a/Tiger.Api/Autofac/SingleInstance.json +++ b/Tiger.Api/Autofac/SingleInstance.json @@ -34,7 +34,7 @@ }, { "type": "Tiger.Business.WMS.WMS_ITEM_Biz+_Biz_WmsItem,Tiger.Business.WMS", - "services": [ { "type": "Tiger.IBusiness.IBiz_WmsItem,Tiger.IBusiness" } ], + "services": [ { "type": "Tiger.IBusiness.IBiz_WmsItem,Tiger.IBusiness.WMS" } ], "autoActivate": true, "injectProperties": true, "instanceScope": "SingleInstance" //鐢熷懡鍛ㄦ湡 @@ -69,35 +69,35 @@ }, { "type": "Tiger.Business.WMS.BS,Tiger.Business.WMS", - "services": [ { "type": "Tiger.IBusiness.IBS,Tiger.IBusiness" } ], + "services": [ { "type": "Tiger.IBusiness.IBS,Tiger.IBusiness.WMS" } ], "autoActivate": true, "injectProperties": true, "instanceScope": "SingleInstance" //鐢熷懡鍛ㄦ湡 }, { "type": "Tiger.Business.WMS.iSRM,Tiger.Business.WMS", - "services": [ { "type": "Tiger.IBusiness.IiSRM,Tiger.IBusiness" } ], + "services": [ { "type": "Tiger.IBusiness.IiSRM,Tiger.IBusiness.WMS" } ], "autoActivate": true, "injectProperties": true, "instanceScope": "SingleInstance" //鐢熷懡鍛ㄦ湡 }, { "type": "Tiger.Business.WMS.KanBan,Tiger.Business.WMS", - "services": [ { "type": "Tiger.IBusiness.IKanBan,Tiger.IBusiness" } ], + "services": [ { "type": "Tiger.IBusiness.IKanBan,Tiger.IBusiness.WMS" } ], "autoActivate": true, "injectProperties": true, "instanceScope": "SingleInstance" //鐢熷懡鍛ㄦ湡 }, { "type": "Tiger.Business.WMS.AGV,Tiger.Business.WMS", - "services": [ { "type": "Tiger.IBusiness.IAGV,Tiger.IBusiness" } ], + "services": [ { "type": "Tiger.IBusiness.IAGV,Tiger.IBusiness.WMS" } ], "autoActivate": true, "injectProperties": true, "instanceScope": "SingleInstance" //鐢熷懡鍛ㄦ湡 }, { "type": "Tiger.Business.WMS.RePrintBarcode,Tiger.Business.WMS", - "services": [ { "type": "Tiger.IBusiness.IRePrintBarcode,Tiger.IBusiness" } ], + "services": [ { "type": "Tiger.IBusiness.IRePrintBarcode,Tiger.IBusiness.WMS" } ], "autoActivate": true, "injectProperties": true, "instanceScope": "SingleInstance" //鐢熷懡鍛ㄦ湡 @@ -111,21 +111,21 @@ }, { "type": "Tiger.Business.WMS.WMSContext,Tiger.Business.WMS", - "services": [ { "type": "Tiger.IBusiness.IWMSContext,Tiger.IBusiness" } ], + "services": [ { "type": "Tiger.IBusiness.IWMSContext,Tiger.IBusiness.WMS" } ], "autoActivate": true, "injectProperties": true, "instanceScope": "SingleInstance" //鐢熷懡鍛ㄦ湡 }, { "type": "Tiger.Business.WMS.iWMS,Tiger.Business.WMS", - "services": [ { "type": "Tiger.IBusiness.IiWMS,Tiger.IBusiness" } ], + "services": [ { "type": "Tiger.IBusiness.IiWMS,Tiger.IBusiness.WMS" } ], "autoActivate": true, "injectProperties": true, "instanceScope": "SingleInstance" //鐢熷懡鍛ㄦ湡 }, { "type": "Tiger.Business.WMS.ErpT100,Tiger.Business.WMS", - "services": [ { "type": "Tiger.IBusiness.IErpT100,Tiger.IBusiness" } ], + "services": [ { "type": "Tiger.IBusiness.IErpT100,Tiger.IBusiness.WMS" } ], "autoActivate": true, "injectProperties": true, "instanceScope": "SingleInstance" //鐢熷懡鍛ㄦ湡 diff --git a/Tiger.Api/Controllers/Extension.cs b/Tiger.Api/Controllers/Extension.cs new file mode 100644 index 0000000..dbc855b --- /dev/null +++ b/Tiger.Api/Controllers/Extension.cs @@ -0,0 +1,36 @@ +锘縰sing Microsoft.Extensions.DependencyInjection; +using System.Collections.Generic; +using System.IO; +using System; +using System.Reflection; +using System.Linq; +using System.Text.RegularExpressions; + +namespace Tiger.Api.Controllers +{ + public static class Extension + { + public static IMvcBuilder AddExtraControllers(this IMvcBuilder builder) + { + // 鍔ㄦ�佸姞杞藉涓猟ll + string[] assemblyPattern = new[] { "Tiger.Controllers([.].*)*.dll" }; + + List<Assembly> assemblies = new List<Assembly>(); + assemblies.AddRange( + Directory.EnumerateFiles(AppDomain.CurrentDomain.BaseDirectory, "*.dll", SearchOption.AllDirectories) + .Where(filename => assemblyPattern.Any(pattern => Regex.IsMatch(filename, pattern))) + .Select(Assembly.LoadFrom) + ); + + foreach (var assembly in assemblies) + { + builder = builder.AddApplicationPart(assembly); + } + + return builder; + + //var assembly = Assembly.Load("Tiger.Controllers.WMS"); + //return builder.AddApplicationPart(assembly); + } + } +} diff --git a/Tiger.Api/Startup.cs b/Tiger.Api/Startup.cs index d553c3a..5a9aace 100644 --- a/Tiger.Api/Startup.cs +++ b/Tiger.Api/Startup.cs @@ -14,6 +14,7 @@ using System.IO; using System.Linq; using System.Reflection; +using Tiger.Api.Controllers; using Tiger.IBusiness; using Tiger.IBusiness.Utility; @@ -60,6 +61,8 @@ 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(); //閰嶇疆璺ㄥ煙澶勭悊cors 聽 聽 聽 聽 聽 聽 services.AddCors(options => diff --git a/Tiger.Api/Tiger.Api.csproj b/Tiger.Api/Tiger.Api.csproj index 4768d89..4688c44 100644 --- a/Tiger.Api/Tiger.Api.csproj +++ b/Tiger.Api/Tiger.Api.csproj @@ -53,9 +53,17 @@ <ItemGroup> + <Compile Remove="Controllers\EMS\**" /> + <Compile Remove="Controllers\QMS\**" /> <Compile Remove="wwwroot\**" /> + <Content Remove="Controllers\EMS\**" /> + <Content Remove="Controllers\QMS\**" /> <Content Remove="wwwroot\**" /> + <EmbeddedResource Remove="Controllers\EMS\**" /> + <EmbeddedResource Remove="Controllers\QMS\**" /> <EmbeddedResource Remove="wwwroot\**" /> + <None Remove="Controllers\EMS\**" /> + <None Remove="Controllers\QMS\**" /> <None Remove="wwwroot\**" /> </ItemGroup> @@ -82,11 +90,8 @@ <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="..\Tiger.IBusiness.WMS\Tiger.IBusiness.WMS.csproj" /> <ProjectReference Include="..\Tiger.IBusiness\Tiger.IBusiness.csproj" /> - </ItemGroup> - <ItemGroup> - <Folder Include="Controllers\EMS\" /> - <Folder Include="Controllers\QMS\" /> </ItemGroup> <ItemGroup> <None Include="Views\Home\Index.cshtml" /> diff --git a/Tiger.Business.MES/Tiger.Business.MES.csproj b/Tiger.Business.MES/Tiger.Business.MES.csproj index 4273963..8a80107 100644 --- a/Tiger.Business.MES/Tiger.Business.MES.csproj +++ b/Tiger.Business.MES/Tiger.Business.MES.csproj @@ -16,7 +16,7 @@ </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)
xcopy /r/y/i $(ProjectDir)$(OutDir)BizSettings.json $(SolutionDir)Tiger.Api\$(OutDir)" /> + <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.Business.MengQi/Tiger.Business.MengQi.csproj b/Tiger.Business.MengQi/Tiger.Business.MengQi.csproj index 91b54bd..e81fb5c 100644 --- a/Tiger.Business.MengQi/Tiger.Business.MengQi.csproj +++ b/Tiger.Business.MengQi/Tiger.Business.MengQi.csproj @@ -7,11 +7,12 @@ </PropertyGroup> <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)
xcopy /r/y/i $(ProjectDir)$(OutDir)BizSettings.json $(SolutionDir)Tiger.Api\$(OutDir)" /> + <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> <ItemGroup> <ProjectReference Include="..\Tiger.Business\Tiger.Business.csproj" /> + <ProjectReference Include="..\Tiger.IBusiness.WMS\Tiger.IBusiness.WMS.csproj" /> <ProjectReference Include="..\Tiger.IBusiness\Tiger.IBusiness.csproj" /> </ItemGroup> diff --git a/Tiger.Business.WMS/Tiger.Business.WMS.csproj b/Tiger.Business.WMS/Tiger.Business.WMS.csproj index 7bb0538..130aa4e 100644 --- a/Tiger.Business.WMS/Tiger.Business.WMS.csproj +++ b/Tiger.Business.WMS/Tiger.Business.WMS.csproj @@ -8,11 +8,12 @@ <ItemGroup> <ProjectReference Include="..\Tiger.Business\Tiger.Business.csproj" /> + <ProjectReference Include="..\Tiger.IBusiness.WMS\Tiger.IBusiness.WMS.csproj" /> <ProjectReference Include="..\Tiger.IBusiness\Tiger.IBusiness.csproj" /> </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)
xcopy /r/y/i $(ProjectDir)$(OutDir)BizSettings.json $(SolutionDir)Tiger.Api\$(OutDir)" /> + <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/Controllers/MES/MESController.BAS_LABEL_TEMP.cs b/Tiger.Controllers.MES/MESController.BAS_LABEL_TEMP.cs similarity index 100% rename from Tiger.Api/Controllers/MES/MESController.BAS_LABEL_TEMP.cs rename to Tiger.Controllers.MES/MESController.BAS_LABEL_TEMP.cs diff --git a/Tiger.Api/Controllers/MES/MESController.BIZ_MES_WO.cs b/Tiger.Controllers.MES/MESController.BIZ_MES_WO.cs similarity index 100% rename from Tiger.Api/Controllers/MES/MESController.BIZ_MES_WO.cs rename to Tiger.Controllers.MES/MESController.BIZ_MES_WO.cs diff --git a/Tiger.Api/Controllers/MES/MESController.BizBaseRule.cs b/Tiger.Controllers.MES/MESController.BizBaseRule.cs similarity index 100% rename from Tiger.Api/Controllers/MES/MESController.BizBaseRule.cs rename to Tiger.Controllers.MES/MESController.BizBaseRule.cs diff --git a/Tiger.Api/Controllers/MES/MESController.CodeVerification.cs b/Tiger.Controllers.MES/MESController.CodeVerification.cs similarity index 100% rename from Tiger.Api/Controllers/MES/MESController.CodeVerification.cs rename to Tiger.Controllers.MES/MESController.CodeVerification.cs diff --git a/Tiger.Api/Controllers/MES/MESController.CollectNode.cs b/Tiger.Controllers.MES/MESController.CollectNode.cs similarity index 100% rename from Tiger.Api/Controllers/MES/MESController.CollectNode.cs rename to Tiger.Controllers.MES/MESController.CollectNode.cs diff --git a/Tiger.Api/Controllers/MES/MESController.DoUnPack.cs b/Tiger.Controllers.MES/MESController.DoUnPack.cs similarity index 100% rename from Tiger.Api/Controllers/MES/MESController.DoUnPack.cs rename to Tiger.Controllers.MES/MESController.DoUnPack.cs diff --git a/Tiger.Api/Controllers/MES/MESController.MES_WORKSHOP.cs b/Tiger.Controllers.MES/MESController.MES_WORKSHOP.cs similarity index 100% rename from Tiger.Api/Controllers/MES/MESController.MES_WORKSHOP.cs rename to Tiger.Controllers.MES/MESController.MES_WORKSHOP.cs diff --git a/Tiger.Api/Controllers/MES/MESController.PackingNode.cs b/Tiger.Controllers.MES/MESController.PackingNode.cs similarity index 100% rename from Tiger.Api/Controllers/MES/MESController.PackingNode.cs rename to Tiger.Controllers.MES/MESController.PackingNode.cs diff --git a/Tiger.Api/Controllers/MES/MESController.Route.cs b/Tiger.Controllers.MES/MESController.Route.cs similarity index 100% rename from Tiger.Api/Controllers/MES/MESController.Route.cs rename to Tiger.Controllers.MES/MESController.Route.cs diff --git a/Tiger.Api/Controllers/MES/MESController.TestNode.cs b/Tiger.Controllers.MES/MESController.TestNode.cs similarity index 100% rename from Tiger.Api/Controllers/MES/MESController.TestNode.cs rename to Tiger.Controllers.MES/MESController.TestNode.cs diff --git a/Tiger.Api/Controllers/MES/MESController.Transaction.cs b/Tiger.Controllers.MES/MESController.Transaction.cs similarity index 100% rename from Tiger.Api/Controllers/MES/MESController.Transaction.cs rename to Tiger.Controllers.MES/MESController.Transaction.cs diff --git a/Tiger.Api/Controllers/MES/MESController.cs b/Tiger.Controllers.MES/MESController.cs similarity index 100% rename from Tiger.Api/Controllers/MES/MESController.cs rename to Tiger.Controllers.MES/MESController.cs diff --git a/Tiger.Api/Controllers/MES/SMTController.Tool.cs b/Tiger.Controllers.MES/SMTController.Tool.cs similarity index 100% rename from Tiger.Api/Controllers/MES/SMTController.Tool.cs rename to Tiger.Controllers.MES/SMTController.Tool.cs diff --git a/Tiger.Api/Controllers/MES/SMTController.cs b/Tiger.Controllers.MES/SMTController.cs similarity index 100% rename from Tiger.Api/Controllers/MES/SMTController.cs rename to Tiger.Controllers.MES/SMTController.cs diff --git a/Tiger.Controllers.MES/Tiger.Controllers.MES.csproj b/Tiger.Controllers.MES/Tiger.Controllers.MES.csproj new file mode 100644 index 0000000..87b14d8 --- /dev/null +++ b/Tiger.Controllers.MES/Tiger.Controllers.MES.csproj @@ -0,0 +1,17 @@ +<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> + + <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/Controllers/WMS/KanBanController.Warehousing.cs b/Tiger.Controllers.WMS/KanBanController.Warehousing.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/KanBanController.Warehousing.cs rename to Tiger.Controllers.WMS/KanBanController.Warehousing.cs diff --git a/Tiger.Api/Controllers/WMS/KanBanController.cs b/Tiger.Controllers.WMS/KanBanController.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/KanBanController.cs rename to Tiger.Controllers.WMS/KanBanController.cs diff --git a/Tiger.Api/Controllers/WMS/SrmController.SrmDataToSiHua.cs b/Tiger.Controllers.WMS/SrmController.SrmDataToSiHua.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/SrmController.SrmDataToSiHua.cs rename to Tiger.Controllers.WMS/SrmController.SrmDataToSiHua.cs diff --git a/Tiger.Api/Controllers/WMS/SrmController.cs b/Tiger.Controllers.WMS/SrmController.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/SrmController.cs rename to Tiger.Controllers.WMS/SrmController.cs diff --git a/Tiger.Api/Controllers/WMS/T100ToWMS/MaterialInfoController.cs b/Tiger.Controllers.WMS/T100ToWMS/MaterialInfoController.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/T100ToWMS/MaterialInfoController.cs rename to Tiger.Controllers.WMS/T100ToWMS/MaterialInfoController.cs diff --git a/Tiger.Controllers.WMS/Tiger.Controllers.WMS.csproj b/Tiger.Controllers.WMS/Tiger.Controllers.WMS.csproj new file mode 100644 index 0000000..fb36fef --- /dev/null +++ b/Tiger.Controllers.WMS/Tiger.Controllers.WMS.csproj @@ -0,0 +1,21 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <TargetFramework>net6.0</TargetFramework> + <ImplicitUsings>enable</ImplicitUsings> + <Nullable>enable</Nullable> + </PropertyGroup> + + <ItemGroup> + <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" /> + </ItemGroup> + + <ItemGroup> + <ProjectReference Include="..\Tiger.Api\Tiger.Api.csproj" /> + </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/Controllers/WMS/WMSController.Agv.cs b/Tiger.Controllers.WMS/WMSController.Agv.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.Agv.cs rename to Tiger.Controllers.WMS/WMSController.Agv.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.Count.cs b/Tiger.Controllers.WMS/WMSController.Count.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.Count.cs rename to Tiger.Controllers.WMS/WMSController.Count.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.CustSupplyChecking.cs b/Tiger.Controllers.WMS/WMSController.CustSupplyChecking.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.CustSupplyChecking.cs rename to Tiger.Controllers.WMS/WMSController.CustSupplyChecking.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.CustSupplyCheckingNew.cs b/Tiger.Controllers.WMS/WMSController.CustSupplyCheckingNew.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.CustSupplyCheckingNew.cs rename to Tiger.Controllers.WMS/WMSController.CustSupplyCheckingNew.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.CustomerSupply.cs b/Tiger.Controllers.WMS/WMSController.CustomerSupply.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.CustomerSupply.cs rename to Tiger.Controllers.WMS/WMSController.CustomerSupply.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.CustomerSupplyNew.cs b/Tiger.Controllers.WMS/WMSController.CustomerSupplyNew.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.CustomerSupplyNew.cs rename to Tiger.Controllers.WMS/WMSController.CustomerSupplyNew.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.InFinished.cs b/Tiger.Controllers.WMS/WMSController.InFinished.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.InFinished.cs rename to Tiger.Controllers.WMS/WMSController.InFinished.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.InMatStorage.cs b/Tiger.Controllers.WMS/WMSController.InMatStorage.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.InMatStorage.cs rename to Tiger.Controllers.WMS/WMSController.InMatStorage.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.InProductionReturn.cs b/Tiger.Controllers.WMS/WMSController.InProductionReturn.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.InProductionReturn.cs rename to Tiger.Controllers.WMS/WMSController.InProductionReturn.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.InReceipt.cs b/Tiger.Controllers.WMS/WMSController.InReceipt.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.InReceipt.cs rename to Tiger.Controllers.WMS/WMSController.InReceipt.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.ItemQuery.cs b/Tiger.Controllers.WMS/WMSController.ItemQuery.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.ItemQuery.cs rename to Tiger.Controllers.WMS/WMSController.ItemQuery.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.LocationTransfer.cs b/Tiger.Controllers.WMS/WMSController.LocationTransfer.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.LocationTransfer.cs rename to Tiger.Controllers.WMS/WMSController.LocationTransfer.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.MaterialReq.cs b/Tiger.Controllers.WMS/WMSController.MaterialReq.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.MaterialReq.cs rename to Tiger.Controllers.WMS/WMSController.MaterialReq.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.MaterialResale.cs b/Tiger.Controllers.WMS/WMSController.MaterialResale.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.MaterialResale.cs rename to Tiger.Controllers.WMS/WMSController.MaterialResale.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.Minsun.cs b/Tiger.Controllers.WMS/WMSController.Minsun.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.Minsun.cs rename to Tiger.Controllers.WMS/WMSController.Minsun.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.MqCustomer.cs b/Tiger.Controllers.WMS/WMSController.MqCustomer.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.MqCustomer.cs rename to Tiger.Controllers.WMS/WMSController.MqCustomer.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.MqModelInfo.cs b/Tiger.Controllers.WMS/WMSController.MqModelInfo.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.MqModelInfo.cs rename to Tiger.Controllers.WMS/WMSController.MqModelInfo.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.MqSNData.cs b/Tiger.Controllers.WMS/WMSController.MqSNData.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.MqSNData.cs rename to Tiger.Controllers.WMS/WMSController.MqSNData.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.OtherInLocation.cs b/Tiger.Controllers.WMS/WMSController.OtherInLocation.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.OtherInLocation.cs rename to Tiger.Controllers.WMS/WMSController.OtherInLocation.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.OtherInLocationChecking.cs b/Tiger.Controllers.WMS/WMSController.OtherInLocationChecking.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.OtherInLocationChecking.cs rename to Tiger.Controllers.WMS/WMSController.OtherInLocationChecking.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.OtherOutInfo.cs b/Tiger.Controllers.WMS/WMSController.OtherOutInfo.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.OtherOutInfo.cs rename to Tiger.Controllers.WMS/WMSController.OtherOutInfo.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.OutNoBillcode.cs b/Tiger.Controllers.WMS/WMSController.OutNoBillcode.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.OutNoBillcode.cs rename to Tiger.Controllers.WMS/WMSController.OutNoBillcode.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.OutOther.cs b/Tiger.Controllers.WMS/WMSController.OutOther.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.OutOther.cs rename to Tiger.Controllers.WMS/WMSController.OutOther.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.OutSale.cs b/Tiger.Controllers.WMS/WMSController.OutSale.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.OutSale.cs rename to Tiger.Controllers.WMS/WMSController.OutSale.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.OutSplit.cs b/Tiger.Controllers.WMS/WMSController.OutSplit.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.OutSplit.cs rename to Tiger.Controllers.WMS/WMSController.OutSplit.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.OutTransfer.cs b/Tiger.Controllers.WMS/WMSController.OutTransfer.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.OutTransfer.cs rename to Tiger.Controllers.WMS/WMSController.OutTransfer.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.OutWordOrder.cs b/Tiger.Controllers.WMS/WMSController.OutWordOrder.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.OutWordOrder.cs rename to Tiger.Controllers.WMS/WMSController.OutWordOrder.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.PDACount.cs b/Tiger.Controllers.WMS/WMSController.PDACount.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.PDACount.cs rename to Tiger.Controllers.WMS/WMSController.PDACount.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.ProductionMaterialReq.cs b/Tiger.Controllers.WMS/WMSController.ProductionMaterialReq.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.ProductionMaterialReq.cs rename to Tiger.Controllers.WMS/WMSController.ProductionMaterialReq.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.RePrintBarcode.cs b/Tiger.Controllers.WMS/WMSController.RePrintBarcode.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.RePrintBarcode.cs rename to Tiger.Controllers.WMS/WMSController.RePrintBarcode.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.ReceiptInfo.cs b/Tiger.Controllers.WMS/WMSController.ReceiptInfo.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.ReceiptInfo.cs rename to Tiger.Controllers.WMS/WMSController.ReceiptInfo.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.Resell.cs b/Tiger.Controllers.WMS/WMSController.Resell.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.Resell.cs rename to Tiger.Controllers.WMS/WMSController.Resell.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.SaleOutInfo.cs b/Tiger.Controllers.WMS/WMSController.SaleOutInfo.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.SaleOutInfo.cs rename to Tiger.Controllers.WMS/WMSController.SaleOutInfo.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.ShelfRemote.cs b/Tiger.Controllers.WMS/WMSController.ShelfRemote.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.ShelfRemote.cs rename to Tiger.Controllers.WMS/WMSController.ShelfRemote.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.T100Service.cs b/Tiger.Controllers.WMS/WMSController.T100Service.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.T100Service.cs rename to Tiger.Controllers.WMS/WMSController.T100Service.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.Tranfer.cs b/Tiger.Controllers.WMS/WMSController.Tranfer.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.Tranfer.cs rename to Tiger.Controllers.WMS/WMSController.Tranfer.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.User.cs b/Tiger.Controllers.WMS/WMSController.User.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.User.cs rename to Tiger.Controllers.WMS/WMSController.User.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.Vender.cs b/Tiger.Controllers.WMS/WMSController.Vender.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.Vender.cs rename to Tiger.Controllers.WMS/WMSController.Vender.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.WareHouseModeling.cs b/Tiger.Controllers.WMS/WMSController.WareHouseModeling.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.WareHouseModeling.cs rename to Tiger.Controllers.WMS/WMSController.WareHouseModeling.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.WmsItem.cs b/Tiger.Controllers.WMS/WMSController.WmsItem.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.WmsItem.cs rename to Tiger.Controllers.WMS/WMSController.WmsItem.cs diff --git a/Tiger.Api/Controllers/WMS/WMSController.cs b/Tiger.Controllers.WMS/WMSController.cs similarity index 100% rename from Tiger.Api/Controllers/WMS/WMSController.cs rename to Tiger.Controllers.WMS/WMSController.cs diff --git a/Tiger.Controllers.WMS/WMSTestController.cs b/Tiger.Controllers.WMS/WMSTestController.cs new file mode 100644 index 0000000..27ebd9d --- /dev/null +++ b/Tiger.Controllers.WMS/WMSTestController.cs @@ -0,0 +1,34 @@ +锘縰sing Microsoft.AspNetCore.Mvc; +using System.Runtime.InteropServices; +using Tiger.Api; +using Tiger.IBusiness; + +namespace Tiger.Controllers.WMS +{ + /// <summary> + /// MQTT娴嬭瘯鎺у埗鍣� + /// </summary> + [ApiController] + [Route("api/[controller]/[action]")] + public partial class _WMSTestController : ControllerBase + { + [HttpGet] + public async Task<IActionResult> DoSomething(int duration) + { + var begin = DateTime.Now; + + return Ok($"{begin:mmssfff} completed"); + } + + /// <summary> + /// D1Async + /// </summary> + /// <returns></returns> + [HttpGet] + public async Task<IActionResult> D1Async(string param) + { + var data = DI.Resolve<ITest>().show(); + return Ok(data); + } + } +} diff --git a/Tiger.IBusiness/WMS/Agv/IAGV.cs b/Tiger.IBusiness.WMS/Agv/IAGV.cs similarity index 100% rename from Tiger.IBusiness/WMS/Agv/IAGV.cs rename to Tiger.IBusiness.WMS/Agv/IAGV.cs diff --git a/Tiger.IBusiness/WMS/DigitalTwin/Sharetronic/IBiz_Shelf.cs b/Tiger.IBusiness.WMS/DigitalTwin/Sharetronic/IBiz_Shelf.cs similarity index 100% rename from Tiger.IBusiness/WMS/DigitalTwin/Sharetronic/IBiz_Shelf.cs rename to Tiger.IBusiness.WMS/DigitalTwin/Sharetronic/IBiz_Shelf.cs diff --git a/Tiger.IBusiness/WMS/IBS.cs b/Tiger.IBusiness.WMS/IBS.cs similarity index 100% rename from Tiger.IBusiness/WMS/IBS.cs rename to Tiger.IBusiness.WMS/IBS.cs diff --git a/Tiger.IBusiness/WMS/IErpT100.cs b/Tiger.IBusiness.WMS/IErpT100.cs similarity index 100% rename from Tiger.IBusiness/WMS/IErpT100.cs rename to Tiger.IBusiness.WMS/IErpT100.cs diff --git a/Tiger.IBusiness/WMS/IInventroyInfo.cs b/Tiger.IBusiness.WMS/IInventroyInfo.cs similarity index 100% rename from Tiger.IBusiness/WMS/IInventroyInfo.cs rename to Tiger.IBusiness.WMS/IInventroyInfo.cs diff --git a/Tiger.IBusiness/WMS/IKanBan.cs b/Tiger.IBusiness.WMS/IKanBan.cs similarity index 100% rename from Tiger.IBusiness/WMS/IKanBan.cs rename to Tiger.IBusiness.WMS/IKanBan.cs diff --git a/Tiger.IBusiness/WMS/IProdMaterialReq.cs b/Tiger.IBusiness.WMS/IProdMaterialReq.cs similarity index 100% rename from Tiger.IBusiness/WMS/IProdMaterialReq.cs rename to Tiger.IBusiness.WMS/IProdMaterialReq.cs diff --git a/Tiger.IBusiness/WMS/IRePrintBarcode.cs b/Tiger.IBusiness.WMS/IRePrintBarcode.cs similarity index 100% rename from Tiger.IBusiness/WMS/IRePrintBarcode.cs rename to Tiger.IBusiness.WMS/IRePrintBarcode.cs diff --git a/Tiger.IBusiness/WMS/IReceiptInfo.cs b/Tiger.IBusiness.WMS/IReceiptInfo.cs similarity index 100% rename from Tiger.IBusiness/WMS/IReceiptInfo.cs rename to Tiger.IBusiness.WMS/IReceiptInfo.cs diff --git a/Tiger.IBusiness/WMS/IWMSContext.cs b/Tiger.IBusiness.WMS/IWMSContext.cs similarity index 100% rename from Tiger.IBusiness/WMS/IWMSContext.cs rename to Tiger.IBusiness.WMS/IWMSContext.cs diff --git a/Tiger.IBusiness/WMS/IWmsItem.cs b/Tiger.IBusiness.WMS/IWmsItem.cs similarity index 100% rename from Tiger.IBusiness/WMS/IWmsItem.cs rename to Tiger.IBusiness.WMS/IWmsItem.cs diff --git a/Tiger.IBusiness/WMS/IiWMS.cs b/Tiger.IBusiness.WMS/IiWMS.cs similarity index 100% rename from Tiger.IBusiness/WMS/IiWMS.cs rename to Tiger.IBusiness.WMS/IiWMS.cs diff --git a/Tiger.IBusiness/WMS/MengQi/ICustomer.cs b/Tiger.IBusiness.WMS/MengQi/ICustomer.cs similarity index 100% rename from Tiger.IBusiness/WMS/MengQi/ICustomer.cs rename to Tiger.IBusiness.WMS/MengQi/ICustomer.cs diff --git a/Tiger.IBusiness/WMS/MengQi/IModelInfo.cs b/Tiger.IBusiness.WMS/MengQi/IModelInfo.cs similarity index 100% rename from Tiger.IBusiness/WMS/MengQi/IModelInfo.cs rename to Tiger.IBusiness.WMS/MengQi/IModelInfo.cs diff --git a/Tiger.IBusiness/WMS/MengQi/IMqSNData.cs b/Tiger.IBusiness.WMS/MengQi/IMqSNData.cs similarity index 100% rename from Tiger.IBusiness/WMS/MengQi/IMqSNData.cs rename to Tiger.IBusiness.WMS/MengQi/IMqSNData.cs diff --git a/Tiger.IBusiness/WMS/MengQi/IUser.cs b/Tiger.IBusiness.WMS/MengQi/IUser.cs similarity index 100% rename from Tiger.IBusiness/WMS/MengQi/IUser.cs rename to Tiger.IBusiness.WMS/MengQi/IUser.cs diff --git a/Tiger.IBusiness/WMS/Minsun/ICustSupplyChecking.cs b/Tiger.IBusiness.WMS/Minsun/ICustSupplyChecking.cs similarity index 100% rename from Tiger.IBusiness/WMS/Minsun/ICustSupplyChecking.cs rename to Tiger.IBusiness.WMS/Minsun/ICustSupplyChecking.cs diff --git a/Tiger.IBusiness/WMS/Minsun/ICustomerSupplyIn.cs b/Tiger.IBusiness.WMS/Minsun/ICustomerSupplyIn.cs similarity index 100% rename from Tiger.IBusiness/WMS/Minsun/ICustomerSupplyIn.cs rename to Tiger.IBusiness.WMS/Minsun/ICustomerSupplyIn.cs diff --git a/Tiger.IBusiness/WMS/T100ToWMS/IMaterialInfoBusiness.cs b/Tiger.IBusiness.WMS/T100ToWMS/IMaterialInfoBusiness.cs similarity index 100% rename from Tiger.IBusiness/WMS/T100ToWMS/IMaterialInfoBusiness.cs rename to Tiger.IBusiness.WMS/T100ToWMS/IMaterialInfoBusiness.cs diff --git a/Tiger.IBusiness/WMS/T100ToWMS/IOtherOutInfoBusiness.cs b/Tiger.IBusiness.WMS/T100ToWMS/IOtherOutInfoBusiness.cs similarity index 100% rename from Tiger.IBusiness/WMS/T100ToWMS/IOtherOutInfoBusiness.cs rename to Tiger.IBusiness.WMS/T100ToWMS/IOtherOutInfoBusiness.cs diff --git a/Tiger.IBusiness/WMS/T100ToWMS/IProductInputBusiness.cs b/Tiger.IBusiness.WMS/T100ToWMS/IProductInputBusiness.cs similarity index 100% rename from Tiger.IBusiness/WMS/T100ToWMS/IProductInputBusiness.cs rename to Tiger.IBusiness.WMS/T100ToWMS/IProductInputBusiness.cs diff --git a/Tiger.IBusiness/WMS/T100ToWMS/IProductOutputBusiness.cs b/Tiger.IBusiness.WMS/T100ToWMS/IProductOutputBusiness.cs similarity index 100% rename from Tiger.IBusiness/WMS/T100ToWMS/IProductOutputBusiness.cs rename to Tiger.IBusiness.WMS/T100ToWMS/IProductOutputBusiness.cs diff --git a/Tiger.IBusiness/WMS/T100ToWMS/IReworkBusiness.cs b/Tiger.IBusiness.WMS/T100ToWMS/IReworkBusiness.cs similarity index 100% rename from Tiger.IBusiness/WMS/T100ToWMS/IReworkBusiness.cs rename to Tiger.IBusiness.WMS/T100ToWMS/IReworkBusiness.cs diff --git a/Tiger.IBusiness/WMS/T100ToWMS/ISaleOutInfoBusiness.cs b/Tiger.IBusiness.WMS/T100ToWMS/ISaleOutInfoBusiness.cs similarity index 100% rename from Tiger.IBusiness/WMS/T100ToWMS/ISaleOutInfoBusiness.cs rename to Tiger.IBusiness.WMS/T100ToWMS/ISaleOutInfoBusiness.cs diff --git a/Tiger.IBusiness/WMS/T100ToWMS/ISplitBoxBusiness.cs b/Tiger.IBusiness.WMS/T100ToWMS/ISplitBoxBusiness.cs similarity index 100% rename from Tiger.IBusiness/WMS/T100ToWMS/ISplitBoxBusiness.cs rename to Tiger.IBusiness.WMS/T100ToWMS/ISplitBoxBusiness.cs diff --git a/Tiger.IBusiness/WMS/T100ToWMS/IStockInfoBusiness.cs b/Tiger.IBusiness.WMS/T100ToWMS/IStockInfoBusiness.cs similarity index 100% rename from Tiger.IBusiness/WMS/T100ToWMS/IStockInfoBusiness.cs rename to Tiger.IBusiness.WMS/T100ToWMS/IStockInfoBusiness.cs diff --git a/Tiger.IBusiness/WMS/T100ToWMS/ITrasferInfoBusiness.cs b/Tiger.IBusiness.WMS/T100ToWMS/ITrasferInfoBusiness.cs similarity index 100% rename from Tiger.IBusiness/WMS/T100ToWMS/ITrasferInfoBusiness.cs rename to Tiger.IBusiness.WMS/T100ToWMS/ITrasferInfoBusiness.cs diff --git a/Tiger.IBusiness.WMS/Tiger.IBusiness.WMS.csproj b/Tiger.IBusiness.WMS/Tiger.IBusiness.WMS.csproj new file mode 100644 index 0000000..cd09432 --- /dev/null +++ b/Tiger.IBusiness.WMS/Tiger.IBusiness.WMS.csproj @@ -0,0 +1,13 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <TargetFramework>net6.0</TargetFramework> + <ImplicitUsings>enable</ImplicitUsings> + <Nullable>enable</Nullable> + </PropertyGroup> + + <ItemGroup> + <ProjectReference Include="..\Tiger.IBusiness\Tiger.IBusiness.csproj" /> + </ItemGroup> + +</Project> diff --git a/Tiger.IBusiness/WMS/Transaction/ICustSupplyCheckingNew.cs b/Tiger.IBusiness.WMS/Transaction/ICustSupplyCheckingNew.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/ICustSupplyCheckingNew.cs rename to Tiger.IBusiness.WMS/Transaction/ICustSupplyCheckingNew.cs diff --git a/Tiger.IBusiness/WMS/Transaction/ICustomerSupplyInNew.cs b/Tiger.IBusiness.WMS/Transaction/ICustomerSupplyInNew.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/ICustomerSupplyInNew.cs rename to Tiger.IBusiness.WMS/Transaction/ICustomerSupplyInNew.cs diff --git a/Tiger.IBusiness/WMS/Transaction/IInFinished.cs b/Tiger.IBusiness.WMS/Transaction/IInFinished.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/IInFinished.cs rename to Tiger.IBusiness.WMS/Transaction/IInFinished.cs diff --git a/Tiger.IBusiness/WMS/Transaction/IInMatStorage.cs b/Tiger.IBusiness.WMS/Transaction/IInMatStorage.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/IInMatStorage.cs rename to Tiger.IBusiness.WMS/Transaction/IInMatStorage.cs diff --git a/Tiger.IBusiness/WMS/Transaction/IInProductionReturn.cs b/Tiger.IBusiness.WMS/Transaction/IInProductionReturn.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/IInProductionReturn.cs rename to Tiger.IBusiness.WMS/Transaction/IInProductionReturn.cs diff --git a/Tiger.IBusiness/WMS/Transaction/IInReceipt.cs b/Tiger.IBusiness.WMS/Transaction/IInReceipt.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/IInReceipt.cs rename to Tiger.IBusiness.WMS/Transaction/IInReceipt.cs diff --git a/Tiger.IBusiness/WMS/Transaction/IItemQuery.cs b/Tiger.IBusiness.WMS/Transaction/IItemQuery.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/IItemQuery.cs rename to Tiger.IBusiness.WMS/Transaction/IItemQuery.cs diff --git a/Tiger.IBusiness/WMS/Transaction/ILocationTransfer.cs b/Tiger.IBusiness.WMS/Transaction/ILocationTransfer.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/ILocationTransfer.cs rename to Tiger.IBusiness.WMS/Transaction/ILocationTransfer.cs diff --git a/Tiger.IBusiness/WMS/Transaction/IOtherInLocation.cs b/Tiger.IBusiness.WMS/Transaction/IOtherInLocation.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/IOtherInLocation.cs rename to Tiger.IBusiness.WMS/Transaction/IOtherInLocation.cs diff --git a/Tiger.IBusiness/WMS/Transaction/IOtherInLocationChecking.cs b/Tiger.IBusiness.WMS/Transaction/IOtherInLocationChecking.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/IOtherInLocationChecking.cs rename to Tiger.IBusiness.WMS/Transaction/IOtherInLocationChecking.cs diff --git a/Tiger.IBusiness/WMS/Transaction/IOutNoBillcode.cs b/Tiger.IBusiness.WMS/Transaction/IOutNoBillcode.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/IOutNoBillcode.cs rename to Tiger.IBusiness.WMS/Transaction/IOutNoBillcode.cs diff --git a/Tiger.IBusiness/WMS/Transaction/IOutOther.cs b/Tiger.IBusiness.WMS/Transaction/IOutOther.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/IOutOther.cs rename to Tiger.IBusiness.WMS/Transaction/IOutOther.cs diff --git a/Tiger.IBusiness/WMS/Transaction/IOutSale.cs b/Tiger.IBusiness.WMS/Transaction/IOutSale.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/IOutSale.cs rename to Tiger.IBusiness.WMS/Transaction/IOutSale.cs diff --git a/Tiger.IBusiness/WMS/Transaction/IOutSplit.cs b/Tiger.IBusiness.WMS/Transaction/IOutSplit.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/IOutSplit.cs rename to Tiger.IBusiness.WMS/Transaction/IOutSplit.cs diff --git a/Tiger.IBusiness/WMS/Transaction/IOutTransfer.cs b/Tiger.IBusiness.WMS/Transaction/IOutTransfer.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/IOutTransfer.cs rename to Tiger.IBusiness.WMS/Transaction/IOutTransfer.cs diff --git a/Tiger.IBusiness/WMS/Transaction/IOutWorkOrder.cs b/Tiger.IBusiness.WMS/Transaction/IOutWorkOrder.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/IOutWorkOrder.cs rename to Tiger.IBusiness.WMS/Transaction/IOutWorkOrder.cs diff --git a/Tiger.IBusiness/WMS/Transaction/IProductionMaterialReq.cs b/Tiger.IBusiness.WMS/Transaction/IProductionMaterialReq.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/IProductionMaterialReq.cs rename to Tiger.IBusiness.WMS/Transaction/IProductionMaterialReq.cs diff --git a/Tiger.IBusiness/WMS/Transaction/IResell.cs b/Tiger.IBusiness.WMS/Transaction/IResell.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/IResell.cs rename to Tiger.IBusiness.WMS/Transaction/IResell.cs diff --git a/Tiger.IBusiness/WMS/Transaction/IShelfRemote.cs b/Tiger.IBusiness.WMS/Transaction/IShelfRemote.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/IShelfRemote.cs rename to Tiger.IBusiness.WMS/Transaction/IShelfRemote.cs diff --git a/Tiger.IBusiness/WMS/Transaction/IWMSTransaction.cs b/Tiger.IBusiness.WMS/Transaction/IWMSTransaction.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/IWMSTransaction.cs rename to Tiger.IBusiness.WMS/Transaction/IWMSTransaction.cs diff --git a/Tiger.IBusiness/WMS/Transaction/IWmsCount.cs b/Tiger.IBusiness.WMS/Transaction/IWmsCount.cs similarity index 100% rename from Tiger.IBusiness/WMS/Transaction/IWmsCount.cs rename to Tiger.IBusiness.WMS/Transaction/IWmsCount.cs diff --git a/Tiger.IBusiness/WMS/iSRM/ISrmDataToSiHua.cs b/Tiger.IBusiness.WMS/iSRM/ISrmDataToSiHua.cs similarity index 100% rename from Tiger.IBusiness/WMS/iSRM/ISrmDataToSiHua.cs rename to Tiger.IBusiness.WMS/iSRM/ISrmDataToSiHua.cs diff --git a/Tiger.IBusiness/WMS/iSRM/ISrmToWms.cs b/Tiger.IBusiness.WMS/iSRM/ISrmToWms.cs similarity index 100% rename from Tiger.IBusiness/WMS/iSRM/ISrmToWms.cs rename to Tiger.IBusiness.WMS/iSRM/ISrmToWms.cs diff --git a/Tiger.IBusiness/WMS/iSRM/IiSRM.cs b/Tiger.IBusiness.WMS/iSRM/IiSRM.cs similarity index 100% rename from Tiger.IBusiness/WMS/iSRM/IiSRM.cs rename to Tiger.IBusiness.WMS/iSRM/IiSRM.cs diff --git a/Tiger.IBusiness/Tiger.IBusiness.csproj b/Tiger.IBusiness/Tiger.IBusiness.csproj index 262beb7..c8648e2 100644 --- a/Tiger.IBusiness/Tiger.IBusiness.csproj +++ b/Tiger.IBusiness/Tiger.IBusiness.csproj @@ -26,4 +26,8 @@ <ProjectReference Include="..\Tiger.Model.Net\Tiger.Model.Net.csproj" /> </ItemGroup> + <ItemGroup> + <Folder Include="WMS\" /> + </ItemGroup> + </Project> -- Gitblit v1.9.3