diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/Controllers/CustAccountController.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/Controllers/CustAccountController.cs index f76db2b40..6518c9b4a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/Controllers/CustAccountController.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/Controllers/CustAccountController.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Net.Http; using System.Net.Http.Headers; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; using Volo.Abp; @@ -16,6 +17,7 @@ namespace WinIn.FasterZ.AuthSiteCenter.Web.Controllers; [ApiController] [Route("CustAccount")] +[AllowAnonymous] public class CustAccountController : AbpController { private readonly IdentityUserManager _userManager; @@ -28,8 +30,8 @@ public class CustAccountController : AbpController _httpClientFactory = httpClientFactory; _configuration = configuration; } - - [HttpPost("login")] + [AllowAnonymous] + [HttpPost("login")] public async Task LoginAsync([FromBody]LoginInput input) { try 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 74f06a76d..01e2c9575 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,9 +1,9 @@ { "App": { "SelfUrl": "http://192.168.0.240:60080", - "ClientUrl": "http://dev.ccwin-in.com:60080,http://dev.ccwin-in.com:60081,http://dev.ccwin-in.com:60075,http://localhost:60080,http://localhost:60081,http://localhost:60075", - "CorsOrigins": "http://dev.ccwin-in.com:60080,http://dev.ccwin-in.com:60081,http://dev.ccwin-in.com:60075,http://localhost:60080,http://localhost:60081,http://localhost:60075", - "RedirectAllowedUrls": "http://dev.ccwin-in.com:60080,http://dev.ccwin-in.com:60081,http://dev.ccwin-in.com:60075,http://localhost:60080,http://localhost:60081,http://localhost:60075" + "ClientUrl": "http://dev.ccwin-in.com:60080,http://dev.ccwin-in.com:60081,http://dev.ccwin-in.com:60075,http://localhost:60080,http://localhost:60081,http://localhost:60075,http://192.168.0.195:60081,http://192.168.0.195:60075", + "CorsOrigins": "http://dev.ccwin-in.com:60080,http://dev.ccwin-in.com:60081,http://dev.ccwin-in.com:60075,http://localhost:60080,http://localhost:60081,http://localhost:60075,http://192.168.0.195:60081,http://192.168.0.195:60075", + "RedirectAllowedUrls": "http://dev.ccwin-in.com:60080,http://dev.ccwin-in.com:60081,http://dev.ccwin-in.com:60075,http://localhost:60080,http://localhost:60081,http://localhost:60075,http://192.168.0.195:60081,http://192.168.0.195:60075" }, "ConnectionStrings": { "Default": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Faster_AuthSiteCenter;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;Encrypt=False;" 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 8a430f535..6a1bd9361 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 @@ -107,10 +107,10 @@ namespace WinIn.FasterZ.Wms.Permissions 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 storeTransferNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreTransferNoteDetail.Default, L("Permission:StoreTransferNoteDetail")); + storeTransferNoteDetailPermission.AddChild(WmsPermissions.StoreTransferNoteDetail.Create, L("Permission:Create")); + storeTransferNoteDetailPermission.AddChild(WmsPermissions.StoreTransferNoteDetail.Update, L("Permission:Update")); + storeTransferNoteDetailPermission.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")); @@ -547,21 +547,11 @@ namespace WinIn.FasterZ.Wms.Permissions storeCountPlanPermission.AddChild(WmsPermissions.StoreCountPlan.Update, L("Permission:Update")); storeCountPlanPermission.AddChild(WmsPermissions.StoreCountPlan.Delete, L("Permission:Delete")); - var storeCountNoteDetailCopyPermission = myGroup.AddPermission(WmsPermissions.StoreCountNoteDetailCopy.Default, L("Permission:StoreCountNoteDetailCopy")); - storeCountNoteDetailCopyPermission.AddChild(WmsPermissions.StoreCountNoteDetailCopy.Create, L("Permission:Create")); - storeCountNoteDetailCopyPermission.AddChild(WmsPermissions.StoreCountNoteDetailCopy.Update, L("Permission:Update")); - storeCountNoteDetailCopyPermission.AddChild(WmsPermissions.StoreCountNoteDetailCopy.Delete, L("Permission:Delete")); - var storeCountNoteDetailPermission = myGroup.AddPermission(WmsPermissions.StoreCountNoteDetail.Default, L("Permission:StoreCountNoteDetail")); storeCountNoteDetailPermission.AddChild(WmsPermissions.StoreCountNoteDetail.Create, L("Permission:Create")); storeCountNoteDetailPermission.AddChild(WmsPermissions.StoreCountNoteDetail.Update, L("Permission:Update")); storeCountNoteDetailPermission.AddChild(WmsPermissions.StoreCountNoteDetail.Delete, L("Permission:Delete")); - var storeCountNoteCopyPermission = myGroup.AddPermission(WmsPermissions.StoreCountNoteCopy.Default, L("Permission:StoreCountNoteCopy")); - storeCountNoteCopyPermission.AddChild(WmsPermissions.StoreCountNoteCopy.Create, L("Permission:Create")); - storeCountNoteCopyPermission.AddChild(WmsPermissions.StoreCountNoteCopy.Update, L("Permission:Update")); - storeCountNoteCopyPermission.AddChild(WmsPermissions.StoreCountNoteCopy.Delete, L("Permission:Delete")); - var storeCountNotePermission = myGroup.AddPermission(WmsPermissions.StoreCountNote.Default, L("Permission:StoreCountNote")); storeCountNotePermission.AddChild(WmsPermissions.StoreCountNote.Create, L("Permission:Create")); storeCountNotePermission.AddChild(WmsPermissions.StoreCountNote.Update, L("Permission:Update")); 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 5e415184b..a3c33acde 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 @@ -149,7 +149,7 @@ namespace WinIn.FasterZ.Wms.Permissions } public class StoreTransferNoteDetail { - public const string Default = GroupName + ".StoreTransferNoteDetailCopy"; + public const string Default = GroupName + ".StoreTransferNoteDetail"; public const string Update = Default + ".Update"; public const string Create = Default + ".Create"; public const string Delete = Default + ".Delete"; @@ -924,16 +924,6 @@ namespace WinIn.FasterZ.Wms.Permissions /// /// /// - public class StoreCountNoteDetailCopy - { - public const string Default = GroupName + ".StoreCountNoteDetailCopy"; - public const string Update = Default + ".Update"; - public const string Create = Default + ".Create"; - public const string Delete = Default + ".Delete"; - } - /// - /// - /// public class StoreCountNoteDetail { public const string Default = GroupName + ".StoreCountNoteDetail"; @@ -941,16 +931,7 @@ namespace WinIn.FasterZ.Wms.Permissions public const string Create = Default + ".Create"; public const string Delete = Default + ".Delete"; } - /// - /// - /// - public class StoreCountNoteCopy - { - public const string Default = GroupName + ".StoreCountNoteCopy"; - 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/Z_Business/LabelInventoryLabel/Dtos/CreateUpdateLabelInventoryLabelDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelInventoryLabel/Dtos/CreateUpdateLabelInventoryLabelDto.cs index b4a0c13b6..67c0e2f4d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelInventoryLabel/Dtos/CreateUpdateLabelInventoryLabelDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelInventoryLabel/Dtos/CreateUpdateLabelInventoryLabelDto.cs @@ -123,12 +123,12 @@ public class CreateUpdateLabelInventoryLabelDto /// /// /// - public string? QualityInfoQlevel { get; set; } + public string? QualityInfo_Qlevel { get; set; } /// /// /// - public string? QualityInfoQualityFile { get; set; } + public string? QualityInfo_QualityFile { get; set; } /// /// diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelInventoryLabel/Dtos/LabelInventoryLabelDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelInventoryLabel/Dtos/LabelInventoryLabelDto.cs index 2e8505d84..3b739b4d0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelInventoryLabel/Dtos/LabelInventoryLabelDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelInventoryLabel/Dtos/LabelInventoryLabelDto.cs @@ -87,37 +87,37 @@ public class LabelInventoryLabelDto : AuditedEntityDto /// /// /// - public string? ProductionInfoProdLine { get; set; } + public string? ProductionInfo_ProdLine { get; set; } /// /// /// - public string? ProductionInfoShift { get; set; } + public string? ProductionInfo_Shift { get; set; } /// /// /// - public string? ProductionInfoTeam { get; set; } + public string? ProductionInfo_Team { get; set; } /// /// /// - public string? PurchaseInfoAsnNumber { get; set; } + public string? PurchaseInfo_AsnNumber { get; set; } /// /// /// - public string? PurchaseInfoPoNumber { get; set; } + public string? PurchaseInfo_PoNumber { get; set; } /// /// /// - public string? PurchaseInfoRpNumber { get; set; } + public string? PurchaseInfo_RpNumber { get; set; } /// /// /// - public string? PurchaseInfoSupplierCode { get; set; } + public string? PurchaseInfo_SupplierCode { get; set; } /// /// @@ -127,12 +127,12 @@ public class LabelInventoryLabelDto : AuditedEntityDto /// /// /// - public string? QualityInfoQlevel { get; set; } + public string? QualityInfo_Qlevel { get; set; } /// /// /// - public string? QualityInfoQualityFile { get; set; } + public string? QualityInfo_QualityFile { get; set; } /// /// diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelSaleLabel/Dtos/CreateUpdateLabelSaleLabelDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelSaleLabel/Dtos/CreateUpdateLabelSaleLabelDto.cs index 0540fa3df..2a3aeea5f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelSaleLabel/Dtos/CreateUpdateLabelSaleLabelDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelSaleLabel/Dtos/CreateUpdateLabelSaleLabelDto.cs @@ -83,12 +83,12 @@ public class CreateUpdateLabelSaleLabelDto /// /// /// - public string? QualityInfoQlevel { get; set; } + public string? QualityInfo_Qlevel { get; set; } /// /// /// - public string? QualityInfoQualityFile { get; set; } + public string? QualityInfo_QualityFile { get; set; } /// /// @@ -98,7 +98,7 @@ public class CreateUpdateLabelSaleLabelDto /// /// /// - public string? SaleInfoSaleInfoName { get; set; } + public string? SaleInfo_SaleInfoName { get; set; } /// /// diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelSaleLabel/Dtos/LabelSaleLabelDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelSaleLabel/Dtos/LabelSaleLabelDto.cs index edd8db57a..1369d2c3b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelSaleLabel/Dtos/LabelSaleLabelDto.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/LabelSaleLabel/Dtos/LabelSaleLabelDto.cs @@ -87,12 +87,12 @@ public class LabelSaleLabelDto : AuditedEntityDto /// /// /// - public string? QualityInfoQlevel { get; set; } + public string? QualityInfo_Qlevel { get; set; } /// /// /// - public string? QualityInfoQualityFile { get; set; } + public string? QualityInfo_QualityFile { get; set; } /// /// @@ -102,7 +102,7 @@ public class LabelSaleLabelDto : AuditedEntityDto /// /// /// - public string? SaleInfoSaleInfoName { get; set; } + public string? SaleInfo_SaleInfoName { 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 044f3c59e..fd06ed423 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,5 @@ -using Volo.Abp.Identity; +using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.Identity; namespace WinIn.FasterZ.Wms.AppBase; @@ -9,6 +10,7 @@ using System.IO; using System.Linq; using System.Linq.Dynamic.Core; using System.Linq.Expressions; +using System.Reflection; using System.Threading; using System.Threading.Tasks; @@ -545,8 +547,7 @@ public class ZbxBase /// 用户个型导出配置 /// - public class ExportCustomUserSettingAppService : ZbxBase, IExportCustomUserSettingAppService @@ -47,20 +47,6 @@ namespace WinIn.FasterZ.Wms.AppBaseBusiness.ExportCustomUserSetting return ObjectMapper.Map, List>(entitys); } - - protected override async Task> CreateFilteredQueryAsync( - ExportCustomUserSettingGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ExportUserId != null, x => x.ExportUserId == input.ExportUserId) - .WhereIf(!input.ExportUserName.IsNullOrWhiteSpace(), x => x.ExportUserName.Contains(input.ExportUserName)) - .WhereIf(!input.ExportColumnName.IsNullOrWhiteSpace(), - x => x.ExportColumnName.Contains(input.ExportColumnName)) - .WhereIf(!input.ExportTableName.IsNullOrWhiteSpace(), - x => x.ExportTableName.Contains(input.ExportTableName)) - .WhereIf(input.CustomUserSetting != null, x => x.CustomUserSetting == input.CustomUserSetting) - ; - } + } } \ No newline at end of file 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 11c106382..c9eca45bc 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 @@ -36,10 +36,6 @@ using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequestDetail; using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequestDetail.Dtos; using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequest; using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequest.Dtos; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy.Dtos; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy.Dtos; using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote; using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; using WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsnDetail; @@ -214,12 +210,8 @@ using WinIn.FasterZ.Wms.Z_Business.StoreCountPlanDetail; using WinIn.FasterZ.Wms.Z_Business.StoreCountPlanDetail.Dtos; using WinIn.FasterZ.Wms.Z_Business.StoreCountPlan; using WinIn.FasterZ.Wms.Z_Business.StoreCountPlan.Dtos; -using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy; -using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy.Dtos; using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetail; using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetail.Dtos; -using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy; -using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy.Dtos; using WinIn.FasterZ.Wms.Z_Business.StoreCountNote; using WinIn.FasterZ.Wms.Z_Business.StoreCountNote.Dtos; using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustRequestDetail; @@ -437,450 +429,450 @@ using WinIn.FasterZ.Wms.Z_Business.AuthUserMenu.Dtos; using WinIn.FasterZ.Wms.Z_Business.AuthMenu; using WinIn.FasterZ.Wms.Z_Business.AuthMenu.Dtos; using AutoMapper; +using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail; +using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail.Dtos; namespace WinIn.FasterZ.Wms { - public class WmsApplicationAutoMapperProfile : Profile - { - public WmsApplicationAutoMapperProfile() - { - /* You can configure your AutoMapper mapping configuration here. + public class WmsApplicationAutoMapperProfile : Profile + { + public WmsApplicationAutoMapperProfile() + { + /* You can configure your AutoMapper mapping configuration here. * Alternatively, you can split your mapping configurations * into multiple profile classes for a better organization. */ - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - } - } + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); + CreateMap(); + 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.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 bcd7b7d00..94975c53c 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 @@ -557,63 +557,6 @@ "CreateStoreTransferRequest": "CreateStoreTransferRequest", "EditStoreTransferRequest": "EditStoreTransferRequest", "StoreTransferRequestDeletionConfirmationMessage": "Are you sure to delete the storeTransferRequest {0}?", - "Permission:StoreTransferNoteDetailCopy": "StoreTransferNoteDetailCopy", - "Menu:StoreTransferNoteDetailCopy": "MenuStoreTransferNoteDetailCopy", - "StoreTransferNoteDetailCopy": "StoreTransferNoteDetailCopy", - "StoreTransferNoteDetailCopyArriveDate": "StoreTransferNoteDetailCopyArriveDate", - "StoreTransferNoteDetailCopyExpireDate": "StoreTransferNoteDetailCopyExpireDate", - "StoreTransferNoteDetailCopyFromContainerCode": "StoreTransferNoteDetailCopyFromContainerCode", - "StoreTransferNoteDetailCopyFromLocationArea": "StoreTransferNoteDetailCopyFromLocationArea", - "StoreTransferNoteDetailCopyFromLocationCode": "StoreTransferNoteDetailCopyFromLocationCode", - "StoreTransferNoteDetailCopyFromLocationErpCode": "StoreTransferNoteDetailCopyFromLocationErpCode", - "StoreTransferNoteDetailCopyFromLocationGroup": "StoreTransferNoteDetailCopyFromLocationGroup", - "StoreTransferNoteDetailCopyFromLot": "StoreTransferNoteDetailCopyFromLot", - "StoreTransferNoteDetailCopyFromPackingCode": "StoreTransferNoteDetailCopyFromPackingCode", - "StoreTransferNoteDetailCopyFromStatus": "StoreTransferNoteDetailCopyFromStatus", - "StoreTransferNoteDetailCopyFromWarehouseCode": "StoreTransferNoteDetailCopyFromWarehouseCode", - "StoreTransferNoteDetailCopyItemCode": "StoreTransferNoteDetailCopyItemCode", - "StoreTransferNoteDetailCopyItemDesc1": "StoreTransferNoteDetailCopyItemDesc1", - "StoreTransferNoteDetailCopyItemDesc2": "StoreTransferNoteDetailCopyItemDesc2", - "StoreTransferNoteDetailCopyItemName": "StoreTransferNoteDetailCopyItemName", - "StoreTransferNoteDetailCopyMaster": "StoreTransferNoteDetailCopyMaster", - "StoreTransferNoteDetailCopyMasterId": "StoreTransferNoteDetailCopyMasterId", - "StoreTransferNoteDetailCopyNumber": "StoreTransferNoteDetailCopyNumber", - "StoreTransferNoteDetailCopyOnTheWayLocationCode": "StoreTransferNoteDetailCopyOnTheWayLocationCode", - "StoreTransferNoteDetailCopyProduceDate": "StoreTransferNoteDetailCopyProduceDate", - "StoreTransferNoteDetailCopyQty": "StoreTransferNoteDetailCopyQty", - "StoreTransferNoteDetailCopyReason": "StoreTransferNoteDetailCopyReason", - "StoreTransferNoteDetailCopyRemark": "StoreTransferNoteDetailCopyRemark", - "StoreTransferNoteDetailCopyStdPackQty": "StoreTransferNoteDetailCopyStdPackQty", - "StoreTransferNoteDetailCopySupplierBatch": "StoreTransferNoteDetailCopySupplierBatch", - "StoreTransferNoteDetailCopyToContainerCode": "StoreTransferNoteDetailCopyToContainerCode", - "StoreTransferNoteDetailCopyToLocationArea": "StoreTransferNoteDetailCopyToLocationArea", - "StoreTransferNoteDetailCopyToLocationCode": "StoreTransferNoteDetailCopyToLocationCode", - "StoreTransferNoteDetailCopyToLocationErpCode": "StoreTransferNoteDetailCopyToLocationErpCode", - "StoreTransferNoteDetailCopyToLocationGroup": "StoreTransferNoteDetailCopyToLocationGroup", - "StoreTransferNoteDetailCopyToLot": "StoreTransferNoteDetailCopyToLot", - "StoreTransferNoteDetailCopyToPackingCode": "StoreTransferNoteDetailCopyToPackingCode", - "StoreTransferNoteDetailCopyToStatus": "StoreTransferNoteDetailCopyToStatus", - "StoreTransferNoteDetailCopyToWarehouseCode": "StoreTransferNoteDetailCopyToWarehouseCode", - "StoreTransferNoteDetailCopyUom": "StoreTransferNoteDetailCopyUom", - "CreateStoreTransferNoteDetailCopy": "CreateStoreTransferNoteDetailCopy", - "EditStoreTransferNoteDetailCopy": "EditStoreTransferNoteDetailCopy", - "StoreTransferNoteDetailCopyDeletionConfirmationMessage": "Are you sure to delete the storeTransferNoteDetailCopy {0}?", - "Permission:StoreTransferNoteCopy": "StoreTransferNoteCopy", - "Menu:StoreTransferNoteCopy": "MenuStoreTransferNoteCopy", - "StoreTransferNoteCopy": "StoreTransferNoteCopy", - "StoreTransferNoteCopyActiveDate": "StoreTransferNoteCopyActiveDate", - "StoreTransferNoteCopyConfirmed": "StoreTransferNoteCopyConfirmed", - "StoreTransferNoteCopyConfirmTime": "StoreTransferNoteCopyConfirmTime", - "StoreTransferNoteCopyJobNumber": "StoreTransferNoteCopyJobNumber", - "StoreTransferNoteCopyNumber": "StoreTransferNoteCopyNumber", - "StoreTransferNoteCopyRemark": "StoreTransferNoteCopyRemark", - "StoreTransferNoteCopyRequestNumber": "StoreTransferNoteCopyRequestNumber", - "StoreTransferNoteCopyType": "StoreTransferNoteCopyType", - "StoreTransferNoteCopyUseOnTheWayLocation": "StoreTransferNoteCopyUseOnTheWayLocation", - "StoreTransferNoteCopyWorker": "StoreTransferNoteCopyWorker", - "CreateStoreTransferNoteCopy": "CreateStoreTransferNoteCopy", - "EditStoreTransferNoteCopy": "EditStoreTransferNoteCopy", - "StoreTransferNoteCopyDeletionConfirmationMessage": "Are you sure to delete the storeTransferNoteCopy {0}?", "Permission:StoreTransferNote": "StoreTransferNote", "Menu:StoreTransferNote": "MenuStoreTransferNote", "StoreTransferNote": "StoreTransferNote", @@ -624,7 +567,6 @@ "StoreTransferNoteNumber": "StoreTransferNoteNumber", "StoreTransferNoteRemark": "StoreTransferNoteRemark", "StoreTransferNoteRequestNumber": "StoreTransferNoteRequestNumber", - "StoreTransferNoteStoreTransferNoteDetailCopies": "StoreTransferNoteStoreTransferNoteDetailCopies", "StoreTransferNoteStoreTransferNoteDetails": "StoreTransferNoteStoreTransferNoteDetails", "StoreTransferNoteType": "StoreTransferNoteType", "StoreTransferNoteUseOnTheWayLocation": "StoreTransferNoteUseOnTheWayLocation", @@ -3606,7 +3548,7 @@ "LabelSaleLabelProduceDate": "LabelSaleLabelProduceDate", "LabelSaleLabelQty": "LabelSaleLabelQty", "LabelSaleLabelQualityInfoQlevel": "LabelSaleLabelQualityInfoQlevel", - "LabelSaleLabelQualityInfoQualityFile": "LabelSaleLabelQualityInfoQualityFile", + "LabelSaleLabelQualityInfo_QualityFile": "LabelSaleLabelQualityInfo_QualityFile", "LabelSaleLabelRemark": "LabelSaleLabelRemark", "LabelSaleLabelSaleInfoSaleInfoName": "LabelSaleLabelSaleInfoSaleInfoName", "LabelSaleLabelStdPackQty": "LabelSaleLabelStdPackQty", @@ -3681,7 +3623,7 @@ "LabelInventoryLabelPurchaseInfoSupplierCode": "LabelInventoryLabelPurchaseInfoSupplierCode", "LabelInventoryLabelQty": "LabelInventoryLabelQty", "LabelInventoryLabelQualityInfoQlevel": "LabelInventoryLabelQualityInfoQlevel", - "LabelInventoryLabelQualityInfoQualityFile": "LabelInventoryLabelQualityInfoQualityFile", + "LabelInventoryLabelQualityInfo_QualityFile": "LabelInventoryLabelQualityInfo_QualityFile", "LabelInventoryLabelRecommendLocationCode": "LabelInventoryLabelRecommendLocationCode", "LabelInventoryLabelRemark": "LabelInventoryLabelRemark", "LabelInventoryLabelSpecifications": "LabelInventoryLabelSpecifications", diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/cs.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/cs.json index 912ffb6f9..6f4f3ec16 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/cs.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/cs.json @@ -558,63 +558,6 @@ "CreateStoreTransferRequest": "CreateStoreTransferRequest", "EditStoreTransferRequest": "EditStoreTransferRequest", "StoreTransferRequestDeletionConfirmationMessage": "Are you sure to delete the storeTransferRequest {0}?", - "Permission:StoreTransferNoteDetailCopy": "StoreTransferNoteDetailCopy", - "Menu:StoreTransferNoteDetailCopy": "MenuStoreTransferNoteDetailCopy", - "StoreTransferNoteDetailCopy": "StoreTransferNoteDetailCopy", - "StoreTransferNoteDetailCopyArriveDate": "StoreTransferNoteDetailCopyArriveDate", - "StoreTransferNoteDetailCopyExpireDate": "StoreTransferNoteDetailCopyExpireDate", - "StoreTransferNoteDetailCopyFromContainerCode": "StoreTransferNoteDetailCopyFromContainerCode", - "StoreTransferNoteDetailCopyFromLocationArea": "StoreTransferNoteDetailCopyFromLocationArea", - "StoreTransferNoteDetailCopyFromLocationCode": "StoreTransferNoteDetailCopyFromLocationCode", - "StoreTransferNoteDetailCopyFromLocationErpCode": "StoreTransferNoteDetailCopyFromLocationErpCode", - "StoreTransferNoteDetailCopyFromLocationGroup": "StoreTransferNoteDetailCopyFromLocationGroup", - "StoreTransferNoteDetailCopyFromLot": "StoreTransferNoteDetailCopyFromLot", - "StoreTransferNoteDetailCopyFromPackingCode": "StoreTransferNoteDetailCopyFromPackingCode", - "StoreTransferNoteDetailCopyFromStatus": "StoreTransferNoteDetailCopyFromStatus", - "StoreTransferNoteDetailCopyFromWarehouseCode": "StoreTransferNoteDetailCopyFromWarehouseCode", - "StoreTransferNoteDetailCopyItemCode": "StoreTransferNoteDetailCopyItemCode", - "StoreTransferNoteDetailCopyItemDesc1": "StoreTransferNoteDetailCopyItemDesc1", - "StoreTransferNoteDetailCopyItemDesc2": "StoreTransferNoteDetailCopyItemDesc2", - "StoreTransferNoteDetailCopyItemName": "StoreTransferNoteDetailCopyItemName", - "StoreTransferNoteDetailCopyMaster": "StoreTransferNoteDetailCopyMaster", - "StoreTransferNoteDetailCopyMasterId": "StoreTransferNoteDetailCopyMasterId", - "StoreTransferNoteDetailCopyNumber": "StoreTransferNoteDetailCopyNumber", - "StoreTransferNoteDetailCopyOnTheWayLocationCode": "StoreTransferNoteDetailCopyOnTheWayLocationCode", - "StoreTransferNoteDetailCopyProduceDate": "StoreTransferNoteDetailCopyProduceDate", - "StoreTransferNoteDetailCopyQty": "StoreTransferNoteDetailCopyQty", - "StoreTransferNoteDetailCopyReason": "StoreTransferNoteDetailCopyReason", - "StoreTransferNoteDetailCopyRemark": "StoreTransferNoteDetailCopyRemark", - "StoreTransferNoteDetailCopyStdPackQty": "StoreTransferNoteDetailCopyStdPackQty", - "StoreTransferNoteDetailCopySupplierBatch": "StoreTransferNoteDetailCopySupplierBatch", - "StoreTransferNoteDetailCopyToContainerCode": "StoreTransferNoteDetailCopyToContainerCode", - "StoreTransferNoteDetailCopyToLocationArea": "StoreTransferNoteDetailCopyToLocationArea", - "StoreTransferNoteDetailCopyToLocationCode": "StoreTransferNoteDetailCopyToLocationCode", - "StoreTransferNoteDetailCopyToLocationErpCode": "StoreTransferNoteDetailCopyToLocationErpCode", - "StoreTransferNoteDetailCopyToLocationGroup": "StoreTransferNoteDetailCopyToLocationGroup", - "StoreTransferNoteDetailCopyToLot": "StoreTransferNoteDetailCopyToLot", - "StoreTransferNoteDetailCopyToPackingCode": "StoreTransferNoteDetailCopyToPackingCode", - "StoreTransferNoteDetailCopyToStatus": "StoreTransferNoteDetailCopyToStatus", - "StoreTransferNoteDetailCopyToWarehouseCode": "StoreTransferNoteDetailCopyToWarehouseCode", - "StoreTransferNoteDetailCopyUom": "StoreTransferNoteDetailCopyUom", - "CreateStoreTransferNoteDetailCopy": "CreateStoreTransferNoteDetailCopy", - "EditStoreTransferNoteDetailCopy": "EditStoreTransferNoteDetailCopy", - "StoreTransferNoteDetailCopyDeletionConfirmationMessage": "Are you sure to delete the storeTransferNoteDetailCopy {0}?", - "Permission:StoreTransferNoteCopy": "StoreTransferNoteCopy", - "Menu:StoreTransferNoteCopy": "MenuStoreTransferNoteCopy", - "StoreTransferNoteCopy": "StoreTransferNoteCopy", - "StoreTransferNoteCopyActiveDate": "StoreTransferNoteCopyActiveDate", - "StoreTransferNoteCopyConfirmed": "StoreTransferNoteCopyConfirmed", - "StoreTransferNoteCopyConfirmTime": "StoreTransferNoteCopyConfirmTime", - "StoreTransferNoteCopyJobNumber": "StoreTransferNoteCopyJobNumber", - "StoreTransferNoteCopyNumber": "StoreTransferNoteCopyNumber", - "StoreTransferNoteCopyRemark": "StoreTransferNoteCopyRemark", - "StoreTransferNoteCopyRequestNumber": "StoreTransferNoteCopyRequestNumber", - "StoreTransferNoteCopyType": "StoreTransferNoteCopyType", - "StoreTransferNoteCopyUseOnTheWayLocation": "StoreTransferNoteCopyUseOnTheWayLocation", - "StoreTransferNoteCopyWorker": "StoreTransferNoteCopyWorker", - "CreateStoreTransferNoteCopy": "CreateStoreTransferNoteCopy", - "EditStoreTransferNoteCopy": "EditStoreTransferNoteCopy", - "StoreTransferNoteCopyDeletionConfirmationMessage": "Are you sure to delete the storeTransferNoteCopy {0}?", "Permission:StoreTransferNote": "StoreTransferNote", "Menu:StoreTransferNote": "MenuStoreTransferNote", "StoreTransferNote": "StoreTransferNote", diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDictItem/BasedataDictItem.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDictItem/BasedataDictItem.cs index 23b74aa84..6e1634f15 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDictItem/BasedataDictItem.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/BasedataDictItem/BasedataDictItem.cs @@ -6,7 +6,7 @@ using WinIn.FasterZ.Wms.Z_Business.BasedataDict; - public class BasedataDictItem : AuditedAggregateRoot + public class BasedataDictItem : AuditedEntity { public string Code { get; set; } = null!; diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelInventoryLabel/LabelInventoryLabel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelInventoryLabel/LabelInventoryLabel.cs index 0a0104ce6..3f046fa37 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelInventoryLabel/LabelInventoryLabel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelInventoryLabel/LabelInventoryLabel.cs @@ -36,25 +36,25 @@ public DateTime ProduceDate { get; set; } - public string? ProductionInfoProdLine { get; set; } + public string? ProductionInfo_ProdLine { get; set; } - public string? ProductionInfoShift { get; set; } + public string? ProductionInfo_Shift { get; set; } - public string? ProductionInfoTeam { get; set; } + public string? ProductionInfo_Team { get; set; } - public string? PurchaseInfoAsnNumber { get; set; } + public string? PurchaseInfo_AsnNumber { get; set; } - public string? PurchaseInfoPoNumber { get; set; } + public string? PurchaseInfo_PoNumber { get; set; } - public string? PurchaseInfoRpNumber { get; set; } + public string? PurchaseInfo_RpNumber { get; set; } - public string? PurchaseInfoSupplierCode { get; set; } + public string? PurchaseInfo_SupplierCode { get; set; } public decimal Qty { get; set; } - public string? QualityInfoQlevel { get; set; } + public string? QualityInfo_Qlevel { get; set; } - public string? QualityInfoQualityFile { get; set; } + public string? QualityInfo_QualityFile { get; set; } public string? RecommendLocationCode { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelSaleLabel/LabelSaleLabel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelSaleLabel/LabelSaleLabel.cs index 286ee9612..89b55bf8f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelSaleLabel/LabelSaleLabel.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/LabelSaleLabel/LabelSaleLabel.cs @@ -36,13 +36,13 @@ public decimal Qty { get; set; } - public string? QualityInfoQlevel { get; set; } + public string? QualityInfo_Qlevel { get; set; } - public string? QualityInfoQualityFile { get; set; } + public string? QualityInfo_QualityFile { get; set; } public string? Remark { get; set; } - public string? SaleInfoSaleInfoName { get; set; } + public string? SaleInfo_SaleInfoName { get; set; } public decimal StdPackQty { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNote/StoreCountNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNote/StoreCountNote.cs index 9ebfa5150..b354ff084 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNote/StoreCountNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNote/StoreCountNote.cs @@ -6,7 +6,6 @@ using Volo.Abp.Domain.Entities.Auditing; using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetail; - using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy; public class StoreCountNote : AuditedAggregateRoot { @@ -28,10 +27,8 @@ public string Stage { get; set; } = null!; - public virtual List StoreCountNoteDetailCopies { get; set; } = - new List(); - - public virtual List StoreCountNoteDetails { get; set; } = + + public virtual List Detalis { get; set; } = new List(); public string Type { get; set; } = null!; 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 f37d6bff7..748189f38 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 @@ -123,9 +123,7 @@ using WinIn.FasterZ.Wms.Z_Business.StoreCustomerAsnDetail; using WinIn.FasterZ.Wms.Z_Business.StoreCustomerAsn; using WinIn.FasterZ.Wms.Z_Business.StoreCountPlanDetail; using WinIn.FasterZ.Wms.Z_Business.StoreCountPlan; -using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy; using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetail; -using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy; using WinIn.FasterZ.Wms.Z_Business.StoreCountNote; using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustRequestDetail; using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustRequest; @@ -541,18 +539,10 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore /// /// /// - public DbSet StoreCountNoteDetailCopies { get; set; } - /// - /// - /// public DbSet StoreCountNoteDetails { get; set; } /// /// /// - public DbSet StoreCountNoteCopies { get; set; } - /// - /// - /// public DbSet StoreCountNotes { get; set; } /// /// @@ -925,7 +915,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore /// /// /// - public DbSet BasedataDictItems { get; set; } + public DbSet BasedataDictItem { get; set; } /// /// /// @@ -1024,7 +1014,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "Auth_Department", WmsConsts.DbSchema); + b.ToTable(WmsConsts.DbTablePrefix + "Auth__Department", WmsConsts.DbSchema); b.ConfigureByConvention(); @@ -2100,16 +2090,6 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore }); - builder.Entity(b => - { - b.ToTable(WmsConsts.DbTablePrefix + "Store_CountNoteDetailCopie", WmsConsts.DbSchema, table => table.HasComment("")); - b.ConfigureByConvention(); - - - /* Configure more properties here */ - }); - - builder.Entity(b => { b.ToTable(WmsConsts.DbTablePrefix + "Store_CountNoteDetail", WmsConsts.DbSchema, table => table.HasComment("")); @@ -2120,15 +2100,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore }); - builder.Entity(b => - { - b.ToTable(WmsConsts.DbTablePrefix + "Store_CountNoteCopie", WmsConsts.DbSchema, table => table.HasComment("")); - b.ConfigureByConvention(); - - - /* Configure more properties here */ - }); - + builder.Entity(b => { @@ -2222,7 +2194,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "MessageUserNotifyMessage", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Message_UserNotifyMessage", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2232,7 +2204,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "MessagePrivateMessage", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Message_PrivateMessage", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2242,7 +2214,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "MessageNotifyMessage", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Message_NotifyMessage", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2252,7 +2224,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "MessageMessageTypeSubscribe", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Message_MessageTypeSubscribe", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2262,7 +2234,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "MessageMessageType", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Message_MessageType", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2272,7 +2244,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "MessageAnnouncement", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Message_Announcement", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2622,7 +2594,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "InventoryTransferLog", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Inventory_TransferLog", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2632,7 +2604,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "InventoryTransaction", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Inventory_Transaction", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2642,7 +2614,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "InventorySnapshot", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Inventory_Snapshot", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2652,7 +2624,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "InventoryLocationCapacitie", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Inventory_LocationCapacity", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2662,7 +2634,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "InventoryExpectOut", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Inventory_ExpectOut", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2672,7 +2644,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "InventoryExpectIn", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Inventory_ExpectIn", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2682,7 +2654,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "InventoryErpBalance", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Inventory_ErpBalance", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2692,7 +2664,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "InventoryContainerDetail", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Inventory_ContainerDetail", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2702,7 +2674,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "InventoryContainer", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Inventory_Container", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2712,7 +2684,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "InventoryBalance", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Inventory_Balance", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2722,7 +2694,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "FileStorageFile", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "FileStorage_File", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2732,7 +2704,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "FileStorageDataImportTask", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "FileStorage_DataImportTask", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2742,7 +2714,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "FileStorageDataExportTask", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "FileStorage_DataExportTask", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -2972,7 +2944,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "Basedata_ItemQualitie", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Basedata_ItemQuality", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -3002,7 +2974,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "Basedata_ItemCategorie", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Basedata_ItemCategory", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -3092,7 +3064,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "Basedata_CustomerAddresse", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Basedata_CustomerAddress", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -3122,7 +3094,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "Basedata_Currencie", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Basedata_Currency", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -3132,7 +3104,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "Basedata_Categorie", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Basedata_Category", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -3182,7 +3154,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "AuthUserWorkGroup", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Auth_UserWorkGroup", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -3192,7 +3164,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "AuthUserMenu", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Auth_UserMenu", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); @@ -3202,7 +3174,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore builder.Entity(b => { - b.ToTable(WmsConsts.DbTablePrefix + "AuthMenu", WmsConsts.DbSchema, table => table.HasComment("")); + b.ToTable(WmsConsts.DbTablePrefix + "Auth_Menu", WmsConsts.DbSchema, table => table.HasComment("")); b.ConfigureByConvention(); 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 6feb04a64..e8aa65c4f 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 @@ -106,9 +106,7 @@ using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustNoteDetail; using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustRequest; using WinIn.FasterZ.Wms.Z_Business.StoreCountAdjustRequestDetail; using WinIn.FasterZ.Wms.Z_Business.StoreCountNote; -using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy; using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetail; -using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy; using WinIn.FasterZ.Wms.Z_Business.StoreCountPlan; using WinIn.FasterZ.Wms.Z_Business.StoreCountPlanDetail; using WinIn.FasterZ.Wms.Z_Business.StoreCustomerAsn; @@ -371,9 +369,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore options.AddRepository(); options.AddRepository(); options.AddRepository(); - options.AddRepository(); options.AddRepository(); - options.AddRepository(); options.AddRepository(); options.AddRepository(); options.AddRepository(); 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 cf08f471a..28b726b35 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": "http://dev.ccwin-in.com:60080,http://dev.ccwin-in.com:60081,http://dev.ccwin-in.com:60075,http://localhost:60080,http://localhost:60081,http://localhost:60075", + "CorsOrigins": "http://dev.ccwin-in.com:60080,http://dev.ccwin-in.com:60081,http://dev.ccwin-in.com:60075,http://localhost:60080,http://localhost:60081,http://localhost:60075,http://192.168.0.195:60081,http://192.168.0.195:60075", "Audit": { "IsEnabled": false // 禁用审计功能 // 其他审计相关设置项