From a09084023bb3fba3947208a372ad94e5e8da3f07 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Fri, 12 Apr 2024 15:39:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E5=AE=B9=E5=99=A8=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Jobs/ThirdLocationJobController.cs | 19 +++++-------------- .../ItemContainers/DTOs/ItemContainerDTO.cs | 7 +------ .../Inputs/ItemContainerEditInput.cs | 8 +------- .../Inputs/ItemContainerImportInput.cs | 11 +---------- .../ItemContainers/ItemContainerAppService.cs | 4 ++-- .../ItemContainers/ItemContainer.cs | 6 +----- ...ntainerDbContextModelCreatingExtensions.cs | 4 ++-- .../Jobs/ThirdLocationJobEventHandler.cs | 5 +++++ 8 files changed, 18 insertions(+), 46 deletions(-) diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/ThirdLocationJobController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/ThirdLocationJobController.cs index f86c7587d..ab4a124cc 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/ThirdLocationJobController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/ThirdLocationJobController.cs @@ -77,19 +77,9 @@ public class ThirdLocationJobController : AbpController /// /// [HttpGet("list")] - public virtual async Task> GetListAsync(int pageSize, int pageIndex, bool isFinished) + public virtual async Task> GetListAsync(int pageSize, int pageIndex) { - var dtos = await _dictApp.GetByCodeAsync("ContainerSpecificationsType").ConfigureAwait(false); - - var status = new List(); - if (isFinished == true) - { - status.Add((int)EnumJobStatus.Done); - } - else - { - status.Add((int)EnumJobStatus.Open); - } + var status = new List() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing }; var jsonStatus = JsonSerializer.Serialize(status); var request = new SfsJobRequestInputBase @@ -100,10 +90,11 @@ public class ThirdLocationJobController : AbpController Condition = new Condition { Filters = new List - { - new(nameof(ThirdLocationJobDTO.JobStatus),jsonStatus,"In") + { + new(nameof(IssueJobDTO.JobStatus),jsonStatus,"In") } } + }; var list = await _thirdLocationJobAppService.GetPagedListByFilterAsync(request, true).ConfigureAwait(false); diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/DTOs/ItemContainerDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/DTOs/ItemContainerDTO.cs index a43c1ff30..a6891f43b 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/DTOs/ItemContainerDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/DTOs/ItemContainerDTO.cs @@ -20,12 +20,7 @@ public class ItemContainerDTO : SfsBaseDataDTOBase [Display(Name = "收容器名称")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ContainerName { get; set; } - /// - /// 收容器类型 - /// - [Display(Name = "收容器类型")] - [StringLength(SfsEfCorePropertyConst.DescLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string ContainerType { get; set; } + /// /// 物品代码 /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/Inputs/ItemContainerEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/Inputs/ItemContainerEditInput.cs index ce87fa288..76ad46b55 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/Inputs/ItemContainerEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/Inputs/ItemContainerEditInput.cs @@ -12,13 +12,7 @@ public class ItemContainerEditInput : SfsBaseDataCreateOrUpdateInputBase [Display(Name = "收容器名称")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ContainerName { get; set; } - - /// - /// 收容器类型 - /// - [Display(Name = "收容器类型")] - [StringLength(SfsEfCorePropertyConst.DescLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string ContainerType { get; set; } + /// /// 收容器计量单位 diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/Inputs/ItemContainerImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/Inputs/ItemContainerImportInput.cs index 4cc761d6c..37ac4d5fc 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/Inputs/ItemContainerImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemContainers/Inputs/ItemContainerImportInput.cs @@ -22,16 +22,7 @@ public class ItemContainerImportInput : SfsBaseDataImportInputBase [Display(Name = "收容器名称")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ContainerName { get; set; } - - /// - /// 收容器类型 - /// - [Display(Name = "收容器类型")] - [StringLength(SfsEfCorePropertyConst.DescLength, ErrorMessage = "{0}最多输入{1}个字符")] - [ValueMapping("EA", "EA")] - [ValueMapping("Box", "Box")] - [ValueMapping("Pallet", "Pallet")] - public string ContainerType { get; set; } + /// /// 物品编号 diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs index a7210b64c..4c21b2851 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs @@ -49,10 +49,10 @@ public class ItemContainerAppService [UnitOfWork] public override async Task CreateAsync(ItemContainerEditInput input) { - var existEntity = await _repository.FirstOrDefaultAsync(p=>p.ContainerCode==input.ContainerCode).ConfigureAwait(false); + var existEntity = await _repository.FirstOrDefaultAsync(p=>p.ItemCode == input.ItemCode).ConfigureAwait(false); if (existEntity != null) { - throw new UserFriendlyException($"{input.ContainerCode} 已存在"); + throw new UserFriendlyException($"物品 {input.ItemCode} 已存在"); } var itemBasic = await ItemBasicAppService.GetByCodeAsync(input.ItemCode).ConfigureAwait(false); diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemContainers/ItemContainer.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemContainers/ItemContainer.cs index 67fc5c48e..335ba11e1 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemContainers/ItemContainer.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/ItemContainers/ItemContainer.cs @@ -17,11 +17,7 @@ public class ItemContainer : SfsBaseDataAggregateRootBase /// 收容器名称 /// public string ContainerName { get; set; } - - /// - /// 收容器类型 - /// - public string ContainerType { get; set; } + /// /// 物品代码 diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/ItemContainers/ItemContainerDbContextModelCreatingExtensions.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/ItemContainers/ItemContainerDbContextModelCreatingExtensions.cs index b94ff820a..d7e1b915c 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/ItemContainers/ItemContainerDbContextModelCreatingExtensions.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/ItemContainers/ItemContainerDbContextModelCreatingExtensions.cs @@ -24,13 +24,13 @@ public static class ItemContainerDbContextModelCreatingExtensions b.Property(q => q.ContainerCode).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength); b.Property(q => q.ItemCode).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength); b.Property(q => q.ContainerName).HasMaxLength(SfsPropertyConst.NameLength); - b.Property(q => q.ContainerType).HasMaxLength(SfsPropertyConst.NameLength); + //Relations //None //Indexes - b.HasIndex(q => new { q.ItemCode, q.ContainerCode }).IsUnique(); + b.HasIndex(q => new { q.ItemCode }).IsUnique(); }); } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/ThirdLocationJobEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/ThirdLocationJobEventHandler.cs index 23151e7ad..31d1acd4e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/ThirdLocationJobEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/ThirdLocationJobEventHandler.cs @@ -75,6 +75,11 @@ public class ThirdLocationJobEventHandler : detail.ToLocationGroup = location.LocationGroupCode; detail.ToLocationErpCode = location.ErpLocationCode; detail.ToWarehouseCode = location.WarehouseCode; + + var locationFrom = await _locationAppService.GetByCodeAsync(detail.FromLocationCode).ConfigureAwait(false); + detail.FromLocationErpCode = locationFrom.ErpLocationCode; + detail.FromWarehouseCode = locationFrom.WarehouseCode; + detail.FromStatus = EnumInventoryStatus.OK; } return thirdLocationNoteCreateInput;