From bbcbfb702d71a036aa5c835ffa0fd7cdc4c3f6e2 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Thu, 23 Nov 2023 09:01:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=B8=9C=E9=98=B3=E4=B8=BB?= =?UTF-8?q?=E5=AD=90=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Permissions/WmsPermissions.cs | 34 +++-- .../Dtos/CreateUpdateStoreTransferNoteDto.cs | 49 +++++- .../Dtos/StoreTransferNoteDto.cs | 38 ++++- .../IStoreTransferNoteAppService.cs | 8 +- .../CreateUpdateStoreTransferNoteDetailDto.cs | 140 +++++++++++++++++- .../Dtos/StoreTransferNoteDetailDto.cs | 108 +++++++++++++- .../IStoreTransferNoteDetailAppService.cs | 8 +- .../WmsApplicationAutoMapperProfile.cs | 2 + .../StoreTransferNoteAppService.cs | 7 +- .../StoreTransferNoteDetailAppService.cs | 7 +- .../Localization/Wms/ar.json | 45 +++++- .../Localization/Wms/zh-Hans.json | 1 - .../IStoreTransferNoteRepository.cs | 3 + .../IStoreTransferNoteDetailRepository.cs | 3 + .../EntityFrameworkCore/WmsDbContext.cs | 30 +++- ...reTransferNoteEfCoreQuerableExtensions.cs} | 3 + ...sferNoteDetailEfCoreQuerableExtensions.cs} | 3 + 17 files changed, 455 insertions(+), 34 deletions(-) rename WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNote/{StoreTransferNoteEfCoreQueryableExtensions.cs => StoreTransferNoteEfCoreQuerableExtensions.cs} (93%) rename WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteDetail/{StoreTransferNoteDetailEfCoreQueryableExtensions.cs => StoreTransferNoteDetailEfCoreQuerableExtensions.cs} (93%) 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 a3c33acde..588ac0401 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 @@ -147,21 +147,7 @@ namespace WinIn.FasterZ.Wms.Permissions public const string Create = Default + ".Create"; public const string Delete = Default + ".Delete"; } - public class StoreTransferNoteDetail - { - public const string Default = GroupName + ".StoreTransferNoteDetail"; - 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"; @@ -2011,6 +1997,26 @@ namespace WinIn.FasterZ.Wms.Permissions 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 StoreTransferNoteDetail + { + public const string Default = GroupName + ".StoreTransferNoteDetail"; + 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/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 9e3c81e8d..d72a2b01c 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,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; @@ -7,25 +8,69 @@ namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; [Serializable] public class CreateUpdateStoreTransferNoteDto { + /// + /// + /// + [DisplayName("StoreTransferNoteActiveDate")] public DateTime ActiveDate { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteConfirmed")] public bool Confirmed { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteConfirmTime")] public DateTime? ConfirmTime { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteJobNumber")] public string? JobNumber { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteNumber")] public string Number { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteRemark")] public string? Remark { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteRequestNumber")] public string? RequestNumber { get; set; } - public List Details {get;set;} =new (); - + /// + /// + /// + [DisplayName("StoreTransferNoteDetails")] + public List Details { get; set; } = new(); + + /// + /// + /// + [DisplayName("StoreTransferNoteType")] public string? Type { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteUseOnTheWayLocation")] public bool UseOnTheWayLocation { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteWorker")] 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/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 b96f5504d..84b5412d0 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 @@ -5,28 +5,64 @@ using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; +/// +/// +/// [Serializable] public class StoreTransferNoteDto : AuditedEntityDto { + /// + /// + /// public DateTime ActiveDate { get; set; } + /// + /// + /// public bool Confirmed { get; set; } + /// + /// + /// public DateTime? ConfirmTime { get; set; } + /// + /// + /// public string? JobNumber { get; set; } + /// + /// + /// public string Number { get; set; } + /// + /// + /// public string? Remark { get; set; } + /// + /// + /// public string? RequestNumber { get; set; } - public List Details {get;set;} =new (); + /// + /// + /// + public List Details { get; set; } + /// + /// + /// public string? Type { get; set; } + /// + /// + /// public bool UseOnTheWayLocation { 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/StoreTransferNote/IStoreTransferNoteAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNote/IStoreTransferNoteAppService.cs index d1a477cc4..cc8a3fb7c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNote/IStoreTransferNoteAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNote/IStoreTransferNoteAppService.cs @@ -1,15 +1,19 @@ using System; using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; +using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNote; +/// +/// +/// public interface IStoreTransferNoteAppService : ICrudAppService< - StoreTransferNoteDto, + StoreTransferNoteDto, Guid, - StoreTransferNoteGetListInput, + PagedAndSortedResultRequestDto, CreateUpdateStoreTransferNoteDto, CreateUpdateStoreTransferNoteDto> { 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 6c0961bf1..3be83812a 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,78 +1,212 @@ using System; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; +using System.ComponentModel; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail.Dtos; [Serializable] public class CreateUpdateStoreTransferNoteDetailDto { + /// + /// + /// + [DisplayName("StoreTransferNoteDetailArriveDate")] public DateTime ArriveDate { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailExpireDate")] public DateTime ExpireDate { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailFromContainerCode")] public string? FromContainerCode { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailFromLocationArea")] public string? FromLocationArea { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailFromLocationCode")] public string FromLocationCode { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailFromLocationErpCode")] public string FromLocationErpCode { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailFromLocationGroup")] public string? FromLocationGroup { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailFromLot")] public string? FromLot { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailFromPackingCode")] public string? FromPackingCode { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailFromStatus")] public string FromStatus { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailFromWarehouseCode")] public string FromWarehouseCode { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailItemCode")] public string ItemCode { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailItemDesc1")] public string? ItemDesc1 { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailItemDesc2")] public string? ItemDesc2 { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailItemName")] public string? ItemName { get; set; } - - + /// + /// + /// + [DisplayName("StoreTransferNoteDetailMasterId")] public Guid MasterId { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailNumber")] public string Number { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailOnTheWayLocationCode")] public string? OnTheWayLocationCode { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailProduceDate")] public DateTime ProduceDate { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailQty")] public decimal Qty { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailReason")] public string? Reason { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailRemark")] public string? Remark { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailStdPackQty")] public decimal StdPackQty { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailSupplierBatch")] public string? SupplierBatch { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailToContainerCode")] public string? ToContainerCode { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailToLocationArea")] public string? ToLocationArea { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailToLocationCode")] public string ToLocationCode { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailToLocationErpCode")] public string ToLocationErpCode { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailToLocationGroup")] public string? ToLocationGroup { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailToLot")] public string? ToLot { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailToPackingCode")] public string? ToPackingCode { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailToStatus")] public string ToStatus { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailToWarehouseCode")] public string ToWarehouseCode { get; set; } + /// + /// + /// + [DisplayName("StoreTransferNoteDetailUom")] 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/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 53f7eec75..0ec5b3e21 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,79 +1,181 @@ using System; using Volo.Abp.Application.Dtos; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail.Dtos; +/// +/// +/// [Serializable] public class StoreTransferNoteDetailDto : 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 Guid MasterId { get; set; } + /// + /// + /// public string Number { get; set; } + /// + /// + /// public string? OnTheWayLocationCode { get; set; } + /// + /// + /// public DateTime ProduceDate { get; set; } + /// + /// + /// public decimal Qty { get; set; } + /// + /// + /// public string? Reason { 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/StoreTransferNoteDetail/IStoreTransferNoteDetailAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetail/IStoreTransferNoteDetailAppService.cs index 51bbf4f69..d72f27641 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetail/IStoreTransferNoteDetailAppService.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetail/IStoreTransferNoteDetailAppService.cs @@ -1,15 +1,19 @@ using System; using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail.Dtos; +using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail; +/// +/// +/// public interface IStoreTransferNoteDetailAppService : ICrudAppService< - StoreTransferNoteDetailDto, + StoreTransferNoteDetailDto, Guid, - StoreTransferNoteDetailGetListInput, + PagedAndSortedResultRequestDto, CreateUpdateStoreTransferNoteDetailDto, CreateUpdateStoreTransferNoteDetailDto> { 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 c9eca45bc..7c623f9a4 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 @@ -873,6 +873,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/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 d0c6f8d54..f000f6229 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,13 +1,17 @@ using System; using WinIn.FasterZ.Wms.Permissions; using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; +using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using WinIn.FasterZ.Wms.AppBase; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNote; -public class StoreTransferNoteAppService : ZbxBase, +/// +/// +/// +public class StoreTransferNoteAppService : ZbxBase, IStoreTransferNoteAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreTransferNote.Default; @@ -22,4 +26,5 @@ public class StoreTransferNoteAppService : ZbxBase, +/// +/// +/// +public class StoreTransferNoteDetailAppService : ZbxBase, IStoreTransferNoteDetailAppService { protected override string GetPolicyName { get; set; } = WmsPermissions.StoreTransferNoteDetail.Default; @@ -22,4 +26,5 @@ public class StoreTransferNoteDetailAppService : ZbxBase +/// +/// public interface IStoreTransferNoteRepository : IRepository { } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetail/IStoreTransferNoteDetailRepository.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetail/IStoreTransferNoteDetailRepository.cs index 7c2ed30af..bacb89f03 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetail/IStoreTransferNoteDetailRepository.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetail/IStoreTransferNoteDetailRepository.cs @@ -3,6 +3,9 @@ using Volo.Abp.Domain.Repositories; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail; +/// +/// +/// public interface IStoreTransferNoteDetailRepository : IRepository { } 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 748189f38..8a481eec7 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 @@ -294,8 +294,6 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore public DbSet StoreUnplannedIssueNotes { get; set; } public DbSet StoreTransferRequestDetails { get; set; } public DbSet StoreTransferRequests { get; set; } - public DbSet StoreTransferNoteDetails { get; set; } - public DbSet StoreTransferNotes { get; set; } public DbSet StoreSupplierAsnDetails { get; set; } public DbSet StoreSupplierAsns { get; set; } public DbSet StoreScrapRequestDetails { get; set; } @@ -972,6 +970,14 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore /// /// public DbSet AuthMenus { get; set; } + /// + /// + /// + public DbSet StoreTransferNotes { get; set; } + /// + /// + /// + public DbSet StoreTransferNoteDetails { get; set; } public WmsDbContext(DbContextOptions options) : base(options) @@ -3180,6 +3186,26 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore /* Configure more properties here */ }); + + + builder.Entity(b => + { + b.ToTable(WmsConsts.DbTablePrefix + "Store_TransferNote", WmsConsts.DbSchema, table => table.HasComment("")); + b.ConfigureByConvention(); + + + /* Configure more properties here */ + }); + + + builder.Entity(b => + { + b.ToTable(WmsConsts.DbTablePrefix + "Store_TransferNoteDetail", 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/Z_Business/StoreTransferNote/StoreTransferNoteEfCoreQueryableExtensions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNote/StoreTransferNoteEfCoreQuerableExtensions.cs similarity index 93% rename from WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNote/StoreTransferNoteEfCoreQueryableExtensions.cs rename to WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNote/StoreTransferNoteEfCoreQuerableExtensions.cs index 937d20661..c09390023 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNote/StoreTransferNoteEfCoreQueryableExtensions.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNote/StoreTransferNoteEfCoreQuerableExtensions.cs @@ -3,6 +3,9 @@ using Microsoft.EntityFrameworkCore; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNote; +/// +/// +/// public static class StoreTransferNoteEfCoreQueryableExtensions { public static IQueryable IncludeDetails(this IQueryable queryable, bool include = true) diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteDetail/StoreTransferNoteDetailEfCoreQueryableExtensions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteDetail/StoreTransferNoteDetailEfCoreQuerableExtensions.cs similarity index 93% rename from WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteDetail/StoreTransferNoteDetailEfCoreQueryableExtensions.cs rename to WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteDetail/StoreTransferNoteDetailEfCoreQuerableExtensions.cs index c65d58abc..4df0ca6e2 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteDetail/StoreTransferNoteDetailEfCoreQueryableExtensions.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteDetail/StoreTransferNoteDetailEfCoreQuerableExtensions.cs @@ -3,6 +3,9 @@ using Microsoft.EntityFrameworkCore; namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail; +/// +/// +/// public static class StoreTransferNoteDetailEfCoreQueryableExtensions { public static IQueryable IncludeDetails(this IQueryable queryable, bool include = true)