From 666c227f7fd6400a1e9859fb61064becdcd4eb3b Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Mon, 20 Nov 2023 17:29:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=20=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=9A=84Copy=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthSiteCenterWebModule.cs | 10 +- .../appsettings.json | 3 +- .../Dtos/CreateUpdateStoreCountNoteCopyDto.cs | 74 ----- .../Dtos/StoreCountNoteCopyDto.cs | 66 ----- .../IStoreCountNoteCopyAppService.cs | 21 -- ...CreateUpdateStoreCountNoteDetailCopyDto.cs | 254 ------------------ .../Dtos/StoreCountNoteDetailCopyDto.cs | 221 --------------- .../IStoreCountNoteDetailCopyAppService.cs | 21 -- .../CreateUpdateStoreTransferNoteCopyDto.cs | 27 -- .../Dtos/StoreTransferNoteCopyDto.cs | 28 -- .../Dtos/StoreTransferNoteCopyGetListInput.cs | 29 -- .../IStoreTransferNoteCopyAppService.cs | 17 -- ...ateUpdateStoreTransferNoteDetailCopyDto.cs | 78 ------ .../Dtos/StoreTransferNoteDetailCopyDto.cs | 79 ------ ...StoreTransferNoteDetailCopyGetListInput.cs | 80 ------ .../IStoreTransferNoteDetailCopyAppService.cs | 17 -- .../WmsApplicationAutoMapperProfile.cs | 4 - .../StoreCountNoteCopyAppService.cs | 30 --- .../StoreCountNoteDetailCopyAppService.cs | 30 --- .../StoreTransferNoteCopyAppService.cs | 44 --- .../StoreTransferNoteDetailCopyAppService.cs | 25 -- .../IStoreCountNoteCopyRepository.cs | 11 - .../StoreCountNoteCopy/StoreCountNoteCopy.cs | 31 --- .../IStoreCountNoteDetailCopyRepository.cs | 11 - .../StoreCountNoteDetailCopy.cs | 95 ------- .../StoreTransferNote/StoreTransferNote.cs | 6 +- .../IStoreTransferNoteCopyRepository.cs | 8 - .../StoreTransferNoteCopy.cs | 29 -- .../IStoreTransferNoteDetailCopyRepository.cs | 8 - .../StoreTransferNoteDetailCopy.cs | 81 ------ .../EntityFrameworkCore/WmsDbContext.cs | 26 -- .../WmsEntityFrameworkCoreModule.cs | 4 - ...reCountNoteCopyEfCoreQuerableExtensions.cs | 22 -- .../StoreCountNoteCopyRepository.cs | 20 -- ...tNoteDetailCopyEfCoreQuerableExtensions.cs | 22 -- .../StoreCountNoteDetailCopyRepository.cs | 20 -- ...ansferNoteCopyEfCoreQueryableExtensions.cs | 19 -- .../StoreTransferNoteCopyRepository.cs | 20 -- ...NoteDetailCopyEfCoreQueryableExtensions.cs | 19 -- .../StoreTransferNoteDetailCopyRepository.cs | 20 -- .../WmsHttpApiHostModule.cs | 10 +- .../appsettings.json | 3 +- 42 files changed, 17 insertions(+), 1626 deletions(-) delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteCopy/Dtos/CreateUpdateStoreCountNoteCopyDto.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteCopy/Dtos/StoreCountNoteCopyDto.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteCopy/IStoreCountNoteCopyAppService.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteDetailCopy/Dtos/CreateUpdateStoreCountNoteDetailCopyDto.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteDetailCopy/Dtos/StoreCountNoteDetailCopyDto.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteDetailCopy/IStoreCountNoteDetailCopyAppService.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteCopy/Dtos/CreateUpdateStoreTransferNoteCopyDto.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteCopy/Dtos/StoreTransferNoteCopyDto.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteCopy/Dtos/StoreTransferNoteCopyGetListInput.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteCopy/IStoreTransferNoteCopyAppService.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/CreateUpdateStoreTransferNoteDetailCopyDto.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/StoreTransferNoteDetailCopyDto.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/StoreTransferNoteDetailCopyGetListInput.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/IStoreTransferNoteDetailCopyAppService.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreCountNoteCopy/StoreCountNoteCopyAppService.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopyAppService.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopyAppService.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopyAppService.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteCopy/IStoreCountNoteCopyRepository.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteCopy/StoreCountNoteCopy.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteDetailCopy/IStoreCountNoteDetailCopyRepository.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopy.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteCopy/IStoreTransferNoteCopyRepository.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopy.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetailCopy/IStoreTransferNoteDetailCopyRepository.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopy.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreCountNoteCopy/StoreCountNoteCopyEfCoreQuerableExtensions.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreCountNoteCopy/StoreCountNoteCopyRepository.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopyEfCoreQuerableExtensions.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopyRepository.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopyEfCoreQueryableExtensions.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopyRepository.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopyEfCoreQueryableExtensions.cs delete mode 100644 WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopyRepository.cs diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/AuthSiteCenterWebModule.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/AuthSiteCenterWebModule.cs index 058338531..92351b814 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/AuthSiteCenterWebModule.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/AuthSiteCenterWebModule.cs @@ -148,16 +148,18 @@ public class AuthSiteCenterWebModule : AbpModule options.ValueLengthLimit = 1024 * 1024 * 100; // 100MB max len form data }); - Configure(options => + var redisKeyPrefix = configuration["Redis:KeyPrefix"]; + Configure(options => { - options.KeyPrefix = "AuthSiteCenter:"; + //options.KeyPrefix = "AuthSiteCenter:"; + options.KeyPrefix = redisKeyPrefix+":"; }); - var dataProtectionBuilder = context.Services.AddDataProtection().SetApplicationName("AuthSiteCenter"); + var dataProtectionBuilder = context.Services.AddDataProtection().SetApplicationName(redisKeyPrefix); if (!hostingEnvironment.IsDevelopment()) { var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]); - dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, "AuthSiteCenter-Protection-Keys"); + dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, $"{redisKeyPrefix}-Protection-Keys"); } context.Services.AddSingleton(sp => 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 52479f600..74f06a76d 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 @@ -12,7 +12,8 @@ "DefaultPassPhrase": "ybgU8NieQZNjguXe" }, "Redis": { - "Configuration": "127.0.0.1:6379" + "Configuration": "127.0.0.1:6379", + "KeyPrefix": "DY_AuthSiteCenter" }, "AuthServer": { "Authority": "http://192.168.0.240:60080" diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteCopy/Dtos/CreateUpdateStoreCountNoteCopyDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteCopy/Dtos/CreateUpdateStoreCountNoteCopyDto.cs deleted file mode 100644 index 6bba81faf..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteCopy/Dtos/CreateUpdateStoreCountNoteCopyDto.cs +++ /dev/null @@ -1,74 +0,0 @@ -using System; -using System.ComponentModel; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy.Dtos; - -[Serializable] -public class CreateUpdateStoreCountNoteCopyDto -{ - /// - /// - /// - [DisplayName("StoreCountNoteCopyActiveDate")] - public DateTime ActiveDate { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteCopyAdjusted")] - public bool Adjusted { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteCopyBeginTime")] - public DateTime BeginTime { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteCopyCountPlanNumber")] - public string? CountPlanNumber { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteCopyDescription")] - public string? Description { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteCopyEndTime")] - public DateTime EndTime { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteCopyNumber")] - public string Number { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteCopyRemark")] - public string? Remark { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteCopyStage")] - public string Stage { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteCopyType")] - public string Type { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteCopyWorker")] - 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/StoreCountNoteCopy/Dtos/StoreCountNoteCopyDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteCopy/Dtos/StoreCountNoteCopyDto.cs deleted file mode 100644 index 4c6c9a02e..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteCopy/Dtos/StoreCountNoteCopyDto.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System; -using Volo.Abp.Application.Dtos; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy.Dtos; - -/// -/// -/// -[Serializable] -public class StoreCountNoteCopyDto : AuditedEntityDto -{ - /// - /// - /// - public DateTime ActiveDate { get; set; } - - /// - /// - /// - public bool Adjusted { get; set; } - - /// - /// - /// - public DateTime BeginTime { get; set; } - - /// - /// - /// - public string? CountPlanNumber { get; set; } - - /// - /// - /// - public string? Description { get; set; } - - /// - /// - /// - public DateTime EndTime { get; set; } - - /// - /// - /// - public string Number { get; set; } - - /// - /// - /// - public string? Remark { get; set; } - - /// - /// - /// - public string Stage { get; set; } - - /// - /// - /// - public string Type { 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/StoreCountNoteCopy/IStoreCountNoteCopyAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteCopy/IStoreCountNoteCopyAppService.cs deleted file mode 100644 index 206488194..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteCopy/IStoreCountNoteCopyAppService.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy.Dtos; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Application.Services; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy; - - -/// -/// -/// -public interface IStoreCountNoteCopyAppService : - ICrudAppService< - StoreCountNoteCopyDto, - Guid, - PagedAndSortedResultRequestDto, - CreateUpdateStoreCountNoteCopyDto, - CreateUpdateStoreCountNoteCopyDto> -{ - -} \ 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/StoreCountNoteDetailCopy/Dtos/CreateUpdateStoreCountNoteDetailCopyDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteDetailCopy/Dtos/CreateUpdateStoreCountNoteDetailCopyDto.cs deleted file mode 100644 index f28595869..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteDetailCopy/Dtos/CreateUpdateStoreCountNoteDetailCopyDto.cs +++ /dev/null @@ -1,254 +0,0 @@ -using System; -using System.ComponentModel; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy.Dtos; - -[Serializable] -public class CreateUpdateStoreCountNoteDetailCopyDto -{ - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyAdjusted")] - public bool Adjusted { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyArriveDate")] - public DateTime ArriveDate { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyAuditCountDescription")] - public string? AuditCountDescription { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyAuditCountOperator")] - public string? AuditCountOperator { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyAuditCountQty")] - public decimal AuditCountQty { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyAuditCountTime")] - public DateTime? AuditCountTime { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyContainerCode")] - public string? ContainerCode { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyCountLabel")] - public string CountLabel { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyCountPlanNumber")] - public string? CountPlanNumber { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyDetailStatus")] - public string DetailStatus { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyExpireDate")] - public DateTime ExpireDate { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyFinalCountQty")] - public decimal FinalCountQty { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyFirstCountDescription")] - public string? FirstCountDescription { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyFirstCountOperator")] - public string? FirstCountOperator { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyFirstCountQty")] - public decimal FirstCountQty { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyFirstCountTime")] - public DateTime? FirstCountTime { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyInventoryQty")] - public decimal InventoryQty { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyItemCode")] - public string ItemCode { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyItemDesc1")] - public string? ItemDesc1 { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyItemDesc2")] - public string? ItemDesc2 { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyItemName")] - public string? ItemName { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyLocationArea")] - public string? LocationArea { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyLocationCode")] - public string LocationCode { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyLocationErpCode")] - public string LocationErpCode { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyLocationGroup")] - public string? LocationGroup { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyLot")] - public string? Lot { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyMasterId")] - public Guid MasterId { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyNumber")] - public string Number { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyPackingCode")] - public string PackingCode { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyProduceDate")] - public DateTime ProduceDate { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyRemark")] - public string? Remark { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyRepeatCountDescription")] - public string? RepeatCountDescription { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyRepeatCountOperator")] - public string? RepeatCountOperator { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyRepeatCountQty")] - public decimal RepeatCountQty { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyRepeatCountTime")] - public DateTime? RepeatCountTime { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyStage")] - public string Stage { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyStatus")] - public string Status { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyStdPackQty")] - public decimal StdPackQty { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopySupplierBatch")] - public string? SupplierBatch { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyUom")] - public string? Uom { get; set; } - - /// - /// - /// - [DisplayName("StoreCountNoteDetailCopyWarehouseCode")] - public string WarehouseCode { 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/StoreCountNoteDetailCopy/Dtos/StoreCountNoteDetailCopyDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteDetailCopy/Dtos/StoreCountNoteDetailCopyDto.cs deleted file mode 100644 index 3faeb05b1..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteDetailCopy/Dtos/StoreCountNoteDetailCopyDto.cs +++ /dev/null @@ -1,221 +0,0 @@ -using System; -using Volo.Abp.Application.Dtos; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy.Dtos; - -/// -/// -/// -[Serializable] -public class StoreCountNoteDetailCopyDto : AuditedEntityDto -{ - /// - /// - /// - public bool Adjusted { get; set; } - - /// - /// - /// - public DateTime ArriveDate { get; set; } - - /// - /// - /// - public string? AuditCountDescription { get; set; } - - /// - /// - /// - public string? AuditCountOperator { get; set; } - - /// - /// - /// - public decimal AuditCountQty { get; set; } - - /// - /// - /// - public DateTime? AuditCountTime { get; set; } - - /// - /// - /// - public string? ContainerCode { get; set; } - - /// - /// - /// - public string CountLabel { get; set; } - - /// - /// - /// - public string? CountPlanNumber { get; set; } - - /// - /// - /// - public string DetailStatus { get; set; } - - /// - /// - /// - public DateTime ExpireDate { get; set; } - - /// - /// - /// - public decimal FinalCountQty { get; set; } - - /// - /// - /// - public string? FirstCountDescription { get; set; } - - /// - /// - /// - public string? FirstCountOperator { get; set; } - - /// - /// - /// - public decimal FirstCountQty { get; set; } - - /// - /// - /// - public DateTime? FirstCountTime { get; set; } - - /// - /// - /// - public decimal InventoryQty { get; set; } - - /// - /// - /// - public string ItemCode { get; set; } - - /// - /// - /// - public string? ItemDesc1 { get; set; } - - /// - /// - /// - public string? ItemDesc2 { get; set; } - - /// - /// - /// - public string? ItemName { get; set; } - - /// - /// - /// - public string? LocationArea { get; set; } - - /// - /// - /// - public string LocationCode { get; set; } - - /// - /// - /// - public string LocationErpCode { get; set; } - - /// - /// - /// - public string? LocationGroup { get; set; } - - /// - /// - /// - public string? Lot { get; set; } - - /// - /// - /// - - - /// - /// - /// - public Guid MasterId { get; set; } - - /// - /// - /// - public string Number { get; set; } - - /// - /// - /// - public string PackingCode { get; set; } - - /// - /// - /// - public DateTime ProduceDate { get; set; } - - /// - /// - /// - public string? Remark { get; set; } - - /// - /// - /// - public string? RepeatCountDescription { get; set; } - - /// - /// - /// - public string? RepeatCountOperator { get; set; } - - /// - /// - /// - public decimal RepeatCountQty { get; set; } - - /// - /// - /// - public DateTime? RepeatCountTime { get; set; } - - /// - /// - /// - public string Stage { get; set; } - - /// - /// - /// - public string Status { get; set; } - - /// - /// - /// - public decimal StdPackQty { get; set; } - - /// - /// - /// - public string? SupplierBatch { get; set; } - - /// - /// - /// - public string? Uom { get; set; } - - /// - /// - /// - public string WarehouseCode { 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/StoreCountNoteDetailCopy/IStoreCountNoteDetailCopyAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteDetailCopy/IStoreCountNoteDetailCopyAppService.cs deleted file mode 100644 index 52e339390..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreCountNoteDetailCopy/IStoreCountNoteDetailCopyAppService.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy.Dtos; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Application.Services; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy; - - -/// -/// -/// -public interface IStoreCountNoteDetailCopyAppService : - ICrudAppService< - StoreCountNoteDetailCopyDto, - Guid, - PagedAndSortedResultRequestDto, - CreateUpdateStoreCountNoteDetailCopyDto, - CreateUpdateStoreCountNoteDetailCopyDto> -{ - -} \ 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/StoreTransferNoteCopy/Dtos/CreateUpdateStoreTransferNoteCopyDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteCopy/Dtos/CreateUpdateStoreTransferNoteCopyDto.cs deleted file mode 100644 index 0dbce1fff..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteCopy/Dtos/CreateUpdateStoreTransferNoteCopyDto.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy.Dtos; - -[Serializable] -public class CreateUpdateStoreTransferNoteCopyDto -{ - 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 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/StoreTransferNoteCopy/Dtos/StoreTransferNoteCopyDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteCopy/Dtos/StoreTransferNoteCopyDto.cs deleted file mode 100644 index 6cdc9312e..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteCopy/Dtos/StoreTransferNoteCopyDto.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using Volo.Abp.Application.Dtos; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy.Dtos; - -[Serializable] -public class StoreTransferNoteCopyDto : 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 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/StoreTransferNoteCopy/Dtos/StoreTransferNoteCopyGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteCopy/Dtos/StoreTransferNoteCopyGetListInput.cs deleted file mode 100644 index 895156b76..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteCopy/Dtos/StoreTransferNoteCopyGetListInput.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.ComponentModel; -using Volo.Abp.Application.Dtos; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy.Dtos; - -[Serializable] -public class StoreTransferNoteCopyGetListInput : PagedAndSortedResultRequestDto -{ - 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 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/StoreTransferNoteCopy/IStoreTransferNoteCopyAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteCopy/IStoreTransferNoteCopyAppService.cs deleted file mode 100644 index 55b700700..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteCopy/IStoreTransferNoteCopyAppService.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy.Dtos; -using Volo.Abp.Application.Services; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy; - - -public interface IStoreTransferNoteCopyAppService : - ICrudAppService< - StoreTransferNoteCopyDto, - Guid, - StoreTransferNoteCopyGetListInput, - CreateUpdateStoreTransferNoteCopyDto, - CreateUpdateStoreTransferNoteCopyDto> -{ - -} \ 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/StoreTransferNoteDetailCopy/Dtos/CreateUpdateStoreTransferNoteDetailCopyDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/CreateUpdateStoreTransferNoteDetailCopyDto.cs deleted file mode 100644 index 425a7b4c0..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/CreateUpdateStoreTransferNoteDetailCopyDto.cs +++ /dev/null @@ -1,78 +0,0 @@ -using System; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy.Dtos; - -[Serializable] -public class CreateUpdateStoreTransferNoteDetailCopyDto -{ - 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/StoreTransferNoteDetailCopy/Dtos/StoreTransferNoteDetailCopyDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/StoreTransferNoteDetailCopyDto.cs deleted file mode 100644 index 380001cb3..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/StoreTransferNoteDetailCopyDto.cs +++ /dev/null @@ -1,79 +0,0 @@ -using System; -using Volo.Abp.Application.Dtos; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy.Dtos; - -[Serializable] -public class StoreTransferNoteDetailCopyDto : 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/StoreTransferNoteDetailCopy/Dtos/StoreTransferNoteDetailCopyGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/StoreTransferNoteDetailCopyGetListInput.cs deleted file mode 100644 index 5ab9d7a81..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/Dtos/StoreTransferNoteDetailCopyGetListInput.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System; -using System.ComponentModel; -using Volo.Abp.Application.Dtos; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote.Dtos; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy.Dtos; - -[Serializable] -public class StoreTransferNoteDetailCopyGetListInput : PagedAndSortedResultRequestDto -{ - public DateTime? ArriveDate { get; set; } - - public DateTime? ExpireDate { get; set; } - - public string? FromContainerCode { get; set; } - - public string? FromLocationArea { get; set; } - - public string? FromLocationCode { get; set; } - - public string? FromLocationErpCode { get; set; } - - public string? FromLocationGroup { get; set; } - - public string? FromLot { get; set; } - - public string? FromPackingCode { get; set; } - - public string? FromStatus { get; set; } - - public string? FromWarehouseCode { get; set; } - - public string? ItemCode { get; set; } - - public string? ItemDesc1 { get; set; } - - public string? ItemDesc2 { get; set; } - - public string? ItemName { get; set; } - - public StoreTransferNoteDto? Master { 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/StoreTransferNoteDetailCopy/IStoreTransferNoteDetailCopyAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/IStoreTransferNoteDetailCopyAppService.cs deleted file mode 100644 index f04b21d83..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/StoreTransferNoteDetailCopy/IStoreTransferNoteDetailCopyAppService.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy.Dtos; -using Volo.Abp.Application.Services; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy; - - -public interface IStoreTransferNoteDetailCopyAppService : - ICrudAppService< - StoreTransferNoteDetailCopyDto, - Guid, - StoreTransferNoteDetailCopyGetListInput, - CreateUpdateStoreTransferNoteDetailCopyDto, - CreateUpdateStoreTransferNoteDetailCopyDto> -{ - -} \ 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 dcd3c6ad7..11c106382 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 @@ -485,10 +485,6 @@ namespace WinIn.FasterZ.Wms CreateMap(MemberList.Source); CreateMap(); CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); - CreateMap(); - CreateMap(MemberList.Source); CreateMap(); CreateMap(MemberList.Source); CreateMap(); diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreCountNoteCopy/StoreCountNoteCopyAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreCountNoteCopy/StoreCountNoteCopyAppService.cs deleted file mode 100644 index 6249a4310..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreCountNoteCopy/StoreCountNoteCopyAppService.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using WinIn.FasterZ.Wms.Permissions; -using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy.Dtos; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Application.Services; -using WinIn.FasterZ.Wms.AppBase; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy; - - -/// -/// -/// -public class StoreCountNoteCopyAppService : ZbxBase, - IStoreCountNoteCopyAppService -{ - protected override string GetPolicyName { get; set; } = WmsPermissions.StoreCountNoteCopy.Default; - protected override string GetListPolicyName { get; set; } = WmsPermissions.StoreCountNoteCopy.Default; - protected override string CreatePolicyName { get; set; } = WmsPermissions.StoreCountNoteCopy.Create; - protected override string UpdatePolicyName { get; set; } = WmsPermissions.StoreCountNoteCopy.Update; - protected override string DeletePolicyName { get; set; } = WmsPermissions.StoreCountNoteCopy.Delete; - - private readonly IStoreCountNoteCopyRepository _repository; - - public StoreCountNoteCopyAppService(IStoreCountNoteCopyRepository repository) : base(repository) - { - _repository = repository; - } - -} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopyAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopyAppService.cs deleted file mode 100644 index 64710fc6f..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopyAppService.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using WinIn.FasterZ.Wms.Permissions; -using WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy.Dtos; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Application.Services; -using WinIn.FasterZ.Wms.AppBase; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy; - - -/// -/// -/// -public class StoreCountNoteDetailCopyAppService : ZbxBase, - IStoreCountNoteDetailCopyAppService -{ - protected override string GetPolicyName { get; set; } = WmsPermissions.StoreCountNoteDetailCopy.Default; - protected override string GetListPolicyName { get; set; } = WmsPermissions.StoreCountNoteDetailCopy.Default; - protected override string CreatePolicyName { get; set; } = WmsPermissions.StoreCountNoteDetailCopy.Create; - protected override string UpdatePolicyName { get; set; } = WmsPermissions.StoreCountNoteDetailCopy.Update; - protected override string DeletePolicyName { get; set; } = WmsPermissions.StoreCountNoteDetailCopy.Delete; - - private readonly IStoreCountNoteDetailCopyRepository _repository; - - public StoreCountNoteDetailCopyAppService(IStoreCountNoteDetailCopyRepository repository) : base(repository) - { - _repository = repository; - } - -} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopyAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopyAppService.cs deleted file mode 100644 index b32dbb7fc..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopyAppService.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Linq; -using System.Threading.Tasks; -using WinIn.FasterZ.Wms.Permissions; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy.Dtos; -using Volo.Abp.Application.Services; -using WinIn.FasterZ.Wms.AppBase; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy; - - -public class StoreTransferNoteCopyAppService : ZbxBase, - IStoreTransferNoteCopyAppService -{ - protected override string GetPolicyName { get; set; } = WmsPermissions.StoreTransferNote.Default; - protected override string GetListPolicyName { get; set; } = WmsPermissions.StoreTransferNote.Default; - protected override string CreatePolicyName { get; set; } = WmsPermissions.StoreTransferNote.Create; - protected override string UpdatePolicyName { get; set; } = WmsPermissions.StoreTransferNote.Update; - protected override string DeletePolicyName { get; set; } = WmsPermissions.StoreTransferNote.Delete; - - private readonly IStoreTransferNoteCopyRepository _repository; - - public StoreTransferNoteCopyAppService(IStoreTransferNoteCopyRepository repository) : base(repository) - { - _repository = repository; - } - - protected override async Task> CreateFilteredQueryAsync(StoreTransferNoteCopyGetListInput input) - { - // TODO: AbpHelper generated - return (await base.CreateFilteredQueryAsync(input)) - .WhereIf(input.ActiveDate != null, x => x.ActiveDate == input.ActiveDate) - .WhereIf(input.Confirmed != null, x => x.Confirmed == input.Confirmed) - .WhereIf(input.ConfirmTime != null, x => x.ConfirmTime == input.ConfirmTime) - .WhereIf(input.JobNumber != null, x => x.JobNumber == input.JobNumber) - .WhereIf(!input.Number.IsNullOrWhiteSpace(), x => x.Number.Contains(input.Number)) - .WhereIf(input.Remark != null, x => x.Remark == input.Remark) - .WhereIf(input.RequestNumber != null, x => x.RequestNumber == input.RequestNumber) - .WhereIf(input.Type != null, x => x.Type == input.Type) - .WhereIf(input.UseOnTheWayLocation != null, x => x.UseOnTheWayLocation == input.UseOnTheWayLocation) - .WhereIf(input.Worker != null, x => x.Worker == input.Worker) - ; - } -} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopyAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopyAppService.cs deleted file mode 100644 index 421ed46c8..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopyAppService.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using WinIn.FasterZ.Wms.Permissions; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy.Dtos; -using Volo.Abp.Application.Services; -using WinIn.FasterZ.Wms.AppBase; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy; - - -public class StoreTransferNoteDetailCopyAppService : ZbxBase, - IStoreTransferNoteDetailCopyAppService -{ - protected override string GetPolicyName { get; set; } = WmsPermissions.StoreTransferNoteDetail.Default; - protected override string GetListPolicyName { get; set; } = WmsPermissions.StoreTransferNoteDetail.Default; - protected override string CreatePolicyName { get; set; } = WmsPermissions.StoreTransferNoteDetail.Create; - protected override string UpdatePolicyName { get; set; } = WmsPermissions.StoreTransferNoteDetail.Update; - protected override string DeletePolicyName { get; set; } = WmsPermissions.StoreTransferNoteDetail.Delete; - - private readonly IStoreTransferNoteDetailCopyRepository _repository; - - public StoreTransferNoteDetailCopyAppService(IStoreTransferNoteDetailCopyRepository repository) : base(repository) - { - _repository = repository; - } -} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteCopy/IStoreCountNoteCopyRepository.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteCopy/IStoreCountNoteCopyRepository.cs deleted file mode 100644 index 46df9f756..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteCopy/IStoreCountNoteCopyRepository.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Volo.Abp.Domain.Repositories; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy; - -/// -/// -/// -public interface IStoreCountNoteCopyRepository : IRepository -{ -} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteCopy/StoreCountNoteCopy.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteCopy/StoreCountNoteCopy.cs deleted file mode 100644 index 8e25d9edd..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteCopy/StoreCountNoteCopy.cs +++ /dev/null @@ -1,31 +0,0 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy -{ - using System; - - using Volo.Abp.Domain.Entities.Auditing; - - public class StoreCountNoteCopy : AuditedAggregateRoot - { - public DateTime ActiveDate { get; set; } - - public bool Adjusted { get; set; } - - public DateTime BeginTime { get; set; } - - public string? CountPlanNumber { get; set; } - - public string? Description { get; set; } - - public DateTime EndTime { get; set; } - - public string Number { get; set; } = null!; - - public string? Remark { get; set; } - - public string Stage { get; set; } = null!; - - public string Type { get; set; } = null!; - - 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.Domain/Z_Business/StoreCountNoteDetailCopy/IStoreCountNoteDetailCopyRepository.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteDetailCopy/IStoreCountNoteDetailCopyRepository.cs deleted file mode 100644 index 0dbc65213..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteDetailCopy/IStoreCountNoteDetailCopyRepository.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Volo.Abp.Domain.Repositories; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy; - -/// -/// -/// -public interface IStoreCountNoteDetailCopyRepository : IRepository -{ -} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopy.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopy.cs deleted file mode 100644 index e8b7f9a12..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopy.cs +++ /dev/null @@ -1,95 +0,0 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy -{ - using System; - - using Volo.Abp.Domain.Entities.Auditing; - - using WinIn.FasterZ.Wms.Z_Business.StoreCountNote; - - public class StoreCountNoteDetailCopy : AuditedAggregateRoot - { - public bool Adjusted { get; set; } - - public DateTime ArriveDate { get; set; } - - public string? AuditCountDescription { get; set; } - - public string? AuditCountOperator { get; set; } - - public decimal AuditCountQty { get; set; } - - public DateTime? AuditCountTime { get; set; } - - public string? ContainerCode { get; set; } - - public string CountLabel { get; set; } = null!; - - public string? CountPlanNumber { get; set; } - - public string DetailStatus { get; set; } = null!; - - public DateTime ExpireDate { get; set; } - - public decimal FinalCountQty { get; set; } - - public string? FirstCountDescription { get; set; } - - public string? FirstCountOperator { get; set; } - - public decimal FirstCountQty { get; set; } - - public DateTime? FirstCountTime { get; set; } - - public decimal InventoryQty { get; set; } - - public string ItemCode { get; set; } = null!; - - public string? ItemDesc1 { get; set; } - - public string? ItemDesc2 { get; set; } - - public string? ItemName { get; set; } - - public string? LocationArea { get; set; } - - public string LocationCode { get; set; } = null!; - - public string LocationErpCode { get; set; } = null!; - - public string? LocationGroup { get; set; } - - public string? Lot { get; set; } - - public virtual StoreCountNote Master { get; set; } = null!; - - public Guid MasterId { get; set; } - - public string Number { get; set; } = null!; - - public string PackingCode { get; set; } = null!; - - public DateTime ProduceDate { get; set; } - - public string? Remark { get; set; } - - public string? RepeatCountDescription { get; set; } - - public string? RepeatCountOperator { get; set; } - - public decimal RepeatCountQty { get; set; } - - public DateTime? RepeatCountTime { get; set; } - - public string Stage { get; set; } = null!; - - public string Status { get; set; } = null!; - - public decimal StdPackQty { get; set; } - - public string? SupplierBatch { get; set; } - - public string? Uom { get; set; } - - public string WarehouseCode { get; set; } = null!; - } -} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNote/StoreTransferNote.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNote/StoreTransferNote.cs index b3db51e93..387d96ae6 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNote/StoreTransferNote.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNote/StoreTransferNote.cs @@ -6,7 +6,6 @@ using Volo.Abp.Domain.Entities.Auditing; using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail; - using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy; public class StoreTransferNote : AuditedAggregateRoot { @@ -24,10 +23,7 @@ public string? RequestNumber { get; set; } - public virtual List StoreTransferNoteDetailCopies { get; set; } = - new List(); - - public virtual List StoreTransferNoteDetails { get; set; } = + public virtual List Details { get; set; } = new List(); public string? Type { get; set; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteCopy/IStoreTransferNoteCopyRepository.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteCopy/IStoreTransferNoteCopyRepository.cs deleted file mode 100644 index d277a08d6..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteCopy/IStoreTransferNoteCopyRepository.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using Volo.Abp.Domain.Repositories; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy; - -public interface IStoreTransferNoteCopyRepository : IRepository -{ -} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopy.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopy.cs deleted file mode 100644 index 5f9fbe2db..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopy.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy -{ - using System; - - using Volo.Abp.Domain.Entities.Auditing; - - public class StoreTransferNoteCopy : AuditedAggregateRoot - { - 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; } = null!; - - public string? Remark { get; set; } - - public string? RequestNumber { 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.Domain/Z_Business/StoreTransferNoteDetailCopy/IStoreTransferNoteDetailCopyRepository.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetailCopy/IStoreTransferNoteDetailCopyRepository.cs deleted file mode 100644 index 046bbd21b..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetailCopy/IStoreTransferNoteDetailCopyRepository.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using Volo.Abp.Domain.Repositories; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy; - -public interface IStoreTransferNoteDetailCopyRepository : IRepository -{ -} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopy.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopy.cs deleted file mode 100644 index 8c72f7466..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopy.cs +++ /dev/null @@ -1,81 +0,0 @@ -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy -{ - using System; - - using Volo.Abp.Domain.Entities.Auditing; - - using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote; - - public class StoreTransferNoteDetailCopy : AuditedAggregateRoot - { - 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; } = null!; - - public string FromLocationErpCode { get; set; } = null!; - - public string? FromLocationGroup { get; set; } - - public string? FromLot { get; set; } - - public string? FromPackingCode { get; set; } - - public string FromStatus { get; set; } = null!; - - public string FromWarehouseCode { get; set; } = null!; - - public string ItemCode { get; set; } = null!; - - public string? ItemDesc1 { get; set; } - - public string? ItemDesc2 { get; set; } - - public string? ItemName { get; set; } - - public virtual StoreTransferNote Master { get; set; } = null!; - - public Guid MasterId { get; set; } - - public string Number { get; set; } = null!; - - 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; } = null!; - - public string ToLocationErpCode { get; set; } = null!; - - public string? ToLocationGroup { get; set; } - - public string? ToLot { get; set; } - - public string? ToPackingCode { get; set; } - - public string ToStatus { get; set; } = null!; - - public string ToWarehouseCode { get; set; } = null!; - - public string Uom { get; set; } = null!; - } -} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContext.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContext.cs index 7f6fa31cc..f37d6bff7 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 @@ -34,9 +34,7 @@ using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNoteDetail; using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNote; using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequestDetail; using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequest; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy; using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy; using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote; using WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsnDetail; using WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsn; @@ -298,9 +296,7 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore public DbSet StoreUnplannedIssueNotes { get; set; } public DbSet StoreTransferRequestDetails { get; set; } public DbSet StoreTransferRequests { get; set; } - public DbSet StoreTransferNoteDetailCopies { get; set; } public DbSet StoreTransferNoteDetails { get; set; } - public DbSet StoreTransferNoteCopies { get; set; } public DbSet StoreTransferNotes { get; set; } public DbSet StoreSupplierAsnDetails { get; set; } public DbSet StoreSupplierAsns { get; set; } @@ -1215,17 +1211,6 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore /* Configure more properties here */ }); - - builder.Entity(b => - { - b.ToTable(WmsConsts.DbTablePrefix + "Store_TransferNoteDetailCopie", WmsConsts.DbSchema); - b.ConfigureByConvention(); - - - /* Configure more properties here */ - }); - - builder.Entity(b => { b.ToTable(WmsConsts.DbTablePrefix + "Store_TransferNoteDetail", WmsConsts.DbSchema); @@ -1235,17 +1220,6 @@ namespace WinIn.FasterZ.Wms.EntityFrameworkCore /* Configure more properties here */ }); - - builder.Entity(b => - { - b.ToTable(WmsConsts.DbTablePrefix + "Store_TransferNoteCopie", WmsConsts.DbSchema); - b.ConfigureByConvention(); - - - /* Configure more properties here */ - }); - - builder.Entity(b => { b.ToTable(WmsConsts.DbTablePrefix + "Store_TransferNote", WmsConsts.DbSchema); 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 35d87987e..6feb04a64 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 @@ -197,9 +197,7 @@ using WinIn.FasterZ.Wms.Z_Business.StoreScrapRequestDetail; using WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsn; using WinIn.FasterZ.Wms.Z_Business.StoreSupplierAsnDetail; using WinIn.FasterZ.Wms.Z_Business.StoreTransferNote; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy; using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetail; -using WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy; using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequest; using WinIn.FasterZ.Wms.Z_Business.StoreTransferRequestDetail; using WinIn.FasterZ.Wms.Z_Business.StoreUnplannedIssueNote; @@ -284,9 +282,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.EntityFrameworkCore/Z_Business/StoreCountNoteCopy/StoreCountNoteCopyEfCoreQuerableExtensions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreCountNoteCopy/StoreCountNoteCopyEfCoreQuerableExtensions.cs deleted file mode 100644 index 3c589f349..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreCountNoteCopy/StoreCountNoteCopyEfCoreQuerableExtensions.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Linq; -using Microsoft.EntityFrameworkCore; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy; - -/// -/// -/// -public static class StoreCountNoteCopyEfCoreQueryableExtensions -{ - public static IQueryable IncludeDetails(this IQueryable queryable, bool include = true) - { - if (!include) - { - return queryable; - } - - return queryable - // .Include(x => x.xxx) // TODO: AbpHelper generated - ; - } -} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreCountNoteCopy/StoreCountNoteCopyRepository.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreCountNoteCopy/StoreCountNoteCopyRepository.cs deleted file mode 100644 index 6a1f2d1f8..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreCountNoteCopy/StoreCountNoteCopyRepository.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Linq; -using System.Threading.Tasks; -using WinIn.FasterZ.Wms.EntityFrameworkCore; -using Volo.Abp.Domain.Repositories.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteCopy; - -public class StoreCountNoteCopyRepository : EfCoreRepository, IStoreCountNoteCopyRepository -{ - public StoreCountNoteCopyRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - } - - public override async Task> WithDetailsAsync() - { - return (await GetQueryableAsync()).IncludeDetails(); - } -} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopyEfCoreQuerableExtensions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopyEfCoreQuerableExtensions.cs deleted file mode 100644 index dbec69eb8..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopyEfCoreQuerableExtensions.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Linq; -using Microsoft.EntityFrameworkCore; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy; - -/// -/// -/// -public static class StoreCountNoteDetailCopyEfCoreQueryableExtensions -{ - public static IQueryable IncludeDetails(this IQueryable queryable, bool include = true) - { - if (!include) - { - return queryable; - } - - return queryable - // .Include(x => x.xxx) // TODO: AbpHelper generated - ; - } -} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopyRepository.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopyRepository.cs deleted file mode 100644 index f648b19e2..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreCountNoteDetailCopy/StoreCountNoteDetailCopyRepository.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Linq; -using System.Threading.Tasks; -using WinIn.FasterZ.Wms.EntityFrameworkCore; -using Volo.Abp.Domain.Repositories.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreCountNoteDetailCopy; - -public class StoreCountNoteDetailCopyRepository : EfCoreRepository, IStoreCountNoteDetailCopyRepository -{ - public StoreCountNoteDetailCopyRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - } - - public override async Task> WithDetailsAsync() - { - return (await GetQueryableAsync()).IncludeDetails(); - } -} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopyEfCoreQueryableExtensions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopyEfCoreQueryableExtensions.cs deleted file mode 100644 index 459c3d4d9..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopyEfCoreQueryableExtensions.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Linq; -using Microsoft.EntityFrameworkCore; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy; - -public static class StoreTransferNoteCopyEfCoreQueryableExtensions -{ - public static IQueryable IncludeDetails(this IQueryable queryable, bool include = true) - { - if (!include) - { - return queryable; - } - - return queryable - // .Include(x => x.xxx) // TODO: AbpHelper generated - ; - } -} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopyRepository.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopyRepository.cs deleted file mode 100644 index 9e6d81a50..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteCopy/StoreTransferNoteCopyRepository.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Linq; -using System.Threading.Tasks; -using WinIn.FasterZ.Wms.EntityFrameworkCore; -using Volo.Abp.Domain.Repositories.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteCopy; - -public class StoreTransferNoteCopyRepository : EfCoreRepository, IStoreTransferNoteCopyRepository -{ - public StoreTransferNoteCopyRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - } - - public override async Task> WithDetailsAsync() - { - return (await GetQueryableAsync()).IncludeDetails(); - } -} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopyEfCoreQueryableExtensions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopyEfCoreQueryableExtensions.cs deleted file mode 100644 index fc54f2792..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopyEfCoreQueryableExtensions.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Linq; -using Microsoft.EntityFrameworkCore; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy; - -public static class StoreTransferNoteDetailCopyEfCoreQueryableExtensions -{ - public static IQueryable IncludeDetails(this IQueryable queryable, bool include = true) - { - if (!include) - { - return queryable; - } - - return queryable - // .Include(x => x.xxx) // TODO: AbpHelper generated - ; - } -} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopyRepository.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopyRepository.cs deleted file mode 100644 index 2072bd93f..000000000 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/StoreTransferNoteDetailCopy/StoreTransferNoteDetailCopyRepository.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Linq; -using System.Threading.Tasks; -using WinIn.FasterZ.Wms.EntityFrameworkCore; -using Volo.Abp.Domain.Repositories.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore; - -namespace WinIn.FasterZ.Wms.Z_Business.StoreTransferNoteDetailCopy; - -public class StoreTransferNoteDetailCopyRepository : EfCoreRepository, IStoreTransferNoteDetailCopyRepository -{ - public StoreTransferNoteDetailCopyRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - } - - public override async Task> WithDetailsAsync() - { - return (await GetQueryableAsync()).IncludeDetails(); - } -} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/WmsHttpApiHostModule.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/WmsHttpApiHostModule.cs index 807cb13c9..8ab488ec2 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/WmsHttpApiHostModule.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/WmsHttpApiHostModule.cs @@ -74,8 +74,9 @@ namespace WinIn.FasterZ.Wms private void ConfigureCache(IConfiguration configuration) { - //Configure(options => { options.KeyPrefix = "Wms:"; }); - Configure(options => { options.KeyPrefix = "AuthSiteCenter:"; }); + var redisKeyPrefix = configuration["Redis:KeyPrefix"]; + //Configure(options => { options.KeyPrefix = "Wms:"; }); + Configure(options => { options.KeyPrefix = redisKeyPrefix + ":";}); } private void ConfigureVirtualFileSystem(ServiceConfigurationContext context) @@ -153,11 +154,12 @@ namespace WinIn.FasterZ.Wms IConfiguration configuration, IWebHostEnvironment hostingEnvironment) { - var dataProtectionBuilder = context.Services.AddDataProtection().SetApplicationName("Wms"); + var redisKeyPrefix = configuration["Redis:KeyPrefix"]; + var dataProtectionBuilder = context.Services.AddDataProtection().SetApplicationName(redisKeyPrefix); if (!hostingEnvironment.IsDevelopment()) { var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]); - dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, "Wms-Protection-Keys"); + dataProtectionBuilder.PersistKeysToStackExchangeRedis(redis, $"{redisKeyPrefix}-Protection-Keys"); } } 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 ccad8a1a4..cf08f471a 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 @@ -11,7 +11,8 @@ "Wms": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;Encrypt=False;" }, "Redis": { - "Configuration": "127.0.0.1" + "Configuration": "127.0.0.1", + "KeyPrefix": "DY_AuthSiteCenter" }, "AuthServer": { "Authority": "http://192.168.0.240:60080",