diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/appsettings.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/appsettings.json index 6daef9997..a8764adba 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/appsettings.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/appsettings.json @@ -1,6 +1,6 @@ { "App": { - "SelfUrl": "https://localhost:60100", + "SelfUrl": "http://192.168.0.196:60100", "ClientUrl": "http://localhost:60011,http://localhost:60012,http://localhost:60013,http://localhost:60021,http://localhost:60022,http://localhost:60022,http://localhost:10090", "CorsOrigins": "http://localhost:60011,http://localhost:60012,http://localhost:60013,http://localhost:60021,http://localhost:60022,http://localhost:60022,http://localhost:10090", "RedirectAllowedUrls": "http://localhost:60011,http://localhost:60012,http://localhost:60013,http://localhost:60021,http://localhost:60022,http://localhost:60022,http://localhost:10090" @@ -15,7 +15,7 @@ "Configuration": "127.0.0.1:6379" }, "AuthServer": { - "Authority": "https://localhost:60100" + "Authority": "http://192.168.0.196:60100" }, - "urls": "https://localhost:60100" + "urls": "http://192.168.0.196:60100" } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms.sln b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms.sln index 52a59cd06..407f306f6 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms.sln +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms.sln @@ -3,16 +3,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.6.33815.320 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinIn.FasterZ.Wms.Domain", "src\WinIn.FasterZ.Wms.Domain\WinIn.FasterZ.Wms.Domain.csproj", "{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinIn.FasterZ.Wms.Application", "src\WinIn.FasterZ.Wms.Application\WinIn.FasterZ.Wms.Application.csproj", "{1A94A50E-06DC-43C1-80B5-B662820EC3EB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinIn.FasterZ.Wms.EntityFrameworkCore", "src\WinIn.FasterZ.Wms.EntityFrameworkCore\WinIn.FasterZ.Wms.EntityFrameworkCore.csproj", "{C956DD76-69C8-4A9C-83EA-D17DF83340FD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CA9AC87F-097E-4F15-8393-4BC07735A5B0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinIn.FasterZ.Wms.Domain.Shared", "src\WinIn.FasterZ.Wms.Domain.Shared\WinIn.FasterZ.Wms.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinIn.FasterZ.Wms.Application.Contracts", "src\WinIn.FasterZ.Wms.Application.Contracts\WinIn.FasterZ.Wms.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinIn.FasterZ.Wms.HttpApi", "src\WinIn.FasterZ.Wms.HttpApi\WinIn.FasterZ.Wms.HttpApi.csproj", "{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}" @@ -29,16 +25,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinIn.FasterZ.Wms.DbMigrato EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "host", "host", "{89151952-6B48-4B68-94A6-18C03ABDE251}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinIn.FasterZ.Wms.Domain", "src\WinIn.FasterZ.Wms.Domain\WinIn.FasterZ.Wms.Domain.csproj", "{B8F96043-82B5-46AA-A500-95D9599CE5FA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinIn.FasterZ.Wms.Domain.Shared", "src\WinIn.FasterZ.Wms.Domain.Shared\WinIn.FasterZ.Wms.Domain.Shared.csproj", "{89F64145-FBD1-4DE3-9386-3095692C8D30}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {554AD327-6DBA-4F8F-96F8-81CE7A0C863F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {554AD327-6DBA-4F8F-96F8-81CE7A0C863F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {554AD327-6DBA-4F8F-96F8-81CE7A0C863F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {554AD327-6DBA-4F8F-96F8-81CE7A0C863F}.Release|Any CPU.Build.0 = Release|Any CPU {1A94A50E-06DC-43C1-80B5-B662820EC3EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1A94A50E-06DC-43C1-80B5-B662820EC3EB}.Debug|Any CPU.Build.0 = Debug|Any CPU {1A94A50E-06DC-43C1-80B5-B662820EC3EB}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -47,10 +43,6 @@ Global {C956DD76-69C8-4A9C-83EA-D17DF83340FD}.Debug|Any CPU.Build.0 = Debug|Any CPU {C956DD76-69C8-4A9C-83EA-D17DF83340FD}.Release|Any CPU.ActiveCfg = Release|Any CPU {C956DD76-69C8-4A9C-83EA-D17DF83340FD}.Release|Any CPU.Build.0 = Release|Any CPU - {42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42F719ED-8413-4895-B5B4-5AB56079BC66}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42F719ED-8413-4895-B5B4-5AB56079BC66}.Release|Any CPU.Build.0 = Release|Any CPU {520659C8-C734-4298-A3DA-B539DB9DFC0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {520659C8-C734-4298-A3DA-B539DB9DFC0B}.Debug|Any CPU.Build.0 = Debug|Any CPU {520659C8-C734-4298-A3DA-B539DB9DFC0B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -79,15 +71,21 @@ Global {AA94D832-1CCC-4715-95A9-A483F23A1A5D}.Debug|Any CPU.Build.0 = Debug|Any CPU {AA94D832-1CCC-4715-95A9-A483F23A1A5D}.Release|Any CPU.ActiveCfg = Release|Any CPU {AA94D832-1CCC-4715-95A9-A483F23A1A5D}.Release|Any CPU.Build.0 = Release|Any CPU + {B8F96043-82B5-46AA-A500-95D9599CE5FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B8F96043-82B5-46AA-A500-95D9599CE5FA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B8F96043-82B5-46AA-A500-95D9599CE5FA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B8F96043-82B5-46AA-A500-95D9599CE5FA}.Release|Any CPU.Build.0 = Release|Any CPU + {89F64145-FBD1-4DE3-9386-3095692C8D30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {89F64145-FBD1-4DE3-9386-3095692C8D30}.Debug|Any CPU.Build.0 = Debug|Any CPU + {89F64145-FBD1-4DE3-9386-3095692C8D30}.Release|Any CPU.ActiveCfg = Release|Any CPU + {89F64145-FBD1-4DE3-9386-3095692C8D30}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {554AD327-6DBA-4F8F-96F8-81CE7A0C863F} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {1A94A50E-06DC-43C1-80B5-B662820EC3EB} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {C956DD76-69C8-4A9C-83EA-D17DF83340FD} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {42F719ED-8413-4895-B5B4-5AB56079BC66} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {520659C8-C734-4298-A3DA-B539DB9DFC0B} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {4164BDF7-F527-4E85-9CE6-E3C2D7426A27} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {3B5A0094-670D-4BB1-BFDD-61B88A8773DC} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} @@ -95,6 +93,8 @@ Global {073C361E-B8F4-49F5-93CC-72A3FF49C026} = {89151952-6B48-4B68-94A6-18C03ABDE251} {E6D5BF0E-DE92-4D82-A352-EF04B37CB11C} = {89151952-6B48-4B68-94A6-18C03ABDE251} {AA94D832-1CCC-4715-95A9-A483F23A1A5D} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {B8F96043-82B5-46AA-A500-95D9599CE5FA} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {89F64145-FBD1-4DE3-9386-3095692C8D30} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/IExportCustomUserSettingAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/IExportCustomUserSettingAppService.cs index 893800077..c76554314 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/IExportCustomUserSettingAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/AppBaseBusiness/ExportCustomUserSetting/IExportCustomUserSettingAppService.cs @@ -17,10 +17,10 @@ namespace WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting CreateUpdateExportCustomUserSettingDto, CreateUpdateExportCustomUserSettingDto> { - /// - /// 根据用户和表名获取个性化导出 - /// - /// - Task> GetByUserIdAndExportTableNameAsync(Guid userId, string exportTableName); + ///// + ///// 根据用户和表名获取个性化导出 + ///// + ///// + //Task> GetByUserIdAndExportTableNameAsync(Guid userId, string exportTableName); } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissionDefinitionProvider.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissionDefinitionProvider.cs index d6354eb85..27ef6f1e7 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissionDefinitionProvider.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissionDefinitionProvider.cs @@ -4,303 +4,303 @@ using Volo.Abp.Localization; namespace WinIn.FasterZ.Wms.Permissions { - public class WmsPermissionDefinitionProvider : PermissionDefinitionProvider - { - public override void Define(IPermissionDefinitionContext context) - { - var myGroup = context.AddGroup(WmsPermissions.GroupName); - //Define your own permissions here. Example: - //myGroup.AddPermission(WmsPermissions.MyPermission1, L("Permission:MyPermission1")); - - var authDepartmentPermission = myGroup.AddPermission(WmsPermissions.AuthDepartment.Default, L("Permission:AuthDepartment")); - authDepartmentPermission.AddChild(WmsPermissions.AuthDepartment.Create, L("Permission:Create")); - authDepartmentPermission.AddChild(WmsPermissions.AuthDepartment.Update, L("Permission:Update")); - authDepartmentPermission.AddChild(WmsPermissions.AuthDepartment.Delete, L("Permission:Delete")); - - var storeWorkOrderPermission = myGroup.AddPermission(WmsPermissions.StoreWorkOrder.Default, L("Permission:StoreWorkOrder")); - storeWorkOrderPermission.AddChild(WmsPermissions.StoreWorkOrder.Create, L("Permission:Create")); - storeWorkOrderPermission.AddChild(WmsPermissions.StoreWorkOrder.Update, L("Permission:Update")); - storeWorkOrderPermission.AddChild(WmsPermissions.StoreWorkOrder.Delete, L("Permission:Delete")); - - var storeWorkOrderDetailPermission = myGroup.AddPermission(WmsPermissions.StoreWorkOrderDetail.Default, L("Permission:StoreWorkOrderDetail")); - storeWorkOrderDetailPermission.AddChild(WmsPermissions.StoreWorkOrderDetail.Create, L("Permission:Create")); - storeWorkOrderDetailPermission.AddChild(WmsPermissions.StoreWorkOrderDetail.Update, L("Permission:Update")); - storeWorkOrderDetailPermission.AddChild(WmsPermissions.StoreWorkOrderDetail.Delete, L("Permission:Delete")); - - var storeWipWarehouseAdjustRequestDetailPermission = myGroup.AddPermission(WmsPermissions.StoreWipWarehouseAdjustRequestDetail.Default, L("Permission:StoreWipWarehouseAdjustRequestDetail")); - storeWipWarehouseAdjustRequestDetailPermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustRequestDetail.Create, L("Permission:Create")); - storeWipWarehouseAdjustRequestDetailPermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustRequestDetail.Update, L("Permission:Update")); - storeWipWarehouseAdjustRequestDetailPermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustRequestDetail.Delete, L("Permission:Delete")); - - var storeWipWarehouseAdjustRequestPermission = myGroup.AddPermission(WmsPermissions.StoreWipWarehouseAdjustRequest.Default, L("Permission:StoreWipWarehouseAdjustRequest")); - storeWipWarehouseAdjustRequestPermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustRequest.Create, L("Permission:Create")); - storeWipWarehouseAdjustRequestPermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustRequest.Update, L("Permission:Update")); - storeWipWarehouseAdjustRequestPermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustRequest.Delete, L("Permission:Delete")); - - var storeWipWarehouseAdjustNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreWipWarehouseAdjustNoteDetail.Default, L("Permission:StoreWipWarehouseAdjustNoteDetail")); - storeWipWarehouseAdjustNoteDetailPermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustNoteDetail.Create, L("Permission:Create")); - storeWipWarehouseAdjustNoteDetailPermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustNoteDetail.Update, L("Permission:Update")); - storeWipWarehouseAdjustNoteDetailPermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustNoteDetail.Delete, L("Permission:Delete")); - - var storeWipWarehouseAdjustNotePermission = myGroup.AddPermission(WmsPermissions.StoreWipWarehouseAdjustNote.Default, L("Permission:StoreWipWarehouseAdjustNote")); - storeWipWarehouseAdjustNotePermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustNote.Create, L("Permission:Create")); - storeWipWarehouseAdjustNotePermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustNote.Update, L("Permission:Update")); - storeWipWarehouseAdjustNotePermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustNote.Delete, L("Permission:Delete")); - - var storeWarehouseTransferNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreWarehouseTransferNoteDetail.Default, L("Permission:StoreWarehouseTransferNoteDetail")); - storeWarehouseTransferNoteDetailPermission.AddChild(WmsPermissions.StoreWarehouseTransferNoteDetail.Create, L("Permission:Create")); - storeWarehouseTransferNoteDetailPermission.AddChild(WmsPermissions.StoreWarehouseTransferNoteDetail.Update, L("Permission:Update")); - storeWarehouseTransferNoteDetailPermission.AddChild(WmsPermissions.StoreWarehouseTransferNoteDetail.Delete, L("Permission:Delete")); - - var storeWarehouseTransferNotePermission = myGroup.AddPermission(WmsPermissions.StoreWarehouseTransferNote.Default, L("Permission:StoreWarehouseTransferNote")); - storeWarehouseTransferNotePermission.AddChild(WmsPermissions.StoreWarehouseTransferNote.Create, L("Permission:Create")); - storeWarehouseTransferNotePermission.AddChild(WmsPermissions.StoreWarehouseTransferNote.Update, L("Permission:Update")); - storeWarehouseTransferNotePermission.AddChild(WmsPermissions.StoreWarehouseTransferNote.Delete, L("Permission:Delete")); - - var storeUnplannedReceiptRequestDetailPermission = myGroup.AddPermission(WmsPermissions.StoreUnplannedReceiptRequestDetail.Default, L("Permission:StoreUnplannedReceiptRequestDetail")); - storeUnplannedReceiptRequestDetailPermission.AddChild(WmsPermissions.StoreUnplannedReceiptRequestDetail.Create, L("Permission:Create")); - storeUnplannedReceiptRequestDetailPermission.AddChild(WmsPermissions.StoreUnplannedReceiptRequestDetail.Update, L("Permission:Update")); - storeUnplannedReceiptRequestDetailPermission.AddChild(WmsPermissions.StoreUnplannedReceiptRequestDetail.Delete, L("Permission:Delete")); - - var storeUnplannedReceiptRequestPermission = myGroup.AddPermission(WmsPermissions.StoreUnplannedReceiptRequest.Default, L("Permission:StoreUnplannedReceiptRequest")); - storeUnplannedReceiptRequestPermission.AddChild(WmsPermissions.StoreUnplannedReceiptRequest.Create, L("Permission:Create")); - storeUnplannedReceiptRequestPermission.AddChild(WmsPermissions.StoreUnplannedReceiptRequest.Update, L("Permission:Update")); - storeUnplannedReceiptRequestPermission.AddChild(WmsPermissions.StoreUnplannedReceiptRequest.Delete, L("Permission:Delete")); - - var storeUnplannedReceiptNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreUnplannedReceiptNoteDetail.Default, L("Permission:StoreUnplannedReceiptNoteDetail")); - storeUnplannedReceiptNoteDetailPermission.AddChild(WmsPermissions.StoreUnplannedReceiptNoteDetail.Create, L("Permission:Create")); - storeUnplannedReceiptNoteDetailPermission.AddChild(WmsPermissions.StoreUnplannedReceiptNoteDetail.Update, L("Permission:Update")); - storeUnplannedReceiptNoteDetailPermission.AddChild(WmsPermissions.StoreUnplannedReceiptNoteDetail.Delete, L("Permission:Delete")); - - var storeUnplannedReceiptNotePermission = myGroup.AddPermission(WmsPermissions.StoreUnplannedReceiptNote.Default, L("Permission:StoreUnplannedReceiptNote")); - storeUnplannedReceiptNotePermission.AddChild(WmsPermissions.StoreUnplannedReceiptNote.Create, L("Permission:Create")); - storeUnplannedReceiptNotePermission.AddChild(WmsPermissions.StoreUnplannedReceiptNote.Update, L("Permission:Update")); - storeUnplannedReceiptNotePermission.AddChild(WmsPermissions.StoreUnplannedReceiptNote.Delete, L("Permission:Delete")); - - var storeUnplannedIssueRequestDetailPermission = myGroup.AddPermission(WmsPermissions.StoreUnplannedIssueRequestDetail.Default, L("Permission:StoreUnplannedIssueRequestDetail")); - storeUnplannedIssueRequestDetailPermission.AddChild(WmsPermissions.StoreUnplannedIssueRequestDetail.Create, L("Permission:Create")); - storeUnplannedIssueRequestDetailPermission.AddChild(WmsPermissions.StoreUnplannedIssueRequestDetail.Update, L("Permission:Update")); - storeUnplannedIssueRequestDetailPermission.AddChild(WmsPermissions.StoreUnplannedIssueRequestDetail.Delete, L("Permission:Delete")); - - var storeUnplannedIssueRequestPermission = myGroup.AddPermission(WmsPermissions.StoreUnplannedIssueRequest.Default, L("Permission:StoreUnplannedIssueRequest")); - storeUnplannedIssueRequestPermission.AddChild(WmsPermissions.StoreUnplannedIssueRequest.Create, L("Permission:Create")); - storeUnplannedIssueRequestPermission.AddChild(WmsPermissions.StoreUnplannedIssueRequest.Update, L("Permission:Update")); - storeUnplannedIssueRequestPermission.AddChild(WmsPermissions.StoreUnplannedIssueRequest.Delete, L("Permission:Delete")); - - var storeUnplannedIssueNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreUnplannedIssueNoteDetail.Default, L("Permission:StoreUnplannedIssueNoteDetail")); - storeUnplannedIssueNoteDetailPermission.AddChild(WmsPermissions.StoreUnplannedIssueNoteDetail.Create, L("Permission:Create")); - storeUnplannedIssueNoteDetailPermission.AddChild(WmsPermissions.StoreUnplannedIssueNoteDetail.Update, L("Permission:Update")); - storeUnplannedIssueNoteDetailPermission.AddChild(WmsPermissions.StoreUnplannedIssueNoteDetail.Delete, L("Permission:Delete")); - - var storeUnplannedIssueNotePermission = myGroup.AddPermission(WmsPermissions.StoreUnplannedIssueNote.Default, L("Permission:StoreUnplannedIssueNote")); - storeUnplannedIssueNotePermission.AddChild(WmsPermissions.StoreUnplannedIssueNote.Create, L("Permission:Create")); - storeUnplannedIssueNotePermission.AddChild(WmsPermissions.StoreUnplannedIssueNote.Update, L("Permission:Update")); - storeUnplannedIssueNotePermission.AddChild(WmsPermissions.StoreUnplannedIssueNote.Delete, L("Permission:Delete")); - - var storeTransferRequestDetailPermission = myGroup.AddPermission(WmsPermissions.StoreTransferRequestDetail.Default, L("Permission:StoreTransferRequestDetail")); - storeTransferRequestDetailPermission.AddChild(WmsPermissions.StoreTransferRequestDetail.Create, L("Permission:Create")); - storeTransferRequestDetailPermission.AddChild(WmsPermissions.StoreTransferRequestDetail.Update, L("Permission:Update")); - storeTransferRequestDetailPermission.AddChild(WmsPermissions.StoreTransferRequestDetail.Delete, L("Permission:Delete")); - - var storeTransferRequestPermission = myGroup.AddPermission(WmsPermissions.StoreTransferRequest.Default, L("Permission:StoreTransferRequest")); - storeTransferRequestPermission.AddChild(WmsPermissions.StoreTransferRequest.Create, L("Permission:Create")); - storeTransferRequestPermission.AddChild(WmsPermissions.StoreTransferRequest.Update, L("Permission:Update")); - storeTransferRequestPermission.AddChild(WmsPermissions.StoreTransferRequest.Delete, L("Permission:Delete")); - - var storeTransferNoteDetailCopyPermission = myGroup.AddPermission(WmsPermissions.StoreTransferNoteDetailCopy.Default, L("Permission:StoreTransferNoteDetailCopy")); - storeTransferNoteDetailCopyPermission.AddChild(WmsPermissions.StoreTransferNoteDetailCopy.Create, L("Permission:Create")); - storeTransferNoteDetailCopyPermission.AddChild(WmsPermissions.StoreTransferNoteDetailCopy.Update, L("Permission:Update")); - storeTransferNoteDetailCopyPermission.AddChild(WmsPermissions.StoreTransferNoteDetailCopy.Delete, L("Permission:Delete")); - - var storeTransferNoteCopyPermission = myGroup.AddPermission(WmsPermissions.StoreTransferNoteCopy.Default, L("Permission:StoreTransferNoteCopy")); - storeTransferNoteCopyPermission.AddChild(WmsPermissions.StoreTransferNoteCopy.Create, L("Permission:Create")); - storeTransferNoteCopyPermission.AddChild(WmsPermissions.StoreTransferNoteCopy.Update, L("Permission:Update")); - storeTransferNoteCopyPermission.AddChild(WmsPermissions.StoreTransferNoteCopy.Delete, L("Permission:Delete")); - - var storeTransferNotePermission = myGroup.AddPermission(WmsPermissions.StoreTransferNote.Default, L("Permission:StoreTransferNote")); - storeTransferNotePermission.AddChild(WmsPermissions.StoreTransferNote.Create, L("Permission:Create")); - storeTransferNotePermission.AddChild(WmsPermissions.StoreTransferNote.Update, L("Permission:Update")); - storeTransferNotePermission.AddChild(WmsPermissions.StoreTransferNote.Delete, L("Permission:Delete")); - - var storeSupplierAsnDetailPermission = myGroup.AddPermission(WmsPermissions.StoreSupplierAsnDetail.Default, L("Permission:StoreSupplierAsnDetail")); - storeSupplierAsnDetailPermission.AddChild(WmsPermissions.StoreSupplierAsnDetail.Create, L("Permission:Create")); - storeSupplierAsnDetailPermission.AddChild(WmsPermissions.StoreSupplierAsnDetail.Update, L("Permission:Update")); - storeSupplierAsnDetailPermission.AddChild(WmsPermissions.StoreSupplierAsnDetail.Delete, L("Permission:Delete")); - - var storeSupplierAsnPermission = myGroup.AddPermission(WmsPermissions.StoreSupplierAsn.Default, L("Permission:StoreSupplierAsn")); - storeSupplierAsnPermission.AddChild(WmsPermissions.StoreSupplierAsn.Create, L("Permission:Create")); - storeSupplierAsnPermission.AddChild(WmsPermissions.StoreSupplierAsn.Update, L("Permission:Update")); - storeSupplierAsnPermission.AddChild(WmsPermissions.StoreSupplierAsn.Delete, L("Permission:Delete")); - - var storeScrapRequestDetailPermission = myGroup.AddPermission(WmsPermissions.StoreScrapRequestDetail.Default, L("Permission:StoreScrapRequestDetail")); - storeScrapRequestDetailPermission.AddChild(WmsPermissions.StoreScrapRequestDetail.Create, L("Permission:Create")); - storeScrapRequestDetailPermission.AddChild(WmsPermissions.StoreScrapRequestDetail.Update, L("Permission:Update")); - storeScrapRequestDetailPermission.AddChild(WmsPermissions.StoreScrapRequestDetail.Delete, L("Permission:Delete")); - - var storeScrapRequestPermission = myGroup.AddPermission(WmsPermissions.StoreScrapRequest.Default, L("Permission:StoreScrapRequest")); - storeScrapRequestPermission.AddChild(WmsPermissions.StoreScrapRequest.Create, L("Permission:Create")); - storeScrapRequestPermission.AddChild(WmsPermissions.StoreScrapRequest.Update, L("Permission:Update")); - storeScrapRequestPermission.AddChild(WmsPermissions.StoreScrapRequest.Delete, L("Permission:Delete")); - - var storeScrapNotePermission = myGroup.AddPermission(WmsPermissions.StoreScrapNote.Default, L("Permission:StoreScrapNote")); - storeScrapNotePermission.AddChild(WmsPermissions.StoreScrapNote.Create, L("Permission:Create")); - storeScrapNotePermission.AddChild(WmsPermissions.StoreScrapNote.Update, L("Permission:Update")); - storeScrapNotePermission.AddChild(WmsPermissions.StoreScrapNote.Delete, L("Permission:Delete")); - - var storeSaleOrderDetailPermission = myGroup.AddPermission(WmsPermissions.StoreSaleOrderDetail.Default, L("Permission:StoreSaleOrderDetail")); - storeSaleOrderDetailPermission.AddChild(WmsPermissions.StoreSaleOrderDetail.Create, L("Permission:Create")); - storeSaleOrderDetailPermission.AddChild(WmsPermissions.StoreSaleOrderDetail.Update, L("Permission:Update")); - storeSaleOrderDetailPermission.AddChild(WmsPermissions.StoreSaleOrderDetail.Delete, L("Permission:Delete")); - - var storeSaleOrderPermission = myGroup.AddPermission(WmsPermissions.StoreSaleOrder.Default, L("Permission:StoreSaleOrder")); - storeSaleOrderPermission.AddChild(WmsPermissions.StoreSaleOrder.Create, L("Permission:Create")); - storeSaleOrderPermission.AddChild(WmsPermissions.StoreSaleOrder.Update, L("Permission:Update")); - storeSaleOrderPermission.AddChild(WmsPermissions.StoreSaleOrder.Delete, L("Permission:Delete")); - - var storeRecycledMaterialReceiptNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreRecycledMaterialReceiptNoteDetail.Default, L("Permission:StoreRecycledMaterialReceiptNoteDetail")); - storeRecycledMaterialReceiptNoteDetailPermission.AddChild(WmsPermissions.StoreRecycledMaterialReceiptNoteDetail.Create, L("Permission:Create")); - storeRecycledMaterialReceiptNoteDetailPermission.AddChild(WmsPermissions.StoreRecycledMaterialReceiptNoteDetail.Update, L("Permission:Update")); - storeRecycledMaterialReceiptNoteDetailPermission.AddChild(WmsPermissions.StoreRecycledMaterialReceiptNoteDetail.Delete, L("Permission:Delete")); - - var storeRecycledMaterialReceiptNotePermission = myGroup.AddPermission(WmsPermissions.StoreRecycledMaterialReceiptNote.Default, L("Permission:StoreRecycledMaterialReceiptNote")); - storeRecycledMaterialReceiptNotePermission.AddChild(WmsPermissions.StoreRecycledMaterialReceiptNote.Create, L("Permission:Create")); - storeRecycledMaterialReceiptNotePermission.AddChild(WmsPermissions.StoreRecycledMaterialReceiptNote.Update, L("Permission:Update")); - storeRecycledMaterialReceiptNotePermission.AddChild(WmsPermissions.StoreRecycledMaterialReceiptNote.Delete, L("Permission:Delete")); - - var storeReceiptAbnormalNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreReceiptAbnormalNoteDetail.Default, L("Permission:StoreReceiptAbnormalNoteDetail")); - storeReceiptAbnormalNoteDetailPermission.AddChild(WmsPermissions.StoreReceiptAbnormalNoteDetail.Create, L("Permission:Create")); - storeReceiptAbnormalNoteDetailPermission.AddChild(WmsPermissions.StoreReceiptAbnormalNoteDetail.Update, L("Permission:Update")); - storeReceiptAbnormalNoteDetailPermission.AddChild(WmsPermissions.StoreReceiptAbnormalNoteDetail.Delete, L("Permission:Delete")); - - var storeReceiptAbnormalNotePermission = myGroup.AddPermission(WmsPermissions.StoreReceiptAbnormalNote.Default, L("Permission:StoreReceiptAbnormalNote")); - storeReceiptAbnormalNotePermission.AddChild(WmsPermissions.StoreReceiptAbnormalNote.Create, L("Permission:Create")); - storeReceiptAbnormalNotePermission.AddChild(WmsPermissions.StoreReceiptAbnormalNote.Update, L("Permission:Update")); - storeReceiptAbnormalNotePermission.AddChild(WmsPermissions.StoreReceiptAbnormalNote.Delete, L("Permission:Delete")); - - var storePutawayRequestDetailPermission = myGroup.AddPermission(WmsPermissions.StorePutawayRequestDetail.Default, L("Permission:StorePutawayRequestDetail")); - storePutawayRequestDetailPermission.AddChild(WmsPermissions.StorePutawayRequestDetail.Create, L("Permission:Create")); - storePutawayRequestDetailPermission.AddChild(WmsPermissions.StorePutawayRequestDetail.Update, L("Permission:Update")); - storePutawayRequestDetailPermission.AddChild(WmsPermissions.StorePutawayRequestDetail.Delete, L("Permission:Delete")); - - var storePutawayRequestPermission = myGroup.AddPermission(WmsPermissions.StorePutawayRequest.Default, L("Permission:StorePutawayRequest")); - storePutawayRequestPermission.AddChild(WmsPermissions.StorePutawayRequest.Create, L("Permission:Create")); - storePutawayRequestPermission.AddChild(WmsPermissions.StorePutawayRequest.Update, L("Permission:Update")); - storePutawayRequestPermission.AddChild(WmsPermissions.StorePutawayRequest.Delete, L("Permission:Delete")); - - var storePutawayNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StorePutawayNoteDetail.Default, L("Permission:StorePutawayNoteDetail")); - storePutawayNoteDetailPermission.AddChild(WmsPermissions.StorePutawayNoteDetail.Create, L("Permission:Create")); - storePutawayNoteDetailPermission.AddChild(WmsPermissions.StorePutawayNoteDetail.Update, L("Permission:Update")); - storePutawayNoteDetailPermission.AddChild(WmsPermissions.StorePutawayNoteDetail.Delete, L("Permission:Delete")); - - var storePutawayNotePermission = myGroup.AddPermission(WmsPermissions.StorePutawayNote.Default, L("Permission:StorePutawayNote")); - storePutawayNotePermission.AddChild(WmsPermissions.StorePutawayNote.Create, L("Permission:Create")); - storePutawayNotePermission.AddChild(WmsPermissions.StorePutawayNote.Update, L("Permission:Update")); - storePutawayNotePermission.AddChild(WmsPermissions.StorePutawayNote.Delete, L("Permission:Delete")); - - var storePurchaseReturnRequestDetailPermission = myGroup.AddPermission(WmsPermissions.StorePurchaseReturnRequestDetail.Default, L("Permission:StorePurchaseReturnRequestDetail")); - storePurchaseReturnRequestDetailPermission.AddChild(WmsPermissions.StorePurchaseReturnRequestDetail.Create, L("Permission:Create")); - storePurchaseReturnRequestDetailPermission.AddChild(WmsPermissions.StorePurchaseReturnRequestDetail.Update, L("Permission:Update")); - storePurchaseReturnRequestDetailPermission.AddChild(WmsPermissions.StorePurchaseReturnRequestDetail.Delete, L("Permission:Delete")); - - var storePurchaseReturnRequestPermission = myGroup.AddPermission(WmsPermissions.StorePurchaseReturnRequest.Default, L("Permission:StorePurchaseReturnRequest")); - storePurchaseReturnRequestPermission.AddChild(WmsPermissions.StorePurchaseReturnRequest.Create, L("Permission:Create")); - storePurchaseReturnRequestPermission.AddChild(WmsPermissions.StorePurchaseReturnRequest.Update, L("Permission:Update")); - storePurchaseReturnRequestPermission.AddChild(WmsPermissions.StorePurchaseReturnRequest.Delete, L("Permission:Delete")); - - var storePurchaseReturnNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StorePurchaseReturnNoteDetail.Default, L("Permission:StorePurchaseReturnNoteDetail")); - storePurchaseReturnNoteDetailPermission.AddChild(WmsPermissions.StorePurchaseReturnNoteDetail.Create, L("Permission:Create")); - storePurchaseReturnNoteDetailPermission.AddChild(WmsPermissions.StorePurchaseReturnNoteDetail.Update, L("Permission:Update")); - storePurchaseReturnNoteDetailPermission.AddChild(WmsPermissions.StorePurchaseReturnNoteDetail.Delete, L("Permission:Delete")); - - var storePurchaseReturnNotePermission = myGroup.AddPermission(WmsPermissions.StorePurchaseReturnNote.Default, L("Permission:StorePurchaseReturnNote")); - storePurchaseReturnNotePermission.AddChild(WmsPermissions.StorePurchaseReturnNote.Create, L("Permission:Create")); - storePurchaseReturnNotePermission.AddChild(WmsPermissions.StorePurchaseReturnNote.Update, L("Permission:Update")); - storePurchaseReturnNotePermission.AddChild(WmsPermissions.StorePurchaseReturnNote.Delete, L("Permission:Delete")); - - var storePurchaseReceiptRequestDetailPermission = myGroup.AddPermission(WmsPermissions.StorePurchaseReceiptRequestDetail.Default, L("Permission:StorePurchaseReceiptRequestDetail")); - storePurchaseReceiptRequestDetailPermission.AddChild(WmsPermissions.StorePurchaseReceiptRequestDetail.Create, L("Permission:Create")); - storePurchaseReceiptRequestDetailPermission.AddChild(WmsPermissions.StorePurchaseReceiptRequestDetail.Update, L("Permission:Update")); - storePurchaseReceiptRequestDetailPermission.AddChild(WmsPermissions.StorePurchaseReceiptRequestDetail.Delete, L("Permission:Delete")); - - var storePurchaseReceiptRequestPermission = myGroup.AddPermission(WmsPermissions.StorePurchaseReceiptRequest.Default, L("Permission:StorePurchaseReceiptRequest")); - storePurchaseReceiptRequestPermission.AddChild(WmsPermissions.StorePurchaseReceiptRequest.Create, L("Permission:Create")); - storePurchaseReceiptRequestPermission.AddChild(WmsPermissions.StorePurchaseReceiptRequest.Update, L("Permission:Update")); - storePurchaseReceiptRequestPermission.AddChild(WmsPermissions.StorePurchaseReceiptRequest.Delete, L("Permission:Delete")); - - var storePurchaseReceiptNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StorePurchaseReceiptNoteDetail.Default, L("Permission:StorePurchaseReceiptNoteDetail")); - storePurchaseReceiptNoteDetailPermission.AddChild(WmsPermissions.StorePurchaseReceiptNoteDetail.Create, L("Permission:Create")); - storePurchaseReceiptNoteDetailPermission.AddChild(WmsPermissions.StorePurchaseReceiptNoteDetail.Update, L("Permission:Update")); - storePurchaseReceiptNoteDetailPermission.AddChild(WmsPermissions.StorePurchaseReceiptNoteDetail.Delete, L("Permission:Delete")); - - var storePurchaseReceiptNotePermission = myGroup.AddPermission(WmsPermissions.StorePurchaseReceiptNote.Default, L("Permission:StorePurchaseReceiptNote")); - storePurchaseReceiptNotePermission.AddChild(WmsPermissions.StorePurchaseReceiptNote.Create, L("Permission:Create")); - storePurchaseReceiptNotePermission.AddChild(WmsPermissions.StorePurchaseReceiptNote.Update, L("Permission:Update")); - storePurchaseReceiptNotePermission.AddChild(WmsPermissions.StorePurchaseReceiptNote.Delete, L("Permission:Delete")); - - var storePurchaseOrderDetailPermission = myGroup.AddPermission(WmsPermissions.StorePurchaseOrderDetail.Default, L("Permission:StorePurchaseOrderDetail")); - storePurchaseOrderDetailPermission.AddChild(WmsPermissions.StorePurchaseOrderDetail.Create, L("Permission:Create")); - storePurchaseOrderDetailPermission.AddChild(WmsPermissions.StorePurchaseOrderDetail.Update, L("Permission:Update")); - storePurchaseOrderDetailPermission.AddChild(WmsPermissions.StorePurchaseOrderDetail.Delete, L("Permission:Delete")); - - var storePurchaseOrderPermission = myGroup.AddPermission(WmsPermissions.StorePurchaseOrder.Default, L("Permission:StorePurchaseOrder")); - storePurchaseOrderPermission.AddChild(WmsPermissions.StorePurchaseOrder.Create, L("Permission:Create")); - storePurchaseOrderPermission.AddChild(WmsPermissions.StorePurchaseOrder.Update, L("Permission:Update")); - storePurchaseOrderPermission.AddChild(WmsPermissions.StorePurchaseOrder.Delete, L("Permission:Delete")); - - var storeProductRecycleRequestPermission = myGroup.AddPermission(WmsPermissions.StoreProductRecycleRequest.Default, L("Permission:StoreProductRecycleRequest")); - storeProductRecycleRequestPermission.AddChild(WmsPermissions.StoreProductRecycleRequest.Create, L("Permission:Create")); - storeProductRecycleRequestPermission.AddChild(WmsPermissions.StoreProductRecycleRequest.Update, L("Permission:Update")); - storeProductRecycleRequestPermission.AddChild(WmsPermissions.StoreProductRecycleRequest.Delete, L("Permission:Delete")); - - var storeProductRecycleNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreProductRecycleNoteDetail.Default, L("Permission:StoreProductRecycleNoteDetail")); - storeProductRecycleNoteDetailPermission.AddChild(WmsPermissions.StoreProductRecycleNoteDetail.Create, L("Permission:Create")); - storeProductRecycleNoteDetailPermission.AddChild(WmsPermissions.StoreProductRecycleNoteDetail.Update, L("Permission:Update")); - storeProductRecycleNoteDetailPermission.AddChild(WmsPermissions.StoreProductRecycleNoteDetail.Delete, L("Permission:Delete")); - - var storeProductRecycleNotePermission = myGroup.AddPermission(WmsPermissions.StoreProductRecycleNote.Default, L("Permission:StoreProductRecycleNote")); - storeProductRecycleNotePermission.AddChild(WmsPermissions.StoreProductRecycleNote.Create, L("Permission:Create")); - storeProductRecycleNotePermission.AddChild(WmsPermissions.StoreProductRecycleNote.Update, L("Permission:Update")); - storeProductRecycleNotePermission.AddChild(WmsPermissions.StoreProductRecycleNote.Delete, L("Permission:Delete")); - - var storeProductRecycleMaterialDetailPermission = myGroup.AddPermission(WmsPermissions.StoreProductRecycleMaterialDetail.Default, L("Permission:StoreProductRecycleMaterialDetail")); - storeProductRecycleMaterialDetailPermission.AddChild(WmsPermissions.StoreProductRecycleMaterialDetail.Create, L("Permission:Create")); - storeProductRecycleMaterialDetailPermission.AddChild(WmsPermissions.StoreProductRecycleMaterialDetail.Update, L("Permission:Update")); - storeProductRecycleMaterialDetailPermission.AddChild(WmsPermissions.StoreProductRecycleMaterialDetail.Delete, L("Permission:Delete")); - - var storeProductReceiptRequestDetailPermission = myGroup.AddPermission(WmsPermissions.StoreProductReceiptRequestDetail.Default, L("Permission:StoreProductReceiptRequestDetail")); - storeProductReceiptRequestDetailPermission.AddChild(WmsPermissions.StoreProductReceiptRequestDetail.Create, L("Permission:Create")); - storeProductReceiptRequestDetailPermission.AddChild(WmsPermissions.StoreProductReceiptRequestDetail.Update, L("Permission:Update")); - storeProductReceiptRequestDetailPermission.AddChild(WmsPermissions.StoreProductReceiptRequestDetail.Delete, L("Permission:Delete")); - - var storeProductReceiptRequestPermission = myGroup.AddPermission(WmsPermissions.StoreProductReceiptRequest.Default, L("Permission:StoreProductReceiptRequest")); - storeProductReceiptRequestPermission.AddChild(WmsPermissions.StoreProductReceiptRequest.Create, L("Permission:Create")); - storeProductReceiptRequestPermission.AddChild(WmsPermissions.StoreProductReceiptRequest.Update, L("Permission:Update")); - storeProductReceiptRequestPermission.AddChild(WmsPermissions.StoreProductReceiptRequest.Delete, L("Permission:Delete")); - - var storeProductReceiptNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreProductReceiptNoteDetail.Default, L("Permission:StoreProductReceiptNoteDetail")); - storeProductReceiptNoteDetailPermission.AddChild(WmsPermissions.StoreProductReceiptNoteDetail.Create, L("Permission:Create")); - storeProductReceiptNoteDetailPermission.AddChild(WmsPermissions.StoreProductReceiptNoteDetail.Update, L("Permission:Update")); - storeProductReceiptNoteDetailPermission.AddChild(WmsPermissions.StoreProductReceiptNoteDetail.Delete, L("Permission:Delete")); - - var storeProductReceiptNotePermission = myGroup.AddPermission(WmsPermissions.StoreProductReceiptNote.Default, L("Permission:StoreProductReceiptNote")); - storeProductReceiptNotePermission.AddChild(WmsPermissions.StoreProductReceiptNote.Create, L("Permission:Create")); - storeProductReceiptNotePermission.AddChild(WmsPermissions.StoreProductReceiptNote.Update, L("Permission:Update")); - storeProductReceiptNotePermission.AddChild(WmsPermissions.StoreProductReceiptNote.Delete, L("Permission:Delete")); - - var storeProductL7partsNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreProductL7partsNoteDetail.Default, L("Permission:StoreProductL7partsNoteDetail")); - storeProductL7partsNoteDetailPermission.AddChild(WmsPermissions.StoreProductL7partsNoteDetail.Create, L("Permission:Create")); - storeProductL7partsNoteDetailPermission.AddChild(WmsPermissions.StoreProductL7partsNoteDetail.Update, L("Permission:Update")); - storeProductL7partsNoteDetailPermission.AddChild(WmsPermissions.StoreProductL7partsNoteDetail.Delete, L("Permission:Delete")); - - var storeProductL7partsNotePermission = myGroup.AddPermission(WmsPermissions.StoreProductL7partsNote.Default, L("Permission:StoreProductL7partsNote")); - storeProductL7partsNotePermission.AddChild(WmsPermissions.StoreProductL7partsNote.Create, L("Permission:Create")); - storeProductL7partsNotePermission.AddChild(WmsPermissions.StoreProductL7partsNote.Update, L("Permission:Update")); - storeProductL7partsNotePermission.AddChild(WmsPermissions.StoreProductL7partsNote.Delete, L("Permission:Delete")); - } - - private static LocalizableString L(string name) - { - return LocalizableString.Create(name); - } - } + public class WmsPermissionDefinitionProvider : PermissionDefinitionProvider + { + public override void Define(IPermissionDefinitionContext context) + { + var myGroup = context.AddGroup(WmsPermissions.GroupName); + //Define your own permissions here. Example: + //myGroup.AddPermission(WmsPermissions.MyPermission1, L("Permission:MyPermission1")); + + var authDepartmentPermission = myGroup.AddPermission(WmsPermissions.AuthDepartment.Default, L("Permission:AuthDepartment")); + authDepartmentPermission.AddChild(WmsPermissions.AuthDepartment.Create, L("Permission:Create")); + authDepartmentPermission.AddChild(WmsPermissions.AuthDepartment.Update, L("Permission:Update")); + authDepartmentPermission.AddChild(WmsPermissions.AuthDepartment.Delete, L("Permission:Delete")); + + var storeWorkOrderPermission = myGroup.AddPermission(WmsPermissions.StoreWorkOrder.Default, L("Permission:StoreWorkOrder")); + storeWorkOrderPermission.AddChild(WmsPermissions.StoreWorkOrder.Create, L("Permission:Create")); + storeWorkOrderPermission.AddChild(WmsPermissions.StoreWorkOrder.Update, L("Permission:Update")); + storeWorkOrderPermission.AddChild(WmsPermissions.StoreWorkOrder.Delete, L("Permission:Delete")); + + var storeWorkOrderDetailPermission = myGroup.AddPermission(WmsPermissions.StoreWorkOrderDetail.Default, L("Permission:StoreWorkOrderDetail")); + storeWorkOrderDetailPermission.AddChild(WmsPermissions.StoreWorkOrderDetail.Create, L("Permission:Create")); + storeWorkOrderDetailPermission.AddChild(WmsPermissions.StoreWorkOrderDetail.Update, L("Permission:Update")); + storeWorkOrderDetailPermission.AddChild(WmsPermissions.StoreWorkOrderDetail.Delete, L("Permission:Delete")); + + var storeWipWarehouseAdjustRequestDetailPermission = myGroup.AddPermission(WmsPermissions.StoreWipWarehouseAdjustRequestDetail.Default, L("Permission:StoreWipWarehouseAdjustRequestDetail")); + storeWipWarehouseAdjustRequestDetailPermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustRequestDetail.Create, L("Permission:Create")); + storeWipWarehouseAdjustRequestDetailPermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustRequestDetail.Update, L("Permission:Update")); + storeWipWarehouseAdjustRequestDetailPermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustRequestDetail.Delete, L("Permission:Delete")); + + var storeWipWarehouseAdjustRequestPermission = myGroup.AddPermission(WmsPermissions.StoreWipWarehouseAdjustRequest.Default, L("Permission:StoreWipWarehouseAdjustRequest")); + storeWipWarehouseAdjustRequestPermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustRequest.Create, L("Permission:Create")); + storeWipWarehouseAdjustRequestPermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustRequest.Update, L("Permission:Update")); + storeWipWarehouseAdjustRequestPermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustRequest.Delete, L("Permission:Delete")); + + var storeWipWarehouseAdjustNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreWipWarehouseAdjustNoteDetail.Default, L("Permission:StoreWipWarehouseAdjustNoteDetail")); + storeWipWarehouseAdjustNoteDetailPermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustNoteDetail.Create, L("Permission:Create")); + storeWipWarehouseAdjustNoteDetailPermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustNoteDetail.Update, L("Permission:Update")); + storeWipWarehouseAdjustNoteDetailPermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustNoteDetail.Delete, L("Permission:Delete")); + + var storeWipWarehouseAdjustNotePermission = myGroup.AddPermission(WmsPermissions.StoreWipWarehouseAdjustNote.Default, L("Permission:StoreWipWarehouseAdjustNote")); + storeWipWarehouseAdjustNotePermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustNote.Create, L("Permission:Create")); + storeWipWarehouseAdjustNotePermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustNote.Update, L("Permission:Update")); + storeWipWarehouseAdjustNotePermission.AddChild(WmsPermissions.StoreWipWarehouseAdjustNote.Delete, L("Permission:Delete")); + + var storeWarehouseTransferNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreWarehouseTransferNoteDetail.Default, L("Permission:StoreWarehouseTransferNoteDetail")); + storeWarehouseTransferNoteDetailPermission.AddChild(WmsPermissions.StoreWarehouseTransferNoteDetail.Create, L("Permission:Create")); + storeWarehouseTransferNoteDetailPermission.AddChild(WmsPermissions.StoreWarehouseTransferNoteDetail.Update, L("Permission:Update")); + storeWarehouseTransferNoteDetailPermission.AddChild(WmsPermissions.StoreWarehouseTransferNoteDetail.Delete, L("Permission:Delete")); + + var storeWarehouseTransferNotePermission = myGroup.AddPermission(WmsPermissions.StoreWarehouseTransferNote.Default, L("Permission:StoreWarehouseTransferNote")); + storeWarehouseTransferNotePermission.AddChild(WmsPermissions.StoreWarehouseTransferNote.Create, L("Permission:Create")); + storeWarehouseTransferNotePermission.AddChild(WmsPermissions.StoreWarehouseTransferNote.Update, L("Permission:Update")); + storeWarehouseTransferNotePermission.AddChild(WmsPermissions.StoreWarehouseTransferNote.Delete, L("Permission:Delete")); + + var storeUnplannedReceiptRequestDetailPermission = myGroup.AddPermission(WmsPermissions.StoreUnplannedReceiptRequestDetail.Default, L("Permission:StoreUnplannedReceiptRequestDetail")); + storeUnplannedReceiptRequestDetailPermission.AddChild(WmsPermissions.StoreUnplannedReceiptRequestDetail.Create, L("Permission:Create")); + storeUnplannedReceiptRequestDetailPermission.AddChild(WmsPermissions.StoreUnplannedReceiptRequestDetail.Update, L("Permission:Update")); + storeUnplannedReceiptRequestDetailPermission.AddChild(WmsPermissions.StoreUnplannedReceiptRequestDetail.Delete, L("Permission:Delete")); + + var storeUnplannedReceiptRequestPermission = myGroup.AddPermission(WmsPermissions.StoreUnplannedReceiptRequest.Default, L("Permission:StoreUnplannedReceiptRequest")); + storeUnplannedReceiptRequestPermission.AddChild(WmsPermissions.StoreUnplannedReceiptRequest.Create, L("Permission:Create")); + storeUnplannedReceiptRequestPermission.AddChild(WmsPermissions.StoreUnplannedReceiptRequest.Update, L("Permission:Update")); + storeUnplannedReceiptRequestPermission.AddChild(WmsPermissions.StoreUnplannedReceiptRequest.Delete, L("Permission:Delete")); + + var storeUnplannedReceiptNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreUnplannedReceiptNoteDetail.Default, L("Permission:StoreUnplannedReceiptNoteDetail")); + storeUnplannedReceiptNoteDetailPermission.AddChild(WmsPermissions.StoreUnplannedReceiptNoteDetail.Create, L("Permission:Create")); + storeUnplannedReceiptNoteDetailPermission.AddChild(WmsPermissions.StoreUnplannedReceiptNoteDetail.Update, L("Permission:Update")); + storeUnplannedReceiptNoteDetailPermission.AddChild(WmsPermissions.StoreUnplannedReceiptNoteDetail.Delete, L("Permission:Delete")); + + var storeUnplannedReceiptNotePermission = myGroup.AddPermission(WmsPermissions.StoreUnplannedReceiptNote.Default, L("Permission:StoreUnplannedReceiptNote")); + storeUnplannedReceiptNotePermission.AddChild(WmsPermissions.StoreUnplannedReceiptNote.Create, L("Permission:Create")); + storeUnplannedReceiptNotePermission.AddChild(WmsPermissions.StoreUnplannedReceiptNote.Update, L("Permission:Update")); + storeUnplannedReceiptNotePermission.AddChild(WmsPermissions.StoreUnplannedReceiptNote.Delete, L("Permission:Delete")); + + var storeUnplannedIssueRequestDetailPermission = myGroup.AddPermission(WmsPermissions.StoreUnplannedIssueRequestDetail.Default, L("Permission:StoreUnplannedIssueRequestDetail")); + storeUnplannedIssueRequestDetailPermission.AddChild(WmsPermissions.StoreUnplannedIssueRequestDetail.Create, L("Permission:Create")); + storeUnplannedIssueRequestDetailPermission.AddChild(WmsPermissions.StoreUnplannedIssueRequestDetail.Update, L("Permission:Update")); + storeUnplannedIssueRequestDetailPermission.AddChild(WmsPermissions.StoreUnplannedIssueRequestDetail.Delete, L("Permission:Delete")); + + var storeUnplannedIssueRequestPermission = myGroup.AddPermission(WmsPermissions.StoreUnplannedIssueRequest.Default, L("Permission:StoreUnplannedIssueRequest")); + storeUnplannedIssueRequestPermission.AddChild(WmsPermissions.StoreUnplannedIssueRequest.Create, L("Permission:Create")); + storeUnplannedIssueRequestPermission.AddChild(WmsPermissions.StoreUnplannedIssueRequest.Update, L("Permission:Update")); + storeUnplannedIssueRequestPermission.AddChild(WmsPermissions.StoreUnplannedIssueRequest.Delete, L("Permission:Delete")); + + var storeUnplannedIssueNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreUnplannedIssueNoteDetail.Default, L("Permission:StoreUnplannedIssueNoteDetail")); + storeUnplannedIssueNoteDetailPermission.AddChild(WmsPermissions.StoreUnplannedIssueNoteDetail.Create, L("Permission:Create")); + storeUnplannedIssueNoteDetailPermission.AddChild(WmsPermissions.StoreUnplannedIssueNoteDetail.Update, L("Permission:Update")); + storeUnplannedIssueNoteDetailPermission.AddChild(WmsPermissions.StoreUnplannedIssueNoteDetail.Delete, L("Permission:Delete")); + + var storeUnplannedIssueNotePermission = myGroup.AddPermission(WmsPermissions.StoreUnplannedIssueNote.Default, L("Permission:StoreUnplannedIssueNote")); + storeUnplannedIssueNotePermission.AddChild(WmsPermissions.StoreUnplannedIssueNote.Create, L("Permission:Create")); + storeUnplannedIssueNotePermission.AddChild(WmsPermissions.StoreUnplannedIssueNote.Update, L("Permission:Update")); + storeUnplannedIssueNotePermission.AddChild(WmsPermissions.StoreUnplannedIssueNote.Delete, L("Permission:Delete")); + + var storeTransferRequestDetailPermission = myGroup.AddPermission(WmsPermissions.StoreTransferRequestDetail.Default, L("Permission:StoreTransferRequestDetail")); + storeTransferRequestDetailPermission.AddChild(WmsPermissions.StoreTransferRequestDetail.Create, L("Permission:Create")); + storeTransferRequestDetailPermission.AddChild(WmsPermissions.StoreTransferRequestDetail.Update, L("Permission:Update")); + storeTransferRequestDetailPermission.AddChild(WmsPermissions.StoreTransferRequestDetail.Delete, L("Permission:Delete")); + + var storeTransferRequestPermission = myGroup.AddPermission(WmsPermissions.StoreTransferRequest.Default, L("Permission:StoreTransferRequest")); + storeTransferRequestPermission.AddChild(WmsPermissions.StoreTransferRequest.Create, L("Permission:Create")); + storeTransferRequestPermission.AddChild(WmsPermissions.StoreTransferRequest.Update, L("Permission:Update")); + storeTransferRequestPermission.AddChild(WmsPermissions.StoreTransferRequest.Delete, L("Permission:Delete")); + + var storeTransferNoteDetailCopyPermission = myGroup.AddPermission(WmsPermissions.StoreTransferNoteDetail.Default, L("Permission:StoreTransferNoteDetailCopy")); + storeTransferNoteDetailCopyPermission.AddChild(WmsPermissions.StoreTransferNoteDetail.Create, L("Permission:Create")); + storeTransferNoteDetailCopyPermission.AddChild(WmsPermissions.StoreTransferNoteDetail.Update, L("Permission:Update")); + storeTransferNoteDetailCopyPermission.AddChild(WmsPermissions.StoreTransferNoteDetail.Delete, L("Permission:Delete")); + + var storeTransferNotePermission = myGroup.AddPermission(WmsPermissions.StoreTransferNote.Default, L("Permission:StoreTransferNote")); + storeTransferNotePermission.AddChild(WmsPermissions.StoreTransferNote.Create, L("Permission:Create")); + storeTransferNotePermission.AddChild(WmsPermissions.StoreTransferNote.Update, L("Permission:Update")); + storeTransferNotePermission.AddChild(WmsPermissions.StoreTransferNote.Delete, L("Permission:Delete")); + + var storeSupplierAsnDetailPermission = myGroup.AddPermission(WmsPermissions.StoreSupplierAsnDetail.Default, L("Permission:StoreSupplierAsnDetail")); + storeSupplierAsnDetailPermission.AddChild(WmsPermissions.StoreSupplierAsnDetail.Create, L("Permission:Create")); + storeSupplierAsnDetailPermission.AddChild(WmsPermissions.StoreSupplierAsnDetail.Update, L("Permission:Update")); + storeSupplierAsnDetailPermission.AddChild(WmsPermissions.StoreSupplierAsnDetail.Delete, L("Permission:Delete")); + + var storeSupplierAsnPermission = myGroup.AddPermission(WmsPermissions.StoreSupplierAsn.Default, L("Permission:StoreSupplierAsn")); + storeSupplierAsnPermission.AddChild(WmsPermissions.StoreSupplierAsn.Create, L("Permission:Create")); + storeSupplierAsnPermission.AddChild(WmsPermissions.StoreSupplierAsn.Update, L("Permission:Update")); + storeSupplierAsnPermission.AddChild(WmsPermissions.StoreSupplierAsn.Delete, L("Permission:Delete")); + + var storeScrapRequestDetailPermission = myGroup.AddPermission(WmsPermissions.StoreScrapRequestDetail.Default, L("Permission:StoreScrapRequestDetail")); + storeScrapRequestDetailPermission.AddChild(WmsPermissions.StoreScrapRequestDetail.Create, L("Permission:Create")); + storeScrapRequestDetailPermission.AddChild(WmsPermissions.StoreScrapRequestDetail.Update, L("Permission:Update")); + storeScrapRequestDetailPermission.AddChild(WmsPermissions.StoreScrapRequestDetail.Delete, L("Permission:Delete")); + + var storeScrapRequestPermission = myGroup.AddPermission(WmsPermissions.StoreScrapRequest.Default, L("Permission:StoreScrapRequest")); + storeScrapRequestPermission.AddChild(WmsPermissions.StoreScrapRequest.Create, L("Permission:Create")); + storeScrapRequestPermission.AddChild(WmsPermissions.StoreScrapRequest.Update, L("Permission:Update")); + storeScrapRequestPermission.AddChild(WmsPermissions.StoreScrapRequest.Delete, L("Permission:Delete")); + + var storeScrapNotePermission = myGroup.AddPermission(WmsPermissions.StoreScrapNote.Default, L("Permission:StoreScrapNote")); + storeScrapNotePermission.AddChild(WmsPermissions.StoreScrapNote.Create, L("Permission:Create")); + storeScrapNotePermission.AddChild(WmsPermissions.StoreScrapNote.Update, L("Permission:Update")); + storeScrapNotePermission.AddChild(WmsPermissions.StoreScrapNote.Delete, L("Permission:Delete")); + + var storeSaleOrderDetailPermission = myGroup.AddPermission(WmsPermissions.StoreSaleOrderDetail.Default, L("Permission:StoreSaleOrderDetail")); + storeSaleOrderDetailPermission.AddChild(WmsPermissions.StoreSaleOrderDetail.Create, L("Permission:Create")); + storeSaleOrderDetailPermission.AddChild(WmsPermissions.StoreSaleOrderDetail.Update, L("Permission:Update")); + storeSaleOrderDetailPermission.AddChild(WmsPermissions.StoreSaleOrderDetail.Delete, L("Permission:Delete")); + + var storeSaleOrderPermission = myGroup.AddPermission(WmsPermissions.StoreSaleOrder.Default, L("Permission:StoreSaleOrder")); + storeSaleOrderPermission.AddChild(WmsPermissions.StoreSaleOrder.Create, L("Permission:Create")); + storeSaleOrderPermission.AddChild(WmsPermissions.StoreSaleOrder.Update, L("Permission:Update")); + storeSaleOrderPermission.AddChild(WmsPermissions.StoreSaleOrder.Delete, L("Permission:Delete")); + + var storeRecycledMaterialReceiptNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreRecycledMaterialReceiptNoteDetail.Default, L("Permission:StoreRecycledMaterialReceiptNoteDetail")); + storeRecycledMaterialReceiptNoteDetailPermission.AddChild(WmsPermissions.StoreRecycledMaterialReceiptNoteDetail.Create, L("Permission:Create")); + storeRecycledMaterialReceiptNoteDetailPermission.AddChild(WmsPermissions.StoreRecycledMaterialReceiptNoteDetail.Update, L("Permission:Update")); + storeRecycledMaterialReceiptNoteDetailPermission.AddChild(WmsPermissions.StoreRecycledMaterialReceiptNoteDetail.Delete, L("Permission:Delete")); + + var storeRecycledMaterialReceiptNotePermission = myGroup.AddPermission(WmsPermissions.StoreRecycledMaterialReceiptNote.Default, L("Permission:StoreRecycledMaterialReceiptNote")); + storeRecycledMaterialReceiptNotePermission.AddChild(WmsPermissions.StoreRecycledMaterialReceiptNote.Create, L("Permission:Create")); + storeRecycledMaterialReceiptNotePermission.AddChild(WmsPermissions.StoreRecycledMaterialReceiptNote.Update, L("Permission:Update")); + storeRecycledMaterialReceiptNotePermission.AddChild(WmsPermissions.StoreRecycledMaterialReceiptNote.Delete, L("Permission:Delete")); + + var storeReceiptAbnormalNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreReceiptAbnormalNoteDetail.Default, L("Permission:StoreReceiptAbnormalNoteDetail")); + storeReceiptAbnormalNoteDetailPermission.AddChild(WmsPermissions.StoreReceiptAbnormalNoteDetail.Create, L("Permission:Create")); + storeReceiptAbnormalNoteDetailPermission.AddChild(WmsPermissions.StoreReceiptAbnormalNoteDetail.Update, L("Permission:Update")); + storeReceiptAbnormalNoteDetailPermission.AddChild(WmsPermissions.StoreReceiptAbnormalNoteDetail.Delete, L("Permission:Delete")); + + var storeReceiptAbnormalNotePermission = myGroup.AddPermission(WmsPermissions.StoreReceiptAbnormalNote.Default, L("Permission:StoreReceiptAbnormalNote")); + storeReceiptAbnormalNotePermission.AddChild(WmsPermissions.StoreReceiptAbnormalNote.Create, L("Permission:Create")); + storeReceiptAbnormalNotePermission.AddChild(WmsPermissions.StoreReceiptAbnormalNote.Update, L("Permission:Update")); + storeReceiptAbnormalNotePermission.AddChild(WmsPermissions.StoreReceiptAbnormalNote.Delete, L("Permission:Delete")); + + var storePutawayRequestDetailPermission = myGroup.AddPermission(WmsPermissions.StorePutawayRequestDetail.Default, L("Permission:StorePutawayRequestDetail")); + storePutawayRequestDetailPermission.AddChild(WmsPermissions.StorePutawayRequestDetail.Create, L("Permission:Create")); + storePutawayRequestDetailPermission.AddChild(WmsPermissions.StorePutawayRequestDetail.Update, L("Permission:Update")); + storePutawayRequestDetailPermission.AddChild(WmsPermissions.StorePutawayRequestDetail.Delete, L("Permission:Delete")); + + var storePutawayRequestPermission = myGroup.AddPermission(WmsPermissions.StorePutawayRequest.Default, L("Permission:StorePutawayRequest")); + storePutawayRequestPermission.AddChild(WmsPermissions.StorePutawayRequest.Create, L("Permission:Create")); + storePutawayRequestPermission.AddChild(WmsPermissions.StorePutawayRequest.Update, L("Permission:Update")); + storePutawayRequestPermission.AddChild(WmsPermissions.StorePutawayRequest.Delete, L("Permission:Delete")); + + var storePutawayNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StorePutawayNoteDetail.Default, L("Permission:StorePutawayNoteDetail")); + storePutawayNoteDetailPermission.AddChild(WmsPermissions.StorePutawayNoteDetail.Create, L("Permission:Create")); + storePutawayNoteDetailPermission.AddChild(WmsPermissions.StorePutawayNoteDetail.Update, L("Permission:Update")); + storePutawayNoteDetailPermission.AddChild(WmsPermissions.StorePutawayNoteDetail.Delete, L("Permission:Delete")); + + var storePutawayNotePermission = myGroup.AddPermission(WmsPermissions.StorePutawayNote.Default, L("Permission:StorePutawayNote")); + storePutawayNotePermission.AddChild(WmsPermissions.StorePutawayNote.Create, L("Permission:Create")); + storePutawayNotePermission.AddChild(WmsPermissions.StorePutawayNote.Update, L("Permission:Update")); + storePutawayNotePermission.AddChild(WmsPermissions.StorePutawayNote.Delete, L("Permission:Delete")); + + var storePurchaseReturnRequestDetailPermission = myGroup.AddPermission(WmsPermissions.StorePurchaseReturnRequestDetail.Default, L("Permission:StorePurchaseReturnRequestDetail")); + storePurchaseReturnRequestDetailPermission.AddChild(WmsPermissions.StorePurchaseReturnRequestDetail.Create, L("Permission:Create")); + storePurchaseReturnRequestDetailPermission.AddChild(WmsPermissions.StorePurchaseReturnRequestDetail.Update, L("Permission:Update")); + storePurchaseReturnRequestDetailPermission.AddChild(WmsPermissions.StorePurchaseReturnRequestDetail.Delete, L("Permission:Delete")); + + var storePurchaseReturnRequestPermission = myGroup.AddPermission(WmsPermissions.StorePurchaseReturnRequest.Default, L("Permission:StorePurchaseReturnRequest")); + storePurchaseReturnRequestPermission.AddChild(WmsPermissions.StorePurchaseReturnRequest.Create, L("Permission:Create")); + storePurchaseReturnRequestPermission.AddChild(WmsPermissions.StorePurchaseReturnRequest.Update, L("Permission:Update")); + storePurchaseReturnRequestPermission.AddChild(WmsPermissions.StorePurchaseReturnRequest.Delete, L("Permission:Delete")); + + var storePurchaseReturnNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StorePurchaseReturnNoteDetail.Default, L("Permission:StorePurchaseReturnNoteDetail")); + storePurchaseReturnNoteDetailPermission.AddChild(WmsPermissions.StorePurchaseReturnNoteDetail.Create, L("Permission:Create")); + storePurchaseReturnNoteDetailPermission.AddChild(WmsPermissions.StorePurchaseReturnNoteDetail.Update, L("Permission:Update")); + storePurchaseReturnNoteDetailPermission.AddChild(WmsPermissions.StorePurchaseReturnNoteDetail.Delete, L("Permission:Delete")); + + var storePurchaseReturnNotePermission = myGroup.AddPermission(WmsPermissions.StorePurchaseReturnNote.Default, L("Permission:StorePurchaseReturnNote")); + storePurchaseReturnNotePermission.AddChild(WmsPermissions.StorePurchaseReturnNote.Create, L("Permission:Create")); + storePurchaseReturnNotePermission.AddChild(WmsPermissions.StorePurchaseReturnNote.Update, L("Permission:Update")); + storePurchaseReturnNotePermission.AddChild(WmsPermissions.StorePurchaseReturnNote.Delete, L("Permission:Delete")); + + var storePurchaseReceiptRequestDetailPermission = myGroup.AddPermission(WmsPermissions.StorePurchaseReceiptRequestDetail.Default, L("Permission:StorePurchaseReceiptRequestDetail")); + storePurchaseReceiptRequestDetailPermission.AddChild(WmsPermissions.StorePurchaseReceiptRequestDetail.Create, L("Permission:Create")); + storePurchaseReceiptRequestDetailPermission.AddChild(WmsPermissions.StorePurchaseReceiptRequestDetail.Update, L("Permission:Update")); + storePurchaseReceiptRequestDetailPermission.AddChild(WmsPermissions.StorePurchaseReceiptRequestDetail.Delete, L("Permission:Delete")); + + var storePurchaseReceiptRequestPermission = myGroup.AddPermission(WmsPermissions.StorePurchaseReceiptRequest.Default, L("Permission:StorePurchaseReceiptRequest")); + storePurchaseReceiptRequestPermission.AddChild(WmsPermissions.StorePurchaseReceiptRequest.Create, L("Permission:Create")); + storePurchaseReceiptRequestPermission.AddChild(WmsPermissions.StorePurchaseReceiptRequest.Update, L("Permission:Update")); + storePurchaseReceiptRequestPermission.AddChild(WmsPermissions.StorePurchaseReceiptRequest.Delete, L("Permission:Delete")); + + var storePurchaseReceiptNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StorePurchaseReceiptNoteDetail.Default, L("Permission:StorePurchaseReceiptNoteDetail")); + storePurchaseReceiptNoteDetailPermission.AddChild(WmsPermissions.StorePurchaseReceiptNoteDetail.Create, L("Permission:Create")); + storePurchaseReceiptNoteDetailPermission.AddChild(WmsPermissions.StorePurchaseReceiptNoteDetail.Update, L("Permission:Update")); + storePurchaseReceiptNoteDetailPermission.AddChild(WmsPermissions.StorePurchaseReceiptNoteDetail.Delete, L("Permission:Delete")); + + var storePurchaseReceiptNotePermission = myGroup.AddPermission(WmsPermissions.StorePurchaseReceiptNote.Default, L("Permission:StorePurchaseReceiptNote")); + storePurchaseReceiptNotePermission.AddChild(WmsPermissions.StorePurchaseReceiptNote.Create, L("Permission:Create")); + storePurchaseReceiptNotePermission.AddChild(WmsPermissions.StorePurchaseReceiptNote.Update, L("Permission:Update")); + storePurchaseReceiptNotePermission.AddChild(WmsPermissions.StorePurchaseReceiptNote.Delete, L("Permission:Delete")); + + var storePurchaseOrderDetailPermission = myGroup.AddPermission(WmsPermissions.StorePurchaseOrderDetail.Default, L("Permission:StorePurchaseOrderDetail")); + storePurchaseOrderDetailPermission.AddChild(WmsPermissions.StorePurchaseOrderDetail.Create, L("Permission:Create")); + storePurchaseOrderDetailPermission.AddChild(WmsPermissions.StorePurchaseOrderDetail.Update, L("Permission:Update")); + storePurchaseOrderDetailPermission.AddChild(WmsPermissions.StorePurchaseOrderDetail.Delete, L("Permission:Delete")); + + var storePurchaseOrderPermission = myGroup.AddPermission(WmsPermissions.StorePurchaseOrder.Default, L("Permission:StorePurchaseOrder")); + storePurchaseOrderPermission.AddChild(WmsPermissions.StorePurchaseOrder.Create, L("Permission:Create")); + storePurchaseOrderPermission.AddChild(WmsPermissions.StorePurchaseOrder.Update, L("Permission:Update")); + storePurchaseOrderPermission.AddChild(WmsPermissions.StorePurchaseOrder.Delete, L("Permission:Delete")); + + var storeProductRecycleRequestPermission = myGroup.AddPermission(WmsPermissions.StoreProductRecycleRequest.Default, L("Permission:StoreProductRecycleRequest")); + storeProductRecycleRequestPermission.AddChild(WmsPermissions.StoreProductRecycleRequest.Create, L("Permission:Create")); + storeProductRecycleRequestPermission.AddChild(WmsPermissions.StoreProductRecycleRequest.Update, L("Permission:Update")); + storeProductRecycleRequestPermission.AddChild(WmsPermissions.StoreProductRecycleRequest.Delete, L("Permission:Delete")); + + var storeProductRecycleNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreProductRecycleNoteDetail.Default, L("Permission:StoreProductRecycleNoteDetail")); + storeProductRecycleNoteDetailPermission.AddChild(WmsPermissions.StoreProductRecycleNoteDetail.Create, L("Permission:Create")); + storeProductRecycleNoteDetailPermission.AddChild(WmsPermissions.StoreProductRecycleNoteDetail.Update, L("Permission:Update")); + storeProductRecycleNoteDetailPermission.AddChild(WmsPermissions.StoreProductRecycleNoteDetail.Delete, L("Permission:Delete")); + + var storeProductRecycleNotePermission = myGroup.AddPermission(WmsPermissions.StoreProductRecycleNote.Default, L("Permission:StoreProductRecycleNote")); + storeProductRecycleNotePermission.AddChild(WmsPermissions.StoreProductRecycleNote.Create, L("Permission:Create")); + storeProductRecycleNotePermission.AddChild(WmsPermissions.StoreProductRecycleNote.Update, L("Permission:Update")); + storeProductRecycleNotePermission.AddChild(WmsPermissions.StoreProductRecycleNote.Delete, L("Permission:Delete")); + + var storeProductRecycleMaterialDetailPermission = myGroup.AddPermission(WmsPermissions.StoreProductRecycleMaterialDetail.Default, L("Permission:StoreProductRecycleMaterialDetail")); + storeProductRecycleMaterialDetailPermission.AddChild(WmsPermissions.StoreProductRecycleMaterialDetail.Create, L("Permission:Create")); + storeProductRecycleMaterialDetailPermission.AddChild(WmsPermissions.StoreProductRecycleMaterialDetail.Update, L("Permission:Update")); + storeProductRecycleMaterialDetailPermission.AddChild(WmsPermissions.StoreProductRecycleMaterialDetail.Delete, L("Permission:Delete")); + + var storeProductReceiptRequestDetailPermission = myGroup.AddPermission(WmsPermissions.StoreProductReceiptRequestDetail.Default, L("Permission:StoreProductReceiptRequestDetail")); + storeProductReceiptRequestDetailPermission.AddChild(WmsPermissions.StoreProductReceiptRequestDetail.Create, L("Permission:Create")); + storeProductReceiptRequestDetailPermission.AddChild(WmsPermissions.StoreProductReceiptRequestDetail.Update, L("Permission:Update")); + storeProductReceiptRequestDetailPermission.AddChild(WmsPermissions.StoreProductReceiptRequestDetail.Delete, L("Permission:Delete")); + + var storeProductReceiptRequestPermission = myGroup.AddPermission(WmsPermissions.StoreProductReceiptRequest.Default, L("Permission:StoreProductReceiptRequest")); + storeProductReceiptRequestPermission.AddChild(WmsPermissions.StoreProductReceiptRequest.Create, L("Permission:Create")); + storeProductReceiptRequestPermission.AddChild(WmsPermissions.StoreProductReceiptRequest.Update, L("Permission:Update")); + storeProductReceiptRequestPermission.AddChild(WmsPermissions.StoreProductReceiptRequest.Delete, L("Permission:Delete")); + + var storeProductReceiptNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreProductReceiptNoteDetail.Default, L("Permission:StoreProductReceiptNoteDetail")); + storeProductReceiptNoteDetailPermission.AddChild(WmsPermissions.StoreProductReceiptNoteDetail.Create, L("Permission:Create")); + storeProductReceiptNoteDetailPermission.AddChild(WmsPermissions.StoreProductReceiptNoteDetail.Update, L("Permission:Update")); + storeProductReceiptNoteDetailPermission.AddChild(WmsPermissions.StoreProductReceiptNoteDetail.Delete, L("Permission:Delete")); + + var storeProductReceiptNotePermission = myGroup.AddPermission(WmsPermissions.StoreProductReceiptNote.Default, L("Permission:StoreProductReceiptNote")); + storeProductReceiptNotePermission.AddChild(WmsPermissions.StoreProductReceiptNote.Create, L("Permission:Create")); + storeProductReceiptNotePermission.AddChild(WmsPermissions.StoreProductReceiptNote.Update, L("Permission:Update")); + storeProductReceiptNotePermission.AddChild(WmsPermissions.StoreProductReceiptNote.Delete, L("Permission:Delete")); + + var storeProductL7partsNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreProductL7partsNoteDetail.Default, L("Permission:StoreProductL7partsNoteDetail")); + storeProductL7partsNoteDetailPermission.AddChild(WmsPermissions.StoreProductL7partsNoteDetail.Create, L("Permission:Create")); + storeProductL7partsNoteDetailPermission.AddChild(WmsPermissions.StoreProductL7partsNoteDetail.Update, L("Permission:Update")); + storeProductL7partsNoteDetailPermission.AddChild(WmsPermissions.StoreProductL7partsNoteDetail.Delete, L("Permission:Delete")); + + var storeProductL7partsNotePermission = myGroup.AddPermission(WmsPermissions.StoreProductL7partsNote.Default, L("Permission:StoreProductL7partsNote")); + storeProductL7partsNotePermission.AddChild(WmsPermissions.StoreProductL7partsNote.Create, L("Permission:Create")); + storeProductL7partsNotePermission.AddChild(WmsPermissions.StoreProductL7partsNote.Update, L("Permission:Update")); + storeProductL7partsNotePermission.AddChild(WmsPermissions.StoreProductL7partsNote.Delete, L("Permission:Delete")); + + var storeScrapNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreScrapNoteDetail.Default, L("Permission:StoreScrapNoteDetail")); + storeScrapNoteDetailPermission.AddChild(WmsPermissions.StoreScrapNoteDetail.Create, L("Permission:Create")); + storeScrapNoteDetailPermission.AddChild(WmsPermissions.StoreScrapNoteDetail.Update, L("Permission:Update")); + storeScrapNoteDetailPermission.AddChild(WmsPermissions.StoreScrapNoteDetail.Delete, L("Permission:Delete")); + } + + private static LocalizableString L(string name) + { + return LocalizableString.Create(name); + } + } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissions.cs index a284e9902..c89d70536 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissions.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissions.cs @@ -1,424 +1,425 @@ namespace WinIn.FasterZ.Wms.Permissions { - public static class WmsPermissions - { - public const string GroupName = "Wms"; + public static class WmsPermissions + { + public const string GroupName = "Wms"; - //Add your own permission names. Example: - //public const string MyPermission1 = GroupName + ".MyPermission1"; - public class AuthDepartment - { - public const string Default = GroupName + ".AuthDepartment"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } + //Add your own permission names. Example: + //public const string MyPermission1 = GroupName + ".MyPermission1"; + public class AuthDepartment + { + public const string Default = GroupName + ".AuthDepartment"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } - public class ExportCustomUserSetting - { - public const string Default = GroupName + ".ExportCustomUserSetting"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreWorkOrder - { - public const string Default = GroupName + ".StoreWorkOrder"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreWorkOrderDetail - { - public const string Default = GroupName + ".StoreWorkOrderDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreWipWarehouseAdjustRequestDetail - { - public const string Default = GroupName + ".StoreWipWarehouseAdjustRequestDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreWipWarehouseAdjustRequest - { - public const string Default = GroupName + ".StoreWipWarehouseAdjustRequest"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreWipWarehouseAdjustNoteDetail - { - public const string Default = GroupName + ".StoreWipWarehouseAdjustNoteDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreWipWarehouseAdjustNote - { - public const string Default = GroupName + ".StoreWipWarehouseAdjustNote"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreWarehouseTransferNoteDetail - { - public const string Default = GroupName + ".StoreWarehouseTransferNoteDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreWarehouseTransferNote - { - public const string Default = GroupName + ".StoreWarehouseTransferNote"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreUnplannedReceiptRequestDetail - { - public const string Default = GroupName + ".StoreUnplannedReceiptRequestDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreUnplannedReceiptRequest - { - public const string Default = GroupName + ".StoreUnplannedReceiptRequest"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreUnplannedReceiptNoteDetail - { - public const string Default = GroupName + ".StoreUnplannedReceiptNoteDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreUnplannedReceiptNote - { - public const string Default = GroupName + ".StoreUnplannedReceiptNote"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreUnplannedIssueRequestDetail - { - public const string Default = GroupName + ".StoreUnplannedIssueRequestDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreUnplannedIssueRequest - { - public const string Default = GroupName + ".StoreUnplannedIssueRequest"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreUnplannedIssueNoteDetail - { - public const string Default = GroupName + ".StoreUnplannedIssueNoteDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreUnplannedIssueNote - { - public const string Default = GroupName + ".StoreUnplannedIssueNote"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreTransferRequestDetail - { - public const string Default = GroupName + ".StoreTransferRequestDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreTransferRequest - { - public const string Default = GroupName + ".StoreTransferRequest"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreTransferNoteDetailCopy - { - public const string Default = GroupName + ".StoreTransferNoteDetailCopy"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreTransferNoteCopy - { - public const string Default = GroupName + ".StoreTransferNoteCopy"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreTransferNote - { - public const string Default = GroupName + ".StoreTransferNote"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreSupplierAsnDetail - { - public const string Default = GroupName + ".StoreSupplierAsnDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreSupplierAsn - { - public const string Default = GroupName + ".StoreSupplierAsn"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreScrapRequestDetail - { - public const string Default = GroupName + ".StoreScrapRequestDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreScrapRequest - { - public const string Default = GroupName + ".StoreScrapRequest"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreScrapNote - { - public const string Default = GroupName + ".StoreScrapNote"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreSaleOrderDetail - { - public const string Default = GroupName + ".StoreSaleOrderDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreSaleOrder - { - public const string Default = GroupName + ".StoreSaleOrder"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreRecycledMaterialReceiptNoteDetail - { - public const string Default = GroupName + ".StoreRecycledMaterialReceiptNoteDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreRecycledMaterialReceiptNote - { - public const string Default = GroupName + ".StoreRecycledMaterialReceiptNote"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreReceiptAbnormalNoteDetail - { - public const string Default = GroupName + ".StoreReceiptAbnormalNoteDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreReceiptAbnormalNote - { - public const string Default = GroupName + ".StoreReceiptAbnormalNote"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StorePutawayRequestDetail - { - public const string Default = GroupName + ".StorePutawayRequestDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StorePutawayRequest - { - public const string Default = GroupName + ".StorePutawayRequest"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StorePutawayNoteDetail - { - public const string Default = GroupName + ".StorePutawayNoteDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StorePutawayNote - { - public const string Default = GroupName + ".StorePutawayNote"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StorePurchaseReturnRequestDetail - { - public const string Default = GroupName + ".StorePurchaseReturnRequestDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StorePurchaseReturnRequest - { - public const string Default = GroupName + ".StorePurchaseReturnRequest"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StorePurchaseReturnNoteDetail - { - public const string Default = GroupName + ".StorePurchaseReturnNoteDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StorePurchaseReturnNote - { - public const string Default = GroupName + ".StorePurchaseReturnNote"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StorePurchaseReceiptRequestDetail - { - public const string Default = GroupName + ".StorePurchaseReceiptRequestDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StorePurchaseReceiptRequest - { - public const string Default = GroupName + ".StorePurchaseReceiptRequest"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StorePurchaseReceiptNoteDetail - { - public const string Default = GroupName + ".StorePurchaseReceiptNoteDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StorePurchaseReceiptNote - { - public const string Default = GroupName + ".StorePurchaseReceiptNote"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StorePurchaseOrderDetail - { - public const string Default = GroupName + ".StorePurchaseOrderDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StorePurchaseOrder - { - public const string Default = GroupName + ".StorePurchaseOrder"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreProductRecycleRequestDetail - { - public const string Default = GroupName + ".StoreProductRecycleRequestDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreProductRecycleRequest - { - public const string Default = GroupName + ".StoreProductRecycleRequest"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreProductRecycleNoteDetail - { - public const string Default = GroupName + ".StoreProductRecycleNoteDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreProductRecycleNote - { - public const string Default = GroupName + ".StoreProductRecycleNote"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreProductRecycleMaterialDetail - { - public const string Default = GroupName + ".StoreProductRecycleMaterialDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreProductReceiptRequestDetail - { - public const string Default = GroupName + ".StoreProductReceiptRequestDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreProductReceiptRequest - { - public const string Default = GroupName + ".StoreProductReceiptRequest"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreProductReceiptNoteDetail - { - public const string Default = GroupName + ".StoreProductReceiptNoteDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreProductReceiptNote - { - public const string Default = GroupName + ".StoreProductReceiptNote"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreProductL7partsNoteDetail - { - public const string Default = GroupName + ".StoreProductL7partsNoteDetail"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - public class StoreProductL7partsNote - { - public const string Default = GroupName + ".StoreProductL7partsNote"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - } + public class ExportCustomUserSetting + { + public const string Default = GroupName + ".ExportCustomUserSetting"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreWorkOrder + { + public const string Default = GroupName + ".StoreWorkOrder"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreWorkOrderDetail + { + public const string Default = GroupName + ".StoreWorkOrderDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreWipWarehouseAdjustRequestDetail + { + public const string Default = GroupName + ".StoreWipWarehouseAdjustRequestDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreWipWarehouseAdjustRequest + { + public const string Default = GroupName + ".StoreWipWarehouseAdjustRequest"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreWipWarehouseAdjustNoteDetail + { + public const string Default = GroupName + ".StoreWipWarehouseAdjustNoteDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreWipWarehouseAdjustNote + { + public const string Default = GroupName + ".StoreWipWarehouseAdjustNote"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreWarehouseTransferNoteDetail + { + public const string Default = GroupName + ".StoreWarehouseTransferNoteDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreWarehouseTransferNote + { + public const string Default = GroupName + ".StoreWarehouseTransferNote"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreUnplannedReceiptRequestDetail + { + public const string Default = GroupName + ".StoreUnplannedReceiptRequestDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreUnplannedReceiptRequest + { + public const string Default = GroupName + ".StoreUnplannedReceiptRequest"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreUnplannedReceiptNoteDetail + { + public const string Default = GroupName + ".StoreUnplannedReceiptNoteDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreUnplannedReceiptNote + { + public const string Default = GroupName + ".StoreUnplannedReceiptNote"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreUnplannedIssueRequestDetail + { + public const string Default = GroupName + ".StoreUnplannedIssueRequestDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreUnplannedIssueRequest + { + public const string Default = GroupName + ".StoreUnplannedIssueRequest"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreUnplannedIssueNoteDetail + { + public const string Default = GroupName + ".StoreUnplannedIssueNoteDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreUnplannedIssueNote + { + public const string Default = GroupName + ".StoreUnplannedIssueNote"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreTransferRequestDetail + { + public const string Default = GroupName + ".StoreTransferRequestDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreTransferRequest + { + public const string Default = GroupName + ".StoreTransferRequest"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreTransferNoteDetail + { + public const string Default = GroupName + ".StoreTransferNoteDetailCopy"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + + public class StoreTransferNote + { + public const string Default = GroupName + ".StoreTransferNote"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreSupplierAsnDetail + { + public const string Default = GroupName + ".StoreSupplierAsnDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreSupplierAsn + { + public const string Default = GroupName + ".StoreSupplierAsn"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreScrapRequestDetail + { + public const string Default = GroupName + ".StoreScrapRequestDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreScrapRequest + { + public const string Default = GroupName + ".StoreScrapRequest"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreScrapNote + { + public const string Default = GroupName + ".StoreScrapNote"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreSaleOrderDetail + { + public const string Default = GroupName + ".StoreSaleOrderDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreSaleOrder + { + public const string Default = GroupName + ".StoreSaleOrder"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreRecycledMaterialReceiptNoteDetail + { + public const string Default = GroupName + ".StoreRecycledMaterialReceiptNoteDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreRecycledMaterialReceiptNote + { + public const string Default = GroupName + ".StoreRecycledMaterialReceiptNote"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreReceiptAbnormalNoteDetail + { + public const string Default = GroupName + ".StoreReceiptAbnormalNoteDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreReceiptAbnormalNote + { + public const string Default = GroupName + ".StoreReceiptAbnormalNote"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StorePutawayRequestDetail + { + public const string Default = GroupName + ".StorePutawayRequestDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StorePutawayRequest + { + public const string Default = GroupName + ".StorePutawayRequest"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StorePutawayNoteDetail + { + public const string Default = GroupName + ".StorePutawayNoteDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StorePutawayNote + { + public const string Default = GroupName + ".StorePutawayNote"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StorePurchaseReturnRequestDetail + { + public const string Default = GroupName + ".StorePurchaseReturnRequestDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StorePurchaseReturnRequest + { + public const string Default = GroupName + ".StorePurchaseReturnRequest"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StorePurchaseReturnNoteDetail + { + public const string Default = GroupName + ".StorePurchaseReturnNoteDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StorePurchaseReturnNote + { + public const string Default = GroupName + ".StorePurchaseReturnNote"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StorePurchaseReceiptRequestDetail + { + public const string Default = GroupName + ".StorePurchaseReceiptRequestDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StorePurchaseReceiptRequest + { + public const string Default = GroupName + ".StorePurchaseReceiptRequest"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StorePurchaseReceiptNoteDetail + { + public const string Default = GroupName + ".StorePurchaseReceiptNoteDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StorePurchaseReceiptNote + { + public const string Default = GroupName + ".StorePurchaseReceiptNote"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StorePurchaseOrderDetail + { + public const string Default = GroupName + ".StorePurchaseOrderDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StorePurchaseOrder + { + public const string Default = GroupName + ".StorePurchaseOrder"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreProductRecycleRequestDetail + { + public const string Default = GroupName + ".StoreProductRecycleRequestDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreProductRecycleRequest + { + public const string Default = GroupName + ".StoreProductRecycleRequest"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreProductRecycleNoteDetail + { + public const string Default = GroupName + ".StoreProductRecycleNoteDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreProductRecycleNote + { + public const string Default = GroupName + ".StoreProductRecycleNote"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreProductRecycleMaterialDetail + { + public const string Default = GroupName + ".StoreProductRecycleMaterialDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreProductReceiptRequestDetail + { + public const string Default = GroupName + ".StoreProductReceiptRequestDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreProductReceiptRequest + { + public const string Default = GroupName + ".StoreProductReceiptRequest"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreProductReceiptNoteDetail + { + public const string Default = GroupName + ".StoreProductReceiptNoteDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreProductReceiptNote + { + public const string Default = GroupName + ".StoreProductReceiptNote"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreProductL7partsNoteDetail + { + public const string Default = GroupName + ".StoreProductL7partsNoteDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreProductL7partsNote + { + public const string Default = GroupName + ".StoreProductL7partsNote"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + public class StoreScrapNoteDetail + { + public const string Default = GroupName + ".StoreScrapNoteDetail"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } + } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/WinIn.FasterZ.Wms.Application.Contracts.csproj b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/WinIn.FasterZ.Wms.Application.Contracts.csproj index 6a66045a4..598f32a5c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/WinIn.FasterZ.Wms.Application.Contracts.csproj +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/WinIn.FasterZ.Wms.Application.Contracts.csproj @@ -8,11 +8,6 @@ WinIn.FasterZ.Wms - - - - - @@ -24,4 +19,8 @@ + + + + diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNote/Dtos/CreateUpdateStoreProductL7partsNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNote/Dtos/CreateUpdateStoreProductL7partsNoteDto.cs index 04b6e9b99..4d9a4f27c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNote/Dtos/CreateUpdateStoreProductL7partsNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNote/Dtos/CreateUpdateStoreProductL7partsNoteDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNote.Dtos; @@ -31,7 +33,7 @@ public class CreateUpdateStoreProductL7partsNoteDto public int Status { get; set; } - public ICollection StoreProductL7partsNoteDetails { get; set; } + public List Details { get; set; } public string? Worker { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNote/Dtos/StoreProductL7partsNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNote/Dtos/StoreProductL7partsNoteDto.cs index c77295746..8213d0dc4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNote/Dtos/StoreProductL7partsNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNote/Dtos/StoreProductL7partsNoteDto.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNote.Dtos; @@ -32,7 +33,7 @@ public class StoreProductL7partsNoteDto : AuditedEntityDto public int Status { get; set; } - public ICollection StoreProductL7partsNoteDetails { get; set; } + public List Details { get; set; } public string? Worker { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNote/Dtos/StoreProductL7partsNoteGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNote/Dtos/StoreProductL7partsNoteGetListInput.cs index d12cbde42..1a1b9374f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNote/Dtos/StoreProductL7partsNoteGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNote/Dtos/StoreProductL7partsNoteGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNote.Dtos; @@ -33,7 +35,7 @@ public class StoreProductL7partsNoteGetListInput : PagedAndSortedResultRequestDt public int? Status { get; set; } - public ICollection? StoreProductL7partsNoteDetails { get; set; } + public List? Details { get; set; } public string? Worker { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNoteDetail/Dtos/CreateUpdateStoreProductL7partsNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNoteDetail/Dtos/CreateUpdateStoreProductL7partsNoteDetailDto.cs index 0521deecb..49a6260a7 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNoteDetail/Dtos/CreateUpdateStoreProductL7partsNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNoteDetail/Dtos/CreateUpdateStoreProductL7partsNoteDetailDto.cs @@ -27,8 +27,6 @@ public class CreateUpdateStoreProductL7partsNoteDetailDto public string? LocationCode { get; set; } - public StoreProductL7partsNote Master { get; set; } - public Guid MasterId { get; set; } public string Number { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNoteDetail/Dtos/StoreProductL7partsNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNoteDetail/Dtos/StoreProductL7partsNoteDetailDto.cs index fbb033465..8ce86b31b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNoteDetail/Dtos/StoreProductL7partsNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNoteDetail/Dtos/StoreProductL7partsNoteDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNoteDetail.Dtos; @@ -28,7 +29,7 @@ public class StoreProductL7partsNoteDetailDto : AuditedEntityDto public string? LocationCode { get; set; } - public StoreProductL7partsNote Master { get; set; } + public StoreProductL7partsNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNoteDetail/Dtos/StoreProductL7partsNoteDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNoteDetail/Dtos/StoreProductL7partsNoteDetailGetListInput.cs index 78b7ef36a..51c3ebfc2 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNoteDetail/Dtos/StoreProductL7partsNoteDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductL7partsNoteDetail/Dtos/StoreProductL7partsNoteDetailGetListInput.cs @@ -29,8 +29,6 @@ public class StoreProductL7partsNoteDetailGetListInput : PagedAndSortedResultReq public string? LocationCode { get; set; } - public StoreProductL7partsNote? Master { get; set; } - public Guid? MasterId { get; set; } public string? Number { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNote/Dtos/CreateUpdateStoreProductReceiptNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNote/Dtos/CreateUpdateStoreProductReceiptNoteDto.cs index 9df193b5e..081450702 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNote/Dtos/CreateUpdateStoreProductReceiptNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNote/Dtos/CreateUpdateStoreProductReceiptNoteDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNote.Dtos; @@ -25,7 +27,7 @@ public class CreateUpdateStoreProductReceiptNoteDto public string? SourceNumber { get; set; } - public ICollection StoreProductReceiptNoteDetails { get; set; } + public List Details { get; set; } public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNote/Dtos/StoreProductReceiptNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNote/Dtos/StoreProductReceiptNoteDto.cs index 2e1175430..cc1062c8d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNote/Dtos/StoreProductReceiptNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNote/Dtos/StoreProductReceiptNoteDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNote.Dtos; @@ -26,7 +28,7 @@ public class StoreProductReceiptNoteDto : AuditedEntityDto public string? SourceNumber { get; set; } - public ICollection StoreProductReceiptNoteDetails { get; set; } + public List Details { get; set; } public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNote/Dtos/StoreProductReceiptNoteGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNote/Dtos/StoreProductReceiptNoteGetListInput.cs index 6ea3f6761..14365e538 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNote/Dtos/StoreProductReceiptNoteGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNote/Dtos/StoreProductReceiptNoteGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNote.Dtos; @@ -27,7 +29,7 @@ public class StoreProductReceiptNoteGetListInput : PagedAndSortedResultRequestDt public string? SourceNumber { get; set; } - public ICollection? StoreProductReceiptNoteDetails { get; set; } + public List? StoreProductReceiptNoteDetails { get; set; } public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNoteDetail/Dtos/CreateUpdateStoreProductReceiptNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNoteDetail/Dtos/CreateUpdateStoreProductReceiptNoteDetailDto.cs index 0e5362145..b6ce68905 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNoteDetail/Dtos/CreateUpdateStoreProductReceiptNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNoteDetail/Dtos/CreateUpdateStoreProductReceiptNoteDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNoteDetail.Dtos; @@ -57,7 +58,7 @@ public class CreateUpdateStoreProductReceiptNoteDetailDto public string? Lot { get; set; } - public StoreProductReceiptNote Master { get; set; } + public StoreProductReceiptNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNoteDetail/Dtos/StoreProductReceiptNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNoteDetail/Dtos/StoreProductReceiptNoteDetailDto.cs index b102031af..cfeaaf8cb 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNoteDetail/Dtos/StoreProductReceiptNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNoteDetail/Dtos/StoreProductReceiptNoteDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNoteDetail.Dtos; @@ -58,7 +59,7 @@ public class StoreProductReceiptNoteDetailDto : AuditedEntityDto public string? Lot { get; set; } - public StoreProductReceiptNote Master { get; set; } + public StoreProductReceiptNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNoteDetail/Dtos/StoreProductReceiptNoteDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNoteDetail/Dtos/StoreProductReceiptNoteDetailGetListInput.cs index 13c0e1331..931fe4bb1 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNoteDetail/Dtos/StoreProductReceiptNoteDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptNoteDetail/Dtos/StoreProductReceiptNoteDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNoteDetail.Dtos; @@ -59,7 +60,7 @@ public class StoreProductReceiptNoteDetailGetListInput : PagedAndSortedResultReq public string? Lot { get; set; } - public StoreProductReceiptNote? Master { get; set; } + public StoreProductReceiptNoteDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequest/Dtos/CreateUpdateStoreProductReceiptRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequest/Dtos/CreateUpdateStoreProductReceiptRequestDto.cs index fc9b6f34d..66881026b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequest/Dtos/CreateUpdateStoreProductReceiptRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequest/Dtos/CreateUpdateStoreProductReceiptRequestDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequest.Dtos; @@ -31,7 +33,7 @@ public class CreateUpdateStoreProductReceiptRequestDto public string? Shift { get; set; } - public ICollection StoreProductReceiptRequestDetails { get; set; } + public List Details { get; set; } public string? Team { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequest/Dtos/StoreProductReceiptRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequest/Dtos/StoreProductReceiptRequestDto.cs index 452bb53fe..3c7c4955b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequest/Dtos/StoreProductReceiptRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequest/Dtos/StoreProductReceiptRequestDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequest.Dtos; @@ -32,7 +34,7 @@ public class StoreProductReceiptRequestDto : AuditedEntityDto public string? Shift { get; set; } - public ICollection StoreProductReceiptRequestDetails { get; set; } + public List Details { get; set; } public string? Team { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequest/Dtos/StoreProductReceiptRequestGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequest/Dtos/StoreProductReceiptRequestGetListInput.cs index c33b2e292..21c24f547 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequest/Dtos/StoreProductReceiptRequestGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequest/Dtos/StoreProductReceiptRequestGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequest.Dtos; @@ -33,7 +35,7 @@ public class StoreProductReceiptRequestGetListInput : PagedAndSortedResultReques public string? Shift { get; set; } - public ICollection? StoreProductReceiptRequestDetails { get; set; } + public List? Details { get; set; } public string? Team { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequestDetail/Dtos/CreateUpdateStoreProductReceiptRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequestDetail/Dtos/CreateUpdateStoreProductReceiptRequestDetailDto.cs index 0d096e41e..89e4302e0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequestDetail/Dtos/CreateUpdateStoreProductReceiptRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequestDetail/Dtos/CreateUpdateStoreProductReceiptRequestDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequestDetail.Dtos; @@ -29,7 +30,7 @@ public class CreateUpdateStoreProductReceiptRequestDetailDto public string? Lot { get; set; } - public StoreProductReceiptRequest Master { get; set; } + public StoreProductReceiptRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequestDetail/Dtos/StoreProductReceiptRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequestDetail/Dtos/StoreProductReceiptRequestDetailDto.cs index c74683ba8..c41540aab 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequestDetail/Dtos/StoreProductReceiptRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequestDetail/Dtos/StoreProductReceiptRequestDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequestDetail.Dtos; @@ -30,7 +31,7 @@ public class StoreProductReceiptRequestDetailDto : AuditedEntityDto public string? Lot { get; set; } - public StoreProductReceiptRequest Master { get; set; } + public StoreProductReceiptRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequestDetail/Dtos/StoreProductReceiptRequestDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequestDetail/Dtos/StoreProductReceiptRequestDetailGetListInput.cs index 03f5ef332..56036756f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequestDetail/Dtos/StoreProductReceiptRequestDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequestDetail/Dtos/StoreProductReceiptRequestDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequestDetail.Dtos; @@ -31,7 +32,7 @@ public class StoreProductReceiptRequestDetailGetListInput : PagedAndSortedResult public string? Lot { get; set; } - public StoreProductReceiptRequest? Master { get; set; } + public StoreProductReceiptRequestDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequestDetail/IStoreProductReceiptRequestDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequestDetail/IStoreProductReceiptRequestDetailAppService.cs index e16e65aa9..366da514a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequestDetail/IStoreProductReceiptRequestDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductReceiptRequestDetail/IStoreProductReceiptRequestDetailAppService.cs @@ -6,7 +6,7 @@ namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequestDetail; public interface IStoreProductReceiptRequestDetailAppService : - ICrudAppService< + ICrudAppService< StoreProductReceiptRequestDetailDto, Guid, StoreProductReceiptRequestDetailGetListInput, diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleMaterialDetail/Dtos/CreateUpdateStoreProductRecycleMaterialDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleMaterialDetail/Dtos/CreateUpdateStoreProductRecycleMaterialDetailDto.cs index a964e1814..c033877a9 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleMaterialDetail/Dtos/CreateUpdateStoreProductRecycleMaterialDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleMaterialDetail/Dtos/CreateUpdateStoreProductRecycleMaterialDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleMaterialDetail.Dtos; @@ -31,7 +32,7 @@ public class CreateUpdateStoreProductRecycleMaterialDetailDto public string? Lot { get; set; } - public StoreProductRecycleNote Master { get; set; } + public StoreProductRecycleNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleMaterialDetail/Dtos/StoreProductRecycleMaterialDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleMaterialDetail/Dtos/StoreProductRecycleMaterialDetailDto.cs index 600f46fb3..4be2f951d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleMaterialDetail/Dtos/StoreProductRecycleMaterialDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleMaterialDetail/Dtos/StoreProductRecycleMaterialDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleMaterialDetail.Dtos; @@ -32,8 +33,8 @@ public class StoreProductRecycleMaterialDetailDto : AuditedEntityDto public string? Lot { get; set; } - public StoreProductRecycleNote Master { get; set; } - + public StoreProductRecycleNoteDto Master { get; set; } + public Guid MasterId { get; set; } public string Number { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleMaterialDetail/Dtos/StoreProductRecycleMaterialDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleMaterialDetail/Dtos/StoreProductRecycleMaterialDetailGetListInput.cs index ba5e7e13c..0481622e4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleMaterialDetail/Dtos/StoreProductRecycleMaterialDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleMaterialDetail/Dtos/StoreProductRecycleMaterialDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleMaterialDetail.Dtos; @@ -33,7 +34,7 @@ public class StoreProductRecycleMaterialDetailGetListInput : PagedAndSortedResul public string? Lot { get; set; } - public StoreProductRecycleNote? Master { get; set; } + public StoreProductRecycleNoteDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNote/Dtos/CreateUpdateStoreProductRecycleNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNote/Dtos/CreateUpdateStoreProductRecycleNoteDto.cs index 2c2786c0d..663da5cfa 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNote/Dtos/CreateUpdateStoreProductRecycleNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNote/Dtos/CreateUpdateStoreProductRecycleNoteDto.cs @@ -1,4 +1,7 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleMaterialDetail.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNote.Dtos; @@ -17,11 +20,9 @@ public class CreateUpdateStoreProductRecycleNoteDto public string? Shift { get; set; } - public ICollection StoreProductRecycleMaterialDetails { get; set; } + public List? Details { get; set; } - public ICollection StoreProductRecycleNoteDetails { get; set; } - - public string? Worker { get; set; } + public string? Worker { get; set; } public string? Workshop { get; set; } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNote/Dtos/StoreProductRecycleNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNote/Dtos/StoreProductRecycleNoteDto.cs index 6bbcc3112..4d0823093 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNote/Dtos/StoreProductRecycleNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNote/Dtos/StoreProductRecycleNoteDto.cs @@ -1,5 +1,8 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleMaterialDetail.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNote.Dtos; @@ -18,11 +21,10 @@ public class StoreProductRecycleNoteDto : AuditedEntityDto public string? Shift { get; set; } - public ICollection StoreProductRecycleMaterialDetails { get; set; } - public ICollection StoreProductRecycleNoteDetails { get; set; } + public List? Details { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } public string? Workshop { get; set; } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNote/Dtos/StoreProductRecycleNoteGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNote/Dtos/StoreProductRecycleNoteGetListInput.cs index f5497ab4a..2992b2f91 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNote/Dtos/StoreProductRecycleNoteGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNote/Dtos/StoreProductRecycleNoteGetListInput.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; @@ -19,11 +20,9 @@ public class StoreProductRecycleNoteGetListInput : PagedAndSortedResultRequestDt public string? Shift { get; set; } - public ICollection? StoreProductRecycleMaterialDetails { get; set; } + public List? Details { get; set; } - public ICollection? StoreProductRecycleNoteDetails { get; set; } - - public string? Worker { get; set; } + public string? Worker { get; set; } public string? Workshop { get; set; } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNoteDetail/Dtos/CreateUpdateStoreProductRecycleNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNoteDetail/Dtos/CreateUpdateStoreProductRecycleNoteDetailDto.cs index 7b3e25ca4..0993600c9 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNoteDetail/Dtos/CreateUpdateStoreProductRecycleNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNoteDetail/Dtos/CreateUpdateStoreProductRecycleNoteDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNoteDetail.Dtos; @@ -29,7 +30,7 @@ public class CreateUpdateStoreProductRecycleNoteDetailDto public string? Lot { get; set; } - public StoreProductRecycleNote Master { get; set; } + public StoreProductRecycleNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNoteDetail/Dtos/StoreProductRecycleNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNoteDetail/Dtos/StoreProductRecycleNoteDetailDto.cs index 106b9d49b..635d6bf75 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNoteDetail/Dtos/StoreProductRecycleNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNoteDetail/Dtos/StoreProductRecycleNoteDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNoteDetail.Dtos; @@ -30,7 +31,7 @@ public class StoreProductRecycleNoteDetailDto : AuditedEntityDto public string? Lot { get; set; } - public StoreProductRecycleNote Master { get; set; } + public StoreProductRecycleNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNoteDetail/Dtos/StoreProductRecycleNoteDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNoteDetail/Dtos/StoreProductRecycleNoteDetailGetListInput.cs index b0cc4cb54..52976e46a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNoteDetail/Dtos/StoreProductRecycleNoteDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleNoteDetail/Dtos/StoreProductRecycleNoteDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNoteDetail.Dtos; @@ -31,7 +32,7 @@ public class StoreProductRecycleNoteDetailGetListInput : PagedAndSortedResultReq public string? Lot { get; set; } - public StoreProductRecycleNote? Master { get; set; } + public StoreProductRecycleNoteDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequest/Dtos/CreateUpdateStoreProductRecycleRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequest/Dtos/CreateUpdateStoreProductRecycleRequestDto.cs index d4adccf15..edbb7ffb3 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequest/Dtos/CreateUpdateStoreProductRecycleRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequest/Dtos/CreateUpdateStoreProductRecycleRequestDto.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequest.Dtos; @@ -25,9 +26,9 @@ public class CreateUpdateStoreProductRecycleRequestDto public string? Shift { get; set; } - public ICollection StoreProductRecycleRequestDetails { get; set; } + public List? Details { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } public string? Workshop { get; set; } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequest/Dtos/StoreProductRecycleRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequest/Dtos/StoreProductRecycleRequestDto.cs index 159a842a4..b30c9bfd7 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequest/Dtos/StoreProductRecycleRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequest/Dtos/StoreProductRecycleRequestDto.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequest.Dtos; @@ -26,9 +27,9 @@ public class StoreProductRecycleRequestDto : AuditedEntityDto public string? Shift { get; set; } - public ICollection StoreProductRecycleRequestDetails { get; set; } + public List? Details { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } public string? Workshop { get; set; } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequest/Dtos/StoreProductRecycleRequestGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequest/Dtos/StoreProductRecycleRequestGetListInput.cs index 5b66d857c..ebffb3443 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequest/Dtos/StoreProductRecycleRequestGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequest/Dtos/StoreProductRecycleRequestGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequest.Dtos; @@ -27,9 +29,9 @@ public class StoreProductRecycleRequestGetListInput : PagedAndSortedResultReques public string? Shift { get; set; } - public ICollection? StoreProductRecycleRequestDetails { get; set; } + public List? Details { get; set; } - public string? Worker { get; set; } + public string? Worker { get; set; } public string? Workshop { get; set; } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequestDetail/Dtos/CreateUpdateStoreProductRecycleRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequestDetail/Dtos/CreateUpdateStoreProductRecycleRequestDetailDto.cs index db7352beb..aeb931a45 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequestDetail/Dtos/CreateUpdateStoreProductRecycleRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequestDetail/Dtos/CreateUpdateStoreProductRecycleRequestDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequestDetail.Dtos; @@ -23,7 +24,7 @@ public class CreateUpdateStoreProductRecycleRequestDetailDto public string? LocationGroup { get; set; } - public StoreProductRecycleRequest Master { get; set; } + public StoreProductRecycleRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequestDetail/Dtos/StoreProductRecycleRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequestDetail/Dtos/StoreProductRecycleRequestDetailDto.cs index 2448e1607..50521fd10 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequestDetail/Dtos/StoreProductRecycleRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequestDetail/Dtos/StoreProductRecycleRequestDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequestDetail.Dtos; @@ -24,7 +25,7 @@ public class StoreProductRecycleRequestDetailDto : AuditedEntityDto public string? LocationGroup { get; set; } - public StoreProductRecycleRequest Master { get; set; } + public StoreProductRecycleRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequestDetail/Dtos/StoreProductRecycleRequestDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequestDetail/Dtos/StoreProductRecycleRequestDetailGetListInput.cs index 55aaffa5c..84aa746d3 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequestDetail/Dtos/StoreProductRecycleRequestDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreProductRecycleRequestDetail/Dtos/StoreProductRecycleRequestDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequestDetail.Dtos; @@ -25,7 +26,7 @@ public class StoreProductRecycleRequestDetailGetListInput : PagedAndSortedResult public string? LocationGroup { get; set; } - public StoreProductRecycleRequest? Master { get; set; } + public StoreProductRecycleRequestDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrder/Dtos/CreateUpdateStorePurchaseOrderDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrder/Dtos/CreateUpdateStorePurchaseOrderDto.cs index 3d84c4e1b..9069b1fcd 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrder/Dtos/CreateUpdateStorePurchaseOrderDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrder/Dtos/CreateUpdateStorePurchaseOrderDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrderDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrder.Dtos; @@ -27,9 +29,9 @@ public class CreateUpdateStorePurchaseOrderDto public string? Remark { get; set; } - public ICollection StorePurchaseOrderDetails { get; set; } + public List? Details { get; set; } - public string? SupplierAddress { get; set; } + public string? SupplierAddress { get; set; } public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrder/Dtos/StorePurchaseOrderDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrder/Dtos/StorePurchaseOrderDto.cs index a58c5e854..10268b820 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrder/Dtos/StorePurchaseOrderDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrder/Dtos/StorePurchaseOrderDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrderDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrder.Dtos; @@ -28,7 +30,7 @@ public class StorePurchaseOrderDto : AuditedEntityDto public string? Remark { get; set; } - public ICollection StorePurchaseOrderDetails { get; set; } + public List Details {get;set;} =new (); public string? SupplierAddress { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrder/Dtos/StorePurchaseOrderGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrder/Dtos/StorePurchaseOrderGetListInput.cs index 75de1a647..9b8973f06 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrder/Dtos/StorePurchaseOrderGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrder/Dtos/StorePurchaseOrderGetListInput.cs @@ -1,6 +1,9 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Permissions; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrderDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrder.Dtos; @@ -29,7 +32,7 @@ public class StorePurchaseOrderGetListInput : PagedAndSortedResultRequestDto public string? Remark { get; set; } - public ICollection? StorePurchaseOrderDetails { get; set; } + public List? Details { get; set; } public string? SupplierAddress { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrderDetail/Dtos/CreateUpdateStorePurchaseOrderDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrderDetail/Dtos/CreateUpdateStorePurchaseOrderDetailDto.cs index 07519842f..b8f5557a3 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrderDetail/Dtos/CreateUpdateStorePurchaseOrderDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrderDetail/Dtos/CreateUpdateStorePurchaseOrderDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrder.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrderDetail.Dtos; @@ -27,7 +28,7 @@ public class CreateUpdateStorePurchaseOrderDetailDto public string? Lot { get; set; } - public StorePurchaseOrder Master { get; set; } + public StorePurchaseOrderDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrderDetail/Dtos/StorePurchaseOrderDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrderDetail/Dtos/StorePurchaseOrderDetailDto.cs index 613a5756c..7a61512c0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrderDetail/Dtos/StorePurchaseOrderDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrderDetail/Dtos/StorePurchaseOrderDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrder.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrderDetail.Dtos; @@ -28,7 +29,7 @@ public class StorePurchaseOrderDetailDto : AuditedEntityDto public string? Lot { get; set; } - public StorePurchaseOrder Master { get; set; } + public StorePurchaseOrderDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrderDetail/Dtos/StorePurchaseOrderDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrderDetail/Dtos/StorePurchaseOrderDetailGetListInput.cs index c0e6b1221..5e6e2a473 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrderDetail/Dtos/StorePurchaseOrderDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseOrderDetail/Dtos/StorePurchaseOrderDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrder.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrderDetail.Dtos; @@ -29,7 +30,7 @@ public class StorePurchaseOrderDetailGetListInput : PagedAndSortedResultRequestD public string? Lot { get; set; } - public StorePurchaseOrder? Master { get; set; } + public StorePurchaseOrderDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNote/Dtos/CreateUpdateStorePurchaseReceiptNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNote/Dtos/CreateUpdateStorePurchaseReceiptNoteDto.cs index 0e06e8862..916862117 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNote/Dtos/CreateUpdateStorePurchaseReceiptNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNote/Dtos/CreateUpdateStorePurchaseReceiptNoteDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNote.Dtos; @@ -25,7 +27,7 @@ public class CreateUpdateStorePurchaseReceiptNoteDto public string Status { get; set; } - public ICollection StorePurchaseReceiptNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? SupplierAddress { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNote/Dtos/StorePurchaseReceiptNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNote/Dtos/StorePurchaseReceiptNoteDto.cs index 4e0491545..6f44afff6 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNote/Dtos/StorePurchaseReceiptNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNote/Dtos/StorePurchaseReceiptNoteDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNote.Dtos; @@ -26,7 +28,7 @@ public class StorePurchaseReceiptNoteDto : AuditedEntityDto public string Status { get; set; } - public ICollection StorePurchaseReceiptNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? SupplierAddress { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNote/Dtos/StorePurchaseReceiptNoteGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNote/Dtos/StorePurchaseReceiptNoteGetListInput.cs index d247ae20b..2189380c6 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNote/Dtos/StorePurchaseReceiptNoteGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNote/Dtos/StorePurchaseReceiptNoteGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNote.Dtos; @@ -27,7 +29,7 @@ public class StorePurchaseReceiptNoteGetListInput : PagedAndSortedResultRequestD public string? Status { get; set; } - public ICollection? StorePurchaseReceiptNoteDetails { get; set; } + public List? StorePurchaseReceiptNoteDetails { get; set; } public string? SupplierAddress { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNoteDetail/Dtos/CreateUpdateStorePurchaseReceiptNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNoteDetail/Dtos/CreateUpdateStorePurchaseReceiptNoteDetailDto.cs index c1e144222..5b004dcc4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNoteDetail/Dtos/CreateUpdateStorePurchaseReceiptNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNoteDetail/Dtos/CreateUpdateStorePurchaseReceiptNoteDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNoteDetail.Dtos; @@ -61,7 +62,7 @@ public class CreateUpdateStorePurchaseReceiptNoteDetailDto public string? MassDefect { get; set; } - public StorePurchaseReceiptNote Master { get; set; } + public StorePurchaseReceiptNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNoteDetail/Dtos/StorePurchaseReceiptNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNoteDetail/Dtos/StorePurchaseReceiptNoteDetailDto.cs index 86c34ab0c..a237d1132 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNoteDetail/Dtos/StorePurchaseReceiptNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNoteDetail/Dtos/StorePurchaseReceiptNoteDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNoteDetail.Dtos; @@ -62,7 +63,7 @@ public class StorePurchaseReceiptNoteDetailDto : AuditedEntityDto public string? MassDefect { get; set; } - public StorePurchaseReceiptNote Master { get; set; } + public StorePurchaseReceiptNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNoteDetail/Dtos/StorePurchaseReceiptNoteDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNoteDetail/Dtos/StorePurchaseReceiptNoteDetailGetListInput.cs index 1c728f4dd..40d8b8730 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNoteDetail/Dtos/StorePurchaseReceiptNoteDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptNoteDetail/Dtos/StorePurchaseReceiptNoteDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNoteDetail.Dtos; @@ -63,7 +64,7 @@ public class StorePurchaseReceiptNoteDetailGetListInput : PagedAndSortedResultRe public string? MassDefect { get; set; } - public StorePurchaseReceiptNote? Master { get; set; } + public StorePurchaseReceiptNoteDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequest/Dtos/CreateUpdateStorePurchaseReceiptRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequest/Dtos/CreateUpdateStorePurchaseReceiptRequestDto.cs index 08d5d6a8d..739a3872d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequest/Dtos/CreateUpdateStorePurchaseReceiptRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequest/Dtos/CreateUpdateStorePurchaseReceiptRequestDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequest.Dtos; @@ -33,7 +35,7 @@ public class CreateUpdateStorePurchaseReceiptRequestDto public string? RpNumber { get; set; } - public ICollection StorePurchaseReceiptRequestDetails { get; set; } + public List StorePurchaseReceiptRequest { get; set; } public string? SupplierAddress { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequest/Dtos/StorePurchaseReceiptRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequest/Dtos/StorePurchaseReceiptRequestDto.cs index 1b8561d83..5b2a89733 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequest/Dtos/StorePurchaseReceiptRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequest/Dtos/StorePurchaseReceiptRequestDto.cs @@ -1,5 +1,8 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Permissions; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequest.Dtos; @@ -34,7 +37,7 @@ public class StorePurchaseReceiptRequestDto : AuditedEntityDto public string? RpNumber { get; set; } - public ICollection StorePurchaseReceiptRequestDetails { get; set; } + public List Details {get;set;} =new (); public string? SupplierAddress { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequest/Dtos/StorePurchaseReceiptRequestGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequest/Dtos/StorePurchaseReceiptRequestGetListInput.cs index 2e8af2129..6cc13b627 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequest/Dtos/StorePurchaseReceiptRequestGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequest/Dtos/StorePurchaseReceiptRequestGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequest.Dtos; @@ -35,7 +37,7 @@ public class StorePurchaseReceiptRequestGetListInput : PagedAndSortedResultReque public string? RpNumber { get; set; } - public ICollection? StorePurchaseReceiptRequestDetails { get; set; } + public List? Details { get; set; } public string? SupplierAddress { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequestDetail/Dtos/CreateUpdateStorePurchaseReceiptRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequestDetail/Dtos/CreateUpdateStorePurchaseReceiptRequestDetailDto.cs index 11e6c0412..2f9cbb7ec 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequestDetail/Dtos/CreateUpdateStorePurchaseReceiptRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequestDetail/Dtos/CreateUpdateStorePurchaseReceiptRequestDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequestDetail.Dtos; @@ -23,7 +24,7 @@ public class CreateUpdateStorePurchaseReceiptRequestDetailDto public string? Lot { get; set; } - public StorePurchaseReceiptRequest Master { get; set; } + public StorePurchaseReceiptRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequestDetail/Dtos/StorePurchaseReceiptRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequestDetail/Dtos/StorePurchaseReceiptRequestDetailDto.cs index 102aa2f2e..ebe90f2f4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequestDetail/Dtos/StorePurchaseReceiptRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequestDetail/Dtos/StorePurchaseReceiptRequestDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequestDetail.Dtos; @@ -24,7 +25,7 @@ public class StorePurchaseReceiptRequestDetailDto : AuditedEntityDto public string? Lot { get; set; } - public StorePurchaseReceiptRequest Master { get; set; } + public StorePurchaseReceiptRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequestDetail/Dtos/StorePurchaseReceiptRequestDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequestDetail/Dtos/StorePurchaseReceiptRequestDetailGetListInput.cs index 5327bd5cc..aac8e771c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequestDetail/Dtos/StorePurchaseReceiptRequestDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReceiptRequestDetail/Dtos/StorePurchaseReceiptRequestDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequestDetail.Dtos; @@ -25,7 +26,7 @@ public class StorePurchaseReceiptRequestDetailGetListInput : PagedAndSortedResul public string? Lot { get; set; } - public StorePurchaseReceiptRequest? Master { get; set; } + public StorePurchaseReceiptRequestDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNote/Dtos/CreateUpdateStorePurchaseReturnNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNote/Dtos/CreateUpdateStorePurchaseReturnNoteDto.cs index 1cac79b21..53261b622 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNote/Dtos/CreateUpdateStorePurchaseReturnNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNote/Dtos/CreateUpdateStorePurchaseReturnNoteDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNote.Dtos; @@ -29,7 +31,7 @@ public class CreateUpdateStorePurchaseReturnNoteDto public string Status { get; set; } - public ICollection StorePurchaseReturnNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNote/Dtos/StorePurchaseReturnNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNote/Dtos/StorePurchaseReturnNoteDto.cs index b4fd284fb..837958348 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNote/Dtos/StorePurchaseReturnNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNote/Dtos/StorePurchaseReturnNoteDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNote.Dtos; @@ -30,7 +32,7 @@ public class StorePurchaseReturnNoteDto : AuditedEntityDto public string Status { get; set; } - public ICollection StorePurchaseReturnNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNote/Dtos/StorePurchaseReturnNoteGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNote/Dtos/StorePurchaseReturnNoteGetListInput.cs index 6c8341c7f..d06516ba5 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNote/Dtos/StorePurchaseReturnNoteGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNote/Dtos/StorePurchaseReturnNoteGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNote.Dtos; @@ -31,7 +33,7 @@ public class StorePurchaseReturnNoteGetListInput : PagedAndSortedResultRequestDt public string? Status { get; set; } - public ICollection? StorePurchaseReturnNoteDetails { get; set; } + public List? StorePurchaseReturnNoteDetails { get; set; } public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNoteDetail/Dtos/CreateUpdateStorePurchaseReturnNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNoteDetail/Dtos/CreateUpdateStorePurchaseReturnNoteDetailDto.cs index a33805b32..ea004aa32 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNoteDetail/Dtos/CreateUpdateStorePurchaseReturnNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNoteDetail/Dtos/CreateUpdateStorePurchaseReturnNoteDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNoteDetail.Dtos; @@ -55,7 +56,7 @@ public class CreateUpdateStorePurchaseReturnNoteDetailDto public string? Lot { get; set; } - public StorePurchaseReturnNote Master { get; set; } + public StorePurchaseReturnNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNoteDetail/Dtos/StorePurchaseReturnNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNoteDetail/Dtos/StorePurchaseReturnNoteDetailDto.cs index 363b95ec6..66b923e19 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNoteDetail/Dtos/StorePurchaseReturnNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNoteDetail/Dtos/StorePurchaseReturnNoteDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNoteDetail.Dtos; @@ -56,7 +57,7 @@ public class StorePurchaseReturnNoteDetailDto : AuditedEntityDto public string? Lot { get; set; } - public StorePurchaseReturnNote Master { get; set; } + public StorePurchaseReturnNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNoteDetail/Dtos/StorePurchaseReturnNoteDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNoteDetail/Dtos/StorePurchaseReturnNoteDetailGetListInput.cs index 942dc960a..0c281ef95 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNoteDetail/Dtos/StorePurchaseReturnNoteDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnNoteDetail/Dtos/StorePurchaseReturnNoteDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNoteDetail.Dtos; @@ -57,7 +58,7 @@ public class StorePurchaseReturnNoteDetailGetListInput : PagedAndSortedResultReq public string? Lot { get; set; } - public StorePurchaseReturnNote? Master { get; set; } + public StorePurchaseReturnNoteDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequest/Dtos/CreateUpdateStorePurchaseReturnRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequest/Dtos/CreateUpdateStorePurchaseReturnRequestDto.cs index ed73a6982..196880c9e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequest/Dtos/CreateUpdateStorePurchaseReturnRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequest/Dtos/CreateUpdateStorePurchaseReturnRequestDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequest.Dtos; @@ -33,7 +35,7 @@ public class CreateUpdateStorePurchaseReturnRequestDto public string? RpNumber { get; set; } - public ICollection StorePurchaseReturnRequestDetails { get; set; } + public List Details {get;set;} =new (); public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequest/Dtos/StorePurchaseReturnRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequest/Dtos/StorePurchaseReturnRequestDto.cs index 4d93c0e25..145a9a436 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequest/Dtos/StorePurchaseReturnRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequest/Dtos/StorePurchaseReturnRequestDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequest.Dtos; @@ -34,7 +36,7 @@ public class StorePurchaseReturnRequestDto : AuditedEntityDto public string? RpNumber { get; set; } - public ICollection StorePurchaseReturnRequestDetails { get; set; } + public List Details {get;set;} =new (); public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequest/Dtos/StorePurchaseReturnRequestGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequest/Dtos/StorePurchaseReturnRequestGetListInput.cs index 3b6190077..94f7ba6b2 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequest/Dtos/StorePurchaseReturnRequestGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequest/Dtos/StorePurchaseReturnRequestGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequest.Dtos; @@ -35,7 +37,7 @@ public class StorePurchaseReturnRequestGetListInput : PagedAndSortedResultReques public string? RpNumber { get; set; } - public ICollection? StorePurchaseReturnRequestDetails { get; set; } + public List? StorePurchaseReturnRequestDetails { get; set; } public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequestDetail/Dtos/CreateUpdateStorePurchaseReturnRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequestDetail/Dtos/CreateUpdateStorePurchaseReturnRequestDetailDto.cs index 74c1653e5..aa14630b0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequestDetail/Dtos/CreateUpdateStorePurchaseReturnRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequestDetail/Dtos/CreateUpdateStorePurchaseReturnRequestDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequestDetail.Dtos; @@ -29,7 +30,7 @@ public class CreateUpdateStorePurchaseReturnRequestDetailDto public string? Lot { get; set; } - public StorePurchaseReturnRequest Master { get; set; } + public StorePurchaseReturnRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequestDetail/Dtos/StorePurchaseReturnRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequestDetail/Dtos/StorePurchaseReturnRequestDetailDto.cs index 9547354fc..1e13d792d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequestDetail/Dtos/StorePurchaseReturnRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequestDetail/Dtos/StorePurchaseReturnRequestDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequestDetail.Dtos; @@ -30,7 +31,7 @@ public class StorePurchaseReturnRequestDetailDto : AuditedEntityDto public string? Lot { get; set; } - public StorePurchaseReturnRequest Master { get; set; } + public StorePurchaseReturnRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequestDetail/Dtos/StorePurchaseReturnRequestDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequestDetail/Dtos/StorePurchaseReturnRequestDetailGetListInput.cs index 633c977f9..85bcb228d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequestDetail/Dtos/StorePurchaseReturnRequestDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePurchaseReturnRequestDetail/Dtos/StorePurchaseReturnRequestDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequestDetail.Dtos; @@ -31,7 +32,7 @@ public class StorePurchaseReturnRequestDetailGetListInput : PagedAndSortedResult public string? Lot { get; set; } - public StorePurchaseReturnRequest? Master { get; set; } + public StorePurchaseReturnRequestDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNote/Dtos/CreateUpdateStorePutawayNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNote/Dtos/CreateUpdateStorePutawayNoteDto.cs index 1de82ee07..c846131d0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNote/Dtos/CreateUpdateStorePutawayNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNote/Dtos/CreateUpdateStorePutawayNoteDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StorePutawayNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayNote.Dtos; @@ -25,7 +27,7 @@ public class CreateUpdateStorePutawayNoteDto public string? RpNumber { get; set; } - public ICollection StorePutawayNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNote/Dtos/StorePutawayNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNote/Dtos/StorePutawayNoteDto.cs index 25e8f5954..57e39c651 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNote/Dtos/StorePutawayNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNote/Dtos/StorePutawayNoteDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePutawayNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayNote.Dtos; @@ -26,7 +28,7 @@ public class StorePutawayNoteDto : AuditedEntityDto public string? RpNumber { get; set; } - public ICollection StorePutawayNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNote/Dtos/StorePutawayNoteGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNote/Dtos/StorePutawayNoteGetListInput.cs index 215b6c692..aea84f781 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNote/Dtos/StorePutawayNoteGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNote/Dtos/StorePutawayNoteGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePutawayNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayNote.Dtos; @@ -27,8 +29,8 @@ public class StorePutawayNoteGetListInput : PagedAndSortedResultRequestDto public string? RpNumber { get; set; } - public ICollection? StorePutawayNoteDetails { get; set; } - + public List? Details { get; set; } + public string? SupplierCode { get; set; } public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNoteDetail/Dtos/CreateUpdateStorePutawayNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNoteDetail/Dtos/CreateUpdateStorePutawayNoteDetailDto.cs index b4931b187..2bff9d3c4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNoteDetail/Dtos/CreateUpdateStorePutawayNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNoteDetail/Dtos/CreateUpdateStorePutawayNoteDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StorePutawayNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayNoteDetail.Dtos; @@ -63,7 +64,7 @@ public class CreateUpdateStorePutawayNoteDetailDto public string? JobNumber { get; set; } - public StorePutawayNote Master { get; set; } + public StorePutawayNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNoteDetail/Dtos/StorePutawayNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNoteDetail/Dtos/StorePutawayNoteDetailDto.cs index 8bc74db7d..7194187e7 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNoteDetail/Dtos/StorePutawayNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNoteDetail/Dtos/StorePutawayNoteDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePutawayNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayNoteDetail.Dtos; @@ -64,7 +65,7 @@ public class StorePutawayNoteDetailDto : AuditedEntityDto public string? JobNumber { get; set; } - public StorePutawayNote Master { get; set; } + public StorePutawayNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNoteDetail/Dtos/StorePutawayNoteDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNoteDetail/Dtos/StorePutawayNoteDetailGetListInput.cs index 47946512b..084b60e34 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNoteDetail/Dtos/StorePutawayNoteDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayNoteDetail/Dtos/StorePutawayNoteDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePutawayNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayNoteDetail.Dtos; @@ -65,7 +66,7 @@ public class StorePutawayNoteDetailGetListInput : PagedAndSortedResultRequestDto public string? JobNumber { get; set; } - public StorePutawayNote? Master { get; set; } + public StorePutawayNoteDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequest/Dtos/CreateUpdateStorePutawayRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequest/Dtos/CreateUpdateStorePutawayRequestDto.cs index 14501fcdd..046cc97d6 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequest/Dtos/CreateUpdateStorePutawayRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequest/Dtos/CreateUpdateStorePutawayRequestDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StorePutawayRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayRequest.Dtos; @@ -41,7 +43,7 @@ public class CreateUpdateStorePutawayRequestDto public string? RpNumber { get; set; } - public ICollection StorePutawayRequestDetails { get; set; } + public List Details {get;set;} =new (); public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequest/Dtos/StorePutawayRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequest/Dtos/StorePutawayRequestDto.cs index 5368c4fb3..b7a1acb5a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequest/Dtos/StorePutawayRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequest/Dtos/StorePutawayRequestDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePutawayRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayRequest.Dtos; @@ -42,7 +44,7 @@ public class StorePutawayRequestDto : AuditedEntityDto public string? RpNumber { get; set; } - public ICollection StorePutawayRequestDetails { get; set; } + public List Details {get;set;} =new (); public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequest/Dtos/StorePutawayRequestGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequest/Dtos/StorePutawayRequestGetListInput.cs index 3fff65519..e772fe8af 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequest/Dtos/StorePutawayRequestGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequest/Dtos/StorePutawayRequestGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePutawayRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayRequest.Dtos; @@ -43,7 +45,7 @@ public class StorePutawayRequestGetListInput : PagedAndSortedResultRequestDto public string? RpNumber { get; set; } - public ICollection? StorePutawayRequestDetails { get; set; } + public List? Details { get; set; } public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequestDetail/Dtos/CreateUpdateStorePutawayRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequestDetail/Dtos/CreateUpdateStorePutawayRequestDetailDto.cs index 1ded0cbd7..0bfcac8bf 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequestDetail/Dtos/CreateUpdateStorePutawayRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequestDetail/Dtos/CreateUpdateStorePutawayRequestDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StorePutawayRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayRequestDetail.Dtos; @@ -37,7 +38,7 @@ public class CreateUpdateStorePutawayRequestDetailDto public string? ItemName { get; set; } - public StorePutawayRequest Master { get; set; } + public StorePutawayRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequestDetail/Dtos/StorePutawayRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequestDetail/Dtos/StorePutawayRequestDetailDto.cs index d66d3cc6b..eaaabd8ec 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequestDetail/Dtos/StorePutawayRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequestDetail/Dtos/StorePutawayRequestDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePutawayRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayRequestDetail.Dtos; @@ -38,7 +39,7 @@ public class StorePutawayRequestDetailDto : AuditedEntityDto public string? ItemName { get; set; } - public StorePutawayRequest Master { get; set; } + public StorePutawayRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequestDetail/Dtos/StorePutawayRequestDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequestDetail/Dtos/StorePutawayRequestDetailGetListInput.cs index 893972751..616327ea7 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequestDetail/Dtos/StorePutawayRequestDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StorePutawayRequestDetail/Dtos/StorePutawayRequestDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StorePutawayRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayRequestDetail.Dtos; @@ -39,7 +40,7 @@ public class StorePutawayRequestDetailGetListInput : PagedAndSortedResultRequest public string? ItemName { get; set; } - public StorePutawayRequest? Master { get; set; } + public StorePutawayRequestDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNote/Dtos/CreateUpdateStoreReceiptAbnormalNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNote/Dtos/CreateUpdateStoreReceiptAbnormalNoteDto.cs index 9265ddcbf..2e2df91a0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNote/Dtos/CreateUpdateStoreReceiptAbnormalNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNote/Dtos/CreateUpdateStoreReceiptAbnormalNoteDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNote.Dtos; @@ -15,7 +17,7 @@ public class CreateUpdateStoreReceiptAbnormalNoteDto public string? Remark { get; set; } - public ICollection StoreReceiptAbnormalNoteDetails { get; set; } + public List Details {get;set;} =new (); public string SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNote/Dtos/StoreReceiptAbnormalNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNote/Dtos/StoreReceiptAbnormalNoteDto.cs index a07f26ff6..632a13bf4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNote/Dtos/StoreReceiptAbnormalNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNote/Dtos/StoreReceiptAbnormalNoteDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNote.Dtos; @@ -16,7 +18,7 @@ public class StoreReceiptAbnormalNoteDto : AuditedEntityDto public string? Remark { get; set; } - public ICollection StoreReceiptAbnormalNoteDetails { get; set; } + public List Details {get;set;} =new (); public string SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNote/Dtos/StoreReceiptAbnormalNoteGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNote/Dtos/StoreReceiptAbnormalNoteGetListInput.cs index f92ec283f..c47313076 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNote/Dtos/StoreReceiptAbnormalNoteGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNote/Dtos/StoreReceiptAbnormalNoteGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNote.Dtos; @@ -17,7 +19,7 @@ public class StoreReceiptAbnormalNoteGetListInput : PagedAndSortedResultRequestD public string? Remark { get; set; } - public ICollection? StoreReceiptAbnormalNoteDetails { get; set; } + public List? Details { get; set; } public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNoteDetail/Dtos/CreateUpdateStoreReceiptAbnormalNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNoteDetail/Dtos/CreateUpdateStoreReceiptAbnormalNoteDetailDto.cs index 70855164b..16068e58f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNoteDetail/Dtos/CreateUpdateStoreReceiptAbnormalNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNoteDetail/Dtos/CreateUpdateStoreReceiptAbnormalNoteDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNoteDetail.Dtos; @@ -31,7 +32,7 @@ public class CreateUpdateStoreReceiptAbnormalNoteDetailDto public string? Lot { get; set; } - public StoreReceiptAbnormalNote Master { get; set; } + public StoreReceiptAbnormalNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNoteDetail/Dtos/StoreReceiptAbnormalNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNoteDetail/Dtos/StoreReceiptAbnormalNoteDetailDto.cs index fdd4288a6..80eae9a90 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNoteDetail/Dtos/StoreReceiptAbnormalNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNoteDetail/Dtos/StoreReceiptAbnormalNoteDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNoteDetail.Dtos; @@ -32,7 +33,7 @@ public class StoreReceiptAbnormalNoteDetailDto : AuditedEntityDto public string? Lot { get; set; } - public StoreReceiptAbnormalNote Master { get; set; } + public StoreReceiptAbnormalNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNoteDetail/Dtos/StoreReceiptAbnormalNoteDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNoteDetail/Dtos/StoreReceiptAbnormalNoteDetailGetListInput.cs index 01c732782..578c61172 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNoteDetail/Dtos/StoreReceiptAbnormalNoteDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreReceiptAbnormalNoteDetail/Dtos/StoreReceiptAbnormalNoteDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNoteDetail.Dtos; @@ -33,7 +34,7 @@ public class StoreReceiptAbnormalNoteDetailGetListInput : PagedAndSortedResultRe public string? Lot { get; set; } - public StoreReceiptAbnormalNote? Master { get; set; } + public StoreReceiptAbnormalNoteDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNote/Dtos/CreateUpdateStoreRecycledMaterialReceiptNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNote/Dtos/CreateUpdateStoreRecycledMaterialReceiptNoteDto.cs index 04be769a6..049d9eaae 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNote/Dtos/CreateUpdateStoreRecycledMaterialReceiptNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNote/Dtos/CreateUpdateStoreRecycledMaterialReceiptNoteDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNote.Dtos; @@ -11,7 +13,7 @@ public class CreateUpdateStoreRecycledMaterialReceiptNoteDto public string? Remark { get; set; } - public ICollection StoreRecycledMaterialReceiptNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? Worker { get; set; } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNote/Dtos/StoreRecycledMaterialReceiptNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNote/Dtos/StoreRecycledMaterialReceiptNoteDto.cs index 86a6db88c..2541e85fd 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNote/Dtos/StoreRecycledMaterialReceiptNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNote/Dtos/StoreRecycledMaterialReceiptNoteDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNote.Dtos; @@ -12,7 +14,7 @@ public class StoreRecycledMaterialReceiptNoteDto : AuditedEntityDto public string? Remark { get; set; } - public ICollection StoreRecycledMaterialReceiptNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? Worker { get; set; } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNote/Dtos/StoreRecycledMaterialReceiptNoteGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNote/Dtos/StoreRecycledMaterialReceiptNoteGetListInput.cs index 3435d91b0..aec80539f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNote/Dtos/StoreRecycledMaterialReceiptNoteGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNote/Dtos/StoreRecycledMaterialReceiptNoteGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNote.Dtos; @@ -13,7 +15,7 @@ public class StoreRecycledMaterialReceiptNoteGetListInput : PagedAndSortedResult public string? Remark { get; set; } - public ICollection? StoreRecycledMaterialReceiptNoteDetails { get; set; } + public List? Details { get; set; } = new(); public string? Worker { get; set; } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNoteDetail/Dtos/CreateUpdateStoreRecycledMaterialReceiptNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNoteDetail/Dtos/CreateUpdateStoreRecycledMaterialReceiptNoteDetailDto.cs index 2fdd95279..b61dceb3d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNoteDetail/Dtos/CreateUpdateStoreRecycledMaterialReceiptNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNoteDetail/Dtos/CreateUpdateStoreRecycledMaterialReceiptNoteDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNoteDetail.Dtos; @@ -29,7 +30,7 @@ public class CreateUpdateStoreRecycledMaterialReceiptNoteDetailDto public string? Lot { get; set; } - public StoreRecycledMaterialReceiptNote Master { get; set; } + public StoreRecycledMaterialReceiptNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNoteDetail/Dtos/StoreRecycledMaterialReceiptNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNoteDetail/Dtos/StoreRecycledMaterialReceiptNoteDetailDto.cs index daa40f5fd..cc7fd5269 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNoteDetail/Dtos/StoreRecycledMaterialReceiptNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNoteDetail/Dtos/StoreRecycledMaterialReceiptNoteDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNoteDetail.Dtos; @@ -30,7 +31,7 @@ public class StoreRecycledMaterialReceiptNoteDetailDto : AuditedEntityDto public string? Lot { get; set; } - public StoreRecycledMaterialReceiptNote Master { get; set; } + public StoreRecycledMaterialReceiptNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNoteDetail/Dtos/StoreRecycledMaterialReceiptNoteDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNoteDetail/Dtos/StoreRecycledMaterialReceiptNoteDetailGetListInput.cs index 9466cfef2..a4a86c95a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNoteDetail/Dtos/StoreRecycledMaterialReceiptNoteDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreRecycledMaterialReceiptNoteDetail/Dtos/StoreRecycledMaterialReceiptNoteDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNoteDetail.Dtos; @@ -31,7 +32,7 @@ public class StoreRecycledMaterialReceiptNoteDetailGetListInput : PagedAndSorted public string? Lot { get; set; } - public StoreRecycledMaterialReceiptNote? Master { get; set; } + public StoreRecycledMaterialReceiptNoteDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrder/Dtos/CreateUpdateStoreSaleOrderDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrder/Dtos/CreateUpdateStoreSaleOrderDto.cs index b02722a1f..1b1c4f864 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrder/Dtos/CreateUpdateStoreSaleOrderDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrder/Dtos/CreateUpdateStoreSaleOrderDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreSaleOrderDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreSaleOrder.Dtos; @@ -27,7 +29,7 @@ public class CreateUpdateStoreSaleOrderDto public string? SoType { get; set; } - public ICollection StoreSaleOrderDetails { get; set; } + public List Details {get;set;} =new (); public decimal TaxRate { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrder/Dtos/StoreSaleOrderDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrder/Dtos/StoreSaleOrderDto.cs index 5ed967590..db411f439 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrder/Dtos/StoreSaleOrderDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrder/Dtos/StoreSaleOrderDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreSaleOrderDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreSaleOrder.Dtos; @@ -28,7 +30,7 @@ public class StoreSaleOrderDto : AuditedEntityDto public string? SoType { get; set; } - public ICollection StoreSaleOrderDetails { get; set; } + public List Details {get;set;} =new (); public decimal TaxRate { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrder/Dtos/StoreSaleOrderGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrder/Dtos/StoreSaleOrderGetListInput.cs index 0f0e83a8b..375560e3e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrder/Dtos/StoreSaleOrderGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrder/Dtos/StoreSaleOrderGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreSaleOrderDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreSaleOrder.Dtos; @@ -29,7 +31,7 @@ public class StoreSaleOrderGetListInput : PagedAndSortedResultRequestDto public string? SoType { get; set; } - public ICollection? StoreSaleOrderDetails { get; set; } + public List? StoreSaleOrderDetails { get; set; } public decimal? TaxRate { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrderDetail/Dtos/CreateUpdateStoreSaleOrderDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrderDetail/Dtos/CreateUpdateStoreSaleOrderDetailDto.cs index 0afd1076e..20c04b5b5 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrderDetail/Dtos/CreateUpdateStoreSaleOrderDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrderDetail/Dtos/CreateUpdateStoreSaleOrderDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreSaleOrder.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreSaleOrderDetail.Dtos; @@ -21,7 +22,7 @@ public class CreateUpdateStoreSaleOrderDetailDto public string LineStatus { get; set; } - public StoreSaleOrder Master { get; set; } + public StoreSaleOrderDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrderDetail/Dtos/StoreSaleOrderDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrderDetail/Dtos/StoreSaleOrderDetailDto.cs index fc3f93af2..631cc0e8a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrderDetail/Dtos/StoreSaleOrderDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrderDetail/Dtos/StoreSaleOrderDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreSaleOrder.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreSaleOrderDetail.Dtos; @@ -22,7 +23,7 @@ public class StoreSaleOrderDetailDto : AuditedEntityDto public string LineStatus { get; set; } - public StoreSaleOrder Master { get; set; } + public StoreSaleOrderDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrderDetail/Dtos/StoreSaleOrderDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrderDetail/Dtos/StoreSaleOrderDetailGetListInput.cs index 30aa81aaf..6b5f1fe0e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrderDetail/Dtos/StoreSaleOrderDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSaleOrderDetail/Dtos/StoreSaleOrderDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreSaleOrder.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreSaleOrderDetail.Dtos; @@ -23,7 +24,7 @@ public class StoreSaleOrderDetailGetListInput : PagedAndSortedResultRequestDto public string? LineStatus { get; set; } - public StoreSaleOrder? Master { get; set; } + public StoreSaleOrderDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNote/Dtos/CreateUpdateStoreScrapNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNote/Dtos/CreateUpdateStoreScrapNoteDto.cs index 7aaf63b1b..236765edf 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNote/Dtos/CreateUpdateStoreScrapNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNote/Dtos/CreateUpdateStoreScrapNoteDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapNote.Dtos; @@ -15,7 +17,7 @@ public class CreateUpdateStoreScrapNoteDto public string? ScrapRequestNumber { get; set; } - public ICollection StoreScrapNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNote/Dtos/StoreScrapNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNote/Dtos/StoreScrapNoteDto.cs index d68722d8a..294b51c41 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNote/Dtos/StoreScrapNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNote/Dtos/StoreScrapNoteDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapNote.Dtos; @@ -16,7 +18,7 @@ public class StoreScrapNoteDto : AuditedEntityDto public string? ScrapRequestNumber { get; set; } - public ICollection StoreScrapNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNote/Dtos/StoreScrapNoteGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNote/Dtos/StoreScrapNoteGetListInput.cs index d807b53fc..f54845faf 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNote/Dtos/StoreScrapNoteGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNote/Dtos/StoreScrapNoteGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapNote.Dtos; @@ -17,7 +19,7 @@ public class StoreScrapNoteGetListInput : PagedAndSortedResultRequestDto public string? ScrapRequestNumber { get; set; } - public ICollection? StoreScrapNoteDetails { get; set; } + public List? Details { get; set; } public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNoteDetail/Dtos/CreateUpdateStoreScrapNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNoteDetail/Dtos/CreateUpdateStoreScrapNoteDetailDto.cs new file mode 100644 index 000000000..e1960aa8a --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNoteDetail/Dtos/CreateUpdateStoreScrapNoteDetailDto.cs @@ -0,0 +1,178 @@ +using System; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapNote.Dtos; + +namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail.Dtos; + +[Serializable] +public class CreateUpdateStoreScrapNoteDetailDto +{ + /// + /// + /// + public DateTime ArriveDate { get; set; } + + /// + /// + /// + public DateTime ExpireDate { get; set; } + + /// + /// + /// + public string? FromContainerCode { get; set; } + + /// + /// + /// + public string? FromLocationArea { get; set; } + + /// + /// + /// + public string FromLocationCode { get; set; } + + /// + /// + /// + public string FromLocationErpCode { get; set; } + + /// + /// + /// + public string? FromLocationGroup { get; set; } + + /// + /// + /// + public string? FromLot { get; set; } + + /// + /// + /// + public string? FromPackingCode { get; set; } + + /// + /// + /// + public string FromStatus { get; set; } + + /// + /// + /// + public string FromWarehouseCode { get; set; } + + /// + /// + /// + public string ItemCode { get; set; } + + /// + /// + /// + public string? ItemDesc1 { get; set; } + + /// + /// + /// + public string? ItemDesc2 { get; set; } + + /// + /// + /// + public string? ItemName { get; set; } + + /// + /// + /// + public StoreScrapNoteDto Master { get; set; } + + /// + /// + /// + public Guid MasterId { get; set; } + + /// + /// + /// + public string Number { get; set; } + + /// + /// + /// + public DateTime ProduceDate { get; set; } + + /// + /// + /// + public decimal Qty { get; set; } + + /// + /// + /// + public string? ReasonCode { get; set; } + + /// + /// + /// + public string? Remark { get; set; } + + /// + /// + /// + public decimal StdPackQty { get; set; } + + /// + /// + /// + public string? SupplierBatch { get; set; } + + /// + /// + /// + public string? ToContainerCode { get; set; } + + /// + /// + /// + public string? ToLocationArea { get; set; } + + /// + /// + /// + public string ToLocationCode { get; set; } + + /// + /// + /// + public string ToLocationErpCode { get; set; } + + /// + /// + /// + public string? ToLocationGroup { get; set; } + + /// + /// + /// + public string? ToLot { get; set; } + + /// + /// + /// + public string? ToPackingCode { get; set; } + + /// + /// + /// + public string ToStatus { get; set; } + + /// + /// + /// + public string ToWarehouseCode { get; set; } + + /// + /// + /// + public string Uom { get; set; } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNoteDetail/Dtos/StoreScrapNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNoteDetail/Dtos/StoreScrapNoteDetailDto.cs new file mode 100644 index 000000000..adf036124 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNoteDetail/Dtos/StoreScrapNoteDetailDto.cs @@ -0,0 +1,182 @@ +using System; +using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapNote.Dtos; + +namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail.Dtos; + +/// +/// +/// +[Serializable] +public class StoreScrapNoteDetailDto : AuditedEntityDto +{ + /// + /// + /// + public DateTime ArriveDate { get; set; } + + /// + /// + /// + public DateTime ExpireDate { get; set; } + + /// + /// + /// + public string? FromContainerCode { get; set; } + + /// + /// + /// + public string? FromLocationArea { get; set; } + + /// + /// + /// + public string FromLocationCode { get; set; } + + /// + /// + /// + public string FromLocationErpCode { get; set; } + + /// + /// + /// + public string? FromLocationGroup { get; set; } + + /// + /// + /// + public string? FromLot { get; set; } + + /// + /// + /// + public string? FromPackingCode { get; set; } + + /// + /// + /// + public string FromStatus { get; set; } + + /// + /// + /// + public string FromWarehouseCode { get; set; } + + /// + /// + /// + public string ItemCode { get; set; } + + /// + /// + /// + public string? ItemDesc1 { get; set; } + + /// + /// + /// + public string? ItemDesc2 { get; set; } + + /// + /// + /// + public string? ItemName { get; set; } + + /// + /// + /// + public StoreScrapNoteDto Master { get; set; } + + /// + /// + /// + public Guid MasterId { get; set; } + + /// + /// + /// + public string Number { get; set; } + + /// + /// + /// + public DateTime ProduceDate { get; set; } + + /// + /// + /// + public decimal Qty { get; set; } + + /// + /// + /// + public string? ReasonCode { get; set; } + + /// + /// + /// + public string? Remark { get; set; } + + /// + /// + /// + public decimal StdPackQty { get; set; } + + /// + /// + /// + public string? SupplierBatch { get; set; } + + /// + /// + /// + public string? ToContainerCode { get; set; } + + /// + /// + /// + public string? ToLocationArea { get; set; } + + /// + /// + /// + public string ToLocationCode { get; set; } + + /// + /// + /// + public string ToLocationErpCode { get; set; } + + /// + /// + /// + public string? ToLocationGroup { get; set; } + + /// + /// + /// + public string? ToLot { get; set; } + + /// + /// + /// + public string? ToPackingCode { get; set; } + + /// + /// + /// + public string ToStatus { get; set; } + + /// + /// + /// + public string ToWarehouseCode { get; set; } + + /// + /// + /// + public string Uom { get; set; } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNoteDetail/Dtos/StoreScrapNoteDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNoteDetail/Dtos/StoreScrapNoteDetailGetListInput.cs new file mode 100644 index 000000000..e57a798e8 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNoteDetail/Dtos/StoreScrapNoteDetailGetListInput.cs @@ -0,0 +1,180 @@ +using System; +using System.ComponentModel; +using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapNote.Dtos; + +namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail.Dtos; + +[Serializable] +public class StoreScrapNoteDetailGetListInput : PagedAndSortedResultRequestDto +{ + /// + /// + /// + public DateTime? ArriveDate { get; set; } + + /// + /// + /// + public DateTime? ExpireDate { get; set; } + + /// + /// + /// + public string? FromContainerCode { get; set; } + + /// + /// + /// + public string? FromLocationArea { get; set; } + + /// + /// + /// + public string FromLocationCode { get; set; } + + /// + /// + /// + public string FromLocationErpCode { get; set; } + + /// + /// + /// + public string? FromLocationGroup { get; set; } + + /// + /// + /// + public string? FromLot { get; set; } + + /// + /// + /// + public string? FromPackingCode { get; set; } + + /// + /// + /// + public string FromStatus { get; set; } + + /// + /// + /// + public string FromWarehouseCode { get; set; } + + /// + /// + /// + public string ItemCode { get; set; } + + /// + /// + /// + public string? ItemDesc1 { get; set; } + + /// + /// + /// + public string? ItemDesc2 { get; set; } + + /// + /// + /// + public string? ItemName { get; set; } + + /// + /// + /// + public StoreScrapNoteDto? Master { get; set; } + + /// + /// + /// + public Guid? MasterId { get; set; } + + /// + /// + /// + public string Number { get; set; } + + /// + /// + /// + public DateTime? ProduceDate { get; set; } + + /// + /// + /// + public decimal? Qty { get; set; } + + /// + /// + /// + public string? ReasonCode { get; set; } + + /// + /// + /// + public string? Remark { get; set; } + + /// + /// + /// + public decimal? StdPackQty { get; set; } + + /// + /// + /// + public string? SupplierBatch { get; set; } + + /// + /// + /// + public string? ToContainerCode { get; set; } + + /// + /// + /// + public string? ToLocationArea { get; set; } + + /// + /// + /// + public string ToLocationCode { get; set; } + + /// + /// + /// + public string ToLocationErpCode { get; set; } + + /// + /// + /// + public string? ToLocationGroup { get; set; } + + /// + /// + /// + public string? ToLot { get; set; } + + /// + /// + /// + public string? ToPackingCode { get; set; } + + /// + /// + /// + public string ToStatus { get; set; } + + /// + /// + /// + public string ToWarehouseCode { get; set; } + + /// + /// + /// + public string Uom { get; set; } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNoteDetail/IStoreScrapNoteDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNoteDetail/IStoreScrapNoteDetailAppService.cs new file mode 100644 index 000000000..0b5e1e914 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapNoteDetail/IStoreScrapNoteDetailAppService.cs @@ -0,0 +1,20 @@ +using System; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail.Dtos; +using Volo.Abp.Application.Services; + +namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail; + + +/// +/// +/// +public interface IStoreScrapNoteDetailAppService : + ICrudAppService< + StoreScrapNoteDetailDto, + Guid, + StoreScrapNoteDetailGetListInput, + CreateUpdateStoreScrapNoteDetailDto, + CreateUpdateStoreScrapNoteDetailDto> +{ + +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequest/Dtos/CreateUpdateStoreScrapRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequest/Dtos/CreateUpdateStoreScrapRequestDto.cs index d68492b50..740aac143 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequest/Dtos/CreateUpdateStoreScrapRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequest/Dtos/CreateUpdateStoreScrapRequestDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapRequest.Dtos; @@ -23,7 +25,7 @@ public class CreateUpdateStoreScrapRequestDto public string RequestStatus { get; set; } - public ICollection StoreScrapRequestDetails { get; set; } + public List Details {get;set;} =new (); public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequest/Dtos/StoreScrapRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequest/Dtos/StoreScrapRequestDto.cs index 01de54a7a..e73cc7e71 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequest/Dtos/StoreScrapRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequest/Dtos/StoreScrapRequestDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapRequest.Dtos; @@ -24,7 +26,7 @@ public class StoreScrapRequestDto : AuditedEntityDto public string RequestStatus { get; set; } - public ICollection StoreScrapRequestDetails { get; set; } + public List Details {get;set;} =new (); public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequest/Dtos/StoreScrapRequestGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequest/Dtos/StoreScrapRequestGetListInput.cs index 994c23c14..f85907704 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequest/Dtos/StoreScrapRequestGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequest/Dtos/StoreScrapRequestGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapRequest.Dtos; @@ -25,7 +27,7 @@ public class StoreScrapRequestGetListInput : PagedAndSortedResultRequestDto public string? RequestStatus { get; set; } - public ICollection? StoreScrapRequestDetails { get; set; } + public List? Details { get; set; } public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequestDetail/Dtos/CreateUpdateStoreScrapRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequestDetail/Dtos/CreateUpdateStoreScrapRequestDetailDto.cs index 4e6202ae2..048138dd2 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequestDetail/Dtos/CreateUpdateStoreScrapRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequestDetail/Dtos/CreateUpdateStoreScrapRequestDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapRequestDetail.Dtos; @@ -21,7 +22,7 @@ public class CreateUpdateStoreScrapRequestDetailDto public string? LocationGroup { get; set; } - public StoreScrapRequest Master { get; set; } + public StoreScrapRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequestDetail/Dtos/StoreScrapRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequestDetail/Dtos/StoreScrapRequestDetailDto.cs index 4618f8532..d9cc1b7aa 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequestDetail/Dtos/StoreScrapRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequestDetail/Dtos/StoreScrapRequestDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapRequestDetail.Dtos; @@ -22,7 +23,7 @@ public class StoreScrapRequestDetailDto : AuditedEntityDto public string? LocationGroup { get; set; } - public StoreScrapRequest Master { get; set; } + public StoreScrapRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequestDetail/Dtos/StoreScrapRequestDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequestDetail/Dtos/StoreScrapRequestDetailGetListInput.cs index 209f299c7..9ecca79c7 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequestDetail/Dtos/StoreScrapRequestDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreScrapRequestDetail/Dtos/StoreScrapRequestDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapRequestDetail.Dtos; @@ -23,7 +24,7 @@ public class StoreScrapRequestDetailGetListInput : PagedAndSortedResultRequestDt public string? LocationGroup { get; set; } - public StoreScrapRequest? Master { get; set; } + public StoreScrapRequestDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsn/Dtos/CreateUpdateStoreSupplierAsnDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsn/Dtos/CreateUpdateStoreSupplierAsnDto.cs index 3dfbbd4ea..6c5dcf0e3 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsn/Dtos/CreateUpdateStoreSupplierAsnDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsn/Dtos/CreateUpdateStoreSupplierAsnDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsnDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsn.Dtos; @@ -37,7 +39,7 @@ public class CreateUpdateStoreSupplierAsnDto public string Status { get; set; } - public ICollection StoreSupplierAsnDetails { get; set; } + public List Details {get;set;} =new (); public string? SupplierAddress { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsn/Dtos/StoreSupplierAsnDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsn/Dtos/StoreSupplierAsnDto.cs index 5cee19291..e36aff29f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsn/Dtos/StoreSupplierAsnDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsn/Dtos/StoreSupplierAsnDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsnDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsn.Dtos; @@ -38,7 +40,7 @@ public class StoreSupplierAsnDto : AuditedEntityDto public string Status { get; set; } - public ICollection StoreSupplierAsnDetails { get; set; } + public List Details {get;set;} =new (); public string? SupplierAddress { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsn/Dtos/StoreSupplierAsnGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsn/Dtos/StoreSupplierAsnGetListInput.cs index 99ebbd87f..7ed94a5dd 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsn/Dtos/StoreSupplierAsnGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsn/Dtos/StoreSupplierAsnGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsnDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsn.Dtos; @@ -39,7 +41,7 @@ public class StoreSupplierAsnGetListInput : PagedAndSortedResultRequestDto public string? Status { get; set; } - public ICollection? StoreSupplierAsnDetails { get; set; } + public List? Details { get; set; } public string? SupplierAddress { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsnDetail/Dtos/CreateUpdateStoreSupplierAsnDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsnDetail/Dtos/CreateUpdateStoreSupplierAsnDetailDto.cs index 335badd77..6a123b4be 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsnDetail/Dtos/CreateUpdateStoreSupplierAsnDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsnDetail/Dtos/CreateUpdateStoreSupplierAsnDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsn.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsnDetail.Dtos; @@ -25,7 +26,7 @@ public class CreateUpdateStoreSupplierAsnDetailDto public string? Lot { get; set; } - public StoreSupplierAsn Master { get; set; } + public StoreSupplierAsnDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsnDetail/Dtos/StoreSupplierAsnDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsnDetail/Dtos/StoreSupplierAsnDetailDto.cs index 207ad9729..ee409a5a1 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsnDetail/Dtos/StoreSupplierAsnDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsnDetail/Dtos/StoreSupplierAsnDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsn.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsnDetail.Dtos; @@ -26,7 +27,7 @@ public class StoreSupplierAsnDetailDto : AuditedEntityDto public string? Lot { get; set; } - public StoreSupplierAsn Master { get; set; } + public StoreSupplierAsnDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsnDetail/Dtos/StoreSupplierAsnDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsnDetail/Dtos/StoreSupplierAsnDetailGetListInput.cs index e1362cbaf..9041ae1ab 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsnDetail/Dtos/StoreSupplierAsnDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreSupplierAsnDetail/Dtos/StoreSupplierAsnDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsn.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsnDetail.Dtos; @@ -27,7 +28,7 @@ public class StoreSupplierAsnDetailGetListInput : PagedAndSortedResultRequestDto public string? Lot { get; set; } - public StoreSupplierAsn? Master { get; set; } + public StoreSupplierAsnDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNote/Dtos/CreateUpdateStoreTransferNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNote/Dtos/CreateUpdateStoreTransferNoteDto.cs index 6b37b4212..9e3c81e8d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNote/Dtos/CreateUpdateStoreTransferNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNote/Dtos/CreateUpdateStoreTransferNoteDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; @@ -19,9 +21,7 @@ public class CreateUpdateStoreTransferNoteDto public string? RequestNumber { get; set; } - public ICollection StoreTransferNoteDetailCopies { get; set; } - - public ICollection StoreTransferNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNote/Dtos/StoreTransferNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNote/Dtos/StoreTransferNoteDto.cs index 34805c24c..b96f5504d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNote/Dtos/StoreTransferNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNote/Dtos/StoreTransferNoteDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; @@ -20,9 +22,7 @@ public class StoreTransferNoteDto : AuditedEntityDto public string? RequestNumber { get; set; } - public ICollection StoreTransferNoteDetailCopies { get; set; } - - public ICollection StoreTransferNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNote/Dtos/StoreTransferNoteGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNote/Dtos/StoreTransferNoteGetListInput.cs index ea09c099f..9b3b44f35 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNote/Dtos/StoreTransferNoteGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNote/Dtos/StoreTransferNoteGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; @@ -21,9 +23,7 @@ public class StoreTransferNoteGetListInput : PagedAndSortedResultRequestDto public string? RequestNumber { get; set; } - public ICollection? StoreTransferNoteDetailCopies { get; set; } - - public ICollection? StoreTransferNoteDetails { get; set; } + public List? Details { get; set; } public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetail/Dtos/CreateUpdateStoreTransferNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetail/Dtos/CreateUpdateStoreTransferNoteDetailDto.cs index 3991290b5..0ff4d669c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetail/Dtos/CreateUpdateStoreTransferNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetail/Dtos/CreateUpdateStoreTransferNoteDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail.Dtos; @@ -35,7 +36,7 @@ public class CreateUpdateStoreTransferNoteDetailDto public string? ItemName { get; set; } - public StoreTransferNote Master { get; set; } + public StoreTransferNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetail/Dtos/StoreTransferNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetail/Dtos/StoreTransferNoteDetailDto.cs index 8a1cc3639..d27b3f534 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetail/Dtos/StoreTransferNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetail/Dtos/StoreTransferNoteDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail.Dtos; @@ -36,7 +37,7 @@ public class StoreTransferNoteDetailDto : AuditedEntityDto public string? ItemName { get; set; } - public StoreTransferNote Master { get; set; } + public StoreTransferNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetail/Dtos/StoreTransferNoteDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetail/Dtos/StoreTransferNoteDetailGetListInput.cs index 5311f6ac7..e04202f09 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetail/Dtos/StoreTransferNoteDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetail/Dtos/StoreTransferNoteDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail.Dtos; @@ -37,7 +38,7 @@ public class StoreTransferNoteDetailGetListInput : PagedAndSortedResultRequestDt public string? ItemName { get; set; } - public StoreTransferNote? Master { get; set; } + public StoreTransferNoteDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/CreateUpdateStoreTransferNoteDetailCopyDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/CreateUpdateStoreTransferNoteDetailCopyDto.cs index 7642b0863..11ce2ef2f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/CreateUpdateStoreTransferNoteDetailCopyDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/CreateUpdateStoreTransferNoteDetailCopyDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy.Dtos; @@ -35,7 +36,7 @@ public class CreateUpdateStoreTransferNoteDetailCopyDto public string? ItemName { get; set; } - public StoreTransferNote Master { get; set; } + public StoreTransferNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/StoreTransferNoteDetailCopyDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/StoreTransferNoteDetailCopyDto.cs index 76ffa4763..54d613965 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/StoreTransferNoteDetailCopyDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/StoreTransferNoteDetailCopyDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy.Dtos; @@ -36,7 +37,7 @@ public class StoreTransferNoteDetailCopyDto : AuditedEntityDto public string? ItemName { get; set; } - public StoreTransferNote Master { get; set; } + public StoreTransferNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/StoreTransferNoteDetailCopyGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/StoreTransferNoteDetailCopyGetListInput.cs index de0ca2692..5ab9d7a81 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/StoreTransferNoteDetailCopyGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/StoreTransferNoteDetailCopyGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy.Dtos; @@ -37,7 +38,7 @@ public class StoreTransferNoteDetailCopyGetListInput : PagedAndSortedResultReque public string? ItemName { get; set; } - public StoreTransferNote? Master { get; set; } + public StoreTransferNoteDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequest/Dtos/CreateUpdateStoreTransferRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequest/Dtos/CreateUpdateStoreTransferRequestDto.cs index ff8ca1268..f2fde8234 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequest/Dtos/CreateUpdateStoreTransferRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequest/Dtos/CreateUpdateStoreTransferRequestDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferRequest.Dtos; @@ -23,7 +25,7 @@ public class CreateUpdateStoreTransferRequestDto public string RequestStatus { get; set; } - public ICollection StoreTransferRequestDetails { get; set; } + public List Details {get;set;} =new (); public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequest/Dtos/StoreTransferRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequest/Dtos/StoreTransferRequestDto.cs index c76cb20dd..66e752594 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequest/Dtos/StoreTransferRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequest/Dtos/StoreTransferRequestDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferRequest.Dtos; @@ -24,7 +26,7 @@ public class StoreTransferRequestDto : AuditedEntityDto public string RequestStatus { get; set; } - public ICollection StoreTransferRequestDetails { get; set; } + public List Details {get;set;} =new (); public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequest/Dtos/StoreTransferRequestGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequest/Dtos/StoreTransferRequestGetListInput.cs index e793ffa12..6d11ac659 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequest/Dtos/StoreTransferRequestGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequest/Dtos/StoreTransferRequestGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferRequest.Dtos; @@ -25,7 +27,7 @@ public class StoreTransferRequestGetListInput : PagedAndSortedResultRequestDto public string? RequestStatus { get; set; } - public ICollection? StoreTransferRequestDetails { get; set; } + public List? StoreTransferRequestDetails { get; set; } public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequestDetail/Dtos/CreateUpdateStoreTransferRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequestDetail/Dtos/CreateUpdateStoreTransferRequestDetailDto.cs index 0b523f1d8..887862e8f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequestDetail/Dtos/CreateUpdateStoreTransferRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequestDetail/Dtos/CreateUpdateStoreTransferRequestDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferRequestDetail.Dtos; @@ -35,7 +36,7 @@ public class CreateUpdateStoreTransferRequestDetailDto public string? ItemName { get; set; } - public StoreTransferRequest Master { get; set; } + public StoreTransferRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequestDetail/Dtos/StoreTransferRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequestDetail/Dtos/StoreTransferRequestDetailDto.cs index a599e728c..561d3bc7d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequestDetail/Dtos/StoreTransferRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequestDetail/Dtos/StoreTransferRequestDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferRequestDetail.Dtos; @@ -36,7 +37,7 @@ public class StoreTransferRequestDetailDto : AuditedEntityDto public string? ItemName { get; set; } - public StoreTransferRequest Master { get; set; } + public StoreTransferRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequestDetail/Dtos/StoreTransferRequestDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequestDetail/Dtos/StoreTransferRequestDetailGetListInput.cs index ffae761c8..2c7c00763 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequestDetail/Dtos/StoreTransferRequestDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferRequestDetail/Dtos/StoreTransferRequestDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferRequestDetail.Dtos; @@ -37,7 +38,7 @@ public class StoreTransferRequestDetailGetListInput : PagedAndSortedResultReques public string? ItemName { get; set; } - public StoreTransferRequest? Master { get; set; } + public StoreTransferRequestDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNote/Dtos/CreateUpdateStoreUnplannedIssueNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNote/Dtos/CreateUpdateStoreUnplannedIssueNoteDto.cs index d85452224..b7a30a987 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNote/Dtos/CreateUpdateStoreUnplannedIssueNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNote/Dtos/CreateUpdateStoreUnplannedIssueNoteDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNote.Dtos; @@ -19,7 +21,7 @@ public class CreateUpdateStoreUnplannedIssueNoteDto public string? Remark { get; set; } - public ICollection StoreUnplannedIssueNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? UnplannedIssueRequestNumber { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNote/Dtos/StoreUnplannedIssueNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNote/Dtos/StoreUnplannedIssueNoteDto.cs index aa48d16a9..48dde6cee 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNote/Dtos/StoreUnplannedIssueNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNote/Dtos/StoreUnplannedIssueNoteDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNote.Dtos; @@ -20,7 +22,7 @@ public class StoreUnplannedIssueNoteDto : AuditedEntityDto public string? Remark { get; set; } - public ICollection StoreUnplannedIssueNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? UnplannedIssueRequestNumber { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNote/Dtos/StoreUnplannedIssueNoteGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNote/Dtos/StoreUnplannedIssueNoteGetListInput.cs index d446c7d98..e0dfb798a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNote/Dtos/StoreUnplannedIssueNoteGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNote/Dtos/StoreUnplannedIssueNoteGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNote.Dtos; @@ -21,7 +23,7 @@ public class StoreUnplannedIssueNoteGetListInput : PagedAndSortedResultRequestDt public string? Remark { get; set; } - public ICollection? StoreUnplannedIssueNoteDetails { get; set; } + public List? Details { get; set; } public string? UnplannedIssueRequestNumber { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNoteDetail/Dtos/CreateUpdateStoreUnplannedIssueNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNoteDetail/Dtos/CreateUpdateStoreUnplannedIssueNoteDetailDto.cs index 8ba8e178c..56b7925ba 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNoteDetail/Dtos/CreateUpdateStoreUnplannedIssueNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNoteDetail/Dtos/CreateUpdateStoreUnplannedIssueNoteDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNoteDetail.Dtos; @@ -57,7 +58,7 @@ public class CreateUpdateStoreUnplannedIssueNoteDetailDto public string? Lot { get; set; } - public StoreUnplannedIssueNote Master { get; set; } + public StoreUnplannedIssueNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNoteDetail/Dtos/StoreUnplannedIssueNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNoteDetail/Dtos/StoreUnplannedIssueNoteDetailDto.cs index 2c00d0059..1ce6e8c12 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNoteDetail/Dtos/StoreUnplannedIssueNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNoteDetail/Dtos/StoreUnplannedIssueNoteDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNoteDetail.Dtos; @@ -58,7 +59,7 @@ public class StoreUnplannedIssueNoteDetailDto : AuditedEntityDto public string? Lot { get; set; } - public StoreUnplannedIssueNote Master { get; set; } + public StoreUnplannedIssueNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNoteDetail/Dtos/StoreUnplannedIssueNoteDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNoteDetail/Dtos/StoreUnplannedIssueNoteDetailGetListInput.cs index 5fddb0a64..e74faac35 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNoteDetail/Dtos/StoreUnplannedIssueNoteDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueNoteDetail/Dtos/StoreUnplannedIssueNoteDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNoteDetail.Dtos; @@ -59,7 +60,7 @@ public class StoreUnplannedIssueNoteDetailGetListInput : PagedAndSortedResultReq public string? Lot { get; set; } - public StoreUnplannedIssueNote? Master { get; set; } + public StoreUnplannedIssueNoteDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequest/Dtos/CreateUpdateStoreUnplannedIssueRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequest/Dtos/CreateUpdateStoreUnplannedIssueRequestDto.cs index d915fddad..51c9f5aa0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequest/Dtos/CreateUpdateStoreUnplannedIssueRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequest/Dtos/CreateUpdateStoreUnplannedIssueRequestDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequest.Dtos; @@ -29,7 +31,7 @@ public class CreateUpdateStoreUnplannedIssueRequestDto public string RequestStatus { get; set; } - public ICollection StoreUnplannedIssueRequestDetails { get; set; } + public List Details {get;set;} =new (); public string? Worker { get; set; } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequest/Dtos/StoreUnplannedIssueRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequest/Dtos/StoreUnplannedIssueRequestDto.cs index 3be504340..878faacea 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequest/Dtos/StoreUnplannedIssueRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequest/Dtos/StoreUnplannedIssueRequestDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequest.Dtos; @@ -30,7 +32,7 @@ public class StoreUnplannedIssueRequestDto : AuditedEntityDto public string RequestStatus { get; set; } - public ICollection StoreUnplannedIssueRequestDetails { get; set; } + public List Details {get;set;} =new (); public string? Worker { get; set; } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequest/Dtos/StoreUnplannedIssueRequestGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequest/Dtos/StoreUnplannedIssueRequestGetListInput.cs index 8fc6af467..f700adeb0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequest/Dtos/StoreUnplannedIssueRequestGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequest/Dtos/StoreUnplannedIssueRequestGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequest.Dtos; @@ -31,7 +33,7 @@ public class StoreUnplannedIssueRequestGetListInput : PagedAndSortedResultReques public string? RequestStatus { get; set; } - public ICollection? StoreUnplannedIssueRequestDetails { get; set; } + public List? Details { get; set; } public string? Worker { get; set; } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequestDetail/Dtos/CreateUpdateStoreUnplannedIssueRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequestDetail/Dtos/CreateUpdateStoreUnplannedIssueRequestDetailDto.cs index 9dcbe8359..add933f3c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequestDetail/Dtos/CreateUpdateStoreUnplannedIssueRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequestDetail/Dtos/CreateUpdateStoreUnplannedIssueRequestDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequestDetail.Dtos; @@ -31,7 +32,7 @@ public class CreateUpdateStoreUnplannedIssueRequestDetailDto public string? Lot { get; set; } - public StoreUnplannedIssueRequest Master { get; set; } + public StoreUnplannedIssueRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequestDetail/Dtos/StoreUnplannedIssueRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequestDetail/Dtos/StoreUnplannedIssueRequestDetailDto.cs index 4b73a5643..ec9da7953 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequestDetail/Dtos/StoreUnplannedIssueRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequestDetail/Dtos/StoreUnplannedIssueRequestDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequestDetail.Dtos; @@ -32,7 +33,7 @@ public class StoreUnplannedIssueRequestDetailDto : AuditedEntityDto public string? Lot { get; set; } - public StoreUnplannedIssueRequest Master { get; set; } + public StoreUnplannedIssueRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequestDetail/Dtos/StoreUnplannedIssueRequestDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequestDetail/Dtos/StoreUnplannedIssueRequestDetailGetListInput.cs index b3b112ab2..4afad4f10 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequestDetail/Dtos/StoreUnplannedIssueRequestDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedIssueRequestDetail/Dtos/StoreUnplannedIssueRequestDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequestDetail.Dtos; @@ -33,7 +34,7 @@ public class StoreUnplannedIssueRequestDetailGetListInput : PagedAndSortedResult public string? Lot { get; set; } - public StoreUnplannedIssueRequest? Master { get; set; } + public StoreUnplannedIssueRequestDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNote/Dtos/CreateUpdateStoreUnplannedReceiptNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNote/Dtos/CreateUpdateStoreUnplannedReceiptNoteDto.cs index 0c7513ed5..e6128d069 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNote/Dtos/CreateUpdateStoreUnplannedReceiptNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNote/Dtos/CreateUpdateStoreUnplannedReceiptNoteDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNote.Dtos; @@ -19,7 +21,7 @@ public class CreateUpdateStoreUnplannedReceiptNoteDto public string? Remark { get; set; } - public ICollection StoreUnplannedReceiptNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? UnplannedReceiptRequestNumber { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNote/Dtos/StoreUnplannedReceiptNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNote/Dtos/StoreUnplannedReceiptNoteDto.cs index 13042252a..748888be8 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNote/Dtos/StoreUnplannedReceiptNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNote/Dtos/StoreUnplannedReceiptNoteDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNote.Dtos; @@ -20,7 +22,7 @@ public class StoreUnplannedReceiptNoteDto : AuditedEntityDto public string? Remark { get; set; } - public ICollection StoreUnplannedReceiptNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? UnplannedReceiptRequestNumber { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNote/Dtos/StoreUnplannedReceiptNoteGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNote/Dtos/StoreUnplannedReceiptNoteGetListInput.cs index a1696b9a6..1cfb11fa1 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNote/Dtos/StoreUnplannedReceiptNoteGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNote/Dtos/StoreUnplannedReceiptNoteGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNote.Dtos; @@ -21,7 +23,7 @@ public class StoreUnplannedReceiptNoteGetListInput : PagedAndSortedResultRequest public string? Remark { get; set; } - public ICollection? StoreUnplannedReceiptNoteDetails { get; set; } + public List? Details { get; set; } public string? UnplannedReceiptRequestNumber { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNoteDetail/Dtos/CreateUpdateStoreUnplannedReceiptNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNoteDetail/Dtos/CreateUpdateStoreUnplannedReceiptNoteDetailDto.cs index b1f2d4d80..91ffa2e72 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNoteDetail/Dtos/CreateUpdateStoreUnplannedReceiptNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNoteDetail/Dtos/CreateUpdateStoreUnplannedReceiptNoteDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNoteDetail.Dtos; @@ -57,7 +58,7 @@ public class CreateUpdateStoreUnplannedReceiptNoteDetailDto public string? Lot { get; set; } - public StoreUnplannedReceiptNote Master { get; set; } + public StoreUnplannedReceiptNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNoteDetail/Dtos/StoreUnplannedReceiptNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNoteDetail/Dtos/StoreUnplannedReceiptNoteDetailDto.cs index 867386b62..f1b0adeec 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNoteDetail/Dtos/StoreUnplannedReceiptNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNoteDetail/Dtos/StoreUnplannedReceiptNoteDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNoteDetail.Dtos; @@ -58,7 +59,7 @@ public class StoreUnplannedReceiptNoteDetailDto : AuditedEntityDto public string? Lot { get; set; } - public StoreUnplannedReceiptNote Master { get; set; } + public StoreUnplannedReceiptNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNoteDetail/Dtos/StoreUnplannedReceiptNoteDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNoteDetail/Dtos/StoreUnplannedReceiptNoteDetailGetListInput.cs index b430eee63..7328b9362 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNoteDetail/Dtos/StoreUnplannedReceiptNoteDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptNoteDetail/Dtos/StoreUnplannedReceiptNoteDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNoteDetail.Dtos; @@ -59,7 +60,7 @@ public class StoreUnplannedReceiptNoteDetailGetListInput : PagedAndSortedResultR public string? Lot { get; set; } - public StoreUnplannedReceiptNote? Master { get; set; } + public StoreUnplannedReceiptNoteDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequest/Dtos/CreateUpdateStoreUnplannedReceiptRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequest/Dtos/CreateUpdateStoreUnplannedReceiptRequestDto.cs index 0d36a8a5a..66df79014 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequest/Dtos/CreateUpdateStoreUnplannedReceiptRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequest/Dtos/CreateUpdateStoreUnplannedReceiptRequestDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequest.Dtos; @@ -29,7 +31,7 @@ public class CreateUpdateStoreUnplannedReceiptRequestDto public string RequestStatus { get; set; } - public ICollection StoreUnplannedReceiptRequestDetails { get; set; } + public List Details {get;set;} =new (); public string? Worker { get; set; } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequest/Dtos/StoreUnplannedReceiptRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequest/Dtos/StoreUnplannedReceiptRequestDto.cs index a8b0713f0..f98ce680c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequest/Dtos/StoreUnplannedReceiptRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequest/Dtos/StoreUnplannedReceiptRequestDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequest.Dtos; @@ -30,7 +32,7 @@ public class StoreUnplannedReceiptRequestDto : AuditedEntityDto public string RequestStatus { get; set; } - public ICollection StoreUnplannedReceiptRequestDetails { get; set; } + public List Details {get;set;} =new (); public string? Worker { get; set; } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequest/Dtos/StoreUnplannedReceiptRequestGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequest/Dtos/StoreUnplannedReceiptRequestGetListInput.cs index e65414ed4..e49e8a523 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequest/Dtos/StoreUnplannedReceiptRequestGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequest/Dtos/StoreUnplannedReceiptRequestGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequest.Dtos; @@ -31,7 +33,7 @@ public class StoreUnplannedReceiptRequestGetListInput : PagedAndSortedResultRequ public string? RequestStatus { get; set; } - public ICollection? StoreUnplannedReceiptRequestDetails { get; set; } + public List? Details { get; set; } public string? Worker { get; set; } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequestDetail/Dtos/CreateUpdateStoreUnplannedReceiptRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequestDetail/Dtos/CreateUpdateStoreUnplannedReceiptRequestDetailDto.cs index b717ae63a..0ce4d7bae 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequestDetail/Dtos/CreateUpdateStoreUnplannedReceiptRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequestDetail/Dtos/CreateUpdateStoreUnplannedReceiptRequestDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequestDetail.Dtos; @@ -31,7 +32,7 @@ public class CreateUpdateStoreUnplannedReceiptRequestDetailDto public string? Lot { get; set; } - public StoreUnplannedReceiptRequest Master { get; set; } + public StoreUnplannedReceiptRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequestDetail/Dtos/StoreUnplannedReceiptRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequestDetail/Dtos/StoreUnplannedReceiptRequestDetailDto.cs index 2483120df..99ae16345 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequestDetail/Dtos/StoreUnplannedReceiptRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequestDetail/Dtos/StoreUnplannedReceiptRequestDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequestDetail.Dtos; @@ -32,7 +33,7 @@ public class StoreUnplannedReceiptRequestDetailDto : AuditedEntityDto public string? Lot { get; set; } - public StoreUnplannedReceiptRequest Master { get; set; } + public StoreUnplannedReceiptRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequestDetail/Dtos/StoreUnplannedReceiptRequestDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequestDetail/Dtos/StoreUnplannedReceiptRequestDetailGetListInput.cs index 73456bd4a..dcddd44ff 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequestDetail/Dtos/StoreUnplannedReceiptRequestDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreUnplannedReceiptRequestDetail/Dtos/StoreUnplannedReceiptRequestDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequestDetail.Dtos; @@ -33,7 +34,7 @@ public class StoreUnplannedReceiptRequestDetailGetListInput : PagedAndSortedResu public string? Lot { get; set; } - public StoreUnplannedReceiptRequest? Master { get; set; } + public StoreUnplannedReceiptRequestDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNote/Dtos/CreateUpdateStoreWarehouseTransferNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNote/Dtos/CreateUpdateStoreWarehouseTransferNoteDto.cs index 2818f792c..bff4e04c6 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNote/Dtos/CreateUpdateStoreWarehouseTransferNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNote/Dtos/CreateUpdateStoreWarehouseTransferNoteDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNote.Dtos; @@ -13,7 +15,7 @@ public class CreateUpdateStoreWarehouseTransferNoteDto public string? Remark { get; set; } - public ICollection StoreWarehouseTransferNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNote/Dtos/StoreWarehouseTransferNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNote/Dtos/StoreWarehouseTransferNoteDto.cs index 18cc0400a..1057d5d29 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNote/Dtos/StoreWarehouseTransferNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNote/Dtos/StoreWarehouseTransferNoteDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNote.Dtos; @@ -14,7 +16,7 @@ public class StoreWarehouseTransferNoteDto : AuditedEntityDto public string? Remark { get; set; } - public ICollection StoreWarehouseTransferNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNote/Dtos/StoreWarehouseTransferNoteGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNote/Dtos/StoreWarehouseTransferNoteGetListInput.cs index 767a361d0..7c4e6113c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNote/Dtos/StoreWarehouseTransferNoteGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNote/Dtos/StoreWarehouseTransferNoteGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNote.Dtos; @@ -15,7 +17,7 @@ public class StoreWarehouseTransferNoteGetListInput : PagedAndSortedResultReques public string? Remark { get; set; } - public ICollection? StoreWarehouseTransferNoteDetails { get; set; } + public List? Details { get; set; } public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNoteDetail/Dtos/CreateUpdateStoreWarehouseTransferNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNoteDetail/Dtos/CreateUpdateStoreWarehouseTransferNoteDetailDto.cs index 4094a8295..820685542 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNoteDetail/Dtos/CreateUpdateStoreWarehouseTransferNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNoteDetail/Dtos/CreateUpdateStoreWarehouseTransferNoteDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNoteDetail.Dtos; @@ -35,7 +36,7 @@ public class CreateUpdateStoreWarehouseTransferNoteDetailDto public string? ItemName { get; set; } - public StoreWarehouseTransferNote Master { get; set; } + public StoreWarehouseTransferNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNoteDetail/Dtos/StoreWarehouseTransferNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNoteDetail/Dtos/StoreWarehouseTransferNoteDetailDto.cs index 96fc5ed95..9513151a2 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNoteDetail/Dtos/StoreWarehouseTransferNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNoteDetail/Dtos/StoreWarehouseTransferNoteDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNoteDetail.Dtos; @@ -36,7 +37,7 @@ public class StoreWarehouseTransferNoteDetailDto : AuditedEntityDto public string? ItemName { get; set; } - public StoreWarehouseTransferNote Master { get; set; } + public StoreWarehouseTransferNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNoteDetail/Dtos/StoreWarehouseTransferNoteDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNoteDetail/Dtos/StoreWarehouseTransferNoteDetailGetListInput.cs index d951361dd..c89724e5a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNoteDetail/Dtos/StoreWarehouseTransferNoteDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWarehouseTransferNoteDetail/Dtos/StoreWarehouseTransferNoteDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNoteDetail.Dtos; @@ -37,7 +38,7 @@ public class StoreWarehouseTransferNoteDetailGetListInput : PagedAndSortedResult public string? ItemName { get; set; } - public StoreWarehouseTransferNote? Master { get; set; } + public StoreWarehouseTransferNoteDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNote/Dtos/CreateUpdateStoreWipWarehouseAdjustNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNote/Dtos/CreateUpdateStoreWipWarehouseAdjustNoteDto.cs index 519395fb2..b959dd1c0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNote/Dtos/CreateUpdateStoreWipWarehouseAdjustNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNote/Dtos/CreateUpdateStoreWipWarehouseAdjustNoteDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNote.Dtos; @@ -19,7 +21,7 @@ public class CreateUpdateStoreWipWarehouseAdjustNoteDto public string? RequestNumber { get; set; } - public ICollection StoreWipWarehouseAdjustNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNote/Dtos/StoreWipWarehouseAdjustNoteDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNote/Dtos/StoreWipWarehouseAdjustNoteDto.cs index 9d17f8485..f41a9cb32 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNote/Dtos/StoreWipWarehouseAdjustNoteDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNote/Dtos/StoreWipWarehouseAdjustNoteDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNote.Dtos; @@ -20,7 +22,7 @@ public class StoreWipWarehouseAdjustNoteDto : AuditedEntityDto public string? RequestNumber { get; set; } - public ICollection StoreWipWarehouseAdjustNoteDetails { get; set; } + public List Details {get;set;} =new (); public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNote/Dtos/StoreWipWarehouseAdjustNoteGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNote/Dtos/StoreWipWarehouseAdjustNoteGetListInput.cs index 1a34421b9..5e36a4814 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNote/Dtos/StoreWipWarehouseAdjustNoteGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNote/Dtos/StoreWipWarehouseAdjustNoteGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNote.Dtos; @@ -21,7 +23,7 @@ public class StoreWipWarehouseAdjustNoteGetListInput : PagedAndSortedResultReque public string? RequestNumber { get; set; } - public ICollection? StoreWipWarehouseAdjustNoteDetails { get; set; } + public List? Details { get; set; } public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNoteDetail/Dtos/CreateUpdateStoreWipWarehouseAdjustNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNoteDetail/Dtos/CreateUpdateStoreWipWarehouseAdjustNoteDetailDto.cs index 7f2d3e77b..e7aab6068 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNoteDetail/Dtos/CreateUpdateStoreWipWarehouseAdjustNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNoteDetail/Dtos/CreateUpdateStoreWipWarehouseAdjustNoteDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNoteDetail.Dtos; @@ -35,7 +36,7 @@ public class CreateUpdateStoreWipWarehouseAdjustNoteDetailDto public string? ItemName { get; set; } - public StoreWipWarehouseAdjustNote Master { get; set; } + public StoreWipWarehouseAdjustNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNoteDetail/Dtos/StoreWipWarehouseAdjustNoteDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNoteDetail/Dtos/StoreWipWarehouseAdjustNoteDetailDto.cs index 53914c3c9..3b024b8a2 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNoteDetail/Dtos/StoreWipWarehouseAdjustNoteDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNoteDetail/Dtos/StoreWipWarehouseAdjustNoteDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNoteDetail.Dtos; @@ -36,7 +37,7 @@ public class StoreWipWarehouseAdjustNoteDetailDto : AuditedEntityDto public string? ItemName { get; set; } - public StoreWipWarehouseAdjustNote Master { get; set; } + public StoreWipWarehouseAdjustNoteDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNoteDetail/Dtos/StoreWipWarehouseAdjustNoteDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNoteDetail/Dtos/StoreWipWarehouseAdjustNoteDetailGetListInput.cs index 3b65f1eee..b6032cb71 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNoteDetail/Dtos/StoreWipWarehouseAdjustNoteDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustNoteDetail/Dtos/StoreWipWarehouseAdjustNoteDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNoteDetail.Dtos; @@ -37,7 +38,7 @@ public class StoreWipWarehouseAdjustNoteDetailGetListInput : PagedAndSortedResul public string? ItemName { get; set; } - public StoreWipWarehouseAdjustNote? Master { get; set; } + public StoreWipWarehouseAdjustNoteDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequest/Dtos/CreateUpdateStoreWipWarehouseAdjustRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequest/Dtos/CreateUpdateStoreWipWarehouseAdjustRequestDto.cs index 18fe0277e..d75f390ef 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequest/Dtos/CreateUpdateStoreWipWarehouseAdjustRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequest/Dtos/CreateUpdateStoreWipWarehouseAdjustRequestDto.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequest.Dtos; @@ -23,7 +25,7 @@ public class CreateUpdateStoreWipWarehouseAdjustRequestDto public string RequestStatus { get; set; } - public ICollection StoreWipWarehouseAdjustRequestDetails { get; set; } + public List Details {get;set;} =new (); public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequest/Dtos/StoreWipWarehouseAdjustRequestDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequest/Dtos/StoreWipWarehouseAdjustRequestDto.cs index e64a3bcc7..2a0dd8965 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequest/Dtos/StoreWipWarehouseAdjustRequestDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequest/Dtos/StoreWipWarehouseAdjustRequestDto.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequest.Dtos; @@ -24,7 +26,7 @@ public class StoreWipWarehouseAdjustRequestDto : AuditedEntityDto public string RequestStatus { get; set; } - public ICollection StoreWipWarehouseAdjustRequestDetails { get; set; } + public List Details {get;set;} =new (); public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequest/Dtos/StoreWipWarehouseAdjustRequestGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequest/Dtos/StoreWipWarehouseAdjustRequestGetListInput.cs index 8c8d3d5b3..6c9065dd0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequest/Dtos/StoreWipWarehouseAdjustRequestGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequest/Dtos/StoreWipWarehouseAdjustRequestGetListInput.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequestDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequest.Dtos; @@ -25,7 +27,7 @@ public class StoreWipWarehouseAdjustRequestGetListInput : PagedAndSortedResultRe public string? RequestStatus { get; set; } - public ICollection? StoreWipWarehouseAdjustRequestDetails { get; set; } + public List? Details { get; set; } public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequestDetail/Dtos/CreateUpdateStoreWipWarehouseAdjustRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequestDetail/Dtos/CreateUpdateStoreWipWarehouseAdjustRequestDetailDto.cs index 222c2f4a0..1c8eb2d1a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequestDetail/Dtos/CreateUpdateStoreWipWarehouseAdjustRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequestDetail/Dtos/CreateUpdateStoreWipWarehouseAdjustRequestDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequestDetail.Dtos; @@ -35,7 +36,7 @@ public class CreateUpdateStoreWipWarehouseAdjustRequestDetailDto public string? ItemName { get; set; } - public StoreWipWarehouseAdjustRequest Master { get; set; } + public StoreWipWarehouseAdjustRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequestDetail/Dtos/StoreWipWarehouseAdjustRequestDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequestDetail/Dtos/StoreWipWarehouseAdjustRequestDetailDto.cs index 444630e4a..8694b306c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequestDetail/Dtos/StoreWipWarehouseAdjustRequestDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequestDetail/Dtos/StoreWipWarehouseAdjustRequestDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequestDetail.Dtos; @@ -36,7 +37,7 @@ public class StoreWipWarehouseAdjustRequestDetailDto : AuditedEntityDto public string? ItemName { get; set; } - public StoreWipWarehouseAdjustRequest Master { get; set; } + public StoreWipWarehouseAdjustRequestDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequestDetail/Dtos/StoreWipWarehouseAdjustRequestDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequestDetail/Dtos/StoreWipWarehouseAdjustRequestDetailGetListInput.cs index 6cb78a97f..6aade8b19 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequestDetail/Dtos/StoreWipWarehouseAdjustRequestDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWipWarehouseAdjustRequestDetail/Dtos/StoreWipWarehouseAdjustRequestDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequest.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequestDetail.Dtos; @@ -37,7 +38,7 @@ public class StoreWipWarehouseAdjustRequestDetailGetListInput : PagedAndSortedRe public string? ItemName { get; set; } - public StoreWipWarehouseAdjustRequest? Master { get; set; } + public StoreWipWarehouseAdjustRequestDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrder/Dtos/StoreWorkOrderDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrder/Dtos/StoreWorkOrderDto.cs index 4bc4b3314..ce1b7af52 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrder/Dtos/StoreWorkOrderDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrder/Dtos/StoreWorkOrderDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreWorkOrderDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWorkOrder.Dtos; @@ -33,7 +34,7 @@ public class StoreWorkOrderDto : AuditedEntityDto public string? Remark { get; set; } - public List Details { get; set; }=new List(); + public List Details {get;set;} =new (); public string Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrder/Dtos/StoreWorkOrderGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrder/Dtos/StoreWorkOrderGetListInput.cs index a1c7af67e..2583522d2 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrder/Dtos/StoreWorkOrderGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrder/Dtos/StoreWorkOrderGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreWorkOrderDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWorkOrder.Dtos; @@ -33,7 +34,7 @@ public class StoreWorkOrderGetListInput : PagedAndSortedResultRequestDto public string? Remark { get; set; } - public ICollection? Details { get; set; } + public List? Details { get; set; } public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrderDetail/Dtos/CreateUpdateStoreWorkOrderDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrderDetail/Dtos/CreateUpdateStoreWorkOrderDetailDto.cs index 8bea7bf82..12b0d1fce 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrderDetail/Dtos/CreateUpdateStoreWorkOrderDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrderDetail/Dtos/CreateUpdateStoreWorkOrderDetailDto.cs @@ -1,4 +1,5 @@ using System; +using WinIn.FasterZ.Wms.Z_Business.StoreWorkOrder.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWorkOrderDetail.Dtos; @@ -17,7 +18,7 @@ public class CreateUpdateStoreWorkOrderDetailDto public string? ItemName { get; set; } - public WmsPermissions.StoreWorkOrder Master { get; set; } + public StoreWorkOrderDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrderDetail/Dtos/StoreWorkOrderDetailDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrderDetail/Dtos/StoreWorkOrderDetailDto.cs index c3a73da13..2d576fc1b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrderDetail/Dtos/StoreWorkOrderDetailDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrderDetail/Dtos/StoreWorkOrderDetailDto.cs @@ -1,5 +1,6 @@ using System; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreWorkOrder.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWorkOrderDetail.Dtos; @@ -19,7 +20,7 @@ public class StoreWorkOrderDetailDto : AuditedEntityDto public string? ItemName { get; set; } - public StoreWorkOrder Master { get; set; } + public StoreWorkOrderDto Master { get; set; } public Guid MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrderDetail/Dtos/StoreWorkOrderDetailGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrderDetail/Dtos/StoreWorkOrderDetailGetListInput.cs index dff23fcf5..c504c45da 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrderDetail/Dtos/StoreWorkOrderDetailGetListInput.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreWorkOrderDetail/Dtos/StoreWorkOrderDetailGetListInput.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel; using Volo.Abp.Application.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreWorkOrder.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreWorkOrderDetail.Dtos; @@ -19,7 +20,7 @@ public class StoreWorkOrderDetailGetListInput : PagedAndSortedResultRequestDto public string? ItemName { get; set; } - public StoreWorkOrder? Master { get; set; } + public StoreWorkOrderDto? Master { get; set; } public Guid? MasterId { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/ZbxBase.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/ZbxBase.cs index 397c36b29..044f3c59e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/ZbxBase.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBase/ZbxBase.cs @@ -1,4 +1,6 @@ -namespace WinIn.FasterZ.Wms.AppBase; +using Volo.Abp.Identity; + +namespace WinIn.FasterZ.Wms.AppBase; using System; using System.Collections; @@ -32,24 +34,28 @@ using WinIn.FasterZ.Wms.AppBaseBusiness.ExportCustomUserSetting; using WinIn.FasterZ.Wms.Localization; public class ZbxBase : - CrudAppService, - IZbxBase - where TEntity : class, IEntity - where TEntityDto : IEntityDto + CrudAppService, + IZbxBase + where TEntity : class, IEntity + where TEntityDto : IEntityDto { - private readonly IRepository _repository; + private readonly IRepository _repository; - public ZbxBase(IRepository repository) : base(repository) - { - _repository = repository; - } + protected IStringLocalizer Localizer => + LazyServiceProvider.LazyGetRequiredService>(); - protected IStringLocalizer Localizer => - LazyServiceProvider.LazyGetRequiredService>(); + protected ExportCustomUserSettingAppService ExportCustomUserSettingAppService => + LazyServiceProvider.LazyGetRequiredService(); - protected ExportCustomUserSettingAppService ExportCustomUserSettingAppService => - LazyServiceProvider.LazyGetRequiredService(); + /// + /// 构造方法 + /// + /// + public ZbxBase(IRepository repository) : base(repository) + { + _repository = repository; + } #region 公开接口 @@ -294,10 +300,10 @@ public class ZbxBase p.CustomUserSetting == Enum_ExportCustomUserSetting.Yes)) { - var showUserColumn = mainUserColumn.Where(p => p.CustomUserSetting == Enum_ExportCustomUserSetting.Yes) - .Select(p => p.ExportColumnName?.ToLower()).Aggregate((a, b) => a + " " + b)?.Split(' ').ToList(); + var showUserColumn = mainUserColumn.Where(p => p.CustomUserSetting == Enum_ExportCustomUserSetting.Yes) + .Select(p => p.ExportColumnName?.ToLower()).Aggregate((a, b) => a + " " + b)?.Split(' ').ToList(); - mainProperties = mainProperties.Where(p => showUserColumn.Contains(p.Name.ToLower())).ToArray(); + mainProperties = mainProperties.Where(p => showUserColumn.Contains(p.Name.ToLower())).ToArray(); } #endregion diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingAppService.cs index 2440d5eed..4de9c73a1 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingAppService.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; +using Volo.Abp.Application.Services; using WinIn.FasterZ.Store.AppBase; using WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting; using WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting.Dtos; @@ -15,7 +16,7 @@ namespace WinIn.FasterZ.Wms.AppBaseBusiness.ExportCustomUserSetting /// /// 用户个型导出配置 /// - public class ExportCustomUserSettingAppService : ZbxBase, IExportCustomUserSettingAppService @@ -44,10 +45,10 @@ namespace WinIn.FasterZ.Wms.AppBaseBusiness.ExportCustomUserSetting var entitys = await _repository.GetListAsync(p => p.ExportUserId == userId && p.ExportTableName == exportTableName); - return ObjectMapper.Map, List>(entitys); + return ObjectMapper.Map, List>(entitys); } - protected override async Task> CreateFilteredQueryAsync( + protected override async Task> CreateFilteredQueryAsync( ExportCustomUserSettingGetListInput input) { // TODO: AbpHelper generated diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WinIn.FasterZ.Wms.Application.csproj b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WinIn.FasterZ.Wms.Application.csproj index b03681648..d888b6fc0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WinIn.FasterZ.Wms.Application.csproj +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WinIn.FasterZ.Wms.Application.csproj @@ -9,8 +9,8 @@ - + diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsApplicationAutoMapperProfile.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsApplicationAutoMapperProfile.cs index d8a989c97..0ba5b3a8d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsApplicationAutoMapperProfile.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsApplicationAutoMapperProfile.cs @@ -112,6 +112,8 @@ using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNoteDetail; using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNoteDetail.Dtos; using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNote; using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNote.Dtos; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail.Dtos; using AutoMapper; namespace WinIn.FasterZ.Wms @@ -237,6 +239,8 @@ namespace WinIn.FasterZ.Wms CreateMap(MemberList.Source); CreateMap(); CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); } } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductL7partsNote/StoreProductL7partsNoteAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductL7partsNote/StoreProductL7partsNoteAppService.cs index 997024d05..efcd99f9a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductL7partsNote/StoreProductL7partsNoteAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductL7partsNote/StoreProductL7partsNoteAppService.cs @@ -4,11 +4,12 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNote.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNote; -public class StoreProductL7partsNoteAppService : CrudAppService, +public class StoreProductL7partsNoteAppService : ZbxBase, IStoreProductL7partsNoteAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreProductL7partsNote.Default; @@ -41,7 +42,7 @@ public class StoreProductL7partsNoteAppService : CrudAppService x.Remark == input.Remark) .WhereIf(input.State != null, x => x.State == input.State) .WhereIf(input.Status != null, x => x.Status == input.Status) - .WhereIf(input.StoreProductL7partsNoteDetails != null, x => x.StoreProductL7partsNoteDetails == input.StoreProductL7partsNoteDetails) + .WhereIf(input.Details != null, x => x.StoreProductL7partsNoteDetails == input.Details) .WhereIf(input.Worker != null, x => x.Worker == input.Worker) .WhereIf(input.Year != null, x => x.Year == input.Year) ; diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductL7partsNoteDetail/StoreProductL7partsNoteDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductL7partsNoteDetail/StoreProductL7partsNoteDetailAppService.cs index 268e21a91..4724c1616 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductL7partsNoteDetail/StoreProductL7partsNoteDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductL7partsNoteDetail/StoreProductL7partsNoteDetailAppService.cs @@ -4,11 +4,12 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNoteDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNoteDetail; -public class StoreProductL7partsNoteDetailAppService : CrudAppService, +public class StoreProductL7partsNoteDetailAppService : ZbxBase, IStoreProductL7partsNoteDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreProductL7partsNoteDetail.Default; @@ -39,7 +40,6 @@ public class StoreProductL7partsNoteDetailAppService : CrudAppService x.ItemName == input.ItemName) .WhereIf(input.L7part != null, x => x.L7part == input.L7part) .WhereIf(input.LocationCode != null, x => x.LocationCode == input.LocationCode) - .WhereIf(input.Master != null, x => x.Master == input.Master) .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) .WhereIf(input.Position != null, x => x.Position == input.Position) diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductReceiptNote/StoreProductReceiptNoteAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductReceiptNote/StoreProductReceiptNoteAppService.cs index ee6d10a52..ee450672f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductReceiptNote/StoreProductReceiptNoteAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductReceiptNote/StoreProductReceiptNoteAppService.cs @@ -4,11 +4,12 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNote.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNote; -public class StoreProductReceiptNoteAppService : CrudAppService, +public class StoreProductReceiptNoteAppService : ZbxBase, IStoreProductReceiptNoteAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreProductReceiptNote.Default; diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductReceiptNoteDetail/StoreProductReceiptNoteDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductReceiptNoteDetail/StoreProductReceiptNoteDetailAppService.cs index 5dc56525b..64db0be59 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductReceiptNoteDetail/StoreProductReceiptNoteDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductReceiptNoteDetail/StoreProductReceiptNoteDetailAppService.cs @@ -4,11 +4,12 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNoteDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNoteDetail; -public class StoreProductReceiptNoteDetailAppService : CrudAppService, +public class StoreProductReceiptNoteDetailAppService : ZbxBase, IStoreProductReceiptNoteDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreProductReceiptNoteDetail.Default; @@ -24,65 +25,5 @@ public class StoreProductReceiptNoteDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreProductReceiptNoteDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.BomVersion != null, x => x.BomVersion == input.BomVersion) - .WhereIf(input.ContainerCode != null, x => x.ContainerCode == input.ContainerCode) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(input.HandledArriveDate != null, x => x.HandledArriveDate == input.HandledArriveDate) - .WhereIf(input.HandledContainerCode != null, x => x.HandledContainerCode == input.HandledContainerCode) - .WhereIf(input.HandledExpireDate != null, x => x.HandledExpireDate == input.HandledExpireDate) - .WhereIf(input.HandledLot != null, x => x.HandledLot == input.HandledLot) - .WhereIf(input.HandledPackingCode != null, x => x.HandledPackingCode == input.HandledPackingCode) - .WhereIf(input.HandledProduceDate != null, x => x.HandledProduceDate == input.HandledProduceDate) - .WhereIf(input.HandledQty != null, x => x.HandledQty == input.HandledQty) - .WhereIf(input.HandledSupplierBatch != null, x => x.HandledSupplierBatch == input.HandledSupplierBatch) - .WhereIf(input.HandledToLocationArea != null, x => x.HandledToLocationArea == input.HandledToLocationArea) - .WhereIf(input.HandledToLocationCode != null, x => x.HandledToLocationCode == input.HandledToLocationCode) - .WhereIf(input.HandledToLocationErpCode != null, x => x.HandledToLocationErpCode == input.HandledToLocationErpCode) - .WhereIf(input.HandledToLocationGroup != null, x => x.HandledToLocationGroup == input.HandledToLocationGroup) - .WhereIf(input.HandledToWarehouseCode != null, x => x.HandledToWarehouseCode == input.HandledToWarehouseCode) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.LocationArea != null, x => x.LocationArea == input.LocationArea) - .WhereIf(!input.LocationCode.IsNullOrWhiteSpace(), x => x.LocationCode.Contains(input.LocationCode)) - .WhereIf(!input.LocationErpCode.IsNullOrWhiteSpace(), x => x.LocationErpCode.Contains(input.LocationErpCode)) - .WhereIf(input.LocationGroup != null, x => x.LocationGroup == input.LocationGroup) - .WhereIf(input.Lot != null, x => x.Lot == input.Lot) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(!input.PackingCode.IsNullOrWhiteSpace(), x => x.PackingCode.Contains(input.PackingCode)) - .WhereIf(input.ProdLine != null, x => x.ProdLine == input.ProdLine) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.RawArea != null, x => x.RawArea == input.RawArea) - .WhereIf(input.RawLocationCode != null, x => x.RawLocationCode == input.RawLocationCode) - .WhereIf(input.RecommendArriveDate != null, x => x.RecommendArriveDate == input.RecommendArriveDate) - .WhereIf(input.RecommendContainerCode != null, x => x.RecommendContainerCode == input.RecommendContainerCode) - .WhereIf(input.RecommendExpireDate != null, x => x.RecommendExpireDate == input.RecommendExpireDate) - .WhereIf(input.RecommendLot != null, x => x.RecommendLot == input.RecommendLot) - .WhereIf(input.RecommendPackingCode != null, x => x.RecommendPackingCode == input.RecommendPackingCode) - .WhereIf(input.RecommendProduceDate != null, x => x.RecommendProduceDate == input.RecommendProduceDate) - .WhereIf(input.RecommendQty != null, x => x.RecommendQty == input.RecommendQty) - .WhereIf(input.RecommendSupplierBatch != null, x => x.RecommendSupplierBatch == input.RecommendSupplierBatch) - .WhereIf(input.RecommendToLocationArea != null, x => x.RecommendToLocationArea == input.RecommendToLocationArea) - .WhereIf(input.RecommendToLocationCode != null, x => x.RecommendToLocationCode == input.RecommendToLocationCode) - .WhereIf(input.RecommendToLocationErpCode != null, x => x.RecommendToLocationErpCode == input.RecommendToLocationErpCode) - .WhereIf(input.RecommendToLocationGroup != null, x => x.RecommendToLocationGroup == input.RecommendToLocationGroup) - .WhereIf(input.RecommendToWarehouseCode != null, x => x.RecommendToWarehouseCode == input.RecommendToWarehouseCode) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.ReturnQty != null, x => x.ReturnQty == input.ReturnQty) - .WhereIf(!input.Status.IsNullOrWhiteSpace(), x => x.Status.Contains(input.Status)) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - .WhereIf(!input.WarehouseCode.IsNullOrWhiteSpace(), x => x.WarehouseCode.Contains(input.WarehouseCode)) - ; - } + } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductReceiptRequest/StoreProductReceiptRequestAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductReceiptRequest/StoreProductReceiptRequestAppService.cs index 9f62c9ebc..d4aff1166 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductReceiptRequest/StoreProductReceiptRequestAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductReceiptRequest/StoreProductReceiptRequestAppService.cs @@ -4,11 +4,12 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequest.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequest; -public class StoreProductReceiptRequestAppService : CrudAppService, +public class StoreProductReceiptRequestAppService : ZbxBase, IStoreProductReceiptRequestAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreProductReceiptRequest.Default; @@ -24,28 +25,5 @@ public class StoreProductReceiptRequestAppService : CrudAppService> CreateFilteredQueryAsync(StoreProductReceiptRequestGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.AutoAgree != null, x => x.AutoAgree == input.AutoAgree) - .WhereIf(input.AutoCompleteJob != null, x => x.AutoCompleteJob == input.AutoCompleteJob) - .WhereIf(input.AutoHandle != null, x => x.AutoHandle == input.AutoHandle) - .WhereIf(input.AutoSubmit != null, x => x.AutoSubmit == input.AutoSubmit) - .WhereIf(input.DirectCreateNote != null, x => x.DirectCreateNote == input.DirectCreateNote) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.PlanDate != null, x => x.PlanDate == input.PlanDate) - .WhereIf(input.ProdLine != null, x => x.ProdLine == input.ProdLine) - .WhereIf(input.ProductionPlanNumber != null, x => x.ProductionPlanNumber == input.ProductionPlanNumber) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.RequestStatus.IsNullOrWhiteSpace(), x => x.RequestStatus.Contains(input.RequestStatus)) - .WhereIf(input.Shift != null, x => x.Shift == input.Shift) - .WhereIf(input.StoreProductReceiptRequestDetails != null, x => x.StoreProductReceiptRequestDetails == input.StoreProductReceiptRequestDetails) - .WhereIf(input.Team != null, x => x.Team == input.Team) - .WhereIf(input.Type != null, x => x.Type == input.Type) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - .WhereIf(input.Workshop != null, x => x.Workshop == input.Workshop) - ; - } + } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductReceiptRequestDetail/StoreProductReceiptRequestDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductReceiptRequestDetail/StoreProductReceiptRequestDetailAppService.cs index 03edad593..fd5533cbe 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductReceiptRequestDetail/StoreProductReceiptRequestDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductReceiptRequestDetail/StoreProductReceiptRequestDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequestDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptRequestDetail; -public class StoreProductReceiptRequestDetailAppService : CrudAppService, +public class StoreProductReceiptRequestDetailAppService : ZbxBase, IStoreProductReceiptRequestDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreProductReceiptRequestDetail.Default; @@ -23,35 +22,4 @@ public class StoreProductReceiptRequestDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreProductReceiptRequestDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.BomVersion != null, x => x.BomVersion == input.BomVersion) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.LocationArea != null, x => x.LocationArea == input.LocationArea) - .WhereIf(!input.LocationCode.IsNullOrWhiteSpace(), x => x.LocationCode.Contains(input.LocationCode)) - .WhereIf(!input.LocationErpCode.IsNullOrWhiteSpace(), x => x.LocationErpCode.Contains(input.LocationErpCode)) - .WhereIf(input.LocationGroup != null, x => x.LocationGroup == input.LocationGroup) - .WhereIf(input.Lot != null, x => x.Lot == input.Lot) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.RawArea != null, x => x.RawArea == input.RawArea) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.ReturnQty != null, x => x.ReturnQty == input.ReturnQty) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - .WhereIf(!input.WarehouseCode.IsNullOrWhiteSpace(), x => x.WarehouseCode.Contains(input.WarehouseCode)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleMaterialDetail/StoreProductRecycleMaterialDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleMaterialDetail/StoreProductRecycleMaterialDetailAppService.cs index 88aa3255e..97a088d67 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleMaterialDetail/StoreProductRecycleMaterialDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleMaterialDetail/StoreProductRecycleMaterialDetailAppService.cs @@ -4,11 +4,12 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleMaterialDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleMaterialDetail; -public class StoreProductRecycleMaterialDetailAppService : CrudAppService, +public class StoreProductRecycleMaterialDetailAppService : ZbxBase, IStoreProductRecycleMaterialDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreProductRecycleMaterialDetail.Default; @@ -24,41 +25,5 @@ public class StoreProductRecycleMaterialDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreProductRecycleMaterialDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.BomVersion != null, x => x.BomVersion == input.BomVersion) - .WhereIf(input.ContainerCode != null, x => x.ContainerCode == input.ContainerCode) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.LocationArea != null, x => x.LocationArea == input.LocationArea) - .WhereIf(!input.LocationCode.IsNullOrWhiteSpace(), x => x.LocationCode.Contains(input.LocationCode)) - .WhereIf(!input.LocationErpCode.IsNullOrWhiteSpace(), x => x.LocationErpCode.Contains(input.LocationErpCode)) - .WhereIf(input.LocationGroup != null, x => x.LocationGroup == input.LocationGroup) - .WhereIf(input.Lot != null, x => x.Lot == input.Lot) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(!input.PackingCode.IsNullOrWhiteSpace(), x => x.PackingCode.Contains(input.PackingCode)) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.ProductItemCode != null, x => x.ProductItemCode == input.ProductItemCode) - .WhereIf(input.ProductItemDesc1 != null, x => x.ProductItemDesc1 == input.ProductItemDesc1) - .WhereIf(input.ProductItemDesc2 != null, x => x.ProductItemDesc2 == input.ProductItemDesc2) - .WhereIf(input.ProductItemName != null, x => x.ProductItemName == input.ProductItemName) - .WhereIf(input.ProductLot != null, x => x.ProductLot == input.ProductLot) - .WhereIf(input.ProductPackingCode != null, x => x.ProductPackingCode == input.ProductPackingCode) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.Status.IsNullOrWhiteSpace(), x => x.Status.Contains(input.Status)) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - .WhereIf(!input.WarehouseCode.IsNullOrWhiteSpace(), x => x.WarehouseCode.Contains(input.WarehouseCode)) - ; - } + } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleNote/StoreProductRecycleNoteAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleNote/StoreProductRecycleNoteAppService.cs index 9d4b8c78d..13805aa54 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleNote/StoreProductRecycleNoteAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleNote/StoreProductRecycleNoteAppService.cs @@ -4,11 +4,12 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNote.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNote; -public class StoreProductRecycleNoteAppService : CrudAppService, +public class StoreProductRecycleNoteAppService : ZbxBase, IStoreProductRecycleNoteAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreProductRecycleNote.Default; @@ -24,20 +25,5 @@ public class StoreProductRecycleNoteAppService : CrudAppService> CreateFilteredQueryAsync(StoreProductRecycleNoteGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.RecycleTime != null, x => x.RecycleTime == input.RecycleTime) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.RequestNumber != null, x => x.RequestNumber == input.RequestNumber) - .WhereIf(input.Shift != null, x => x.Shift == input.Shift) - .WhereIf(input.StoreProductRecycleMaterialDetails != null, x => x.StoreProductRecycleMaterialDetails == input.StoreProductRecycleMaterialDetails) - .WhereIf(input.StoreProductRecycleNoteDetails != null, x => x.StoreProductRecycleNoteDetails == input.StoreProductRecycleNoteDetails) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - .WhereIf(input.Workshop != null, x => x.Workshop == input.Workshop) - ; - } + } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleNoteDetail/StoreProductRecycleNoteDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleNoteDetail/StoreProductRecycleNoteDetailAppService.cs index 2d1fcc158..5ecc0f420 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleNoteDetail/StoreProductRecycleNoteDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleNoteDetail/StoreProductRecycleNoteDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNoteDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleNoteDetail; -public class StoreProductRecycleNoteDetailAppService : CrudAppService, +public class StoreProductRecycleNoteDetailAppService : ZbxBase, IStoreProductRecycleNoteDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreProductRecycleNoteDetail.Default; @@ -23,36 +22,4 @@ public class StoreProductRecycleNoteDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreProductRecycleNoteDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.ContainerCode != null, x => x.ContainerCode == input.ContainerCode) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.LocationArea != null, x => x.LocationArea == input.LocationArea) - .WhereIf(!input.LocationCode.IsNullOrWhiteSpace(), x => x.LocationCode.Contains(input.LocationCode)) - .WhereIf(!input.LocationErpCode.IsNullOrWhiteSpace(), x => x.LocationErpCode.Contains(input.LocationErpCode)) - .WhereIf(input.LocationGroup != null, x => x.LocationGroup == input.LocationGroup) - .WhereIf(input.Lot != null, x => x.Lot == input.Lot) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(!input.PackingCode.IsNullOrWhiteSpace(), x => x.PackingCode.Contains(input.PackingCode)) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.ReasonCode != null, x => x.ReasonCode == input.ReasonCode) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.Status.IsNullOrWhiteSpace(), x => x.Status.Contains(input.Status)) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - .WhereIf(!input.WarehouseCode.IsNullOrWhiteSpace(), x => x.WarehouseCode.Contains(input.WarehouseCode)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleRequest/StoreProductRecycleRequestAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleRequest/StoreProductRecycleRequestAppService.cs index c8e25e89d..6e82b55ac 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleRequest/StoreProductRecycleRequestAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleRequest/StoreProductRecycleRequestAppService.cs @@ -4,11 +4,12 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequest.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequest; -public class StoreProductRecycleRequestAppService : CrudAppService, +public class StoreProductRecycleRequestAppService : ZbxBase, IStoreProductRecycleRequestAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreProductRecycleRequest.Default; @@ -24,23 +25,5 @@ public class StoreProductRecycleRequestAppService : CrudAppService> CreateFilteredQueryAsync(StoreProductRecycleRequestGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.AutoAgree != null, x => x.AutoAgree == input.AutoAgree) - .WhereIf(input.AutoCompleteJob != null, x => x.AutoCompleteJob == input.AutoCompleteJob) - .WhereIf(input.AutoHandle != null, x => x.AutoHandle == input.AutoHandle) - .WhereIf(input.AutoSubmit != null, x => x.AutoSubmit == input.AutoSubmit) - .WhereIf(input.DirectCreateNote != null, x => x.DirectCreateNote == input.DirectCreateNote) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.RequestStatus.IsNullOrWhiteSpace(), x => x.RequestStatus.Contains(input.RequestStatus)) - .WhereIf(input.Shift != null, x => x.Shift == input.Shift) - .WhereIf(input.StoreProductRecycleRequestDetails != null, x => x.StoreProductRecycleRequestDetails == input.StoreProductRecycleRequestDetails) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - .WhereIf(input.Workshop != null, x => x.Workshop == input.Workshop) - ; - } + } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleRequestDetail/StoreProductRecycleRequestDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleRequestDetail/StoreProductRecycleRequestDetailAppService.cs index c8fd1750e..5e0d68714 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleRequestDetail/StoreProductRecycleRequestDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreProductRecycleRequestDetail/StoreProductRecycleRequestDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequestDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreProductRecycleRequestDetail; -public class StoreProductRecycleRequestDetailAppService : CrudAppService, +public class StoreProductRecycleRequestDetailAppService : ZbxBase, IStoreProductRecycleRequestDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreProductRecycleRequestDetail.Default; @@ -23,33 +22,4 @@ public class StoreProductRecycleRequestDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreProductRecycleRequestDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.BomVersion != null, x => x.BomVersion == input.BomVersion) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.LocationArea != null, x => x.LocationArea == input.LocationArea) - .WhereIf(!input.LocationCode.IsNullOrWhiteSpace(), x => x.LocationCode.Contains(input.LocationCode)) - .WhereIf(!input.LocationErpCode.IsNullOrWhiteSpace(), x => x.LocationErpCode.Contains(input.LocationErpCode)) - .WhereIf(input.LocationGroup != null, x => x.LocationGroup == input.LocationGroup) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.RawLocationArea != null, x => x.RawLocationArea == input.RawLocationArea) - .WhereIf(input.RawLocationCode != null, x => x.RawLocationCode == input.RawLocationCode) - .WhereIf(input.RawLocationErpCode != null, x => x.RawLocationErpCode == input.RawLocationErpCode) - .WhereIf(input.RawLocationGroup != null, x => x.RawLocationGroup == input.RawLocationGroup) - .WhereIf(input.RawWarehouseCode != null, x => x.RawWarehouseCode == input.RawWarehouseCode) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.Status.IsNullOrWhiteSpace(), x => x.Status.Contains(input.Status)) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - .WhereIf(!input.WarehouseCode.IsNullOrWhiteSpace(), x => x.WarehouseCode.Contains(input.WarehouseCode)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseOrder/StorePurchaseOrderAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseOrder/StorePurchaseOrderAppService.cs index 1cd861128..61ad36d45 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseOrder/StorePurchaseOrderAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseOrder/StorePurchaseOrderAppService.cs @@ -4,11 +4,12 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrder.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrder; -public class StorePurchaseOrderAppService : CrudAppService, +public class StorePurchaseOrderAppService : ZbxBase, IStorePurchaseOrderAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StorePurchaseOrder.Default; @@ -24,28 +25,5 @@ public class StorePurchaseOrderAppService : CrudAppService> CreateFilteredQueryAsync(StorePurchaseOrderGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.ContactEmail != null, x => x.ContactEmail == input.ContactEmail) - .WhereIf(input.ContactName != null, x => x.ContactName == input.ContactName) - .WhereIf(input.ContactPhone != null, x => x.ContactPhone == input.ContactPhone) - .WhereIf(input.DueDate != null, x => x.DueDate == input.DueDate) - .WhereIf(input.IsConsignment != null, x => x.IsConsignment == input.IsConsignment) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.OrderDate != null, x => x.OrderDate == input.OrderDate) - .WhereIf(!input.OrderStatus.IsNullOrWhiteSpace(), x => x.OrderStatus.Contains(input.OrderStatus)) - .WhereIf(input.PoType != null, x => x.PoType == input.PoType) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.StorePurchaseOrderDetails != null, x => x.StorePurchaseOrderDetails == input.StorePurchaseOrderDetails) - .WhereIf(input.SupplierAddress != null, x => x.SupplierAddress == input.SupplierAddress) - .WhereIf(input.SupplierCode != null, x => x.SupplierCode == input.SupplierCode) - .WhereIf(input.SupplierName != null, x => x.SupplierName == input.SupplierName) - .WhereIf(input.TaxRate != null, x => x.TaxRate == input.TaxRate) - .WhereIf(input.Version != null, x => x.Version == input.Version) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - ; - } + } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseOrderDetail/StorePurchaseOrderDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseOrderDetail/StorePurchaseOrderDetailAppService.cs index 2f8a87b05..8bd6933fd 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseOrderDetail/StorePurchaseOrderDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseOrderDetail/StorePurchaseOrderDetailAppService.cs @@ -4,11 +4,12 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrderDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseOrderDetail; -public class StorePurchaseOrderDetailAppService : CrudAppService, +public class StorePurchaseOrderDetailAppService : ZbxBase, IStorePurchaseOrderDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StorePurchaseOrderDetail.Default; @@ -24,40 +25,5 @@ public class StorePurchaseOrderDetailAppService : CrudAppService> CreateFilteredQueryAsync(StorePurchaseOrderDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ConvertRate != null, x => x.ConvertRate == input.ConvertRate) - .WhereIf(input.Ctype != null, x => x.Ctype == input.Ctype) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(input.IsConsignment != null, x => x.IsConsignment == input.IsConsignment) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(!input.LineStatus.IsNullOrWhiteSpace(), x => x.LineStatus.Contains(input.LineStatus)) - .WhereIf(input.LocationErpCode != null, x => x.LocationErpCode == input.LocationErpCode) - .WhereIf(input.Lot != null, x => x.Lot == input.Lot) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.OrderRemark != null, x => x.OrderRemark == input.OrderRemark) - .WhereIf(input.PlanArriveDate != null, x => x.PlanArriveDate == input.PlanArriveDate) - .WhereIf(input.PlanUserCode != null, x => x.PlanUserCode == input.PlanUserCode) - .WhereIf(input.PoLine != null, x => x.PoLine == input.PoLine) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.ProjectCode != null, x => x.ProjectCode == input.ProjectCode) - .WhereIf(input.PutAwayQty != null, x => x.PutAwayQty == input.PutAwayQty) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.ReceivedQty != null, x => x.ReceivedQty == input.ReceivedQty) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.ReturnedQty != null, x => x.ReturnedQty == input.ReturnedQty) - .WhereIf(input.ShippedQty != null, x => x.ShippedQty == input.ShippedQty) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierPackQty != null, x => x.SupplierPackQty == input.SupplierPackQty) - .WhereIf(input.SupplierPackUom != null, x => x.SupplierPackUom == input.SupplierPackUom) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - ; - } + } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReceiptNote/StorePurchaseReceiptNoteAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReceiptNote/StorePurchaseReceiptNoteAppService.cs index 93d57dfe4..3241ecb6e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReceiptNote/StorePurchaseReceiptNoteAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReceiptNote/StorePurchaseReceiptNoteAppService.cs @@ -4,11 +4,12 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNote.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNote; -public class StorePurchaseReceiptNoteAppService : CrudAppService, +public class StorePurchaseReceiptNoteAppService : ZbxBase, IStorePurchaseReceiptNoteAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StorePurchaseReceiptNote.Default; diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReceiptNoteDetail/StorePurchaseReceiptNoteDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReceiptNoteDetail/StorePurchaseReceiptNoteDetailAppService.cs index f8ff7a047..db3aeccb1 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReceiptNoteDetail/StorePurchaseReceiptNoteDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReceiptNoteDetail/StorePurchaseReceiptNoteDetailAppService.cs @@ -4,11 +4,12 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNoteDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptNoteDetail; -public class StorePurchaseReceiptNoteDetailAppService : CrudAppService, +public class StorePurchaseReceiptNoteDetailAppService : ZbxBase, IStorePurchaseReceiptNoteDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StorePurchaseReceiptNoteDetail.Default; @@ -24,68 +25,5 @@ public class StorePurchaseReceiptNoteDetailAppService : CrudAppService> CreateFilteredQueryAsync(StorePurchaseReceiptNoteDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.ContainerCode != null, x => x.ContainerCode == input.ContainerCode) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(input.FailedReason != null, x => x.FailedReason == input.FailedReason) - .WhereIf(input.HandledArriveDate != null, x => x.HandledArriveDate == input.HandledArriveDate) - .WhereIf(input.HandledContainerCode != null, x => x.HandledContainerCode == input.HandledContainerCode) - .WhereIf(input.HandledExpireDate != null, x => x.HandledExpireDate == input.HandledExpireDate) - .WhereIf(input.HandledLot != null, x => x.HandledLot == input.HandledLot) - .WhereIf(input.HandledPackingCode != null, x => x.HandledPackingCode == input.HandledPackingCode) - .WhereIf(input.HandledProduceDate != null, x => x.HandledProduceDate == input.HandledProduceDate) - .WhereIf(input.HandledQty != null, x => x.HandledQty == input.HandledQty) - .WhereIf(input.HandledSupplierBatch != null, x => x.HandledSupplierBatch == input.HandledSupplierBatch) - .WhereIf(input.HandledToLocationArea != null, x => x.HandledToLocationArea == input.HandledToLocationArea) - .WhereIf(input.HandledToLocationCode != null, x => x.HandledToLocationCode == input.HandledToLocationCode) - .WhereIf(input.HandledToLocationErpCode != null, x => x.HandledToLocationErpCode == input.HandledToLocationErpCode) - .WhereIf(input.HandledToLocationGroup != null, x => x.HandledToLocationGroup == input.HandledToLocationGroup) - .WhereIf(input.HandledToWarehouseCode != null, x => x.HandledToWarehouseCode == input.HandledToWarehouseCode) - .WhereIf(input.InspectPhotoJson != null, x => x.InspectPhotoJson == input.InspectPhotoJson) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.LocationArea != null, x => x.LocationArea == input.LocationArea) - .WhereIf(!input.LocationCode.IsNullOrWhiteSpace(), x => x.LocationCode.Contains(input.LocationCode)) - .WhereIf(!input.LocationErpCode.IsNullOrWhiteSpace(), x => x.LocationErpCode.Contains(input.LocationErpCode)) - .WhereIf(input.LocationGroup != null, x => x.LocationGroup == input.LocationGroup) - .WhereIf(input.Lot != null, x => x.Lot == input.Lot) - .WhereIf(input.MassDefect != null, x => x.MassDefect == input.MassDefect) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(!input.PackingCode.IsNullOrWhiteSpace(), x => x.PackingCode.Contains(input.PackingCode)) - .WhereIf(input.PoLine != null, x => x.PoLine == input.PoLine) - .WhereIf(input.PoNumber != null, x => x.PoNumber == input.PoNumber) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(!input.PurchaseReceiptInspectStatus.IsNullOrWhiteSpace(), x => x.PurchaseReceiptInspectStatus.Contains(input.PurchaseReceiptInspectStatus)) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.RecommendArriveDate != null, x => x.RecommendArriveDate == input.RecommendArriveDate) - .WhereIf(input.RecommendContainerCode != null, x => x.RecommendContainerCode == input.RecommendContainerCode) - .WhereIf(input.RecommendExpireDate != null, x => x.RecommendExpireDate == input.RecommendExpireDate) - .WhereIf(input.RecommendLot != null, x => x.RecommendLot == input.RecommendLot) - .WhereIf(input.RecommendPackingCode != null, x => x.RecommendPackingCode == input.RecommendPackingCode) - .WhereIf(input.RecommendProduceDate != null, x => x.RecommendProduceDate == input.RecommendProduceDate) - .WhereIf(input.RecommendQty != null, x => x.RecommendQty == input.RecommendQty) - .WhereIf(input.RecommendSupplierBatch != null, x => x.RecommendSupplierBatch == input.RecommendSupplierBatch) - .WhereIf(input.RecommendToLocationArea != null, x => x.RecommendToLocationArea == input.RecommendToLocationArea) - .WhereIf(input.RecommendToLocationCode != null, x => x.RecommendToLocationCode == input.RecommendToLocationCode) - .WhereIf(input.RecommendToLocationErpCode != null, x => x.RecommendToLocationErpCode == input.RecommendToLocationErpCode) - .WhereIf(input.RecommendToLocationGroup != null, x => x.RecommendToLocationGroup == input.RecommendToLocationGroup) - .WhereIf(input.RecommendToWarehouseCode != null, x => x.RecommendToWarehouseCode == input.RecommendToWarehouseCode) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.Status.IsNullOrWhiteSpace(), x => x.Status.Contains(input.Status)) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(input.SupplierPackQty != null, x => x.SupplierPackQty == input.SupplierPackQty) - .WhereIf(input.SupplierPackUom != null, x => x.SupplierPackUom == input.SupplierPackUom) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - .WhereIf(!input.WarehouseCode.IsNullOrWhiteSpace(), x => x.WarehouseCode.Contains(input.WarehouseCode)) - ; - } + } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReceiptRequest/StorePurchaseReceiptRequestAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReceiptRequest/StorePurchaseReceiptRequestAppService.cs index 2c7bc1dc8..1143b9aa5 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReceiptRequest/StorePurchaseReceiptRequestAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReceiptRequest/StorePurchaseReceiptRequestAppService.cs @@ -4,11 +4,12 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequest.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequest; -public class StorePurchaseReceiptRequestAppService : CrudAppService, +public class StorePurchaseReceiptRequestAppService : ZbxBase, IStorePurchaseReceiptRequestAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StorePurchaseReceiptRequest.Default; @@ -24,31 +25,4 @@ public class StorePurchaseReceiptRequestAppService : CrudAppService> CreateFilteredQueryAsync(StorePurchaseReceiptRequestGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.AsnNumber != null, x => x.AsnNumber == input.AsnNumber) - .WhereIf(input.AutoAgree != null, x => x.AutoAgree == input.AutoAgree) - .WhereIf(input.AutoCompleteJob != null, x => x.AutoCompleteJob == input.AutoCompleteJob) - .WhereIf(input.AutoHandle != null, x => x.AutoHandle == input.AutoHandle) - .WhereIf(input.AutoSubmit != null, x => x.AutoSubmit == input.AutoSubmit) - .WhereIf(input.DirectCreateNote != null, x => x.DirectCreateNote == input.DirectCreateNote) - .WhereIf(!input.DockCode.IsNullOrWhiteSpace(), x => x.DockCode.Contains(input.DockCode)) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.PlanArriveDate != null, x => x.PlanArriveDate == input.PlanArriveDate) - .WhereIf(input.PoNumber != null, x => x.PoNumber == input.PoNumber) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.RequestStatus.IsNullOrWhiteSpace(), x => x.RequestStatus.Contains(input.RequestStatus)) - .WhereIf(input.RpNumber != null, x => x.RpNumber == input.RpNumber) - .WhereIf(input.StorePurchaseReceiptRequestDetails != null, x => x.StorePurchaseReceiptRequestDetails == input.StorePurchaseReceiptRequestDetails) - .WhereIf(input.SupplierAddress != null, x => x.SupplierAddress == input.SupplierAddress) - .WhereIf(!input.SupplierCode.IsNullOrWhiteSpace(), x => x.SupplierCode.Contains(input.SupplierCode)) - .WhereIf(input.SupplierName != null, x => x.SupplierName == input.SupplierName) - .WhereIf(!input.TimeWindow.IsNullOrWhiteSpace(), x => x.TimeWindow.Contains(input.TimeWindow)) - .WhereIf(input.TruckNumber != null, x => x.TruckNumber == input.TruckNumber) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReceiptRequestDetail/StorePurchaseReceiptRequestDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReceiptRequestDetail/StorePurchaseReceiptRequestDetailAppService.cs index 5bc00eb29..315f90fa4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReceiptRequestDetail/StorePurchaseReceiptRequestDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReceiptRequestDetail/StorePurchaseReceiptRequestDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequestDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReceiptRequestDetail; -public class StorePurchaseReceiptRequestDetailAppService : CrudAppService, +public class StorePurchaseReceiptRequestDetailAppService : ZbxBase, IStorePurchaseReceiptRequestDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StorePurchaseReceiptRequestDetail.Default; @@ -23,35 +22,4 @@ public class StorePurchaseReceiptRequestDetailAppService : CrudAppService> CreateFilteredQueryAsync(StorePurchaseReceiptRequestDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.ContainerCode != null, x => x.ContainerCode == input.ContainerCode) - .WhereIf(input.ConvertRate != null, x => x.ConvertRate == input.ConvertRate) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.Lot != null, x => x.Lot == input.Lot) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(!input.PackingCode.IsNullOrWhiteSpace(), x => x.PackingCode.Contains(input.PackingCode)) - .WhereIf(input.PoLine != null, x => x.PoLine == input.PoLine) - .WhereIf(input.PoNumber != null, x => x.PoNumber == input.PoNumber) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.RecommendErpCode != null, x => x.RecommendErpCode == input.RecommendErpCode) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(input.SupplierPackQty != null, x => x.SupplierPackQty == input.SupplierPackQty) - .WhereIf(input.SupplierPackUom != null, x => x.SupplierPackUom == input.SupplierPackUom) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReturnNote/StorePurchaseReturnNoteAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReturnNote/StorePurchaseReturnNoteAppService.cs index b291f61bb..7220b144a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReturnNote/StorePurchaseReturnNoteAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReturnNote/StorePurchaseReturnNoteAppService.cs @@ -4,11 +4,12 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNote.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNote; -public class StorePurchaseReturnNoteAppService : CrudAppService, +public class StorePurchaseReturnNoteAppService : ZbxBase, IStorePurchaseReturnNoteAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StorePurchaseReturnNote.Default; diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReturnNoteDetail/StorePurchaseReturnNoteDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReturnNoteDetail/StorePurchaseReturnNoteDetailAppService.cs index 8ff299de8..9eab9529b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReturnNoteDetail/StorePurchaseReturnNoteDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReturnNoteDetail/StorePurchaseReturnNoteDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNoteDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnNoteDetail; -public class StorePurchaseReturnNoteDetailAppService : CrudAppService, +public class StorePurchaseReturnNoteDetailAppService : ZbxBase, IStorePurchaseReturnNoteDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StorePurchaseReturnNoteDetail.Default; @@ -23,64 +22,4 @@ public class StorePurchaseReturnNoteDetailAppService : CrudAppService> CreateFilteredQueryAsync(StorePurchaseReturnNoteDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.ContainerCode != null, x => x.ContainerCode == input.ContainerCode) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(input.HandledArriveDate != null, x => x.HandledArriveDate == input.HandledArriveDate) - .WhereIf(input.HandledContainerCode != null, x => x.HandledContainerCode == input.HandledContainerCode) - .WhereIf(input.HandledExpireDate != null, x => x.HandledExpireDate == input.HandledExpireDate) - .WhereIf(input.HandledFromLocationArea != null, x => x.HandledFromLocationArea == input.HandledFromLocationArea) - .WhereIf(input.HandledFromLocationCode != null, x => x.HandledFromLocationCode == input.HandledFromLocationCode) - .WhereIf(input.HandledFromLocationErpCode != null, x => x.HandledFromLocationErpCode == input.HandledFromLocationErpCode) - .WhereIf(input.HandledFromLocationGroup != null, x => x.HandledFromLocationGroup == input.HandledFromLocationGroup) - .WhereIf(input.HandledFromWarehouseCode != null, x => x.HandledFromWarehouseCode == input.HandledFromWarehouseCode) - .WhereIf(input.HandledLot != null, x => x.HandledLot == input.HandledLot) - .WhereIf(input.HandledPackingCode != null, x => x.HandledPackingCode == input.HandledPackingCode) - .WhereIf(input.HandledProduceDate != null, x => x.HandledProduceDate == input.HandledProduceDate) - .WhereIf(input.HandledQty != null, x => x.HandledQty == input.HandledQty) - .WhereIf(input.HandledSupplierBatch != null, x => x.HandledSupplierBatch == input.HandledSupplierBatch) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.LocationArea != null, x => x.LocationArea == input.LocationArea) - .WhereIf(!input.LocationCode.IsNullOrWhiteSpace(), x => x.LocationCode.Contains(input.LocationCode)) - .WhereIf(!input.LocationErpCode.IsNullOrWhiteSpace(), x => x.LocationErpCode.Contains(input.LocationErpCode)) - .WhereIf(input.LocationGroup != null, x => x.LocationGroup == input.LocationGroup) - .WhereIf(input.Lot != null, x => x.Lot == input.Lot) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(!input.PackingCode.IsNullOrWhiteSpace(), x => x.PackingCode.Contains(input.PackingCode)) - .WhereIf(input.PoLine != null, x => x.PoLine == input.PoLine) - .WhereIf(input.PoNumber != null, x => x.PoNumber == input.PoNumber) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.Reason != null, x => x.Reason == input.Reason) - .WhereIf(input.RecommendArriveDate != null, x => x.RecommendArriveDate == input.RecommendArriveDate) - .WhereIf(input.RecommendContainerCode != null, x => x.RecommendContainerCode == input.RecommendContainerCode) - .WhereIf(input.RecommendExpireDate != null, x => x.RecommendExpireDate == input.RecommendExpireDate) - .WhereIf(input.RecommendFromLocationArea != null, x => x.RecommendFromLocationArea == input.RecommendFromLocationArea) - .WhereIf(input.RecommendFromLocationCode != null, x => x.RecommendFromLocationCode == input.RecommendFromLocationCode) - .WhereIf(input.RecommendFromLocationErpCode != null, x => x.RecommendFromLocationErpCode == input.RecommendFromLocationErpCode) - .WhereIf(input.RecommendFromLocationGroup != null, x => x.RecommendFromLocationGroup == input.RecommendFromLocationGroup) - .WhereIf(input.RecommendFromWarehouseCode != null, x => x.RecommendFromWarehouseCode == input.RecommendFromWarehouseCode) - .WhereIf(input.RecommendLot != null, x => x.RecommendLot == input.RecommendLot) - .WhereIf(input.RecommendPackingCode != null, x => x.RecommendPackingCode == input.RecommendPackingCode) - .WhereIf(input.RecommendProduceDate != null, x => x.RecommendProduceDate == input.RecommendProduceDate) - .WhereIf(input.RecommendQty != null, x => x.RecommendQty == input.RecommendQty) - .WhereIf(input.RecommendSupplierBatch != null, x => x.RecommendSupplierBatch == input.RecommendSupplierBatch) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.Status.IsNullOrWhiteSpace(), x => x.Status.Contains(input.Status)) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - .WhereIf(!input.WarehouseCode.IsNullOrWhiteSpace(), x => x.WarehouseCode.Contains(input.WarehouseCode)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReturnRequest/StorePurchaseReturnRequestAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReturnRequest/StorePurchaseReturnRequestAppService.cs index c3413d55c..5b5fe0d7d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReturnRequest/StorePurchaseReturnRequestAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReturnRequest/StorePurchaseReturnRequestAppService.cs @@ -4,11 +4,12 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequest.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequest; -public class StorePurchaseReturnRequestAppService : CrudAppService, +public class StorePurchaseReturnRequestAppService : ZbxBase, IStorePurchaseReturnRequestAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StorePurchaseReturnRequest.Default; diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReturnRequestDetail/StorePurchaseReturnRequestDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReturnRequestDetail/StorePurchaseReturnRequestDetailAppService.cs index c8931e041..3254330f4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReturnRequestDetail/StorePurchaseReturnRequestDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePurchaseReturnRequestDetail/StorePurchaseReturnRequestDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequestDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StorePurchaseReturnRequestDetail; -public class StorePurchaseReturnRequestDetailAppService : CrudAppService, +public class StorePurchaseReturnRequestDetailAppService : ZbxBase, IStorePurchaseReturnRequestDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StorePurchaseReturnRequestDetail.Default; @@ -23,37 +22,4 @@ public class StorePurchaseReturnRequestDetailAppService : CrudAppService> CreateFilteredQueryAsync(StorePurchaseReturnRequestDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.ContainerCode != null, x => x.ContainerCode == input.ContainerCode) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.LocationArea != null, x => x.LocationArea == input.LocationArea) - .WhereIf(!input.LocationCode.IsNullOrWhiteSpace(), x => x.LocationCode.Contains(input.LocationCode)) - .WhereIf(!input.LocationErpCode.IsNullOrWhiteSpace(), x => x.LocationErpCode.Contains(input.LocationErpCode)) - .WhereIf(input.LocationGroup != null, x => x.LocationGroup == input.LocationGroup) - .WhereIf(input.Lot != null, x => x.Lot == input.Lot) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(!input.PackingCode.IsNullOrWhiteSpace(), x => x.PackingCode.Contains(input.PackingCode)) - .WhereIf(input.PoLine != null, x => x.PoLine == input.PoLine) - .WhereIf(input.PoNumber != null, x => x.PoNumber == input.PoNumber) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.Status.IsNullOrWhiteSpace(), x => x.Status.Contains(input.Status)) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - .WhereIf(!input.WarehouseCode.IsNullOrWhiteSpace(), x => x.WarehouseCode.Contains(input.WarehouseCode)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePutawayNote/StorePutawayNoteAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePutawayNote/StorePutawayNoteAppService.cs index 01a999144..311bda6ad 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePutawayNote/StorePutawayNoteAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePutawayNote/StorePutawayNoteAppService.cs @@ -4,11 +4,12 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StorePutawayNote.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayNote; -public class StorePutawayNoteAppService : CrudAppService, +public class StorePutawayNoteAppService : ZbxBase, IStorePutawayNoteAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StorePutawayNote.Default; @@ -24,24 +25,4 @@ public class StorePutawayNoteAppService : CrudAppService> CreateFilteredQueryAsync(StorePutawayNoteGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.AsnNumber != null, x => x.AsnNumber == input.AsnNumber) - .WhereIf(input.InspectNumber != null, x => x.InspectNumber == input.InspectNumber) - .WhereIf(input.JobNumber != null, x => x.JobNumber == input.JobNumber) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.ProductReceiptNumber != null, x => x.ProductReceiptNumber == input.ProductReceiptNumber) - .WhereIf(input.PurchaseReceiptRequestNumber != null, x => x.PurchaseReceiptRequestNumber == input.PurchaseReceiptRequestNumber) - .WhereIf(input.ReceiptNumber != null, x => x.ReceiptNumber == input.ReceiptNumber) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.RpNumber != null, x => x.RpNumber == input.RpNumber) - .WhereIf(input.StorePutawayNoteDetails != null, x => x.StorePutawayNoteDetails == input.StorePutawayNoteDetails) - .WhereIf(input.SupplierCode != null, x => x.SupplierCode == input.SupplierCode) - .WhereIf(!input.Type.IsNullOrWhiteSpace(), x => x.Type.Contains(input.Type)) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePutawayNoteDetail/StorePutawayNoteDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePutawayNoteDetail/StorePutawayNoteDetailAppService.cs index 4f1803906..06b7b06f3 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePutawayNoteDetail/StorePutawayNoteDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePutawayNoteDetail/StorePutawayNoteDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StorePutawayNoteDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayNoteDetail; -public class StorePutawayNoteDetailAppService : CrudAppService, +public class StorePutawayNoteDetailAppService : ZbxBase, IStorePutawayNoteDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StorePutawayNoteDetail.Default; @@ -23,73 +22,4 @@ public class StorePutawayNoteDetailAppService : CrudAppService> CreateFilteredQueryAsync(StorePutawayNoteDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(input.FromContainerCode != null, x => x.FromContainerCode == input.FromContainerCode) - .WhereIf(input.FromLocationArea != null, x => x.FromLocationArea == input.FromLocationArea) - .WhereIf(!input.FromLocationCode.IsNullOrWhiteSpace(), x => x.FromLocationCode.Contains(input.FromLocationCode)) - .WhereIf(!input.FromLocationErpCode.IsNullOrWhiteSpace(), x => x.FromLocationErpCode.Contains(input.FromLocationErpCode)) - .WhereIf(input.FromLocationGroup != null, x => x.FromLocationGroup == input.FromLocationGroup) - .WhereIf(input.FromLot != null, x => x.FromLot == input.FromLot) - .WhereIf(input.FromPackingCode != null, x => x.FromPackingCode == input.FromPackingCode) - .WhereIf(!input.FromStatus.IsNullOrWhiteSpace(), x => x.FromStatus.Contains(input.FromStatus)) - .WhereIf(!input.FromWarehouseCode.IsNullOrWhiteSpace(), x => x.FromWarehouseCode.Contains(input.FromWarehouseCode)) - .WhereIf(input.HandledArriveDate != null, x => x.HandledArriveDate == input.HandledArriveDate) - .WhereIf(input.HandledContainerCode != null, x => x.HandledContainerCode == input.HandledContainerCode) - .WhereIf(input.HandledExpireDate != null, x => x.HandledExpireDate == input.HandledExpireDate) - .WhereIf(input.HandledLot != null, x => x.HandledLot == input.HandledLot) - .WhereIf(input.HandledPackingCode != null, x => x.HandledPackingCode == input.HandledPackingCode) - .WhereIf(input.HandledProduceDate != null, x => x.HandledProduceDate == input.HandledProduceDate) - .WhereIf(input.HandledQty != null, x => x.HandledQty == input.HandledQty) - .WhereIf(input.HandledSupplierBatch != null, x => x.HandledSupplierBatch == input.HandledSupplierBatch) - .WhereIf(input.HandledToLocationArea != null, x => x.HandledToLocationArea == input.HandledToLocationArea) - .WhereIf(input.HandledToLocationCode != null, x => x.HandledToLocationCode == input.HandledToLocationCode) - .WhereIf(input.HandledToLocationErpCode != null, x => x.HandledToLocationErpCode == input.HandledToLocationErpCode) - .WhereIf(input.HandledToLocationGroup != null, x => x.HandledToLocationGroup == input.HandledToLocationGroup) - .WhereIf(input.HandledToWarehouseCode != null, x => x.HandledToWarehouseCode == input.HandledToWarehouseCode) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.JobNumber != null, x => x.JobNumber == input.JobNumber) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.PoLine != null, x => x.PoLine == input.PoLine) - .WhereIf(input.PoNumber != null, x => x.PoNumber == input.PoNumber) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.RecommendArriveDate != null, x => x.RecommendArriveDate == input.RecommendArriveDate) - .WhereIf(input.RecommendContainerCode != null, x => x.RecommendContainerCode == input.RecommendContainerCode) - .WhereIf(input.RecommendExpireDate != null, x => x.RecommendExpireDate == input.RecommendExpireDate) - .WhereIf(input.RecommendLot != null, x => x.RecommendLot == input.RecommendLot) - .WhereIf(input.RecommendPackingCode != null, x => x.RecommendPackingCode == input.RecommendPackingCode) - .WhereIf(input.RecommendProduceDate != null, x => x.RecommendProduceDate == input.RecommendProduceDate) - .WhereIf(input.RecommendQty != null, x => x.RecommendQty == input.RecommendQty) - .WhereIf(input.RecommendSupplierBatch != null, x => x.RecommendSupplierBatch == input.RecommendSupplierBatch) - .WhereIf(input.RecommendToLocationArea != null, x => x.RecommendToLocationArea == input.RecommendToLocationArea) - .WhereIf(input.RecommendToLocationCode != null, x => x.RecommendToLocationCode == input.RecommendToLocationCode) - .WhereIf(input.RecommendToLocationErpCode != null, x => x.RecommendToLocationErpCode == input.RecommendToLocationErpCode) - .WhereIf(input.RecommendToLocationGroup != null, x => x.RecommendToLocationGroup == input.RecommendToLocationGroup) - .WhereIf(input.RecommendToWarehouseCode != null, x => x.RecommendToWarehouseCode == input.RecommendToWarehouseCode) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(input.ToContainerCode != null, x => x.ToContainerCode == input.ToContainerCode) - .WhereIf(input.ToLocationArea != null, x => x.ToLocationArea == input.ToLocationArea) - .WhereIf(!input.ToLocationCode.IsNullOrWhiteSpace(), x => x.ToLocationCode.Contains(input.ToLocationCode)) - .WhereIf(!input.ToLocationErpCode.IsNullOrWhiteSpace(), x => x.ToLocationErpCode.Contains(input.ToLocationErpCode)) - .WhereIf(input.ToLocationGroup != null, x => x.ToLocationGroup == input.ToLocationGroup) - .WhereIf(input.ToLot != null, x => x.ToLot == input.ToLot) - .WhereIf(input.ToPackingCode != null, x => x.ToPackingCode == input.ToPackingCode) - .WhereIf(!input.ToStatus.IsNullOrWhiteSpace(), x => x.ToStatus.Contains(input.ToStatus)) - .WhereIf(!input.ToWarehouseCode.IsNullOrWhiteSpace(), x => x.ToWarehouseCode.Contains(input.ToWarehouseCode)) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePutawayRequest/StorePutawayRequestAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePutawayRequest/StorePutawayRequestAppService.cs index 1b7b441ce..f9ec3c290 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePutawayRequest/StorePutawayRequestAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePutawayRequest/StorePutawayRequestAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StorePutawayRequest.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayRequest; -public class StorePutawayRequestAppService : CrudAppService, +public class StorePutawayRequestAppService : ZbxBase, IStorePutawayRequestAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StorePutawayRequest.Default; @@ -23,33 +22,4 @@ public class StorePutawayRequestAppService : CrudAppService> CreateFilteredQueryAsync(StorePutawayRequestGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.AsnNumber != null, x => x.AsnNumber == input.AsnNumber) - .WhereIf(input.AutoAgree != null, x => x.AutoAgree == input.AutoAgree) - .WhereIf(input.AutoCompleteJob != null, x => x.AutoCompleteJob == input.AutoCompleteJob) - .WhereIf(input.AutoHandle != null, x => x.AutoHandle == input.AutoHandle) - .WhereIf(input.AutoSubmit != null, x => x.AutoSubmit == input.AutoSubmit) - .WhereIf(input.DirectCreateNote != null, x => x.DirectCreateNote == input.DirectCreateNote) - .WhereIf(input.InspectNumber != null, x => x.InspectNumber == input.InspectNumber) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.PoNumber != null, x => x.PoNumber == input.PoNumber) - .WhereIf(input.ProductReceiptNumber != null, x => x.ProductReceiptNumber == input.ProductReceiptNumber) - .WhereIf(input.PurchaseReceiptRequestNumber != null, x => x.PurchaseReceiptRequestNumber == input.PurchaseReceiptRequestNumber) - .WhereIf(!input.PutawayMode.IsNullOrWhiteSpace(), x => x.PutawayMode.Contains(input.PutawayMode)) - .WhereIf(input.ReceiptNumber != null, x => x.ReceiptNumber == input.ReceiptNumber) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.RequestNumber != null, x => x.RequestNumber == input.RequestNumber) - .WhereIf(!input.RequestStatus.IsNullOrWhiteSpace(), x => x.RequestStatus.Contains(input.RequestStatus)) - .WhereIf(input.RpNumber != null, x => x.RpNumber == input.RpNumber) - .WhereIf(input.StorePutawayRequestDetails != null, x => x.StorePutawayRequestDetails == input.StorePutawayRequestDetails) - .WhereIf(input.SupplierCode != null, x => x.SupplierCode == input.SupplierCode) - .WhereIf(!input.Type.IsNullOrWhiteSpace(), x => x.Type.Contains(input.Type)) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePutawayRequestDetail/StorePutawayRequestDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePutawayRequestDetail/StorePutawayRequestDetailAppService.cs index 8ac9e73e3..bc1a337f0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePutawayRequestDetail/StorePutawayRequestDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StorePutawayRequestDetail/StorePutawayRequestDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StorePutawayRequestDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StorePutawayRequestDetail; -public class StorePutawayRequestDetailAppService : CrudAppService, +public class StorePutawayRequestDetailAppService : ZbxBase, IStorePutawayRequestDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StorePutawayRequestDetail.Default; @@ -23,47 +22,4 @@ public class StorePutawayRequestDetailAppService : CrudAppService> CreateFilteredQueryAsync(StorePutawayRequestDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(input.FromContainerCode != null, x => x.FromContainerCode == input.FromContainerCode) - .WhereIf(input.FromLocationArea != null, x => x.FromLocationArea == input.FromLocationArea) - .WhereIf(!input.FromLocationCode.IsNullOrWhiteSpace(), x => x.FromLocationCode.Contains(input.FromLocationCode)) - .WhereIf(!input.FromLocationErpCode.IsNullOrWhiteSpace(), x => x.FromLocationErpCode.Contains(input.FromLocationErpCode)) - .WhereIf(input.FromLocationGroup != null, x => x.FromLocationGroup == input.FromLocationGroup) - .WhereIf(input.FromLot != null, x => x.FromLot == input.FromLot) - .WhereIf(input.FromPackingCode != null, x => x.FromPackingCode == input.FromPackingCode) - .WhereIf(!input.FromStatus.IsNullOrWhiteSpace(), x => x.FromStatus.Contains(input.FromStatus)) - .WhereIf(!input.FromWarehouseCode.IsNullOrWhiteSpace(), x => x.FromWarehouseCode.Contains(input.FromWarehouseCode)) - .WhereIf(input.InventoryQty != null, x => x.InventoryQty == input.InventoryQty) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.PoLine != null, x => x.PoLine == input.PoLine) - .WhereIf(input.PoNumber != null, x => x.PoNumber == input.PoNumber) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(input.ToContainerCode != null, x => x.ToContainerCode == input.ToContainerCode) - .WhereIf(input.ToLocationArea != null, x => x.ToLocationArea == input.ToLocationArea) - .WhereIf(!input.ToLocationCode.IsNullOrWhiteSpace(), x => x.ToLocationCode.Contains(input.ToLocationCode)) - .WhereIf(!input.ToLocationErpCode.IsNullOrWhiteSpace(), x => x.ToLocationErpCode.Contains(input.ToLocationErpCode)) - .WhereIf(input.ToLocationGroup != null, x => x.ToLocationGroup == input.ToLocationGroup) - .WhereIf(input.ToLot != null, x => x.ToLot == input.ToLot) - .WhereIf(input.ToPackingCode != null, x => x.ToPackingCode == input.ToPackingCode) - .WhereIf(!input.ToStatus.IsNullOrWhiteSpace(), x => x.ToStatus.Contains(input.ToStatus)) - .WhereIf(!input.ToWarehouseCode.IsNullOrWhiteSpace(), x => x.ToWarehouseCode.Contains(input.ToWarehouseCode)) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreReceiptAbnormalNote/StoreReceiptAbnormalNoteAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreReceiptAbnormalNote/StoreReceiptAbnormalNoteAppService.cs index 91e840b8d..f1933d808 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreReceiptAbnormalNote/StoreReceiptAbnormalNoteAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreReceiptAbnormalNote/StoreReceiptAbnormalNoteAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNote.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNote; -public class StoreReceiptAbnormalNoteAppService : CrudAppService, +public class StoreReceiptAbnormalNoteAppService : ZbxBase, IStoreReceiptAbnormalNoteAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreReceiptAbnormalNote.Default; @@ -23,19 +22,4 @@ public class StoreReceiptAbnormalNoteAppService : CrudAppService> CreateFilteredQueryAsync(StoreReceiptAbnormalNoteGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(!input.AsnNumber.IsNullOrWhiteSpace(), x => x.AsnNumber.Contains(input.AsnNumber)) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(!input.ReceiptNumber.IsNullOrWhiteSpace(), x => x.ReceiptNumber.Contains(input.ReceiptNumber)) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.StoreReceiptAbnormalNoteDetails != null, x => x.StoreReceiptAbnormalNoteDetails == input.StoreReceiptAbnormalNoteDetails) - .WhereIf(!input.SupplierCode.IsNullOrWhiteSpace(), x => x.SupplierCode.Contains(input.SupplierCode)) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreReceiptAbnormalNoteDetail/StoreReceiptAbnormalNoteDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreReceiptAbnormalNoteDetail/StoreReceiptAbnormalNoteDetailAppService.cs index ab03442a8..3036aa0de 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreReceiptAbnormalNoteDetail/StoreReceiptAbnormalNoteDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreReceiptAbnormalNoteDetail/StoreReceiptAbnormalNoteDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNoteDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreReceiptAbnormalNoteDetail; -public class StoreReceiptAbnormalNoteDetailAppService : CrudAppService, +public class StoreReceiptAbnormalNoteDetailAppService : ZbxBase, IStoreReceiptAbnormalNoteDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreReceiptAbnormalNoteDetail.Default; @@ -23,38 +22,4 @@ public class StoreReceiptAbnormalNoteDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreReceiptAbnormalNoteDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(!input.AbnormalType.IsNullOrWhiteSpace(), x => x.AbnormalType.Contains(input.AbnormalType)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.ContainerCode != null, x => x.ContainerCode == input.ContainerCode) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.LocationArea != null, x => x.LocationArea == input.LocationArea) - .WhereIf(!input.LocationCode.IsNullOrWhiteSpace(), x => x.LocationCode.Contains(input.LocationCode)) - .WhereIf(!input.LocationErpCode.IsNullOrWhiteSpace(), x => x.LocationErpCode.Contains(input.LocationErpCode)) - .WhereIf(input.LocationGroup != null, x => x.LocationGroup == input.LocationGroup) - .WhereIf(input.Lot != null, x => x.Lot == input.Lot) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(!input.PackingCode.IsNullOrWhiteSpace(), x => x.PackingCode.Contains(input.PackingCode)) - .WhereIf(input.Photos != null, x => x.Photos == input.Photos) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(!input.ReceiptNumber.IsNullOrWhiteSpace(), x => x.ReceiptNumber.Contains(input.ReceiptNumber)) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.Status.IsNullOrWhiteSpace(), x => x.Status.Contains(input.Status)) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - .WhereIf(!input.WarehouseCode.IsNullOrWhiteSpace(), x => x.WarehouseCode.Contains(input.WarehouseCode)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreRecycledMaterialReceiptNote/StoreRecycledMaterialReceiptNoteAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreRecycledMaterialReceiptNote/StoreRecycledMaterialReceiptNoteAppService.cs index c84779210..91e1f0455 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreRecycledMaterialReceiptNote/StoreRecycledMaterialReceiptNoteAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreRecycledMaterialReceiptNote/StoreRecycledMaterialReceiptNoteAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNote.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNote; -public class StoreRecycledMaterialReceiptNoteAppService : CrudAppService, +public class StoreRecycledMaterialReceiptNoteAppService : ZbxBase, IStoreRecycledMaterialReceiptNoteAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreRecycledMaterialReceiptNote.Default; @@ -23,16 +22,4 @@ public class StoreRecycledMaterialReceiptNoteAppService : CrudAppService> CreateFilteredQueryAsync(StoreRecycledMaterialReceiptNoteGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.StoreRecycledMaterialReceiptNoteDetails != null, x => x.StoreRecycledMaterialReceiptNoteDetails == input.StoreRecycledMaterialReceiptNoteDetails) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreRecycledMaterialReceiptNoteDetail/StoreRecycledMaterialReceiptNoteDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreRecycledMaterialReceiptNoteDetail/StoreRecycledMaterialReceiptNoteDetailAppService.cs index 188599aa3..10eb01b17 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreRecycledMaterialReceiptNoteDetail/StoreRecycledMaterialReceiptNoteDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreRecycledMaterialReceiptNoteDetail/StoreRecycledMaterialReceiptNoteDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNoteDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreRecycledMaterialReceiptNoteDetail; -public class StoreRecycledMaterialReceiptNoteDetailAppService : CrudAppService, +public class StoreRecycledMaterialReceiptNoteDetailAppService : ZbxBase, IStoreRecycledMaterialReceiptNoteDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreRecycledMaterialReceiptNoteDetail.Default; @@ -23,36 +22,4 @@ public class StoreRecycledMaterialReceiptNoteDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreRecycledMaterialReceiptNoteDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.ContainerCode != null, x => x.ContainerCode == input.ContainerCode) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.LocationArea != null, x => x.LocationArea == input.LocationArea) - .WhereIf(!input.LocationCode.IsNullOrWhiteSpace(), x => x.LocationCode.Contains(input.LocationCode)) - .WhereIf(!input.LocationErpCode.IsNullOrWhiteSpace(), x => x.LocationErpCode.Contains(input.LocationErpCode)) - .WhereIf(input.LocationGroup != null, x => x.LocationGroup == input.LocationGroup) - .WhereIf(input.Lot != null, x => x.Lot == input.Lot) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(!input.PackingCode.IsNullOrWhiteSpace(), x => x.PackingCode.Contains(input.PackingCode)) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.ReasonCode != null, x => x.ReasonCode == input.ReasonCode) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.Status.IsNullOrWhiteSpace(), x => x.Status.Contains(input.Status)) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - .WhereIf(!input.WarehouseCode.IsNullOrWhiteSpace(), x => x.WarehouseCode.Contains(input.WarehouseCode)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreSaleOrder/StoreSaleOrderAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreSaleOrder/StoreSaleOrderAppService.cs index 675f4ba11..0722daf3c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreSaleOrder/StoreSaleOrderAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreSaleOrder/StoreSaleOrderAppService.cs @@ -4,11 +4,12 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreSaleOrder.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreSaleOrder; -public class StoreSaleOrderAppService : CrudAppService, +public class StoreSaleOrderAppService : ZbxBase, IStoreSaleOrderAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreSaleOrder.Default; diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreSaleOrderDetail/StoreSaleOrderDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreSaleOrderDetail/StoreSaleOrderDetailAppService.cs index 5f501527f..b702f1350 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreSaleOrderDetail/StoreSaleOrderDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreSaleOrderDetail/StoreSaleOrderDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreSaleOrderDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreSaleOrderDetail; -public class StoreSaleOrderDetailAppService : CrudAppService, +public class StoreSaleOrderDetailAppService : ZbxBase, IStoreSaleOrderDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreSaleOrderDetail.Default; @@ -23,27 +22,4 @@ public class StoreSaleOrderDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreSaleOrderDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ConvertRate != null, x => x.ConvertRate == input.ConvertRate) - .WhereIf(input.CustomerPackQty != null, x => x.CustomerPackQty == input.CustomerPackQty) - .WhereIf(input.CustomerPackUom != null, x => x.CustomerPackUom == input.CustomerPackUom) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(!input.LineStatus.IsNullOrWhiteSpace(), x => x.LineStatus.Contains(input.LineStatus)) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.SoLine.IsNullOrWhiteSpace(), x => x.SoLine.Contains(input.SoLine)) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreScrapNote/StoreScrapNoteAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreScrapNote/StoreScrapNoteAppService.cs index 06c60529a..4f333fdf6 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreScrapNote/StoreScrapNoteAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreScrapNote/StoreScrapNoteAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreScrapNote.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapNote; -public class StoreScrapNoteAppService : CrudAppService, +public class StoreScrapNoteAppService : ZbxBase, IStoreScrapNoteAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreScrapNote.Default; @@ -23,19 +22,4 @@ public class StoreScrapNoteAppService : CrudAppService> CreateFilteredQueryAsync(StoreScrapNoteGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.JobNumber != null, x => x.JobNumber == input.JobNumber) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.ScrapRequestNumber != null, x => x.ScrapRequestNumber == input.ScrapRequestNumber) - .WhereIf(input.StoreScrapNoteDetails != null, x => x.StoreScrapNoteDetails == input.StoreScrapNoteDetails) - .WhereIf(input.Type != null, x => x.Type == input.Type) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetailAppService.cs new file mode 100644 index 000000000..d62aabf57 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetailAppService.cs @@ -0,0 +1,28 @@ +using System; +using WinIn.FasterZ.Wms.Permissions; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail.Dtos; +using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; + +namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail; + + +/// +/// +/// +public class StoreScrapNoteDetailAppService : ZbxBase, + IStoreScrapNoteDetailAppService +{ + protected override string GetPolicyName { get; set; } = WmsPermissions.StoreScrapNoteDetail.Default; + protected override string GetListPolicyName { get; set; } = WmsPermissions.StoreScrapNoteDetail.Default; + protected override string CreatePolicyName { get; set; } = WmsPermissions.StoreScrapNoteDetail.Create; + protected override string UpdatePolicyName { get; set; } = WmsPermissions.StoreScrapNoteDetail.Update; + protected override string DeletePolicyName { get; set; } = WmsPermissions.StoreScrapNoteDetail.Delete; + + private readonly IStoreScrapNoteDetailRepository _repository; + + public StoreScrapNoteDetailAppService(IStoreScrapNoteDetailRepository repository) : base(repository) + { + _repository = repository; + } +} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreScrapRequest/StoreScrapRequestAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreScrapRequest/StoreScrapRequestAppService.cs index bba05760a..72c7c1e1d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreScrapRequest/StoreScrapRequestAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreScrapRequest/StoreScrapRequestAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreScrapRequest.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapRequest; -public class StoreScrapRequestAppService : CrudAppService, +public class StoreScrapRequestAppService : ZbxBase, IStoreScrapRequestAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreScrapRequest.Default; @@ -23,23 +22,4 @@ public class StoreScrapRequestAppService : CrudAppService> CreateFilteredQueryAsync(StoreScrapRequestGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.AutoAgree != null, x => x.AutoAgree == input.AutoAgree) - .WhereIf(input.AutoCompleteJob != null, x => x.AutoCompleteJob == input.AutoCompleteJob) - .WhereIf(input.AutoHandle != null, x => x.AutoHandle == input.AutoHandle) - .WhereIf(input.AutoSubmit != null, x => x.AutoSubmit == input.AutoSubmit) - .WhereIf(input.DirectCreateNote != null, x => x.DirectCreateNote == input.DirectCreateNote) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.RequestStatus.IsNullOrWhiteSpace(), x => x.RequestStatus.Contains(input.RequestStatus)) - .WhereIf(input.StoreScrapRequestDetails != null, x => x.StoreScrapRequestDetails == input.StoreScrapRequestDetails) - .WhereIf(input.Type != null, x => x.Type == input.Type) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreScrapRequestDetail/StoreScrapRequestDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreScrapRequestDetail/StoreScrapRequestDetailAppService.cs index 6af64dd20..f55112902 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreScrapRequestDetail/StoreScrapRequestDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreScrapRequestDetail/StoreScrapRequestDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreScrapRequestDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapRequestDetail; -public class StoreScrapRequestDetailAppService : CrudAppService, +public class StoreScrapRequestDetailAppService : ZbxBase, IStoreScrapRequestDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreScrapRequestDetail.Default; @@ -23,28 +22,4 @@ public class StoreScrapRequestDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreScrapRequestDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.LocationArea != null, x => x.LocationArea == input.LocationArea) - .WhereIf(!input.LocationCode.IsNullOrWhiteSpace(), x => x.LocationCode.Contains(input.LocationCode)) - .WhereIf(!input.LocationErpCode.IsNullOrWhiteSpace(), x => x.LocationErpCode.Contains(input.LocationErpCode)) - .WhereIf(input.LocationGroup != null, x => x.LocationGroup == input.LocationGroup) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.ReasonCode != null, x => x.ReasonCode == input.ReasonCode) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - .WhereIf(!input.WarehouseCode.IsNullOrWhiteSpace(), x => x.WarehouseCode.Contains(input.WarehouseCode)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreSupplierAsn/StoreSupplierAsnAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreSupplierAsn/StoreSupplierAsnAppService.cs index a7b2eb9b4..c9da01cb9 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreSupplierAsn/StoreSupplierAsnAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreSupplierAsn/StoreSupplierAsnAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsn.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsn; -public class StoreSupplierAsnAppService : CrudAppService, +public class StoreSupplierAsnAppService : ZbxBase, IStoreSupplierAsnAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreSupplierAsn.Default; @@ -23,34 +22,4 @@ public class StoreSupplierAsnAppService : CrudAppService> CreateFilteredQueryAsync(StoreSupplierAsnGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.ContactEmail != null, x => x.ContactEmail == input.ContactEmail) - .WhereIf(input.ContactName != null, x => x.ContactName == input.ContactName) - .WhereIf(input.ContactPhone != null, x => x.ContactPhone == input.ContactPhone) - .WhereIf(!input.CreateType.IsNullOrWhiteSpace(), x => x.CreateType.Contains(input.CreateType)) - .WhereIf(input.Ctype != null, x => x.Ctype == input.Ctype) - .WhereIf(!input.DockCode.IsNullOrWhiteSpace(), x => x.DockCode.Contains(input.DockCode)) - .WhereIf(input.DueDate != null, x => x.DueDate == input.DueDate) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.PlanArriveDate != null, x => x.PlanArriveDate == input.PlanArriveDate) - .WhereIf(input.PlanUserCode != null, x => x.PlanUserCode == input.PlanUserCode) - .WhereIf(input.PoNumber != null, x => x.PoNumber == input.PoNumber) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.RpNumber.IsNullOrWhiteSpace(), x => x.RpNumber.Contains(input.RpNumber)) - .WhereIf(input.ShipDate != null, x => x.ShipDate == input.ShipDate) - .WhereIf(!input.Status.IsNullOrWhiteSpace(), x => x.Status.Contains(input.Status)) - .WhereIf(input.StoreSupplierAsnDetails != null, x => x.StoreSupplierAsnDetails == input.StoreSupplierAsnDetails) - .WhereIf(input.SupplierAddress != null, x => x.SupplierAddress == input.SupplierAddress) - .WhereIf(!input.SupplierCode.IsNullOrWhiteSpace(), x => x.SupplierCode.Contains(input.SupplierCode)) - .WhereIf(input.SupplierName != null, x => x.SupplierName == input.SupplierName) - .WhereIf(input.TimeWindow != null, x => x.TimeWindow == input.TimeWindow) - .WhereIf(input.TruckNumber != null, x => x.TruckNumber == input.TruckNumber) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreSupplierAsnDetail/StoreSupplierAsnDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreSupplierAsnDetail/StoreSupplierAsnDetailAppService.cs index 598959c59..58ce79731 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreSupplierAsnDetail/StoreSupplierAsnDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreSupplierAsnDetail/StoreSupplierAsnDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsnDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsnDetail; -public class StoreSupplierAsnDetailAppService : CrudAppService, +public class StoreSupplierAsnDetailAppService : ZbxBase, IStoreSupplierAsnDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreSupplierAsnDetail.Default; @@ -23,38 +22,4 @@ public class StoreSupplierAsnDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreSupplierAsnDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.ContainerCode != null, x => x.ContainerCode == input.ContainerCode) - .WhereIf(input.ConvertRate != null, x => x.ConvertRate == input.ConvertRate) - .WhereIf(input.Ctype != null, x => x.Ctype == input.Ctype) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.Lot != null, x => x.Lot == input.Lot) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(!input.PackingCode.IsNullOrWhiteSpace(), x => x.PackingCode.Contains(input.PackingCode)) - .WhereIf(input.PlanUserCode != null, x => x.PlanUserCode == input.PlanUserCode) - .WhereIf(input.PoLine != null, x => x.PoLine == input.PoLine) - .WhereIf(input.PoNumber != null, x => x.PoNumber == input.PoNumber) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.ProjectCode != null, x => x.ProjectCode == input.ProjectCode) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.RecommendErpCode != null, x => x.RecommendErpCode == input.RecommendErpCode) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(input.SupplierPackQty != null, x => x.SupplierPackQty == input.SupplierPackQty) - .WhereIf(input.SupplierPackUom != null, x => x.SupplierPackUom == input.SupplierPackUom) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNote/StoreTransferNoteAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNote/StoreTransferNoteAppService.cs index 2fbfc8165..d0c6f8d54 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNote/StoreTransferNoteAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNote/StoreTransferNoteAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNote; -public class StoreTransferNoteAppService : CrudAppService, +public class StoreTransferNoteAppService : ZbxBase, IStoreTransferNoteAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreTransferNote.Default; @@ -23,23 +22,4 @@ public class StoreTransferNoteAppService : CrudAppService> CreateFilteredQueryAsync(StoreTransferNoteGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.Confirmed != null, x => x.Confirmed == input.Confirmed) - .WhereIf(input.ConfirmTime != null, x => x.ConfirmTime == input.ConfirmTime) - .WhereIf(input.JobNumber != null, x => x.JobNumber == input.JobNumber) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.RequestNumber != null, x => x.RequestNumber == input.RequestNumber) - .WhereIf(input.StoreTransferNoteDetailCopies != null, x => x.StoreTransferNoteDetailCopies == input.StoreTransferNoteDetailCopies) - .WhereIf(input.StoreTransferNoteDetails != null, x => x.StoreTransferNoteDetails == input.StoreTransferNoteDetails) - .WhereIf(input.Type != null, x => x.Type == input.Type) - .WhereIf(input.UseOnTheWayLocation != null, x => x.UseOnTheWayLocation == input.UseOnTheWayLocation) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopyAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopyAppService.cs index 8a50edf11..b32dbb7fc 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopyAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopyAppService.cs @@ -4,18 +4,19 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy; -public class StoreTransferNoteCopyAppService : CrudAppService, +public class StoreTransferNoteCopyAppService : ZbxBase, IStoreTransferNoteCopyAppService { - protected override string GetPolicyName { get; set; } = WmsPermissions.StoreTransferNoteCopy.Default; - protected override string GetListPolicyName { get; set; } = WmsPermissions.StoreTransferNoteCopy.Default; - protected override string CreatePolicyName { get; set; } = WmsPermissions.StoreTransferNoteCopy.Create; - protected override string UpdatePolicyName { get; set; } = WmsPermissions.StoreTransferNoteCopy.Update; - protected override string DeletePolicyName { get; set; } = WmsPermissions.StoreTransferNoteCopy.Delete; + protected override string GetPolicyName { get; set; } = WmsPermissions.StoreTransferNote.Default; + protected override string GetListPolicyName { get; set; } = WmsPermissions.StoreTransferNote.Default; + protected override string CreatePolicyName { get; set; } = WmsPermissions.StoreTransferNote.Create; + protected override string UpdatePolicyName { get; set; } = WmsPermissions.StoreTransferNote.Update; + protected override string DeletePolicyName { get; set; } = WmsPermissions.StoreTransferNote.Delete; private readonly IStoreTransferNoteCopyRepository _repository; diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteDetail/StoreTransferNoteDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteDetail/StoreTransferNoteDetailAppService.cs index 9c70b6b77..9d41aa7af 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteDetail/StoreTransferNoteDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteDetail/StoreTransferNoteDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail; -public class StoreTransferNoteDetailAppService : CrudAppService, +public class StoreTransferNoteDetailAppService : ZbxBase, IStoreTransferNoteDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreTransferNoteDetail.Default; @@ -23,46 +22,4 @@ public class StoreTransferNoteDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreTransferNoteDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(input.FromContainerCode != null, x => x.FromContainerCode == input.FromContainerCode) - .WhereIf(input.FromLocationArea != null, x => x.FromLocationArea == input.FromLocationArea) - .WhereIf(!input.FromLocationCode.IsNullOrWhiteSpace(), x => x.FromLocationCode.Contains(input.FromLocationCode)) - .WhereIf(!input.FromLocationErpCode.IsNullOrWhiteSpace(), x => x.FromLocationErpCode.Contains(input.FromLocationErpCode)) - .WhereIf(input.FromLocationGroup != null, x => x.FromLocationGroup == input.FromLocationGroup) - .WhereIf(input.FromLot != null, x => x.FromLot == input.FromLot) - .WhereIf(input.FromPackingCode != null, x => x.FromPackingCode == input.FromPackingCode) - .WhereIf(!input.FromStatus.IsNullOrWhiteSpace(), x => x.FromStatus.Contains(input.FromStatus)) - .WhereIf(!input.FromWarehouseCode.IsNullOrWhiteSpace(), x => x.FromWarehouseCode.Contains(input.FromWarehouseCode)) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.OnTheWayLocationCode != null, x => x.OnTheWayLocationCode == input.OnTheWayLocationCode) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.Reason != null, x => x.Reason == input.Reason) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(input.ToContainerCode != null, x => x.ToContainerCode == input.ToContainerCode) - .WhereIf(input.ToLocationArea != null, x => x.ToLocationArea == input.ToLocationArea) - .WhereIf(!input.ToLocationCode.IsNullOrWhiteSpace(), x => x.ToLocationCode.Contains(input.ToLocationCode)) - .WhereIf(!input.ToLocationErpCode.IsNullOrWhiteSpace(), x => x.ToLocationErpCode.Contains(input.ToLocationErpCode)) - .WhereIf(input.ToLocationGroup != null, x => x.ToLocationGroup == input.ToLocationGroup) - .WhereIf(input.ToLot != null, x => x.ToLot == input.ToLot) - .WhereIf(input.ToPackingCode != null, x => x.ToPackingCode == input.ToPackingCode) - .WhereIf(!input.ToStatus.IsNullOrWhiteSpace(), x => x.ToStatus.Contains(input.ToStatus)) - .WhereIf(!input.ToWarehouseCode.IsNullOrWhiteSpace(), x => x.ToWarehouseCode.Contains(input.ToWarehouseCode)) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopyAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopyAppService.cs index be2da48fa..421ed46c8 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopyAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopyAppService.cs @@ -1,21 +1,20 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy; -public class StoreTransferNoteDetailCopyAppService : CrudAppService, +public class StoreTransferNoteDetailCopyAppService : ZbxBase, IStoreTransferNoteDetailCopyAppService { - protected override string GetPolicyName { get; set; } = WmsPermissions.StoreTransferNoteDetailCopy.Default; - protected override string GetListPolicyName { get; set; } = WmsPermissions.StoreTransferNoteDetailCopy.Default; - protected override string CreatePolicyName { get; set; } = WmsPermissions.StoreTransferNoteDetailCopy.Create; - protected override string UpdatePolicyName { get; set; } = WmsPermissions.StoreTransferNoteDetailCopy.Update; - protected override string DeletePolicyName { get; set; } = WmsPermissions.StoreTransferNoteDetailCopy.Delete; + protected override string GetPolicyName { get; set; } = WmsPermissions.StoreTransferNoteDetail.Default; + protected override string GetListPolicyName { get; set; } = WmsPermissions.StoreTransferNoteDetail.Default; + protected override string CreatePolicyName { get; set; } = WmsPermissions.StoreTransferNoteDetail.Create; + protected override string UpdatePolicyName { get; set; } = WmsPermissions.StoreTransferNoteDetail.Update; + protected override string DeletePolicyName { get; set; } = WmsPermissions.StoreTransferNoteDetail.Delete; private readonly IStoreTransferNoteDetailCopyRepository _repository; @@ -23,46 +22,4 @@ public class StoreTransferNoteDetailCopyAppService : CrudAppService> CreateFilteredQueryAsync(StoreTransferNoteDetailCopyGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(input.FromContainerCode != null, x => x.FromContainerCode == input.FromContainerCode) - .WhereIf(input.FromLocationArea != null, x => x.FromLocationArea == input.FromLocationArea) - .WhereIf(!input.FromLocationCode.IsNullOrWhiteSpace(), x => x.FromLocationCode.Contains(input.FromLocationCode)) - .WhereIf(!input.FromLocationErpCode.IsNullOrWhiteSpace(), x => x.FromLocationErpCode.Contains(input.FromLocationErpCode)) - .WhereIf(input.FromLocationGroup != null, x => x.FromLocationGroup == input.FromLocationGroup) - .WhereIf(input.FromLot != null, x => x.FromLot == input.FromLot) - .WhereIf(input.FromPackingCode != null, x => x.FromPackingCode == input.FromPackingCode) - .WhereIf(!input.FromStatus.IsNullOrWhiteSpace(), x => x.FromStatus.Contains(input.FromStatus)) - .WhereIf(!input.FromWarehouseCode.IsNullOrWhiteSpace(), x => x.FromWarehouseCode.Contains(input.FromWarehouseCode)) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.OnTheWayLocationCode != null, x => x.OnTheWayLocationCode == input.OnTheWayLocationCode) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.Reason != null, x => x.Reason == input.Reason) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(input.ToContainerCode != null, x => x.ToContainerCode == input.ToContainerCode) - .WhereIf(input.ToLocationArea != null, x => x.ToLocationArea == input.ToLocationArea) - .WhereIf(!input.ToLocationCode.IsNullOrWhiteSpace(), x => x.ToLocationCode.Contains(input.ToLocationCode)) - .WhereIf(!input.ToLocationErpCode.IsNullOrWhiteSpace(), x => x.ToLocationErpCode.Contains(input.ToLocationErpCode)) - .WhereIf(input.ToLocationGroup != null, x => x.ToLocationGroup == input.ToLocationGroup) - .WhereIf(input.ToLot != null, x => x.ToLot == input.ToLot) - .WhereIf(input.ToPackingCode != null, x => x.ToPackingCode == input.ToPackingCode) - .WhereIf(!input.ToStatus.IsNullOrWhiteSpace(), x => x.ToStatus.Contains(input.ToStatus)) - .WhereIf(!input.ToWarehouseCode.IsNullOrWhiteSpace(), x => x.ToWarehouseCode.Contains(input.ToWarehouseCode)) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferRequest/StoreTransferRequestAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferRequest/StoreTransferRequestAppService.cs index 39a747374..e3ec87fcc 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferRequest/StoreTransferRequestAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferRequest/StoreTransferRequestAppService.cs @@ -4,11 +4,12 @@ using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequest.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferRequest; -public class StoreTransferRequestAppService : CrudAppService, +public class StoreTransferRequestAppService : ZbxBase, IStoreTransferRequestAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreTransferRequest.Default; diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferRequestDetail/StoreTransferRequestDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferRequestDetail/StoreTransferRequestDetailAppService.cs index 0e88c17ec..867e5bc3f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferRequestDetail/StoreTransferRequestDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferRequestDetail/StoreTransferRequestDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequestDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferRequestDetail; -public class StoreTransferRequestDetailAppService : CrudAppService, +public class StoreTransferRequestDetailAppService : ZbxBase, IStoreTransferRequestDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreTransferRequestDetail.Default; @@ -23,45 +22,4 @@ public class StoreTransferRequestDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreTransferRequestDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(input.FromContainerCode != null, x => x.FromContainerCode == input.FromContainerCode) - .WhereIf(input.FromLocationArea != null, x => x.FromLocationArea == input.FromLocationArea) - .WhereIf(!input.FromLocationCode.IsNullOrWhiteSpace(), x => x.FromLocationCode.Contains(input.FromLocationCode)) - .WhereIf(!input.FromLocationErpCode.IsNullOrWhiteSpace(), x => x.FromLocationErpCode.Contains(input.FromLocationErpCode)) - .WhereIf(input.FromLocationGroup != null, x => x.FromLocationGroup == input.FromLocationGroup) - .WhereIf(input.FromLot != null, x => x.FromLot == input.FromLot) - .WhereIf(input.FromPackingCode != null, x => x.FromPackingCode == input.FromPackingCode) - .WhereIf(!input.FromStatus.IsNullOrWhiteSpace(), x => x.FromStatus.Contains(input.FromStatus)) - .WhereIf(!input.FromWarehouseCode.IsNullOrWhiteSpace(), x => x.FromWarehouseCode.Contains(input.FromWarehouseCode)) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.Reason != null, x => x.Reason == input.Reason) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(input.ToContainerCode != null, x => x.ToContainerCode == input.ToContainerCode) - .WhereIf(input.ToLocationArea != null, x => x.ToLocationArea == input.ToLocationArea) - .WhereIf(!input.ToLocationCode.IsNullOrWhiteSpace(), x => x.ToLocationCode.Contains(input.ToLocationCode)) - .WhereIf(!input.ToLocationErpCode.IsNullOrWhiteSpace(), x => x.ToLocationErpCode.Contains(input.ToLocationErpCode)) - .WhereIf(input.ToLocationGroup != null, x => x.ToLocationGroup == input.ToLocationGroup) - .WhereIf(input.ToLot != null, x => x.ToLot == input.ToLot) - .WhereIf(input.ToPackingCode != null, x => x.ToPackingCode == input.ToPackingCode) - .WhereIf(!input.ToStatus.IsNullOrWhiteSpace(), x => x.ToStatus.Contains(input.ToStatus)) - .WhereIf(!input.ToWarehouseCode.IsNullOrWhiteSpace(), x => x.ToWarehouseCode.Contains(input.ToWarehouseCode)) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedIssueNote/StoreUnplannedIssueNoteAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedIssueNote/StoreUnplannedIssueNoteAppService.cs index 8b22315c8..ae01e2ce4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedIssueNote/StoreUnplannedIssueNoteAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedIssueNote/StoreUnplannedIssueNoteAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNote.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNote; -public class StoreUnplannedIssueNoteAppService : CrudAppService, +public class StoreUnplannedIssueNoteAppService : ZbxBase, IStoreUnplannedIssueNoteAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreUnplannedIssueNote.Default; @@ -23,21 +22,4 @@ public class StoreUnplannedIssueNoteAppService : CrudAppService> CreateFilteredQueryAsync(StoreUnplannedIssueNoteGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.BuildDate != null, x => x.BuildDate == input.BuildDate) - .WhereIf(input.DeptCode != null, x => x.DeptCode == input.DeptCode) - .WhereIf(input.DeptName != null, x => x.DeptName == input.DeptName) - .WhereIf(input.JobNumber != null, x => x.JobNumber == input.JobNumber) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.StoreUnplannedIssueNoteDetails != null, x => x.StoreUnplannedIssueNoteDetails == input.StoreUnplannedIssueNoteDetails) - .WhereIf(input.UnplannedIssueRequestNumber != null, x => x.UnplannedIssueRequestNumber == input.UnplannedIssueRequestNumber) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedIssueNoteDetail/StoreUnplannedIssueNoteDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedIssueNoteDetail/StoreUnplannedIssueNoteDetailAppService.cs index 5c9b566da..8cc376661 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedIssueNoteDetail/StoreUnplannedIssueNoteDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedIssueNoteDetail/StoreUnplannedIssueNoteDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNoteDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNoteDetail; -public class StoreUnplannedIssueNoteDetailAppService : CrudAppService, +public class StoreUnplannedIssueNoteDetailAppService : ZbxBase, IStoreUnplannedIssueNoteDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreUnplannedIssueNoteDetail.Default; @@ -23,65 +22,4 @@ public class StoreUnplannedIssueNoteDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreUnplannedIssueNoteDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.CaseCode != null, x => x.CaseCode == input.CaseCode) - .WhereIf(input.ContainerCode != null, x => x.ContainerCode == input.ContainerCode) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(input.HandledArriveDate != null, x => x.HandledArriveDate == input.HandledArriveDate) - .WhereIf(input.HandledContainerCode != null, x => x.HandledContainerCode == input.HandledContainerCode) - .WhereIf(input.HandledExpireDate != null, x => x.HandledExpireDate == input.HandledExpireDate) - .WhereIf(input.HandledFromLocationArea != null, x => x.HandledFromLocationArea == input.HandledFromLocationArea) - .WhereIf(input.HandledFromLocationCode != null, x => x.HandledFromLocationCode == input.HandledFromLocationCode) - .WhereIf(input.HandledFromLocationErpCode != null, x => x.HandledFromLocationErpCode == input.HandledFromLocationErpCode) - .WhereIf(input.HandledFromLocationGroup != null, x => x.HandledFromLocationGroup == input.HandledFromLocationGroup) - .WhereIf(input.HandledFromWarehouseCode != null, x => x.HandledFromWarehouseCode == input.HandledFromWarehouseCode) - .WhereIf(input.HandledLot != null, x => x.HandledLot == input.HandledLot) - .WhereIf(input.HandledPackingCode != null, x => x.HandledPackingCode == input.HandledPackingCode) - .WhereIf(input.HandledProduceDate != null, x => x.HandledProduceDate == input.HandledProduceDate) - .WhereIf(input.HandledQty != null, x => x.HandledQty == input.HandledQty) - .WhereIf(input.HandledSupplierBatch != null, x => x.HandledSupplierBatch == input.HandledSupplierBatch) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.LocationArea != null, x => x.LocationArea == input.LocationArea) - .WhereIf(!input.LocationCode.IsNullOrWhiteSpace(), x => x.LocationCode.Contains(input.LocationCode)) - .WhereIf(!input.LocationErpCode.IsNullOrWhiteSpace(), x => x.LocationErpCode.Contains(input.LocationErpCode)) - .WhereIf(input.LocationGroup != null, x => x.LocationGroup == input.LocationGroup) - .WhereIf(input.Lot != null, x => x.Lot == input.Lot) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.OnceBusiCode != null, x => x.OnceBusiCode == input.OnceBusiCode) - .WhereIf(!input.PackingCode.IsNullOrWhiteSpace(), x => x.PackingCode.Contains(input.PackingCode)) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.ProjCapacityCode != null, x => x.ProjCapacityCode == input.ProjCapacityCode) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.ReasonCode != null, x => x.ReasonCode == input.ReasonCode) - .WhereIf(input.RecommendArriveDate != null, x => x.RecommendArriveDate == input.RecommendArriveDate) - .WhereIf(input.RecommendContainerCode != null, x => x.RecommendContainerCode == input.RecommendContainerCode) - .WhereIf(input.RecommendExpireDate != null, x => x.RecommendExpireDate == input.RecommendExpireDate) - .WhereIf(input.RecommendFromLocationArea != null, x => x.RecommendFromLocationArea == input.RecommendFromLocationArea) - .WhereIf(input.RecommendFromLocationCode != null, x => x.RecommendFromLocationCode == input.RecommendFromLocationCode) - .WhereIf(input.RecommendFromLocationErpCode != null, x => x.RecommendFromLocationErpCode == input.RecommendFromLocationErpCode) - .WhereIf(input.RecommendFromLocationGroup != null, x => x.RecommendFromLocationGroup == input.RecommendFromLocationGroup) - .WhereIf(input.RecommendFromWarehouseCode != null, x => x.RecommendFromWarehouseCode == input.RecommendFromWarehouseCode) - .WhereIf(input.RecommendLot != null, x => x.RecommendLot == input.RecommendLot) - .WhereIf(input.RecommendPackingCode != null, x => x.RecommendPackingCode == input.RecommendPackingCode) - .WhereIf(input.RecommendProduceDate != null, x => x.RecommendProduceDate == input.RecommendProduceDate) - .WhereIf(input.RecommendQty != null, x => x.RecommendQty == input.RecommendQty) - .WhereIf(input.RecommendSupplierBatch != null, x => x.RecommendSupplierBatch == input.RecommendSupplierBatch) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.Status.IsNullOrWhiteSpace(), x => x.Status.Contains(input.Status)) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - .WhereIf(!input.WarehouseCode.IsNullOrWhiteSpace(), x => x.WarehouseCode.Contains(input.WarehouseCode)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedIssueRequest/StoreUnplannedIssueRequestAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedIssueRequest/StoreUnplannedIssueRequestAppService.cs index 469c10384..3e74eac29 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedIssueRequest/StoreUnplannedIssueRequestAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedIssueRequest/StoreUnplannedIssueRequestAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequest.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequest; -public class StoreUnplannedIssueRequestAppService : CrudAppService, +public class StoreUnplannedIssueRequestAppService : ZbxBase, IStoreUnplannedIssueRequestAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreUnplannedIssueRequest.Default; @@ -23,25 +22,4 @@ public class StoreUnplannedIssueRequestAppService : CrudAppService> CreateFilteredQueryAsync(StoreUnplannedIssueRequestGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.AutoAgree != null, x => x.AutoAgree == input.AutoAgree) - .WhereIf(input.AutoCompleteJob != null, x => x.AutoCompleteJob == input.AutoCompleteJob) - .WhereIf(input.AutoHandle != null, x => x.AutoHandle == input.AutoHandle) - .WhereIf(input.AutoSubmit != null, x => x.AutoSubmit == input.AutoSubmit) - .WhereIf(input.BuildDate != null, x => x.BuildDate == input.BuildDate) - .WhereIf(input.DeptCode != null, x => x.DeptCode == input.DeptCode) - .WhereIf(input.DeptName != null, x => x.DeptName == input.DeptName) - .WhereIf(input.DirectCreateNote != null, x => x.DirectCreateNote == input.DirectCreateNote) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.RequestStatus.IsNullOrWhiteSpace(), x => x.RequestStatus.Contains(input.RequestStatus)) - .WhereIf(input.StoreUnplannedIssueRequestDetails != null, x => x.StoreUnplannedIssueRequestDetails == input.StoreUnplannedIssueRequestDetails) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedIssueRequestDetail/StoreUnplannedIssueRequestDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedIssueRequestDetail/StoreUnplannedIssueRequestDetailAppService.cs index 28d434733..5dafcf980 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedIssueRequestDetail/StoreUnplannedIssueRequestDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedIssueRequestDetail/StoreUnplannedIssueRequestDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequestDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueRequestDetail; -public class StoreUnplannedIssueRequestDetailAppService : CrudAppService, +public class StoreUnplannedIssueRequestDetailAppService : ZbxBase, IStoreUnplannedIssueRequestDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreUnplannedIssueRequestDetail.Default; @@ -23,39 +22,4 @@ public class StoreUnplannedIssueRequestDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreUnplannedIssueRequestDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.CaseCode != null, x => x.CaseCode == input.CaseCode) - .WhereIf(input.ContainerCode != null, x => x.ContainerCode == input.ContainerCode) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.LocationArea != null, x => x.LocationArea == input.LocationArea) - .WhereIf(!input.LocationCode.IsNullOrWhiteSpace(), x => x.LocationCode.Contains(input.LocationCode)) - .WhereIf(!input.LocationErpCode.IsNullOrWhiteSpace(), x => x.LocationErpCode.Contains(input.LocationErpCode)) - .WhereIf(input.LocationGroup != null, x => x.LocationGroup == input.LocationGroup) - .WhereIf(input.Lot != null, x => x.Lot == input.Lot) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.OnceBusiCode != null, x => x.OnceBusiCode == input.OnceBusiCode) - .WhereIf(!input.PackingCode.IsNullOrWhiteSpace(), x => x.PackingCode.Contains(input.PackingCode)) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.ProjCapacityCode != null, x => x.ProjCapacityCode == input.ProjCapacityCode) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.ReasonCode != null, x => x.ReasonCode == input.ReasonCode) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.Status.IsNullOrWhiteSpace(), x => x.Status.Contains(input.Status)) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - .WhereIf(!input.WarehouseCode.IsNullOrWhiteSpace(), x => x.WarehouseCode.Contains(input.WarehouseCode)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedReceiptNote/StoreUnplannedReceiptNoteAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedReceiptNote/StoreUnplannedReceiptNoteAppService.cs index 434a41219..25cd80268 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedReceiptNote/StoreUnplannedReceiptNoteAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedReceiptNote/StoreUnplannedReceiptNoteAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNote.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNote; -public class StoreUnplannedReceiptNoteAppService : CrudAppService, +public class StoreUnplannedReceiptNoteAppService : ZbxBase, IStoreUnplannedReceiptNoteAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreUnplannedReceiptNote.Default; @@ -23,21 +22,4 @@ public class StoreUnplannedReceiptNoteAppService : CrudAppService> CreateFilteredQueryAsync(StoreUnplannedReceiptNoteGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.BuildDate != null, x => x.BuildDate == input.BuildDate) - .WhereIf(input.DeptCode != null, x => x.DeptCode == input.DeptCode) - .WhereIf(input.DeptName != null, x => x.DeptName == input.DeptName) - .WhereIf(input.JobNumber != null, x => x.JobNumber == input.JobNumber) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.StoreUnplannedReceiptNoteDetails != null, x => x.StoreUnplannedReceiptNoteDetails == input.StoreUnplannedReceiptNoteDetails) - .WhereIf(input.UnplannedReceiptRequestNumber != null, x => x.UnplannedReceiptRequestNumber == input.UnplannedReceiptRequestNumber) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedReceiptNoteDetail/StoreUnplannedReceiptNoteDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedReceiptNoteDetail/StoreUnplannedReceiptNoteDetailAppService.cs index 7abd287c5..e98c5eaca 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedReceiptNoteDetail/StoreUnplannedReceiptNoteDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedReceiptNoteDetail/StoreUnplannedReceiptNoteDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNoteDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptNoteDetail; -public class StoreUnplannedReceiptNoteDetailAppService : CrudAppService, +public class StoreUnplannedReceiptNoteDetailAppService : ZbxBase, IStoreUnplannedReceiptNoteDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreUnplannedReceiptNoteDetail.Default; @@ -23,65 +22,4 @@ public class StoreUnplannedReceiptNoteDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreUnplannedReceiptNoteDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.CaseCode != null, x => x.CaseCode == input.CaseCode) - .WhereIf(input.ContainerCode != null, x => x.ContainerCode == input.ContainerCode) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(input.HandledArriveDate != null, x => x.HandledArriveDate == input.HandledArriveDate) - .WhereIf(input.HandledContainerCode != null, x => x.HandledContainerCode == input.HandledContainerCode) - .WhereIf(input.HandledExpireDate != null, x => x.HandledExpireDate == input.HandledExpireDate) - .WhereIf(input.HandledLot != null, x => x.HandledLot == input.HandledLot) - .WhereIf(input.HandledPackingCode != null, x => x.HandledPackingCode == input.HandledPackingCode) - .WhereIf(input.HandledProduceDate != null, x => x.HandledProduceDate == input.HandledProduceDate) - .WhereIf(input.HandledQty != null, x => x.HandledQty == input.HandledQty) - .WhereIf(input.HandledSupplierBatch != null, x => x.HandledSupplierBatch == input.HandledSupplierBatch) - .WhereIf(input.HandledToLocationArea != null, x => x.HandledToLocationArea == input.HandledToLocationArea) - .WhereIf(input.HandledToLocationCode != null, x => x.HandledToLocationCode == input.HandledToLocationCode) - .WhereIf(input.HandledToLocationErpCode != null, x => x.HandledToLocationErpCode == input.HandledToLocationErpCode) - .WhereIf(input.HandledToLocationGroup != null, x => x.HandledToLocationGroup == input.HandledToLocationGroup) - .WhereIf(input.HandledToWarehouseCode != null, x => x.HandledToWarehouseCode == input.HandledToWarehouseCode) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.LocationArea != null, x => x.LocationArea == input.LocationArea) - .WhereIf(!input.LocationCode.IsNullOrWhiteSpace(), x => x.LocationCode.Contains(input.LocationCode)) - .WhereIf(!input.LocationErpCode.IsNullOrWhiteSpace(), x => x.LocationErpCode.Contains(input.LocationErpCode)) - .WhereIf(input.LocationGroup != null, x => x.LocationGroup == input.LocationGroup) - .WhereIf(input.Lot != null, x => x.Lot == input.Lot) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.OnceBusiCode != null, x => x.OnceBusiCode == input.OnceBusiCode) - .WhereIf(!input.PackingCode.IsNullOrWhiteSpace(), x => x.PackingCode.Contains(input.PackingCode)) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.ProjCapacityCode != null, x => x.ProjCapacityCode == input.ProjCapacityCode) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.ReasonCode != null, x => x.ReasonCode == input.ReasonCode) - .WhereIf(input.RecommendArriveDate != null, x => x.RecommendArriveDate == input.RecommendArriveDate) - .WhereIf(input.RecommendContainerCode != null, x => x.RecommendContainerCode == input.RecommendContainerCode) - .WhereIf(input.RecommendExpireDate != null, x => x.RecommendExpireDate == input.RecommendExpireDate) - .WhereIf(input.RecommendLot != null, x => x.RecommendLot == input.RecommendLot) - .WhereIf(input.RecommendPackingCode != null, x => x.RecommendPackingCode == input.RecommendPackingCode) - .WhereIf(input.RecommendProduceDate != null, x => x.RecommendProduceDate == input.RecommendProduceDate) - .WhereIf(input.RecommendQty != null, x => x.RecommendQty == input.RecommendQty) - .WhereIf(input.RecommendSupplierBatch != null, x => x.RecommendSupplierBatch == input.RecommendSupplierBatch) - .WhereIf(input.RecommendToLocationArea != null, x => x.RecommendToLocationArea == input.RecommendToLocationArea) - .WhereIf(input.RecommendToLocationCode != null, x => x.RecommendToLocationCode == input.RecommendToLocationCode) - .WhereIf(input.RecommendToLocationErpCode != null, x => x.RecommendToLocationErpCode == input.RecommendToLocationErpCode) - .WhereIf(input.RecommendToLocationGroup != null, x => x.RecommendToLocationGroup == input.RecommendToLocationGroup) - .WhereIf(input.RecommendToWarehouseCode != null, x => x.RecommendToWarehouseCode == input.RecommendToWarehouseCode) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.Status.IsNullOrWhiteSpace(), x => x.Status.Contains(input.Status)) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - .WhereIf(!input.WarehouseCode.IsNullOrWhiteSpace(), x => x.WarehouseCode.Contains(input.WarehouseCode)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedReceiptRequest/StoreUnplannedReceiptRequestAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedReceiptRequest/StoreUnplannedReceiptRequestAppService.cs index 1261feb82..d7b86f897 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedReceiptRequest/StoreUnplannedReceiptRequestAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedReceiptRequest/StoreUnplannedReceiptRequestAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequest.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequest; -public class StoreUnplannedReceiptRequestAppService : CrudAppService, +public class StoreUnplannedReceiptRequestAppService : ZbxBase, IStoreUnplannedReceiptRequestAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreUnplannedReceiptRequest.Default; @@ -23,25 +22,4 @@ public class StoreUnplannedReceiptRequestAppService : CrudAppService> CreateFilteredQueryAsync(StoreUnplannedReceiptRequestGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.AutoAgree != null, x => x.AutoAgree == input.AutoAgree) - .WhereIf(input.AutoCompleteJob != null, x => x.AutoCompleteJob == input.AutoCompleteJob) - .WhereIf(input.AutoHandle != null, x => x.AutoHandle == input.AutoHandle) - .WhereIf(input.AutoSubmit != null, x => x.AutoSubmit == input.AutoSubmit) - .WhereIf(input.BuildDate != null, x => x.BuildDate == input.BuildDate) - .WhereIf(input.DeptCode != null, x => x.DeptCode == input.DeptCode) - .WhereIf(input.DeptName != null, x => x.DeptName == input.DeptName) - .WhereIf(input.DirectCreateNote != null, x => x.DirectCreateNote == input.DirectCreateNote) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.RequestStatus.IsNullOrWhiteSpace(), x => x.RequestStatus.Contains(input.RequestStatus)) - .WhereIf(input.StoreUnplannedReceiptRequestDetails != null, x => x.StoreUnplannedReceiptRequestDetails == input.StoreUnplannedReceiptRequestDetails) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedReceiptRequestDetail/StoreUnplannedReceiptRequestDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedReceiptRequestDetail/StoreUnplannedReceiptRequestDetailAppService.cs index c4078c49c..5d09bf1b1 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedReceiptRequestDetail/StoreUnplannedReceiptRequestDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreUnplannedReceiptRequestDetail/StoreUnplannedReceiptRequestDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequestDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreUnplannedReceiptRequestDetail; -public class StoreUnplannedReceiptRequestDetailAppService : CrudAppService, +public class StoreUnplannedReceiptRequestDetailAppService : ZbxBase, IStoreUnplannedReceiptRequestDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreUnplannedReceiptRequestDetail.Default; @@ -23,39 +22,4 @@ public class StoreUnplannedReceiptRequestDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreUnplannedReceiptRequestDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.CaseCode != null, x => x.CaseCode == input.CaseCode) - .WhereIf(input.ContainerCode != null, x => x.ContainerCode == input.ContainerCode) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.LocationArea != null, x => x.LocationArea == input.LocationArea) - .WhereIf(!input.LocationCode.IsNullOrWhiteSpace(), x => x.LocationCode.Contains(input.LocationCode)) - .WhereIf(!input.LocationErpCode.IsNullOrWhiteSpace(), x => x.LocationErpCode.Contains(input.LocationErpCode)) - .WhereIf(input.LocationGroup != null, x => x.LocationGroup == input.LocationGroup) - .WhereIf(input.Lot != null, x => x.Lot == input.Lot) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.OnceBusiCode != null, x => x.OnceBusiCode == input.OnceBusiCode) - .WhereIf(!input.PackingCode.IsNullOrWhiteSpace(), x => x.PackingCode.Contains(input.PackingCode)) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.ProjCapacityCode != null, x => x.ProjCapacityCode == input.ProjCapacityCode) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.ReasonCode != null, x => x.ReasonCode == input.ReasonCode) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.Status.IsNullOrWhiteSpace(), x => x.Status.Contains(input.Status)) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - .WhereIf(!input.WarehouseCode.IsNullOrWhiteSpace(), x => x.WarehouseCode.Contains(input.WarehouseCode)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWarehouseTransferNote/StoreWarehouseTransferNoteAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWarehouseTransferNote/StoreWarehouseTransferNoteAppService.cs index a7ba409e7..9916f0a1b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWarehouseTransferNote/StoreWarehouseTransferNoteAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWarehouseTransferNote/StoreWarehouseTransferNoteAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNote.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNote; -public class StoreWarehouseTransferNoteAppService : CrudAppService, +public class StoreWarehouseTransferNoteAppService : ZbxBase, IStoreWarehouseTransferNoteAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreWarehouseTransferNote.Default; @@ -23,18 +22,4 @@ public class StoreWarehouseTransferNoteAppService : CrudAppService> CreateFilteredQueryAsync(StoreWarehouseTransferNoteGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.JobNumber != null, x => x.JobNumber == input.JobNumber) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.StoreWarehouseTransferNoteDetails != null, x => x.StoreWarehouseTransferNoteDetails == input.StoreWarehouseTransferNoteDetails) - .WhereIf(input.SupplierCode != null, x => x.SupplierCode == input.SupplierCode) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWarehouseTransferNoteDetail/StoreWarehouseTransferNoteDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWarehouseTransferNoteDetail/StoreWarehouseTransferNoteDetailAppService.cs index 2297aae51..c63c057d1 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWarehouseTransferNoteDetail/StoreWarehouseTransferNoteDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWarehouseTransferNoteDetail/StoreWarehouseTransferNoteDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNoteDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreWarehouseTransferNoteDetail; -public class StoreWarehouseTransferNoteDetailAppService : CrudAppService, +public class StoreWarehouseTransferNoteDetailAppService : ZbxBase, IStoreWarehouseTransferNoteDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreWarehouseTransferNoteDetail.Default; @@ -23,45 +22,4 @@ public class StoreWarehouseTransferNoteDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreWarehouseTransferNoteDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(input.FromContainerCode != null, x => x.FromContainerCode == input.FromContainerCode) - .WhereIf(input.FromLocationArea != null, x => x.FromLocationArea == input.FromLocationArea) - .WhereIf(!input.FromLocationCode.IsNullOrWhiteSpace(), x => x.FromLocationCode.Contains(input.FromLocationCode)) - .WhereIf(!input.FromLocationErpCode.IsNullOrWhiteSpace(), x => x.FromLocationErpCode.Contains(input.FromLocationErpCode)) - .WhereIf(input.FromLocationGroup != null, x => x.FromLocationGroup == input.FromLocationGroup) - .WhereIf(input.FromLot != null, x => x.FromLot == input.FromLot) - .WhereIf(input.FromPackingCode != null, x => x.FromPackingCode == input.FromPackingCode) - .WhereIf(!input.FromStatus.IsNullOrWhiteSpace(), x => x.FromStatus.Contains(input.FromStatus)) - .WhereIf(!input.FromWarehouseCode.IsNullOrWhiteSpace(), x => x.FromWarehouseCode.Contains(input.FromWarehouseCode)) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.Reason != null, x => x.Reason == input.Reason) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(input.ToContainerCode != null, x => x.ToContainerCode == input.ToContainerCode) - .WhereIf(input.ToLocationArea != null, x => x.ToLocationArea == input.ToLocationArea) - .WhereIf(!input.ToLocationCode.IsNullOrWhiteSpace(), x => x.ToLocationCode.Contains(input.ToLocationCode)) - .WhereIf(!input.ToLocationErpCode.IsNullOrWhiteSpace(), x => x.ToLocationErpCode.Contains(input.ToLocationErpCode)) - .WhereIf(input.ToLocationGroup != null, x => x.ToLocationGroup == input.ToLocationGroup) - .WhereIf(input.ToLot != null, x => x.ToLot == input.ToLot) - .WhereIf(input.ToPackingCode != null, x => x.ToPackingCode == input.ToPackingCode) - .WhereIf(!input.ToStatus.IsNullOrWhiteSpace(), x => x.ToStatus.Contains(input.ToStatus)) - .WhereIf(!input.ToWarehouseCode.IsNullOrWhiteSpace(), x => x.ToWarehouseCode.Contains(input.ToWarehouseCode)) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWipWarehouseAdjustNote/StoreWipWarehouseAdjustNoteAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWipWarehouseAdjustNote/StoreWipWarehouseAdjustNoteAppService.cs index 15b6aba15..7d4b123c2 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWipWarehouseAdjustNote/StoreWipWarehouseAdjustNoteAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWipWarehouseAdjustNote/StoreWipWarehouseAdjustNoteAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNote.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNote; -public class StoreWipWarehouseAdjustNoteAppService : CrudAppService, +public class StoreWipWarehouseAdjustNoteAppService : ZbxBase, IStoreWipWarehouseAdjustNoteAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreWipWarehouseAdjustNote.Default; @@ -23,21 +22,4 @@ public class StoreWipWarehouseAdjustNoteAppService : CrudAppService> CreateFilteredQueryAsync(StoreWipWarehouseAdjustNoteGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.Confirmed != null, x => x.Confirmed == input.Confirmed) - .WhereIf(input.ConfirmTime != null, x => x.ConfirmTime == input.ConfirmTime) - .WhereIf(input.JobNumber != null, x => x.JobNumber == input.JobNumber) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.RequestNumber != null, x => x.RequestNumber == input.RequestNumber) - .WhereIf(input.StoreWipWarehouseAdjustNoteDetails != null, x => x.StoreWipWarehouseAdjustNoteDetails == input.StoreWipWarehouseAdjustNoteDetails) - .WhereIf(input.Type != null, x => x.Type == input.Type) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWipWarehouseAdjustNoteDetail/StoreWipWarehouseAdjustNoteDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWipWarehouseAdjustNoteDetail/StoreWipWarehouseAdjustNoteDetailAppService.cs index 45e7d5634..0d330962a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWipWarehouseAdjustNoteDetail/StoreWipWarehouseAdjustNoteDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWipWarehouseAdjustNoteDetail/StoreWipWarehouseAdjustNoteDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNoteDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustNoteDetail; -public class StoreWipWarehouseAdjustNoteDetailAppService : CrudAppService, +public class StoreWipWarehouseAdjustNoteDetailAppService : ZbxBase, IStoreWipWarehouseAdjustNoteDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreWipWarehouseAdjustNoteDetail.Default; @@ -23,46 +22,4 @@ public class StoreWipWarehouseAdjustNoteDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreWipWarehouseAdjustNoteDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(input.FromContainerCode != null, x => x.FromContainerCode == input.FromContainerCode) - .WhereIf(input.FromLocationArea != null, x => x.FromLocationArea == input.FromLocationArea) - .WhereIf(!input.FromLocationCode.IsNullOrWhiteSpace(), x => x.FromLocationCode.Contains(input.FromLocationCode)) - .WhereIf(!input.FromLocationErpCode.IsNullOrWhiteSpace(), x => x.FromLocationErpCode.Contains(input.FromLocationErpCode)) - .WhereIf(input.FromLocationGroup != null, x => x.FromLocationGroup == input.FromLocationGroup) - .WhereIf(input.FromLot != null, x => x.FromLot == input.FromLot) - .WhereIf(input.FromPackingCode != null, x => x.FromPackingCode == input.FromPackingCode) - .WhereIf(!input.FromStatus.IsNullOrWhiteSpace(), x => x.FromStatus.Contains(input.FromStatus)) - .WhereIf(!input.FromWarehouseCode.IsNullOrWhiteSpace(), x => x.FromWarehouseCode.Contains(input.FromWarehouseCode)) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.Reason != null, x => x.Reason == input.Reason) - .WhereIf(input.ReasonCode != null, x => x.ReasonCode == input.ReasonCode) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(input.ToContainerCode != null, x => x.ToContainerCode == input.ToContainerCode) - .WhereIf(input.ToLocationArea != null, x => x.ToLocationArea == input.ToLocationArea) - .WhereIf(!input.ToLocationCode.IsNullOrWhiteSpace(), x => x.ToLocationCode.Contains(input.ToLocationCode)) - .WhereIf(!input.ToLocationErpCode.IsNullOrWhiteSpace(), x => x.ToLocationErpCode.Contains(input.ToLocationErpCode)) - .WhereIf(input.ToLocationGroup != null, x => x.ToLocationGroup == input.ToLocationGroup) - .WhereIf(input.ToLot != null, x => x.ToLot == input.ToLot) - .WhereIf(input.ToPackingCode != null, x => x.ToPackingCode == input.ToPackingCode) - .WhereIf(!input.ToStatus.IsNullOrWhiteSpace(), x => x.ToStatus.Contains(input.ToStatus)) - .WhereIf(!input.ToWarehouseCode.IsNullOrWhiteSpace(), x => x.ToWarehouseCode.Contains(input.ToWarehouseCode)) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWipWarehouseAdjustRequest/StoreWipWarehouseAdjustRequestAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWipWarehouseAdjustRequest/StoreWipWarehouseAdjustRequestAppService.cs index 5e1825df4..840613de8 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWipWarehouseAdjustRequest/StoreWipWarehouseAdjustRequestAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWipWarehouseAdjustRequest/StoreWipWarehouseAdjustRequestAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequest.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequest; -public class StoreWipWarehouseAdjustRequestAppService : CrudAppService, +public class StoreWipWarehouseAdjustRequestAppService : ZbxBase, IStoreWipWarehouseAdjustRequestAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreWipWarehouseAdjustRequest.Default; @@ -23,23 +22,4 @@ public class StoreWipWarehouseAdjustRequestAppService : CrudAppService> CreateFilteredQueryAsync(StoreWipWarehouseAdjustRequestGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.AutoAgree != null, x => x.AutoAgree == input.AutoAgree) - .WhereIf(input.AutoCompleteJob != null, x => x.AutoCompleteJob == input.AutoCompleteJob) - .WhereIf(input.AutoHandle != null, x => x.AutoHandle == input.AutoHandle) - .WhereIf(input.AutoSubmit != null, x => x.AutoSubmit == input.AutoSubmit) - .WhereIf(input.DirectCreateNote != null, x => x.DirectCreateNote == input.DirectCreateNote) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(!input.RequestStatus.IsNullOrWhiteSpace(), x => x.RequestStatus.Contains(input.RequestStatus)) - .WhereIf(input.StoreWipWarehouseAdjustRequestDetails != null, x => x.StoreWipWarehouseAdjustRequestDetails == input.StoreWipWarehouseAdjustRequestDetails) - .WhereIf(input.Type != null, x => x.Type == input.Type) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWipWarehouseAdjustRequestDetail/StoreWipWarehouseAdjustRequestDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWipWarehouseAdjustRequestDetail/StoreWipWarehouseAdjustRequestDetailAppService.cs index 25812863b..8fcb0db9e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWipWarehouseAdjustRequestDetail/StoreWipWarehouseAdjustRequestDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWipWarehouseAdjustRequestDetail/StoreWipWarehouseAdjustRequestDetailAppService.cs @@ -1,14 +1,13 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequestDetail.Dtos; using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequestDetail; -public class StoreWipWarehouseAdjustRequestDetailAppService : CrudAppService, +public class StoreWipWarehouseAdjustRequestDetailAppService : ZbxBase, IStoreWipWarehouseAdjustRequestDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreWipWarehouseAdjustRequestDetail.Default; @@ -23,46 +22,4 @@ public class StoreWipWarehouseAdjustRequestDetailAppService : CrudAppService> CreateFilteredQueryAsync(StoreWipWarehouseAdjustRequestDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ArriveDate != null, x => x.ArriveDate == input.ArriveDate) - .WhereIf(input.ExpireDate != null, x => x.ExpireDate == input.ExpireDate) - .WhereIf(input.FromContainerCode != null, x => x.FromContainerCode == input.FromContainerCode) - .WhereIf(input.FromLocationArea != null, x => x.FromLocationArea == input.FromLocationArea) - .WhereIf(!input.FromLocationCode.IsNullOrWhiteSpace(), x => x.FromLocationCode.Contains(input.FromLocationCode)) - .WhereIf(!input.FromLocationErpCode.IsNullOrWhiteSpace(), x => x.FromLocationErpCode.Contains(input.FromLocationErpCode)) - .WhereIf(input.FromLocationGroup != null, x => x.FromLocationGroup == input.FromLocationGroup) - .WhereIf(input.FromLot != null, x => x.FromLot == input.FromLot) - .WhereIf(input.FromPackingCode != null, x => x.FromPackingCode == input.FromPackingCode) - .WhereIf(!input.FromStatus.IsNullOrWhiteSpace(), x => x.FromStatus.Contains(input.FromStatus)) - .WhereIf(!input.FromWarehouseCode.IsNullOrWhiteSpace(), x => x.FromWarehouseCode.Contains(input.FromWarehouseCode)) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.ProduceDate != null, x => x.ProduceDate == input.ProduceDate) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.Reason != null, x => x.Reason == input.Reason) - .WhereIf(input.ReasonCode != null, x => x.ReasonCode == input.ReasonCode) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.StdPackQty != null, x => x.StdPackQty == input.StdPackQty) - .WhereIf(input.SupplierBatch != null, x => x.SupplierBatch == input.SupplierBatch) - .WhereIf(input.ToContainerCode != null, x => x.ToContainerCode == input.ToContainerCode) - .WhereIf(input.ToLocationArea != null, x => x.ToLocationArea == input.ToLocationArea) - .WhereIf(!input.ToLocationCode.IsNullOrWhiteSpace(), x => x.ToLocationCode.Contains(input.ToLocationCode)) - .WhereIf(!input.ToLocationErpCode.IsNullOrWhiteSpace(), x => x.ToLocationErpCode.Contains(input.ToLocationErpCode)) - .WhereIf(input.ToLocationGroup != null, x => x.ToLocationGroup == input.ToLocationGroup) - .WhereIf(input.ToLot != null, x => x.ToLot == input.ToLot) - .WhereIf(input.ToPackingCode != null, x => x.ToPackingCode == input.ToPackingCode) - .WhereIf(!input.ToStatus.IsNullOrWhiteSpace(), x => x.ToStatus.Contains(input.ToStatus)) - .WhereIf(!input.ToWarehouseCode.IsNullOrWhiteSpace(), x => x.ToWarehouseCode.Contains(input.ToWarehouseCode)) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWorkOrder/StoreWorkOrderAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWorkOrder/StoreWorkOrderAppService.cs index 0da74bb4d..ead6315f2 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWorkOrder/StoreWorkOrderAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWorkOrder/StoreWorkOrderAppService.cs @@ -1,6 +1,4 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreWorkOrder.Dtos; using Volo.Abp.Application.Services; @@ -24,29 +22,4 @@ public class StoreWorkOrderAppService : ZbxBase> CreateFilteredQueryAsync(StoreWorkOrderGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.EffectiveDate != null, x => x.EffectiveDate == input.EffectiveDate) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.LocationCode != null, x => x.LocationCode == input.LocationCode) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.Op != null, x => x.Op == input.Op) - .WhereIf(input.Qty != null, x => x.Qty == input.Qty) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.Details != null, x => x.Details == input.Details) - .WhereIf(!input.Type.IsNullOrWhiteSpace(), x => x.Type.Contains(input.Type)) - .WhereIf(!input.Uom.IsNullOrWhiteSpace(), x => x.Uom.Contains(input.Uom)) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - .WhereIf(input.WorkOrderId != null, x => x.WorkOrderId == input.WorkOrderId) - .WhereIf(input.WorkStation != null, x => x.WorkStation == input.WorkStation) - .WhereIf(!input.WoStatus.IsNullOrWhiteSpace(), x => x.WoStatus.Contains(input.WoStatus)) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWorkOrderDetail/StoreWorkOrderDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWorkOrderDetail/StoreWorkOrderDetailAppService.cs index 4e54e87ed..3b8ae28e3 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWorkOrderDetail/StoreWorkOrderDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreWorkOrderDetail/StoreWorkOrderDetailAppService.cs @@ -1,6 +1,4 @@ using System; -using System.Linq; -using System.Threading.Tasks; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreWorkOrderDetail.Dtos; using Volo.Abp.Application.Services; @@ -24,24 +22,4 @@ public class StoreWorkOrderDetailAppService : ZbxBase> CreateFilteredQueryAsync(StoreWorkOrderDetailGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.EffectiveDate != null, x => x.EffectiveDate == input.EffectiveDate) - .WhereIf(!input.ItemCode.IsNullOrWhiteSpace(), x => x.ItemCode.Contains(input.ItemCode)) - .WhereIf(input.ItemDesc1 != null, x => x.ItemDesc1 == input.ItemDesc1) - .WhereIf(input.ItemDesc2 != null, x => x.ItemDesc2 == input.ItemDesc2) - .WhereIf(input.ItemName != null, x => x.ItemName == input.ItemName) - .WhereIf(input.Master != null, x => x.Master == input.Master) - .WhereIf(input.MasterId != null, x => x.MasterId == input.MasterId) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.Op != null, x => x.Op == input.Op) - .WhereIf(input.RawLocationCode != null, x => x.RawLocationCode == input.RawLocationCode) - .WhereIf(input.RawQty != null, x => x.RawQty == input.RawQty) - .WhereIf(input.RawUom != null, x => x.RawUom == input.RawUom) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - ; - } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/ar.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/ar.json index aefe9ab26..1ca46b5d4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/ar.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/ar.json @@ -1667,6 +1667,46 @@ "StoreProductL7partsNoteYear": "StoreProductL7partsNoteYear", "CreateStoreProductL7partsNote": "CreateStoreProductL7partsNote", "EditStoreProductL7partsNote": "EditStoreProductL7partsNote", - "StoreProductL7partsNoteDeletionConfirmationMessage": "Are you sure to delete the storeProductL7partsNote {0}?" + "StoreProductL7partsNoteDeletionConfirmationMessage": "Are you sure to delete the storeProductL7partsNote {0}?", + "Permission:StoreScrapNoteDetail": "StoreScrapNoteDetail", + "Menu:StoreScrapNoteDetail": "MenuStoreScrapNoteDetail", + "StoreScrapNoteDetail": "StoreScrapNoteDetail", + "StoreScrapNoteDetailArriveDate": "StoreScrapNoteDetailArriveDate", + "StoreScrapNoteDetailExpireDate": "StoreScrapNoteDetailExpireDate", + "StoreScrapNoteDetailFromContainerCode": "StoreScrapNoteDetailFromContainerCode", + "StoreScrapNoteDetailFromLocationArea": "StoreScrapNoteDetailFromLocationArea", + "StoreScrapNoteDetailFromLocationCode": "StoreScrapNoteDetailFromLocationCode", + "StoreScrapNoteDetailFromLocationErpCode": "StoreScrapNoteDetailFromLocationErpCode", + "StoreScrapNoteDetailFromLocationGroup": "StoreScrapNoteDetailFromLocationGroup", + "StoreScrapNoteDetailFromLot": "StoreScrapNoteDetailFromLot", + "StoreScrapNoteDetailFromPackingCode": "StoreScrapNoteDetailFromPackingCode", + "StoreScrapNoteDetailFromStatus": "StoreScrapNoteDetailFromStatus", + "StoreScrapNoteDetailFromWarehouseCode": "StoreScrapNoteDetailFromWarehouseCode", + "StoreScrapNoteDetailItemCode": "StoreScrapNoteDetailItemCode", + "StoreScrapNoteDetailItemDesc1": "StoreScrapNoteDetailItemDesc1", + "StoreScrapNoteDetailItemDesc2": "StoreScrapNoteDetailItemDesc2", + "StoreScrapNoteDetailItemName": "StoreScrapNoteDetailItemName", + "StoreScrapNoteDetailMaster": "StoreScrapNoteDetailMaster", + "StoreScrapNoteDetailMasterId": "StoreScrapNoteDetailMasterId", + "StoreScrapNoteDetailNumber": "StoreScrapNoteDetailNumber", + "StoreScrapNoteDetailProduceDate": "StoreScrapNoteDetailProduceDate", + "StoreScrapNoteDetailQty": "StoreScrapNoteDetailQty", + "StoreScrapNoteDetailReasonCode": "StoreScrapNoteDetailReasonCode", + "StoreScrapNoteDetailRemark": "StoreScrapNoteDetailRemark", + "StoreScrapNoteDetailStdPackQty": "StoreScrapNoteDetailStdPackQty", + "StoreScrapNoteDetailSupplierBatch": "StoreScrapNoteDetailSupplierBatch", + "StoreScrapNoteDetailToContainerCode": "StoreScrapNoteDetailToContainerCode", + "StoreScrapNoteDetailToLocationArea": "StoreScrapNoteDetailToLocationArea", + "StoreScrapNoteDetailToLocationCode": "StoreScrapNoteDetailToLocationCode", + "StoreScrapNoteDetailToLocationErpCode": "StoreScrapNoteDetailToLocationErpCode", + "StoreScrapNoteDetailToLocationGroup": "StoreScrapNoteDetailToLocationGroup", + "StoreScrapNoteDetailToLot": "StoreScrapNoteDetailToLot", + "StoreScrapNoteDetailToPackingCode": "StoreScrapNoteDetailToPackingCode", + "StoreScrapNoteDetailToStatus": "StoreScrapNoteDetailToStatus", + "StoreScrapNoteDetailToWarehouseCode": "StoreScrapNoteDetailToWarehouseCode", + "StoreScrapNoteDetailUom": "StoreScrapNoteDetailUom", + "CreateStoreScrapNoteDetail": "CreateStoreScrapNoteDetail", + "EditStoreScrapNoteDetail": "EditStoreScrapNoteDetail", + "StoreScrapNoteDetailDeletionConfirmationMessage": "Are you sure to delete the storeScrapNoteDetail {0}?" } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSetting.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSetting.cs index 3b384abb8..e34c08581 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSetting.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSetting.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations; using Volo.Abp.Domain.Entities.Auditing; using WinIn.FasterZ.Store.Enums; -namespace WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting +namespace WinIn.FasterZ.Wms.AppBaseBusiness.ExportCustomUserSetting { /// /// 用户个型导出配置 diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/AppBaseBusiness/ExportCustomUserSetting/IExportCustomUserSettingRepository.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/AppBaseBusiness/ExportCustomUserSetting/IExportCustomUserSettingRepository.cs index 90249c3cf..3c573bfa1 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/AppBaseBusiness/ExportCustomUserSetting/IExportCustomUserSettingRepository.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/AppBaseBusiness/ExportCustomUserSetting/IExportCustomUserSettingRepository.cs @@ -6,7 +6,7 @@ namespace WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting /// /// 用户个型导出配置 /// - public interface IExportCustomUserSettingRepository : IRepository + public interface IExportCustomUserSettingRepository : IRepository { } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/WinIn.FasterZ.Wms.Domain.csproj b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/WinIn.FasterZ.Wms.Domain.csproj index 6b480f6e9..77f51851a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/WinIn.FasterZ.Wms.Domain.csproj +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/WinIn.FasterZ.Wms.Domain.csproj @@ -14,10 +14,6 @@ - - - - @@ -36,4 +32,8 @@ + + + + diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapNoteDetail/IStoreScrapNoteDetailRepository.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapNoteDetail/IStoreScrapNoteDetailRepository.cs new file mode 100644 index 000000000..3079a3e01 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreScrapNoteDetail/IStoreScrapNoteDetailRepository.cs @@ -0,0 +1,11 @@ +using System; +using Volo.Abp.Domain.Repositories; + +namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail; + +/// +/// +/// +public interface IStoreScrapNoteDetailRepository : IRepository +{ +} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWorkOrderDetail/StoreWorkOrderDetail.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWorkOrderDetail/StoreWorkOrderDetail.cs index b61ab4187..3e63627e4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWorkOrderDetail/StoreWorkOrderDetail.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreWorkOrderDetail/StoreWorkOrderDetail.cs @@ -17,9 +17,6 @@ public string? ItemDesc2 { get; set; } public string? ItemName { get; set; } - - public virtual StoreWorkOrder Master { get; set; } = null!; - public Guid MasterId { get; set; } public string Number { get; set; } = null!; diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingEfCoreQuerableExtensions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingEfCoreQuerableExtensions.cs new file mode 100644 index 000000000..e869d40f4 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingEfCoreQuerableExtensions.cs @@ -0,0 +1,21 @@ +using System.Linq; + +namespace WinIn.FasterZ.Wms.AppBaseBusiness.ExportCustomUserSetting; + +/// +/// 用户个型导出配置 +/// +public static class ExportCustomUserSettingEfCoreQueryableExtensions +{ + public static IQueryable IncludeDetails(this IQueryable queryable, bool include = true) + { + if (!include) + { + return queryable; + } + + return queryable + // .Include(x => x.xxx) // TODO: AbpHelper generated + ; + } +} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingRepository.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingRepository.cs new file mode 100644 index 000000000..5380d934a --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/AppBaseBusiness/ExportCustomUserSetting/ExportCustomUserSettingRepository.cs @@ -0,0 +1,21 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using Volo.Abp.Domain.Repositories.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore; +using WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting; +using WinIn.FasterZ.Wms.EntityFrameworkCore; + +namespace WinIn.FasterZ.Wms.AppBaseBusiness.ExportCustomUserSetting; + +public class ExportCustomUserSettingRepository : EfCoreRepository, IExportCustomUserSettingRepository +{ + public ExportCustomUserSettingRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } + + public override async Task> WithDetailsAsync() + { + return (await GetQueryableAsync()).IncludeDetails(); + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContext.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContext.cs index 07ec60f67..b44140637 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContext.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContext.cs @@ -14,6 +14,8 @@ using Volo.Abp.TenantManagement; using Volo.Abp.TenantManagement.EntityFrameworkCore; using WinIn.FasterZ.Wms.Z_Business.AuthDepartment; using Volo.Abp.EntityFrameworkCore.Modeling; +using WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting; +using WinIn.FasterZ.Wms.AppBaseBusiness.ExportCustomUserSetting; using WinIn.FasterZ.Wms.Z_Business.StoreWorkOrder; using WinIn.FasterZ.Wms.Z_Business.StoreWorkOrderDetail; using WinIn.FasterZ.Wms.Z_Business.StoreWipWarehouseAdjustRequestDetail; @@ -72,6 +74,7 @@ using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNoteDetail; using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNote; using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNoteDetail; using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNote; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail; namespace WinIn.FasterZ.Wms.EntityFrameworkCore { @@ -83,11 +86,14 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore IIdentityDbContext, ITenantManagementDbContext { - /* Add DbSet properties for your Aggregate Roots / Entities here. */ - - #region Entities from the modules - - /* Notice: We only implemented IIdentityDbContext and ITenantManagementDbContext + /* Add DbSet properties for your Aggregate Roots / Entities here. */ + /// + /// û͵ + /// + public DbSet ExportCustomUserSettings { get; set; } + #region Entities from the modules + + /* Notice: We only implemented IIdentityDbContext and ITenantManagementDbContext * and replaced them for this DbContext. This allows you to perform JOIN * queries for the entities of these modules over the repositories easily. You * typically don't need that for other modules. But, if you need, you can @@ -98,8 +104,8 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore * uses this DbContext on runtime. Otherwise, it will use its own DbContext class. */ - //Identity - public DbSet Users { get; set; } + //Identity + public DbSet Users { get; set; } public DbSet Roles { get; set; } public DbSet ClaimTypes { get; set; } public DbSet OrganizationUnits { get; set; } @@ -171,6 +177,10 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore public DbSet StoreProductReceiptNotes { get; set; } public DbSet StoreProductL7partsNoteDetails { get; set; } public DbSet StoreProductL7partsNotes { get; set; } + /// + /// + /// + public DbSet StoreScrapNoteDetails { get; set; } public WmsDbContext(DbContextOptions options) : base(options) @@ -193,17 +203,25 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.ConfigureFeatureManagement(); builder.ConfigureTenantManagement(); - /* Configure your own tables/entities inside here */ + /* Configure your own tables/entities inside here */ + + //builder.Entity(b => + //{ + // b.ToTable(WmsConsts.DbTablePrefix + "YourEntities", WmsConsts.DbSchema); + // b.ConfigureByConvention(); //auto configure for the base class props + // //... + //}); - //builder.Entity(b => - //{ - // b.ToTable(WmsConsts.DbTablePrefix + "YourEntities", WmsConsts.DbSchema); - // b.ConfigureByConvention(); //auto configure for the base class props - // //... - //}); + builder.Entity(b => + { + b.ToTable(WmsConsts.DbTablePrefix + "ExportCustomUserSettings", WmsConsts.DbSchema, table => table.HasComment(" û͵")); + b.ConfigureByConvention(); - builder.Entity(b => + /* Configure more properties here */ + }); + + builder.Entity(b => { b.ToTable(WmsConsts.DbTablePrefix + "Auth_Department", WmsConsts.DbSchema); b.ConfigureByConvention(); @@ -789,6 +807,16 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore b.ConfigureByConvention(); + /* Configure more properties here */ + }); + + + builder.Entity(b => + { + b.ToTable(WmsConsts.DbTablePrefix + "StoreScrapNoteDetails", WmsConsts.DbSchema, table => table.HasComment("")); + b.ConfigureByConvention(); + + /* Configure more properties here */ }); } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsEntityFrameworkCoreModule.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsEntityFrameworkCoreModule.cs index 0406a65b7..137944458 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsEntityFrameworkCoreModule.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsEntityFrameworkCoreModule.cs @@ -1,3 +1,4 @@ +using WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail; using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNote; using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNoteDetail; using WinIn.FasterZ.Wms.Z_Business.StoreProductReceiptNote; @@ -71,6 +72,8 @@ using Volo.Abp.OpenIddict.EntityFrameworkCore; using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Abp.TenantManagement.EntityFrameworkCore; +using WinIn.FasterZ.Store.AppBaseBusiness.ExportCustomUserSetting; +using WinIn.FasterZ.Wms.AppBaseBusiness.ExportCustomUserSetting; namespace WinIn.FasterZ.Wms.EntityFrameworkCore { @@ -100,7 +103,8 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore /* Remove "includeAllEntities: true" to create * default repositories only for aggregate roots */ options.AddDefaultRepositories(includeAllEntities: true); - options.AddRepository(); + options.AddRepository(); + options.AddRepository(); options.AddRepository(); options.AddRepository(); options.AddRepository(); @@ -159,6 +163,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore options.AddRepository(); options.AddRepository(); options.AddRepository(); + options.AddRepository(); }); Configure(options => diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/WinIn.FasterZ.Wms.EntityFrameworkCore.csproj b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/WinIn.FasterZ.Wms.EntityFrameworkCore.csproj index 04dd326dc..5a01eb860 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/WinIn.FasterZ.Wms.EntityFrameworkCore.csproj +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/WinIn.FasterZ.Wms.EntityFrameworkCore.csproj @@ -9,7 +9,6 @@ - @@ -28,4 +27,8 @@ + + + + diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetailEfCoreQuerableExtensions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetailEfCoreQuerableExtensions.cs new file mode 100644 index 000000000..8dd6e9346 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetailEfCoreQuerableExtensions.cs @@ -0,0 +1,22 @@ +using System.Linq; +using Microsoft.EntityFrameworkCore; + +namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail; + +/// +/// +/// +public static class StoreScrapNoteDetailEfCoreQueryableExtensions +{ + public static IQueryable IncludeDetails(this IQueryable queryable, bool include = true) + { + if (!include) + { + return queryable; + } + + return queryable + // .Include(x => x.xxx) // TODO: AbpHelper generated + ; + } +} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetailRepository.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetailRepository.cs new file mode 100644 index 000000000..b6f834c51 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetailRepository.cs @@ -0,0 +1,20 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using WinIn.FasterZ.Wms.EntityFrameworkCore; +using Volo.Abp.Domain.Repositories.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore; + +namespace WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail; + +public class StoreScrapNoteDetailRepository : EfCoreRepository, IStoreScrapNoteDetailRepository +{ + public StoreScrapNoteDetailRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } + + public override async Task> WithDetailsAsync() + { + return (await GetQueryableAsync()).IncludeDetails(); + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/appsettings.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/appsettings.json index 1c0133312..4ac756344 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/appsettings.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/appsettings.json @@ -1,6 +1,6 @@ { "App": { - "CorsOrigins": "https://*.Wms.com", + "CorsOrigins": "http://localhost:60011,http://localhost:60012,http://localhost:60013,http://localhost:60021,http://localhost:60022,http://localhost:60022,http://localhost:10090", "Audit": { "IsEnabled": false // 禁用审计功能 // 其他审计相关设置项 @@ -14,7 +14,7 @@ "Configuration": "127.0.0.1" }, "AuthServer": { - "Authority": "https://localhost:60100", + "Authority": "http://192.168.0.196:60100", "RequireHttpsMetadata": "false", "SwaggerClientId": "Wms_Swagger" }, @@ -22,6 +22,6 @@ "DefaultPassPhrase": "4jjXQgqwh6PRrjn4" }, "AlwaysAllowAuthorization": "false", - "urls": "http://localhost:60011" + "urls": "http://192.168.0.196:60011" } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenuContributor.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenuContributor.cs index 40c4c9288..8216818ae 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenuContributor.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenuContributor.cs @@ -406,6 +406,12 @@ namespace WinIn.FasterZ.Wms.Web.Menus new ApplicationMenuItem(WmsMenus.StoreProductL7partsNote, l["Menu:StoreProductL7partsNote"], "/Z_Business/StoreProductL7partsNote/StoreProductL7partsNote") ); } + if (await context.IsGrantedAsync(WmsPermissions.StoreScrapNoteDetail.Default)) + { + context.Menu.AddItem( + new ApplicationMenuItem(WmsMenus.StoreScrapNoteDetail, l["Menu:StoreScrapNoteDetail"], "/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail") + ); + } } private Task ConfigureUserMenuAsync(MenuConfigurationContext context) diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenus.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenus.cs index 49da33b07..21b99d9d7 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenus.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenus.cs @@ -64,5 +64,6 @@ namespace WinIn.FasterZ.Wms.Web.Menus public const string StoreProductReceiptNote = Prefix + ".StoreProductReceiptNote"; public const string StoreProductL7partsNoteDetail = Prefix + ".StoreProductL7partsNoteDetail"; public const string StoreProductL7partsNote = Prefix + ".StoreProductL7partsNote"; + public const string StoreScrapNoteDetail = Prefix + ".StoreScrapNoteDetail"; } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductL7partsNote/StoreProductL7partsNote/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductL7partsNote/StoreProductL7partsNote/Index.cshtml.cs index c6286f704..86066af00 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductL7partsNote/StoreProductL7partsNote/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductL7partsNote/StoreProductL7partsNote/Index.cshtml.cs @@ -71,7 +71,7 @@ public class StoreProductL7partsNoteFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreProductL7partsNoteStoreProductL7partsNoteDetails")] - public ICollection? StoreProductL7partsNoteDetails { get; set; } + public List? StoreProductL7partsNoteDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreProductL7partsNoteWorker")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductL7partsNote/StoreProductL7partsNote/ViewModels/CreateEditStoreProductL7partsNoteViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductL7partsNote/StoreProductL7partsNote/ViewModels/CreateEditStoreProductL7partsNoteViewModel.cs index c36d9622b..d4f75ade7 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductL7partsNote/StoreProductL7partsNote/ViewModels/CreateEditStoreProductL7partsNoteViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductL7partsNote/StoreProductL7partsNote/ViewModels/CreateEditStoreProductL7partsNoteViewModel.cs @@ -1,5 +1,8 @@ using System; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using WinIn.FasterZ.Wms.Permissions; +using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Web.Pages.Z_Business.StoreProductL7partsNote.StoreProductL7partsNote.ViewModels; @@ -45,7 +48,7 @@ public class CreateEditStoreProductL7partsNoteViewModel public int Status { get; set; } [Display(Name = "StoreProductL7partsNoteStoreProductL7partsNoteDetails")] - public ICollection StoreProductL7partsNoteDetails { get; set; } + public List Details { get; set; } [Display(Name = "StoreProductL7partsNoteWorker")] public string? Worker { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductReceiptNote/StoreProductReceiptNote/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductReceiptNote/StoreProductReceiptNote/Index.cshtml.cs index 739078d49..f7552dcf1 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductReceiptNote/StoreProductReceiptNote/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductReceiptNote/StoreProductReceiptNote/Index.cshtml.cs @@ -59,7 +59,7 @@ public class StoreProductReceiptNoteFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreProductReceiptNoteStoreProductReceiptNoteDetails")] - public ICollection? StoreProductReceiptNoteDetails { get; set; } + public List? StoreProductReceiptNoteDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreProductReceiptNoteType")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductReceiptNote/StoreProductReceiptNote/ViewModels/CreateEditStoreProductReceiptNoteViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductReceiptNote/StoreProductReceiptNote/ViewModels/CreateEditStoreProductReceiptNoteViewModel.cs index 2102580a7..3e9f784f9 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductReceiptNote/StoreProductReceiptNote/ViewModels/CreateEditStoreProductReceiptNoteViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductReceiptNote/StoreProductReceiptNote/ViewModels/CreateEditStoreProductReceiptNoteViewModel.cs @@ -36,7 +36,7 @@ public class CreateEditStoreProductReceiptNoteViewModel public string? SourceNumber { get; set; } [Display(Name = "StoreProductReceiptNoteStoreProductReceiptNoteDetails")] - public ICollection StoreProductReceiptNoteDetails { get; set; } + public List StoreProductReceiptNoteDetails { get; set; } [Display(Name = "StoreProductReceiptNoteType")] public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductReceiptRequest/StoreProductReceiptRequest/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductReceiptRequest/StoreProductReceiptRequest/Index.cshtml.cs index cae6b91fa..af061f843 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductReceiptRequest/StoreProductReceiptRequest/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductReceiptRequest/StoreProductReceiptRequest/Index.cshtml.cs @@ -71,7 +71,7 @@ public class StoreProductReceiptRequestFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreProductReceiptRequestStoreProductReceiptRequestDetails")] - public ICollection? StoreProductReceiptRequestDetails { get; set; } + public List? StoreProductReceiptRequestDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreProductReceiptRequestTeam")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductReceiptRequest/StoreProductReceiptRequest/ViewModels/CreateEditStoreProductReceiptRequestViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductReceiptRequest/StoreProductReceiptRequest/ViewModels/CreateEditStoreProductReceiptRequestViewModel.cs index 59982905d..7f38efc6d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductReceiptRequest/StoreProductReceiptRequest/ViewModels/CreateEditStoreProductReceiptRequestViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductReceiptRequest/StoreProductReceiptRequest/ViewModels/CreateEditStoreProductReceiptRequestViewModel.cs @@ -45,7 +45,7 @@ public class CreateEditStoreProductReceiptRequestViewModel public string? Shift { get; set; } [Display(Name = "StoreProductReceiptRequestStoreProductReceiptRequestDetails")] - public ICollection StoreProductReceiptRequestDetails { get; set; } + public List StoreProductReceiptRequestDetails { get; set; } [Display(Name = "StoreProductReceiptRequestTeam")] public string? Team { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductRecycleNote/StoreProductRecycleNote/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductRecycleNote/StoreProductRecycleNote/Index.cshtml.cs index a5f902eab..039e16f69 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductRecycleNote/StoreProductRecycleNote/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductRecycleNote/StoreProductRecycleNote/Index.cshtml.cs @@ -43,11 +43,11 @@ public class StoreProductRecycleNoteFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreProductRecycleNoteStoreProductRecycleMaterialDetails")] - public ICollection? StoreProductRecycleMaterialDetails { get; set; } + public List? StoreProductRecycleMaterialDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreProductRecycleNoteStoreProductRecycleNoteDetails")] - public ICollection? StoreProductRecycleNoteDetails { get; set; } + public List? StoreProductRecycleNoteDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreProductRecycleNoteWorker")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductRecycleNote/StoreProductRecycleNote/ViewModels/CreateEditStoreProductRecycleNoteViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductRecycleNote/StoreProductRecycleNote/ViewModels/CreateEditStoreProductRecycleNoteViewModel.cs index fd873abcb..2d92918c9 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductRecycleNote/StoreProductRecycleNote/ViewModels/CreateEditStoreProductRecycleNoteViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductRecycleNote/StoreProductRecycleNote/ViewModels/CreateEditStoreProductRecycleNoteViewModel.cs @@ -24,10 +24,10 @@ public class CreateEditStoreProductRecycleNoteViewModel public string? Shift { get; set; } [Display(Name = "StoreProductRecycleNoteStoreProductRecycleMaterialDetails")] - public ICollection StoreProductRecycleMaterialDetails { get; set; } + public List StoreProductRecycleMaterialDetails { get; set; } [Display(Name = "StoreProductRecycleNoteStoreProductRecycleNoteDetails")] - public ICollection StoreProductRecycleNoteDetails { get; set; } + public List StoreProductRecycleNoteDetails { get; set; } [Display(Name = "StoreProductRecycleNoteWorker")] public string? Worker { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductRecycleRequest/StoreProductRecycleRequest/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductRecycleRequest/StoreProductRecycleRequest/Index.cshtml.cs index 31cee428b..1c41d7d9b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductRecycleRequest/StoreProductRecycleRequest/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductRecycleRequest/StoreProductRecycleRequest/Index.cshtml.cs @@ -59,7 +59,7 @@ public class StoreProductRecycleRequestFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreProductRecycleRequestStoreProductRecycleRequestDetails")] - public ICollection? StoreProductRecycleRequestDetails { get; set; } + public List? StoreProductRecycleRequestDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreProductRecycleRequestWorker")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductRecycleRequest/StoreProductRecycleRequest/ViewModels/CreateEditStoreProductRecycleRequestViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductRecycleRequest/StoreProductRecycleRequest/ViewModels/CreateEditStoreProductRecycleRequestViewModel.cs index bc17dd1b6..19f511ea6 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductRecycleRequest/StoreProductRecycleRequest/ViewModels/CreateEditStoreProductRecycleRequestViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreProductRecycleRequest/StoreProductRecycleRequest/ViewModels/CreateEditStoreProductRecycleRequestViewModel.cs @@ -36,7 +36,7 @@ public class CreateEditStoreProductRecycleRequestViewModel public string? Shift { get; set; } [Display(Name = "StoreProductRecycleRequestStoreProductRecycleRequestDetails")] - public ICollection StoreProductRecycleRequestDetails { get; set; } + public List StoreProductRecycleRequestDetails { get; set; } [Display(Name = "StoreProductRecycleRequestWorker")] public string? Worker { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseOrder/StorePurchaseOrder/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseOrder/StorePurchaseOrder/Index.cshtml.cs index b17d50eba..2532bc447 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseOrder/StorePurchaseOrder/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseOrder/StorePurchaseOrder/Index.cshtml.cs @@ -63,7 +63,7 @@ public class StorePurchaseOrderFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StorePurchaseOrderStorePurchaseOrderDetails")] - public ICollection? StorePurchaseOrderDetails { get; set; } + public List? StorePurchaseOrderDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StorePurchaseOrderSupplierAddress")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseOrder/StorePurchaseOrder/ViewModels/CreateEditStorePurchaseOrderViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseOrder/StorePurchaseOrder/ViewModels/CreateEditStorePurchaseOrderViewModel.cs index c0d1f9d86..b54eaea9d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseOrder/StorePurchaseOrder/ViewModels/CreateEditStorePurchaseOrderViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseOrder/StorePurchaseOrder/ViewModels/CreateEditStorePurchaseOrderViewModel.cs @@ -39,7 +39,7 @@ public class CreateEditStorePurchaseOrderViewModel public string? Remark { get; set; } [Display(Name = "StorePurchaseOrderStorePurchaseOrderDetails")] - public ICollection StorePurchaseOrderDetails { get; set; } + public List StorePurchaseOrderDetails { get; set; } [Display(Name = "StorePurchaseOrderSupplierAddress")] public string? SupplierAddress { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReceiptNote/StorePurchaseReceiptNote/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReceiptNote/StorePurchaseReceiptNote/Index.cshtml.cs index 9b23d10aa..bcaf4e002 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReceiptNote/StorePurchaseReceiptNote/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReceiptNote/StorePurchaseReceiptNote/Index.cshtml.cs @@ -59,7 +59,7 @@ public class StorePurchaseReceiptNoteFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StorePurchaseReceiptNoteStorePurchaseReceiptNoteDetails")] - public ICollection? StorePurchaseReceiptNoteDetails { get; set; } + public List? StorePurchaseReceiptNoteDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StorePurchaseReceiptNoteSupplierAddress")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReceiptNote/StorePurchaseReceiptNote/ViewModels/CreateEditStorePurchaseReceiptNoteViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReceiptNote/StorePurchaseReceiptNote/ViewModels/CreateEditStorePurchaseReceiptNoteViewModel.cs index 268a4923d..0f29622a7 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReceiptNote/StorePurchaseReceiptNote/ViewModels/CreateEditStorePurchaseReceiptNoteViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReceiptNote/StorePurchaseReceiptNote/ViewModels/CreateEditStorePurchaseReceiptNoteViewModel.cs @@ -36,7 +36,7 @@ public class CreateEditStorePurchaseReceiptNoteViewModel public string Status { get; set; } [Display(Name = "StorePurchaseReceiptNoteStorePurchaseReceiptNoteDetails")] - public ICollection StorePurchaseReceiptNoteDetails { get; set; } + public List StorePurchaseReceiptNoteDetails { get; set; } [Display(Name = "StorePurchaseReceiptNoteSupplierAddress")] public string? SupplierAddress { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReceiptRequest/StorePurchaseReceiptRequest/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReceiptRequest/StorePurchaseReceiptRequest/Index.cshtml.cs index 2d2a6268b..e2944c059 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReceiptRequest/StorePurchaseReceiptRequest/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReceiptRequest/StorePurchaseReceiptRequest/Index.cshtml.cs @@ -75,7 +75,7 @@ public class StorePurchaseReceiptRequestFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StorePurchaseReceiptRequestStorePurchaseReceiptRequestDetails")] - public ICollection? StorePurchaseReceiptRequestDetails { get; set; } + public List? StorePurchaseReceiptRequestDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StorePurchaseReceiptRequestSupplierAddress")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReceiptRequest/StorePurchaseReceiptRequest/ViewModels/CreateEditStorePurchaseReceiptRequestViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReceiptRequest/StorePurchaseReceiptRequest/ViewModels/CreateEditStorePurchaseReceiptRequestViewModel.cs index 492daa65c..be3ad238a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReceiptRequest/StorePurchaseReceiptRequest/ViewModels/CreateEditStorePurchaseReceiptRequestViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReceiptRequest/StorePurchaseReceiptRequest/ViewModels/CreateEditStorePurchaseReceiptRequestViewModel.cs @@ -48,7 +48,7 @@ public class CreateEditStorePurchaseReceiptRequestViewModel public string? RpNumber { get; set; } [Display(Name = "StorePurchaseReceiptRequestStorePurchaseReceiptRequestDetails")] - public ICollection StorePurchaseReceiptRequestDetails { get; set; } + public List StorePurchaseReceiptRequestDetails { get; set; } [Display(Name = "StorePurchaseReceiptRequestSupplierAddress")] public string? SupplierAddress { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReturnNote/StorePurchaseReturnNote/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReturnNote/StorePurchaseReturnNote/Index.cshtml.cs index d50a8ec3b..dbe0377c0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReturnNote/StorePurchaseReturnNote/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReturnNote/StorePurchaseReturnNote/Index.cshtml.cs @@ -67,7 +67,7 @@ public class StorePurchaseReturnNoteFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StorePurchaseReturnNoteStorePurchaseReturnNoteDetails")] - public ICollection? StorePurchaseReturnNoteDetails { get; set; } + public List? StorePurchaseReturnNoteDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StorePurchaseReturnNoteSupplierCode")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReturnNote/StorePurchaseReturnNote/ViewModels/CreateEditStorePurchaseReturnNoteViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReturnNote/StorePurchaseReturnNote/ViewModels/CreateEditStorePurchaseReturnNoteViewModel.cs index 860d78879..faa21db0a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReturnNote/StorePurchaseReturnNote/ViewModels/CreateEditStorePurchaseReturnNoteViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReturnNote/StorePurchaseReturnNote/ViewModels/CreateEditStorePurchaseReturnNoteViewModel.cs @@ -42,7 +42,7 @@ public class CreateEditStorePurchaseReturnNoteViewModel public string Status { get; set; } [Display(Name = "StorePurchaseReturnNoteStorePurchaseReturnNoteDetails")] - public ICollection StorePurchaseReturnNoteDetails { get; set; } + public List StorePurchaseReturnNoteDetails { get; set; } [Display(Name = "StorePurchaseReturnNoteSupplierCode")] public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReturnRequest/StorePurchaseReturnRequest/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReturnRequest/StorePurchaseReturnRequest/Index.cshtml.cs index 154d0b9f4..beccb2f13 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReturnRequest/StorePurchaseReturnRequest/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReturnRequest/StorePurchaseReturnRequest/Index.cshtml.cs @@ -75,7 +75,7 @@ public class StorePurchaseReturnRequestFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StorePurchaseReturnRequestStorePurchaseReturnRequestDetails")] - public ICollection? StorePurchaseReturnRequestDetails { get; set; } + public List? StorePurchaseReturnRequestDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StorePurchaseReturnRequestSupplierCode")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReturnRequest/StorePurchaseReturnRequest/ViewModels/CreateEditStorePurchaseReturnRequestViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReturnRequest/StorePurchaseReturnRequest/ViewModels/CreateEditStorePurchaseReturnRequestViewModel.cs index 1bcd7eca3..7eb8ef048 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReturnRequest/StorePurchaseReturnRequest/ViewModels/CreateEditStorePurchaseReturnRequestViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePurchaseReturnRequest/StorePurchaseReturnRequest/ViewModels/CreateEditStorePurchaseReturnRequestViewModel.cs @@ -48,7 +48,7 @@ public class CreateEditStorePurchaseReturnRequestViewModel public string? RpNumber { get; set; } [Display(Name = "StorePurchaseReturnRequestStorePurchaseReturnRequestDetails")] - public ICollection StorePurchaseReturnRequestDetails { get; set; } + public List StorePurchaseReturnRequestDetails { get; set; } [Display(Name = "StorePurchaseReturnRequestSupplierCode")] public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePutawayNote/StorePutawayNote/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePutawayNote/StorePutawayNote/Index.cshtml.cs index 29df76477..ada3cb1a1 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePutawayNote/StorePutawayNote/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePutawayNote/StorePutawayNote/Index.cshtml.cs @@ -59,7 +59,7 @@ public class StorePutawayNoteFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StorePutawayNoteStorePutawayNoteDetails")] - public ICollection? StorePutawayNoteDetails { get; set; } + public List? StorePutawayNoteDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StorePutawayNoteSupplierCode")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePutawayNote/StorePutawayNote/ViewModels/CreateEditStorePutawayNoteViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePutawayNote/StorePutawayNote/ViewModels/CreateEditStorePutawayNoteViewModel.cs index 2af9694d7..301fd77fc 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePutawayNote/StorePutawayNote/ViewModels/CreateEditStorePutawayNoteViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePutawayNote/StorePutawayNote/ViewModels/CreateEditStorePutawayNoteViewModel.cs @@ -36,7 +36,7 @@ public class CreateEditStorePutawayNoteViewModel public string? RpNumber { get; set; } [Display(Name = "StorePutawayNoteStorePutawayNoteDetails")] - public ICollection StorePutawayNoteDetails { get; set; } + public List StorePutawayNoteDetails { get; set; } [Display(Name = "StorePutawayNoteSupplierCode")] public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePutawayRequest/StorePutawayRequest/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePutawayRequest/StorePutawayRequest/Index.cshtml.cs index 907977409..58b87f74f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePutawayRequest/StorePutawayRequest/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePutawayRequest/StorePutawayRequest/Index.cshtml.cs @@ -91,7 +91,7 @@ public class StorePutawayRequestFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StorePutawayRequestStorePutawayRequestDetails")] - public ICollection? StorePutawayRequestDetails { get; set; } + public List? StorePutawayRequestDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StorePutawayRequestSupplierCode")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePutawayRequest/StorePutawayRequest/ViewModels/CreateEditStorePutawayRequestViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePutawayRequest/StorePutawayRequest/ViewModels/CreateEditStorePutawayRequestViewModel.cs index 1a17341b8..f284fa5f4 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePutawayRequest/StorePutawayRequest/ViewModels/CreateEditStorePutawayRequestViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StorePutawayRequest/StorePutawayRequest/ViewModels/CreateEditStorePutawayRequestViewModel.cs @@ -60,7 +60,7 @@ public class CreateEditStorePutawayRequestViewModel public string? RpNumber { get; set; } [Display(Name = "StorePutawayRequestStorePutawayRequestDetails")] - public ICollection StorePutawayRequestDetails { get; set; } + public List StorePutawayRequestDetails { get; set; } [Display(Name = "StorePutawayRequestSupplierCode")] public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreReceiptAbnormalNote/StoreReceiptAbnormalNote/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreReceiptAbnormalNote/StoreReceiptAbnormalNote/Index.cshtml.cs index 79fff915b..01601de67 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreReceiptAbnormalNote/StoreReceiptAbnormalNote/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreReceiptAbnormalNote/StoreReceiptAbnormalNote/Index.cshtml.cs @@ -39,7 +39,7 @@ public class StoreReceiptAbnormalNoteFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreReceiptAbnormalNoteStoreReceiptAbnormalNoteDetails")] - public ICollection? StoreReceiptAbnormalNoteDetails { get; set; } + public List? StoreReceiptAbnormalNoteDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreReceiptAbnormalNoteSupplierCode")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreReceiptAbnormalNote/StoreReceiptAbnormalNote/ViewModels/CreateEditStoreReceiptAbnormalNoteViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreReceiptAbnormalNote/StoreReceiptAbnormalNote/ViewModels/CreateEditStoreReceiptAbnormalNoteViewModel.cs index 4e9d3893a..b740a6e1b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreReceiptAbnormalNote/StoreReceiptAbnormalNote/ViewModels/CreateEditStoreReceiptAbnormalNoteViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreReceiptAbnormalNote/StoreReceiptAbnormalNote/ViewModels/CreateEditStoreReceiptAbnormalNoteViewModel.cs @@ -21,7 +21,7 @@ public class CreateEditStoreReceiptAbnormalNoteViewModel public string? Remark { get; set; } [Display(Name = "StoreReceiptAbnormalNoteStoreReceiptAbnormalNoteDetails")] - public ICollection StoreReceiptAbnormalNoteDetails { get; set; } + public List StoreReceiptAbnormalNoteDetails { get; set; } [Display(Name = "StoreReceiptAbnormalNoteSupplierCode")] public string SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreRecycledMaterialReceiptNote/StoreRecycledMaterialReceiptNote/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreRecycledMaterialReceiptNote/StoreRecycledMaterialReceiptNote/Index.cshtml.cs index b796af44d..93a7b7964 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreRecycledMaterialReceiptNote/StoreRecycledMaterialReceiptNote/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreRecycledMaterialReceiptNote/StoreRecycledMaterialReceiptNote/Index.cshtml.cs @@ -31,7 +31,7 @@ public class StoreRecycledMaterialReceiptNoteFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreRecycledMaterialReceiptNoteStoreRecycledMaterialReceiptNoteDetails")] - public ICollection? StoreRecycledMaterialReceiptNoteDetails { get; set; } + public List? StoreRecycledMaterialReceiptNoteDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreRecycledMaterialReceiptNoteWorker")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreRecycledMaterialReceiptNote/StoreRecycledMaterialReceiptNote/ViewModels/CreateEditStoreRecycledMaterialReceiptNoteViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreRecycledMaterialReceiptNote/StoreRecycledMaterialReceiptNote/ViewModels/CreateEditStoreRecycledMaterialReceiptNoteViewModel.cs index 40293e274..bf6c3f4f7 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreRecycledMaterialReceiptNote/StoreRecycledMaterialReceiptNote/ViewModels/CreateEditStoreRecycledMaterialReceiptNoteViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreRecycledMaterialReceiptNote/StoreRecycledMaterialReceiptNote/ViewModels/CreateEditStoreRecycledMaterialReceiptNoteViewModel.cs @@ -15,7 +15,7 @@ public class CreateEditStoreRecycledMaterialReceiptNoteViewModel public string? Remark { get; set; } [Display(Name = "StoreRecycledMaterialReceiptNoteStoreRecycledMaterialReceiptNoteDetails")] - public ICollection StoreRecycledMaterialReceiptNoteDetails { get; set; } + public List StoreRecycledMaterialReceiptNoteDetails { get; set; } [Display(Name = "StoreRecycledMaterialReceiptNoteWorker")] public string? Worker { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreSaleOrder/StoreSaleOrder/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreSaleOrder/StoreSaleOrder/Index.cshtml.cs index 5ad23be92..28fb0bc80 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreSaleOrder/StoreSaleOrder/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreSaleOrder/StoreSaleOrder/Index.cshtml.cs @@ -63,7 +63,7 @@ public class StoreSaleOrderFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreSaleOrderStoreSaleOrderDetails")] - public ICollection? StoreSaleOrderDetails { get; set; } + public List? StoreSaleOrderDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreSaleOrderTaxRate")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreSaleOrder/StoreSaleOrder/ViewModels/CreateEditStoreSaleOrderViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreSaleOrder/StoreSaleOrder/ViewModels/CreateEditStoreSaleOrderViewModel.cs index 45e0dd6d8..5794a0e92 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreSaleOrder/StoreSaleOrder/ViewModels/CreateEditStoreSaleOrderViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreSaleOrder/StoreSaleOrder/ViewModels/CreateEditStoreSaleOrderViewModel.cs @@ -39,7 +39,7 @@ public class CreateEditStoreSaleOrderViewModel public string? SoType { get; set; } [Display(Name = "StoreSaleOrderStoreSaleOrderDetails")] - public ICollection StoreSaleOrderDetails { get; set; } + public List StoreSaleOrderDetails { get; set; } [Display(Name = "StoreSaleOrderTaxRate")] public decimal TaxRate { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNote/StoreScrapNote/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNote/StoreScrapNote/Index.cshtml.cs index 4f20208da..062eadf98 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNote/StoreScrapNote/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNote/StoreScrapNote/Index.cshtml.cs @@ -39,7 +39,7 @@ public class StoreScrapNoteFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreScrapNoteStoreScrapNoteDetails")] - public ICollection? StoreScrapNoteDetails { get; set; } + public List? StoreScrapNoteDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreScrapNoteType")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNote/StoreScrapNote/ViewModels/CreateEditStoreScrapNoteViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNote/StoreScrapNote/ViewModels/CreateEditStoreScrapNoteViewModel.cs index 4165e4db8..df16b4c8d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNote/StoreScrapNote/ViewModels/CreateEditStoreScrapNoteViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNote/StoreScrapNote/ViewModels/CreateEditStoreScrapNoteViewModel.cs @@ -21,7 +21,7 @@ public class CreateEditStoreScrapNoteViewModel public string? ScrapRequestNumber { get; set; } [Display(Name = "StoreScrapNoteStoreScrapNoteDetails")] - public ICollection StoreScrapNoteDetails { get; set; } + public List StoreScrapNoteDetails { get; set; } [Display(Name = "StoreScrapNoteType")] public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/CreateModal.cshtml b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/CreateModal.cshtml new file mode 100644 index 000000000..58bc4ed81 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/CreateModal.cshtml @@ -0,0 +1,18 @@ +@page +@using Microsoft.AspNetCore.Mvc.Localization +@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal; +@using WinIn.FasterZ.Wms.Localization +@inject IHtmlLocalizer L +@model WinIn.FasterZ.Wms.Web.Pages.Z_Business.StoreScrapNoteDetail.StoreScrapNoteDetail.CreateModalModel +@{ + Layout = null; +} + + + + + + + + + \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/CreateModal.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/CreateModal.cshtml.cs new file mode 100644 index 000000000..93099cae4 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/CreateModal.cshtml.cs @@ -0,0 +1,27 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail.Dtos; +using WinIn.FasterZ.Wms.Web.Pages.Z_Business.StoreScrapNoteDetail.StoreScrapNoteDetail.ViewModels; + +namespace WinIn.FasterZ.Wms.Web.Pages.Z_Business.StoreScrapNoteDetail.StoreScrapNoteDetail; + +public class CreateModalModel : WmsPageModel +{ + [BindProperty] + public CreateEditStoreScrapNoteDetailViewModel ViewModel { get; set; } + + private readonly IStoreScrapNoteDetailAppService _service; + + public CreateModalModel(IStoreScrapNoteDetailAppService service) + { + _service = service; + } + + public virtual async Task OnPostAsync() + { + var dto = ObjectMapper.Map(ViewModel); + await _service.CreateAsync(dto); + return NoContent(); + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/EditModal.cshtml b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/EditModal.cshtml new file mode 100644 index 000000000..66701ba49 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/EditModal.cshtml @@ -0,0 +1,19 @@ +@page +@using WinIn.FasterZ.Wms.Localization +@using Microsoft.AspNetCore.Mvc.Localization +@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal; +@inject IHtmlLocalizer L +@model WinIn.FasterZ.Wms.Web.Pages.Z_Business.StoreScrapNoteDetail.StoreScrapNoteDetail.EditModalModel +@{ + Layout = null; +} + + + + + + + + + + diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/EditModal.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/EditModal.cshtml.cs new file mode 100644 index 000000000..16bba6d1c --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/EditModal.cshtml.cs @@ -0,0 +1,38 @@ +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail.Dtos; +using WinIn.FasterZ.Wms.Web.Pages.Z_Business.StoreScrapNoteDetail.StoreScrapNoteDetail.ViewModels; + +namespace WinIn.FasterZ.Wms.Web.Pages.Z_Business.StoreScrapNoteDetail.StoreScrapNoteDetail; + +public class EditModalModel : WmsPageModel +{ + [HiddenInput] + [BindProperty(SupportsGet = true)] + public Guid Id { get; set; } + + [BindProperty] + public CreateEditStoreScrapNoteDetailViewModel ViewModel { get; set; } + + private readonly IStoreScrapNoteDetailAppService _service; + + public EditModalModel(IStoreScrapNoteDetailAppService service) + { + _service = service; + } + + public virtual async Task OnGetAsync() + { + var dto = await _service.GetAsync(Id); + ViewModel = ObjectMapper.Map(dto); + } + + public virtual async Task OnPostAsync() + { + var dto = ObjectMapper.Map(ViewModel); + await _service.UpdateAsync(Id, dto); + return NoContent(); + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/Index.cshtml b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/Index.cshtml new file mode 100644 index 000000000..139ade94a --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/Index.cshtml @@ -0,0 +1,55 @@ +@page +@using WinIn.FasterZ.Wms.Permissions +@using Microsoft.AspNetCore.Authorization +@using Microsoft.AspNetCore.Mvc.Localization +@using Volo.Abp.AspNetCore.Mvc.UI.Layout +@using WinIn.FasterZ.Wms.Web.Pages.Z_Business.StoreScrapNoteDetail.StoreScrapNoteDetail +@using WinIn.FasterZ.Wms.Localization +@using WinIn.FasterZ.Wms.Web.Menus +@model IndexModel +@inject IPageLayout PageLayout +@inject IHtmlLocalizer L +@inject IAuthorizationService Authorization +@{ + PageLayout.Content.Title = L["StoreScrapNoteDetail"].Value; + PageLayout.Content.BreadCrumb.Add(L["Menu:StoreScrapNoteDetail"].Value); + PageLayout.Content.MenuItemName = WmsMenus.StoreScrapNoteDetail; +} + +@section scripts +{ + +} +@section styles +{ + +} + + + + + + @L["StoreScrapNoteDetail"] + + + @if (await Authorization.IsGrantedAsync(WmsPermissions.StoreScrapNoteDetail.Create)) + { + + } + + + + + + @L["TableFilter"] + + + +
+
+ +
+
diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/Index.cshtml.cs new file mode 100644 index 000000000..ef892ae6e --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/Index.cshtml.cs @@ -0,0 +1,155 @@ +using System; +using System.Threading.Tasks; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form; + +namespace WinIn.FasterZ.Wms.Web.Pages.Z_Business.StoreScrapNoteDetail.StoreScrapNoteDetail; + +public class IndexModel : WmsPageModel +{ + public StoreScrapNoteDetailFilterInput StoreScrapNoteDetailFilter { get; set; } + + public virtual async Task OnGetAsync() + { + await Task.CompletedTask; + } +} + +public class StoreScrapNoteDetailFilterInput +{ + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailArriveDate")] + public DateTime? ArriveDate { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailExpireDate")] + public DateTime? ExpireDate { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailFromContainerCode")] + public string? FromContainerCode { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailFromLocationArea")] + public string? FromLocationArea { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailFromLocationCode")] + public string FromLocationCode { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailFromLocationErpCode")] + public string FromLocationErpCode { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailFromLocationGroup")] + public string? FromLocationGroup { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailFromLot")] + public string? FromLot { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailFromPackingCode")] + public string? FromPackingCode { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailFromStatus")] + public string FromStatus { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailFromWarehouseCode")] + public string FromWarehouseCode { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailItemCode")] + public string ItemCode { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailItemDesc1")] + public string? ItemDesc1 { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailItemDesc2")] + public string? ItemDesc2 { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailItemName")] + public string? ItemName { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailMaster")] + public StoreScrapNote? Master { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailMasterId")] + public Guid? MasterId { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailNumber")] + public string Number { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailProduceDate")] + public DateTime? ProduceDate { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailQty")] + public decimal? Qty { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailReasonCode")] + public string? ReasonCode { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailRemark")] + public string? Remark { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailStdPackQty")] + public decimal? StdPackQty { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailSupplierBatch")] + public string? SupplierBatch { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailToContainerCode")] + public string? ToContainerCode { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailToLocationArea")] + public string? ToLocationArea { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailToLocationCode")] + public string ToLocationCode { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailToLocationErpCode")] + public string ToLocationErpCode { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailToLocationGroup")] + public string? ToLocationGroup { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailToLot")] + public string? ToLot { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailToPackingCode")] + public string? ToPackingCode { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailToStatus")] + public string ToStatus { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailToWarehouseCode")] + public string ToWarehouseCode { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "StoreScrapNoteDetailUom")] + public string Uom { get; set; } +} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/ViewModels/CreateEditStoreScrapNoteDetailViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/ViewModels/CreateEditStoreScrapNoteDetailViewModel.cs new file mode 100644 index 000000000..81b8c21b4 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/ViewModels/CreateEditStoreScrapNoteDetailViewModel.cs @@ -0,0 +1,109 @@ +using System; +using System.ComponentModel.DataAnnotations; + +namespace WinIn.FasterZ.Wms.Web.Pages.Z_Business.StoreScrapNoteDetail.StoreScrapNoteDetail.ViewModels; + +public class CreateEditStoreScrapNoteDetailViewModel +{ + [Display(Name = "StoreScrapNoteDetailArriveDate")] + public DateTime ArriveDate { get; set; } + + [Display(Name = "StoreScrapNoteDetailExpireDate")] + public DateTime ExpireDate { get; set; } + + [Display(Name = "StoreScrapNoteDetailFromContainerCode")] + public string? FromContainerCode { get; set; } + + [Display(Name = "StoreScrapNoteDetailFromLocationArea")] + public string? FromLocationArea { get; set; } + + [Display(Name = "StoreScrapNoteDetailFromLocationCode")] + public string FromLocationCode { get; set; } + + [Display(Name = "StoreScrapNoteDetailFromLocationErpCode")] + public string FromLocationErpCode { get; set; } + + [Display(Name = "StoreScrapNoteDetailFromLocationGroup")] + public string? FromLocationGroup { get; set; } + + [Display(Name = "StoreScrapNoteDetailFromLot")] + public string? FromLot { get; set; } + + [Display(Name = "StoreScrapNoteDetailFromPackingCode")] + public string? FromPackingCode { get; set; } + + [Display(Name = "StoreScrapNoteDetailFromStatus")] + public string FromStatus { get; set; } + + [Display(Name = "StoreScrapNoteDetailFromWarehouseCode")] + public string FromWarehouseCode { get; set; } + + [Display(Name = "StoreScrapNoteDetailItemCode")] + public string ItemCode { get; set; } + + [Display(Name = "StoreScrapNoteDetailItemDesc1")] + public string? ItemDesc1 { get; set; } + + [Display(Name = "StoreScrapNoteDetailItemDesc2")] + public string? ItemDesc2 { get; set; } + + [Display(Name = "StoreScrapNoteDetailItemName")] + public string? ItemName { get; set; } + + [Display(Name = "StoreScrapNoteDetailMaster")] + public StoreScrapNote Master { get; set; } + + [Display(Name = "StoreScrapNoteDetailMasterId")] + public Guid MasterId { get; set; } + + [Display(Name = "StoreScrapNoteDetailNumber")] + public string Number { get; set; } + + [Display(Name = "StoreScrapNoteDetailProduceDate")] + public DateTime ProduceDate { get; set; } + + [Display(Name = "StoreScrapNoteDetailQty")] + public decimal Qty { get; set; } + + [Display(Name = "StoreScrapNoteDetailReasonCode")] + public string? ReasonCode { get; set; } + + [Display(Name = "StoreScrapNoteDetailRemark")] + public string? Remark { get; set; } + + [Display(Name = "StoreScrapNoteDetailStdPackQty")] + public decimal StdPackQty { get; set; } + + [Display(Name = "StoreScrapNoteDetailSupplierBatch")] + public string? SupplierBatch { get; set; } + + [Display(Name = "StoreScrapNoteDetailToContainerCode")] + public string? ToContainerCode { get; set; } + + [Display(Name = "StoreScrapNoteDetailToLocationArea")] + public string? ToLocationArea { get; set; } + + [Display(Name = "StoreScrapNoteDetailToLocationCode")] + public string ToLocationCode { get; set; } + + [Display(Name = "StoreScrapNoteDetailToLocationErpCode")] + public string ToLocationErpCode { get; set; } + + [Display(Name = "StoreScrapNoteDetailToLocationGroup")] + public string? ToLocationGroup { get; set; } + + [Display(Name = "StoreScrapNoteDetailToLot")] + public string? ToLot { get; set; } + + [Display(Name = "StoreScrapNoteDetailToPackingCode")] + public string? ToPackingCode { get; set; } + + [Display(Name = "StoreScrapNoteDetailToStatus")] + public string ToStatus { get; set; } + + [Display(Name = "StoreScrapNoteDetailToWarehouseCode")] + public string ToWarehouseCode { get; set; } + + [Display(Name = "StoreScrapNoteDetailUom")] + public string Uom { get; set; } +} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/index.css b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/index.css new file mode 100644 index 000000000..e69de29bb diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/index.js b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/index.js new file mode 100644 index 000000000..d96891330 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/index.js @@ -0,0 +1,216 @@ +$(function () { + + $("#StoreScrapNoteDetailFilter :input").on('input', function () { + dataTable.ajax.reload(); + }); + + $('#StoreScrapNoteDetailFilter div').addClass('col-sm-3').parent().addClass('row'); + + var getFilter = function () { + var input = {}; + $("#StoreScrapNoteDetailFilter") + .serializeArray() + .forEach(function (data) { + if (data.value != '') { + input[abp.utils.toCamelCase(data.name.replace(/StoreScrapNoteDetailFilter./g, ''))] = data.value; + } + }) + return input; + }; + + var l = abp.localization.getResource('Wms'); + + var service = winIn.fasterZ.wms.z_Business.storeScrapNoteDetail.storeScrapNoteDetail; + var createModal = new abp.ModalManager(abp.appPath + 'Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/CreateModal'); + var editModal = new abp.ModalManager(abp.appPath + 'Z_Business/StoreScrapNoteDetail/StoreScrapNoteDetail/EditModal'); + + var dataTable = $('#StoreScrapNoteDetailTable').DataTable(abp.libs.datatables.normalizeConfiguration({ + processing: true, + serverSide: true, + paging: true, + searching: false,//disable default searchbox + autoWidth: false, + scrollCollapse: true, + order: [[0, "asc"]], + ajax: abp.libs.datatables.createAjax(service.getList,getFilter), + columnDefs: [ + { + rowAction: { + items: + [ + { + text: l('Edit'), + visible: abp.auth.isGranted('Wms.StoreScrapNoteDetail.Update'), + action: function (data) { + editModal.open({ id: data.record.id }); + } + }, + { + text: l('Delete'), + visible: abp.auth.isGranted('Wms.StoreScrapNoteDetail.Delete'), + confirmMessage: function (data) { + return l('StoreScrapNoteDetailDeletionConfirmationMessage', data.record.id); + }, + action: function (data) { + service.delete(data.record.id) + .then(function () { + abp.notify.info(l('SuccessfullyDeleted')); + dataTable.ajax.reload(); + }); + } + } + ] + } + }, + { + title: l('StoreScrapNoteDetailArriveDate'), + data: "arriveDate" + }, + { + title: l('StoreScrapNoteDetailExpireDate'), + data: "expireDate" + }, + { + title: l('StoreScrapNoteDetailFromContainerCode'), + data: "fromContainerCode" + }, + { + title: l('StoreScrapNoteDetailFromLocationArea'), + data: "fromLocationArea" + }, + { + title: l('StoreScrapNoteDetailFromLocationCode'), + data: "fromLocationCode" + }, + { + title: l('StoreScrapNoteDetailFromLocationErpCode'), + data: "fromLocationErpCode" + }, + { + title: l('StoreScrapNoteDetailFromLocationGroup'), + data: "fromLocationGroup" + }, + { + title: l('StoreScrapNoteDetailFromLot'), + data: "fromLot" + }, + { + title: l('StoreScrapNoteDetailFromPackingCode'), + data: "fromPackingCode" + }, + { + title: l('StoreScrapNoteDetailFromStatus'), + data: "fromStatus" + }, + { + title: l('StoreScrapNoteDetailFromWarehouseCode'), + data: "fromWarehouseCode" + }, + { + title: l('StoreScrapNoteDetailItemCode'), + data: "itemCode" + }, + { + title: l('StoreScrapNoteDetailItemDesc1'), + data: "itemDesc1" + }, + { + title: l('StoreScrapNoteDetailItemDesc2'), + data: "itemDesc2" + }, + { + title: l('StoreScrapNoteDetailItemName'), + data: "itemName" + }, + { + title: l('StoreScrapNoteDetailMaster'), + data: "master" + }, + { + title: l('StoreScrapNoteDetailMasterId'), + data: "masterId" + }, + { + title: l('StoreScrapNoteDetailNumber'), + data: "number" + }, + { + title: l('StoreScrapNoteDetailProduceDate'), + data: "produceDate" + }, + { + title: l('StoreScrapNoteDetailQty'), + data: "qty" + }, + { + title: l('StoreScrapNoteDetailReasonCode'), + data: "reasonCode" + }, + { + title: l('StoreScrapNoteDetailRemark'), + data: "remark" + }, + { + title: l('StoreScrapNoteDetailStdPackQty'), + data: "stdPackQty" + }, + { + title: l('StoreScrapNoteDetailSupplierBatch'), + data: "supplierBatch" + }, + { + title: l('StoreScrapNoteDetailToContainerCode'), + data: "toContainerCode" + }, + { + title: l('StoreScrapNoteDetailToLocationArea'), + data: "toLocationArea" + }, + { + title: l('StoreScrapNoteDetailToLocationCode'), + data: "toLocationCode" + }, + { + title: l('StoreScrapNoteDetailToLocationErpCode'), + data: "toLocationErpCode" + }, + { + title: l('StoreScrapNoteDetailToLocationGroup'), + data: "toLocationGroup" + }, + { + title: l('StoreScrapNoteDetailToLot'), + data: "toLot" + }, + { + title: l('StoreScrapNoteDetailToPackingCode'), + data: "toPackingCode" + }, + { + title: l('StoreScrapNoteDetailToStatus'), + data: "toStatus" + }, + { + title: l('StoreScrapNoteDetailToWarehouseCode'), + data: "toWarehouseCode" + }, + { + title: l('StoreScrapNoteDetailUom'), + data: "uom" + }, + ] + })); + + createModal.onResult(function () { + dataTable.ajax.reload(); + }); + + editModal.onResult(function () { + dataTable.ajax.reload(); + }); + + $('#NewStoreScrapNoteDetailButton').click(function (e) { + e.preventDefault(); + createModal.open(); + }); +}); diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapRequest/StoreScrapRequest/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapRequest/StoreScrapRequest/Index.cshtml.cs index afb5f7e62..920e2c5ad 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapRequest/StoreScrapRequest/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapRequest/StoreScrapRequest/Index.cshtml.cs @@ -55,7 +55,7 @@ public class StoreScrapRequestFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreScrapRequestStoreScrapRequestDetails")] - public ICollection? StoreScrapRequestDetails { get; set; } + public List? StoreScrapRequestDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreScrapRequestType")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapRequest/StoreScrapRequest/ViewModels/CreateEditStoreScrapRequestViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapRequest/StoreScrapRequest/ViewModels/CreateEditStoreScrapRequestViewModel.cs index cf152acaf..f9adc1763 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapRequest/StoreScrapRequest/ViewModels/CreateEditStoreScrapRequestViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreScrapRequest/StoreScrapRequest/ViewModels/CreateEditStoreScrapRequestViewModel.cs @@ -33,7 +33,7 @@ public class CreateEditStoreScrapRequestViewModel public string RequestStatus { get; set; } [Display(Name = "StoreScrapRequestStoreScrapRequestDetails")] - public ICollection StoreScrapRequestDetails { get; set; } + public List StoreScrapRequestDetails { get; set; } [Display(Name = "StoreScrapRequestType")] public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreSupplierAsn/StoreSupplierAsn/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreSupplierAsn/StoreSupplierAsn/Index.cshtml.cs index 906cfcfac..8f3cb15c8 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreSupplierAsn/StoreSupplierAsn/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreSupplierAsn/StoreSupplierAsn/Index.cshtml.cs @@ -83,7 +83,7 @@ public class StoreSupplierAsnFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreSupplierAsnStoreSupplierAsnDetails")] - public ICollection? StoreSupplierAsnDetails { get; set; } + public List? StoreSupplierAsnDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreSupplierAsnSupplierAddress")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreSupplierAsn/StoreSupplierAsn/ViewModels/CreateEditStoreSupplierAsnViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreSupplierAsn/StoreSupplierAsn/ViewModels/CreateEditStoreSupplierAsnViewModel.cs index 20bade3f6..c8969fbe6 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreSupplierAsn/StoreSupplierAsn/ViewModels/CreateEditStoreSupplierAsnViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreSupplierAsn/StoreSupplierAsn/ViewModels/CreateEditStoreSupplierAsnViewModel.cs @@ -54,7 +54,7 @@ public class CreateEditStoreSupplierAsnViewModel public string Status { get; set; } [Display(Name = "StoreSupplierAsnStoreSupplierAsnDetails")] - public ICollection StoreSupplierAsnDetails { get; set; } + public List StoreSupplierAsnDetails { get; set; } [Display(Name = "StoreSupplierAsnSupplierAddress")] public string? SupplierAddress { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreTransferNote/StoreTransferNote/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreTransferNote/StoreTransferNote/Index.cshtml.cs index 777793c08..477b1db8a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreTransferNote/StoreTransferNote/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreTransferNote/StoreTransferNote/Index.cshtml.cs @@ -47,11 +47,11 @@ public class StoreTransferNoteFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreTransferNoteStoreTransferNoteDetailCopies")] - public ICollection? StoreTransferNoteDetailCopies { get; set; } + public List? StoreTransferNoteDetailCopies { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreTransferNoteStoreTransferNoteDetails")] - public ICollection? StoreTransferNoteDetails { get; set; } + public List? StoreTransferNoteDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreTransferNoteType")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreTransferNote/StoreTransferNote/ViewModels/CreateEditStoreTransferNoteViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreTransferNote/StoreTransferNote/ViewModels/CreateEditStoreTransferNoteViewModel.cs index 162b666d1..4a357d52e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreTransferNote/StoreTransferNote/ViewModels/CreateEditStoreTransferNoteViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreTransferNote/StoreTransferNote/ViewModels/CreateEditStoreTransferNoteViewModel.cs @@ -27,10 +27,10 @@ public class CreateEditStoreTransferNoteViewModel public string? RequestNumber { get; set; } [Display(Name = "StoreTransferNoteStoreTransferNoteDetailCopies")] - public ICollection StoreTransferNoteDetailCopies { get; set; } + public List StoreTransferNoteDetailCopies { get; set; } [Display(Name = "StoreTransferNoteStoreTransferNoteDetails")] - public ICollection StoreTransferNoteDetails { get; set; } + public List StoreTransferNoteDetails { get; set; } [Display(Name = "StoreTransferNoteType")] public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreTransferRequest/StoreTransferRequest/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreTransferRequest/StoreTransferRequest/Index.cshtml.cs index 351e2bb08..aaf42f97a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreTransferRequest/StoreTransferRequest/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreTransferRequest/StoreTransferRequest/Index.cshtml.cs @@ -55,7 +55,7 @@ public class StoreTransferRequestFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreTransferRequestStoreTransferRequestDetails")] - public ICollection? StoreTransferRequestDetails { get; set; } + public List? StoreTransferRequestDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreTransferRequestType")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreTransferRequest/StoreTransferRequest/ViewModels/CreateEditStoreTransferRequestViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreTransferRequest/StoreTransferRequest/ViewModels/CreateEditStoreTransferRequestViewModel.cs index 0d82c2a77..b89329fa1 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreTransferRequest/StoreTransferRequest/ViewModels/CreateEditStoreTransferRequestViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreTransferRequest/StoreTransferRequest/ViewModels/CreateEditStoreTransferRequestViewModel.cs @@ -33,7 +33,7 @@ public class CreateEditStoreTransferRequestViewModel public string RequestStatus { get; set; } [Display(Name = "StoreTransferRequestStoreTransferRequestDetails")] - public ICollection StoreTransferRequestDetails { get; set; } + public List StoreTransferRequestDetails { get; set; } [Display(Name = "StoreTransferRequestType")] public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedIssueNote/StoreUnplannedIssueNote/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedIssueNote/StoreUnplannedIssueNote/Index.cshtml.cs index b4874d02c..0c1c91eb3 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedIssueNote/StoreUnplannedIssueNote/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedIssueNote/StoreUnplannedIssueNote/Index.cshtml.cs @@ -47,7 +47,7 @@ public class StoreUnplannedIssueNoteFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreUnplannedIssueNoteStoreUnplannedIssueNoteDetails")] - public ICollection? StoreUnplannedIssueNoteDetails { get; set; } + public List? StoreUnplannedIssueNoteDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreUnplannedIssueNoteUnplannedIssueRequestNumber")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedIssueNote/StoreUnplannedIssueNote/ViewModels/CreateEditStoreUnplannedIssueNoteViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedIssueNote/StoreUnplannedIssueNote/ViewModels/CreateEditStoreUnplannedIssueNoteViewModel.cs index 6af87fa6e..51513b761 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedIssueNote/StoreUnplannedIssueNote/ViewModels/CreateEditStoreUnplannedIssueNoteViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedIssueNote/StoreUnplannedIssueNote/ViewModels/CreateEditStoreUnplannedIssueNoteViewModel.cs @@ -27,7 +27,7 @@ public class CreateEditStoreUnplannedIssueNoteViewModel public string? Remark { get; set; } [Display(Name = "StoreUnplannedIssueNoteStoreUnplannedIssueNoteDetails")] - public ICollection StoreUnplannedIssueNoteDetails { get; set; } + public List StoreUnplannedIssueNoteDetails { get; set; } [Display(Name = "StoreUnplannedIssueNoteUnplannedIssueRequestNumber")] public string? UnplannedIssueRequestNumber { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedIssueRequest/StoreUnplannedIssueRequest/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedIssueRequest/StoreUnplannedIssueRequest/Index.cshtml.cs index f7248f80b..3a3f8ef24 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedIssueRequest/StoreUnplannedIssueRequest/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedIssueRequest/StoreUnplannedIssueRequest/Index.cshtml.cs @@ -67,7 +67,7 @@ public class StoreUnplannedIssueRequestFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreUnplannedIssueRequestStoreUnplannedIssueRequestDetails")] - public ICollection? StoreUnplannedIssueRequestDetails { get; set; } + public List? StoreUnplannedIssueRequestDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreUnplannedIssueRequestWorker")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedIssueRequest/StoreUnplannedIssueRequest/ViewModels/CreateEditStoreUnplannedIssueRequestViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedIssueRequest/StoreUnplannedIssueRequest/ViewModels/CreateEditStoreUnplannedIssueRequestViewModel.cs index 8ec785760..d6ec25e6f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedIssueRequest/StoreUnplannedIssueRequest/ViewModels/CreateEditStoreUnplannedIssueRequestViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedIssueRequest/StoreUnplannedIssueRequest/ViewModels/CreateEditStoreUnplannedIssueRequestViewModel.cs @@ -42,7 +42,7 @@ public class CreateEditStoreUnplannedIssueRequestViewModel public string RequestStatus { get; set; } [Display(Name = "StoreUnplannedIssueRequestStoreUnplannedIssueRequestDetails")] - public ICollection StoreUnplannedIssueRequestDetails { get; set; } + public List StoreUnplannedIssueRequestDetails { get; set; } [Display(Name = "StoreUnplannedIssueRequestWorker")] public string? Worker { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedReceiptNote/StoreUnplannedReceiptNote/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedReceiptNote/StoreUnplannedReceiptNote/Index.cshtml.cs index 7cc101ddd..cd4c9395a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedReceiptNote/StoreUnplannedReceiptNote/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedReceiptNote/StoreUnplannedReceiptNote/Index.cshtml.cs @@ -47,7 +47,7 @@ public class StoreUnplannedReceiptNoteFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreUnplannedReceiptNoteStoreUnplannedReceiptNoteDetails")] - public ICollection? StoreUnplannedReceiptNoteDetails { get; set; } + public List? StoreUnplannedReceiptNoteDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreUnplannedReceiptNoteUnplannedReceiptRequestNumber")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedReceiptNote/StoreUnplannedReceiptNote/ViewModels/CreateEditStoreUnplannedReceiptNoteViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedReceiptNote/StoreUnplannedReceiptNote/ViewModels/CreateEditStoreUnplannedReceiptNoteViewModel.cs index 7f937c23d..d611eeea6 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedReceiptNote/StoreUnplannedReceiptNote/ViewModels/CreateEditStoreUnplannedReceiptNoteViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedReceiptNote/StoreUnplannedReceiptNote/ViewModels/CreateEditStoreUnplannedReceiptNoteViewModel.cs @@ -27,7 +27,7 @@ public class CreateEditStoreUnplannedReceiptNoteViewModel public string? Remark { get; set; } [Display(Name = "StoreUnplannedReceiptNoteStoreUnplannedReceiptNoteDetails")] - public ICollection StoreUnplannedReceiptNoteDetails { get; set; } + public List StoreUnplannedReceiptNoteDetails { get; set; } [Display(Name = "StoreUnplannedReceiptNoteUnplannedReceiptRequestNumber")] public string? UnplannedReceiptRequestNumber { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedReceiptRequest/StoreUnplannedReceiptRequest/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedReceiptRequest/StoreUnplannedReceiptRequest/Index.cshtml.cs index 267d53bfe..625fb6bd2 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedReceiptRequest/StoreUnplannedReceiptRequest/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedReceiptRequest/StoreUnplannedReceiptRequest/Index.cshtml.cs @@ -67,7 +67,7 @@ public class StoreUnplannedReceiptRequestFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreUnplannedReceiptRequestStoreUnplannedReceiptRequestDetails")] - public ICollection? StoreUnplannedReceiptRequestDetails { get; set; } + public List? StoreUnplannedReceiptRequestDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreUnplannedReceiptRequestWorker")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedReceiptRequest/StoreUnplannedReceiptRequest/ViewModels/CreateEditStoreUnplannedReceiptRequestViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedReceiptRequest/StoreUnplannedReceiptRequest/ViewModels/CreateEditStoreUnplannedReceiptRequestViewModel.cs index 674c7800f..ea263977b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedReceiptRequest/StoreUnplannedReceiptRequest/ViewModels/CreateEditStoreUnplannedReceiptRequestViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreUnplannedReceiptRequest/StoreUnplannedReceiptRequest/ViewModels/CreateEditStoreUnplannedReceiptRequestViewModel.cs @@ -42,7 +42,7 @@ public class CreateEditStoreUnplannedReceiptRequestViewModel public string RequestStatus { get; set; } [Display(Name = "StoreUnplannedReceiptRequestStoreUnplannedReceiptRequestDetails")] - public ICollection StoreUnplannedReceiptRequestDetails { get; set; } + public List StoreUnplannedReceiptRequestDetails { get; set; } [Display(Name = "StoreUnplannedReceiptRequestWorker")] public string? Worker { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWarehouseTransferNote/StoreWarehouseTransferNote/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWarehouseTransferNote/StoreWarehouseTransferNote/Index.cshtml.cs index 80f7165a3..cd36f8411 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWarehouseTransferNote/StoreWarehouseTransferNote/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWarehouseTransferNote/StoreWarehouseTransferNote/Index.cshtml.cs @@ -35,7 +35,7 @@ public class StoreWarehouseTransferNoteFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreWarehouseTransferNoteStoreWarehouseTransferNoteDetails")] - public ICollection? StoreWarehouseTransferNoteDetails { get; set; } + public List? StoreWarehouseTransferNoteDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreWarehouseTransferNoteSupplierCode")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWarehouseTransferNote/StoreWarehouseTransferNote/ViewModels/CreateEditStoreWarehouseTransferNoteViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWarehouseTransferNote/StoreWarehouseTransferNote/ViewModels/CreateEditStoreWarehouseTransferNoteViewModel.cs index 6df594e1e..cbb56f34f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWarehouseTransferNote/StoreWarehouseTransferNote/ViewModels/CreateEditStoreWarehouseTransferNoteViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWarehouseTransferNote/StoreWarehouseTransferNote/ViewModels/CreateEditStoreWarehouseTransferNoteViewModel.cs @@ -18,7 +18,7 @@ public class CreateEditStoreWarehouseTransferNoteViewModel public string? Remark { get; set; } [Display(Name = "StoreWarehouseTransferNoteStoreWarehouseTransferNoteDetails")] - public ICollection StoreWarehouseTransferNoteDetails { get; set; } + public List StoreWarehouseTransferNoteDetails { get; set; } [Display(Name = "StoreWarehouseTransferNoteSupplierCode")] public string? SupplierCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWipWarehouseAdjustNote/StoreWipWarehouseAdjustNote/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWipWarehouseAdjustNote/StoreWipWarehouseAdjustNote/Index.cshtml.cs index 87e33c84c..3dfb8db0e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWipWarehouseAdjustNote/StoreWipWarehouseAdjustNote/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWipWarehouseAdjustNote/StoreWipWarehouseAdjustNote/Index.cshtml.cs @@ -47,7 +47,7 @@ public class StoreWipWarehouseAdjustNoteFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreWipWarehouseAdjustNoteStoreWipWarehouseAdjustNoteDetails")] - public ICollection? StoreWipWarehouseAdjustNoteDetails { get; set; } + public List? StoreWipWarehouseAdjustNoteDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreWipWarehouseAdjustNoteType")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWipWarehouseAdjustNote/StoreWipWarehouseAdjustNote/ViewModels/CreateEditStoreWipWarehouseAdjustNoteViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWipWarehouseAdjustNote/StoreWipWarehouseAdjustNote/ViewModels/CreateEditStoreWipWarehouseAdjustNoteViewModel.cs index d9e5ef4e9..3c315d461 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWipWarehouseAdjustNote/StoreWipWarehouseAdjustNote/ViewModels/CreateEditStoreWipWarehouseAdjustNoteViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWipWarehouseAdjustNote/StoreWipWarehouseAdjustNote/ViewModels/CreateEditStoreWipWarehouseAdjustNoteViewModel.cs @@ -27,7 +27,7 @@ public class CreateEditStoreWipWarehouseAdjustNoteViewModel public string? RequestNumber { get; set; } [Display(Name = "StoreWipWarehouseAdjustNoteStoreWipWarehouseAdjustNoteDetails")] - public ICollection StoreWipWarehouseAdjustNoteDetails { get; set; } + public List StoreWipWarehouseAdjustNoteDetails { get; set; } [Display(Name = "StoreWipWarehouseAdjustNoteType")] public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWipWarehouseAdjustRequest/StoreWipWarehouseAdjustRequest/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWipWarehouseAdjustRequest/StoreWipWarehouseAdjustRequest/Index.cshtml.cs index 381113f95..704ece049 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWipWarehouseAdjustRequest/StoreWipWarehouseAdjustRequest/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWipWarehouseAdjustRequest/StoreWipWarehouseAdjustRequest/Index.cshtml.cs @@ -55,7 +55,7 @@ public class StoreWipWarehouseAdjustRequestFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreWipWarehouseAdjustRequestStoreWipWarehouseAdjustRequestDetails")] - public ICollection? StoreWipWarehouseAdjustRequestDetails { get; set; } + public List? StoreWipWarehouseAdjustRequestDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreWipWarehouseAdjustRequestType")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWipWarehouseAdjustRequest/StoreWipWarehouseAdjustRequest/ViewModels/CreateEditStoreWipWarehouseAdjustRequestViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWipWarehouseAdjustRequest/StoreWipWarehouseAdjustRequest/ViewModels/CreateEditStoreWipWarehouseAdjustRequestViewModel.cs index 60399c20b..9d680de11 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWipWarehouseAdjustRequest/StoreWipWarehouseAdjustRequest/ViewModels/CreateEditStoreWipWarehouseAdjustRequestViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWipWarehouseAdjustRequest/StoreWipWarehouseAdjustRequest/ViewModels/CreateEditStoreWipWarehouseAdjustRequestViewModel.cs @@ -33,7 +33,7 @@ public class CreateEditStoreWipWarehouseAdjustRequestViewModel public string RequestStatus { get; set; } [Display(Name = "StoreWipWarehouseAdjustRequestStoreWipWarehouseAdjustRequestDetails")] - public ICollection StoreWipWarehouseAdjustRequestDetails { get; set; } + public List StoreWipWarehouseAdjustRequestDetails { get; set; } [Display(Name = "StoreWipWarehouseAdjustRequestType")] public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWorkOrder/StoreWorkOrder/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWorkOrder/StoreWorkOrder/Index.cshtml.cs index 2ac7f88a5..00dd38dea 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWorkOrder/StoreWorkOrder/Index.cshtml.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWorkOrder/StoreWorkOrder/Index.cshtml.cs @@ -67,7 +67,7 @@ public class StoreWorkOrderFilterInput [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreWorkOrderStoreWorkOrderDetails")] - public ICollection? StoreWorkOrderDetails { get; set; } + public List? StoreWorkOrderDetails { get; set; } [FormControlSize(AbpFormControlSize.Small)] [Display(Name = "StoreWorkOrderType")] diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWorkOrder/StoreWorkOrder/ViewModels/CreateEditStoreWorkOrderViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWorkOrder/StoreWorkOrder/ViewModels/CreateEditStoreWorkOrderViewModel.cs index 0ba418cb3..1e87dc2b1 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWorkOrder/StoreWorkOrder/ViewModels/CreateEditStoreWorkOrderViewModel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/StoreWorkOrder/StoreWorkOrder/ViewModels/CreateEditStoreWorkOrderViewModel.cs @@ -43,7 +43,7 @@ public class CreateEditStoreWorkOrderViewModel public string? Remark { get; set; } [Display(Name = "StoreWorkOrderStoreWorkOrderDetails")] - public ICollection StoreWorkOrderDetails { get; set; } + public List StoreWorkOrderDetails { get; set; } [Display(Name = "StoreWorkOrderType")] public string Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsWebAutoMapperProfile.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsWebAutoMapperProfile.cs index 3ea02b6b8..9f2b22d85 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsWebAutoMapperProfile.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsWebAutoMapperProfile.cs @@ -112,6 +112,8 @@ using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNoteDetail.Dtos; using WinIn.FasterZ.Wms.Web.Pages.Z_Business.StoreProductL7partsNoteDetail.StoreProductL7partsNoteDetail.ViewModels; using WinIn.FasterZ.Wms.Z_Business.StoreProductL7partsNote.Dtos; using WinIn.FasterZ.Wms.Web.Pages.Z_Business.StoreProductL7partsNote.StoreProductL7partsNote.ViewModels; +using WinIn.FasterZ.Wms.Z_Business.StoreScrapNoteDetail.Dtos; +using WinIn.FasterZ.Wms.Web.Pages.Z_Business.StoreScrapNoteDetail.StoreScrapNoteDetail.ViewModels; using AutoMapper; namespace WinIn.FasterZ.Wms.Web @@ -235,6 +237,8 @@ namespace WinIn.FasterZ.Wms.Web CreateMap(); CreateMap(); CreateMap(); + CreateMap(); + CreateMap(); } } }