diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductionLines/DTOs/ProductionLineDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductionLines/DTOs/ProductionLineDTO.cs index c74b68f8e..d5c2980d1 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductionLines/DTOs/ProductionLineDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductionLines/DTOs/ProductionLineDTO.cs @@ -12,18 +12,24 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; [Display(Name = "生产线")] public class ProductionLineDTO : SfsBaseDataDTOBase, IHasCode, IHasName { - [Display(Name = "编码")] [IgnoreUpdate] public string Code { get; set; } + /// + /// 代码 + /// + [Display(Name = "代码")] + [Key] + [IgnoreUpdate] + public string Code { get; set; } /// /// 名称 /// - [Display(Name = "编码")] + [Display(Name = "名称")] public string Name { get; set; } /// /// 描述 /// - [Display(Name = "编码")] + [Display(Name = "描述")] public string Description { get; set; } /// @@ -34,18 +40,18 @@ public class ProductionLineDTO : SfsBaseDataDTOBase, IHasCode, IHasName /// /// 原料库位 /// - [Display(Name = "原料库位集合")] - public List RawLocationCodeList { get; set; } + [Display(Name = "原料库位Json集合")] + public string RawLocationCodeListJson { get; set; } /// /// 成品库位 /// - [Display(Name = "完工库位集合")] - public List ProductLocationCodeList { get; set; } + [Display(Name = "完工库位Json集合")] + public string ProductLocationCodeListJson { get; set; } /// /// 线边库位 /// - [Display(Name = "线边库位集合")] - public List WipLocationCodeList { get; set; } + [Display(Name = "线边库位Json集合")] + public string WipLocationCodeListJson { get; set; } } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductionLines/Inputs/ProductionLineEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductionLines/Inputs/ProductionLineEditInput.cs index 2f26e30fe..52c391c8c 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductionLines/Inputs/ProductionLineEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductionLines/Inputs/ProductionLineEditInput.cs @@ -11,18 +11,24 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; /// public class ProductionLineEditInput : SfsBaseDataCreateOrUpdateInputBase { - [Display(Name = "编码")][IgnoreUpdate] public string Code { get; set; } + /// + /// 代码 + /// + [Display(Name = "代码")] + [Key] + [IgnoreUpdate] + public string Code { get; set; } /// /// 名称 /// - [Display(Name = "编码")] + [Display(Name = "名称")] public string Name { get; set; } /// /// 描述 /// - [Display(Name = "编码")] + [Display(Name = "描述")] public string Description { get; set; } /// @@ -33,18 +39,18 @@ public class ProductionLineEditInput : SfsBaseDataCreateOrUpdateInputBase /// /// 原料库位 /// - [Display(Name = "原料库位集合")] - public List RawLocationCodeList { get; set; } + [Display(Name = "原料库位Json集合")] + public string RawLocationCodeListJson { get; set; } /// /// 成品库位 /// - [Display(Name = "完工库位集合")] - public List ProductLocationCodeList { get; set; } + [Display(Name = "完工库位Json集合")] + public string ProductLocationCodeListJson { get; set; } /// /// 线边库位 /// - [Display(Name = "线边库位集合")] - public List WipLocationCodeList { get; set; } + [Display(Name = "线边库位Json集合")] + public string WipLocationCodeListJson { get; set; } } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductionLines/Inputs/ProductionLineImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductionLines/Inputs/ProductionLineImportInput.cs index 893a37e16..bbc24b3ae 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductionLines/Inputs/ProductionLineImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductionLines/Inputs/ProductionLineImportInput.cs @@ -12,18 +12,24 @@ namespace Win_in.Sfs.Basedata.Application.Contracts; [Display(Name = "生产线")] public class ProductionLineImportInput : SfsBaseDataImportInputBase { - [Display(Name = "编码")][IgnoreUpdate] public string Code { get; set; } + /// + /// 代码 + /// + [Display(Name = "代码")] + [Key] + [IgnoreUpdate] + public string Code { get; set; } /// /// 名称 /// - [Display(Name = "编码")] + [Display(Name = "名称")] public string Name { get; set; } /// /// 描述 /// - [Display(Name = "编码")] + [Display(Name = "描述")] public string Description { get; set; } /// @@ -34,18 +40,18 @@ public class ProductionLineImportInput : SfsBaseDataImportInputBase /// /// 原料库位 /// - [Display(Name = "原料库位集合")] - public List RawLocationCodeList { get; set; } + [Display(Name = "原料库位Json集合")] + public string RawLocationCodeListJson { get; set; } /// /// 成品库位 /// - [Display(Name = "完工库位集合")] - public List ProductLocationCodeList { get; set; } + [Display(Name = "完工库位Json集合")] + public string ProductLocationCodeListJson { get; set; } /// /// 线边库位 /// - [Display(Name = "线边库位集合")] - public List WipLocationCodeList { get; set; } + [Display(Name = "线边库位Json集合")] + public string WipLocationCodeListJson { get; set; } } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ProductionLines/ProductionLineAutoMapperProfile.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ProductionLines/ProductionLineAutoMapperProfile.cs index ef063d859..47d08b6a6 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ProductionLines/ProductionLineAutoMapperProfile.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ProductionLines/ProductionLineAutoMapperProfile.cs @@ -17,11 +17,11 @@ public partial class BasedataApplicationAutoMapperProfile : Profile .Ignore(x => x.TenantId) .Ignore(x => x.ExtraProperties) .Ignore(x => x.ConcurrencyStamp) - ; + .Ignore(x=>x.Remark) + ; CreateMap() - .Ignore(x => x.ReportStatus) + .Ignore(x => x.ReportStatus) .Ignore(x => x.ReportReason); - } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/DTOs/InjectionRequestDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/DTOs/InjectionRequestDTO.cs index b57dece0c..654107abe 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/DTOs/InjectionRequestDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/DTOs/InjectionRequestDTO.cs @@ -5,33 +5,36 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class InjectionRequestDTO : SfsStoreRequestDTOBase, IHasNumber { /// - /// 叫料类型 + /// 叫料类型 /// [Display(Name = "叫料类型")] public string Type { get; set; } /// - /// 备料计划单号 + /// 生产线 /// - [Display(Name = "备料计划单号")] - public string PreparationPlanNumber { get; set; } + [Display(Name = "生产线")] + public string ProdLine { get; set; } /// - /// 生产线 + /// 是否使用在途库 /// - [Display(Name = "生产线")] - public string ProdLine { get; set; } + [Display(Name = "是否使用在途库")] + public bool IsUseOnTheWayLocation { get; set; } /// - /// 车间 + /// 可用来源库位Json集合 /// - [Display(Name = "车间")] - public string Workshop { get; set; } + public string FromLocationCodeJsonList { get; set; } /// - /// 使用在途库 + /// 叫料库位 /// - [Display(Name = "使用在途库")] - public bool UseOnTheWayLocation { get; set; } + public string ToLocationCode { get; set; } + /// + /// 目标ERP储位 + /// + [Display(Name = "目标ERP储位")] + public string ToLocationErpCode { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/DTOs/InjectionRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/DTOs/InjectionRequestDetailDTO.cs index 6116135fb..45f7be885 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/DTOs/InjectionRequestDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/DTOs/InjectionRequestDetailDTO.cs @@ -7,51 +7,7 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class InjectionRequestDetailDTO : SfsStoreDetailWithQtyDTOBase - { - - /// - /// 目标库位 - /// - [Display(Name = "目标库位")] - public string ToLocationCode { get; set; } - - /// - /// 来源库区 - /// - [Display(Name = "来源库区")] - [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string FromLocationArea { get; set; } - - // /// - // /// 在途库库位 - // /// - // public string OnTheWayLocationCode { get; set; } - - /// - /// 生产线 - /// - [Display(Name = "生产线")] - public string ProdLine { get; set; } - - /// - /// 工作中心 - /// - [Display(Name = "工作中心")] - public string WorkStation { get; set; } - - /// - /// 过期时间 - /// - [Display(Name = "过期时间")] - public DateTime ExpiredTime { get; set; } - - /// - /// 目标ERP储位 - /// - [Display(Name = "目标ERP储位")] - public string ToLocationErpCode { get; set; } - /// /// 已发数量 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/InjectionRequests/InjectionRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/InjectionRequests/InjectionRequestAppService.cs index 229223da8..c12bd69d5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/InjectionRequests/InjectionRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/InjectionRequests/InjectionRequestAppService.cs @@ -61,10 +61,12 @@ public class InjectionRequestAppService : SfsStoreRequestAppServiceBase HandleAsync(Guid id) { - var entity=await _repository.GetAsync(id).ConfigureAwait(false); + var entity = await _repository.GetAsync(id).ConfigureAwait(false); await LocalEventBus.PublishAsync(new SfsHandledEntityEventData(entity), false).ConfigureAwait(false); return ObjectMapper.Map(entity); } @@ -72,12 +74,6 @@ public class InjectionRequestAppService : SfsStoreRequestAppServiceBase CreateAsync(InjectionRequestEditInput input) - { - return await CreateAndHandleAsync(input).ConfigureAwait(false); - } - - //[Authorize(InjectionRequestPermissions.Create)] - private async Task CreateAndHandleAsync(InjectionRequestEditInput input) { foreach (var item in input.Details) { @@ -113,6 +109,19 @@ public class InjectionRequestAppService : SfsStoreRequestAppServiceBase CreateAndHandleAsync(InjectionRequestEditInput input) + { + var injectionRequestDto = await CreateAsync(input).ConfigureAwait(false); + + await HandleAsync(injectionRequestDto.Id).ConfigureAwait(false); + + return injectionRequestDto; + } + + #endregion + /// /// 根据类型 获取叫料申请 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionRequests/InjectionRequest.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionRequests/InjectionRequest.cs index c6058c8ae..cbd538565 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionRequests/InjectionRequest.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionRequests/InjectionRequest.cs @@ -16,24 +16,12 @@ public class InjectionRequest : SfsStoreRequestAggregateRootBase - /// 备料计划单号 - /// - [IgnoreUpdate] - public string PreparationPlanNumber { get; set; } - /// /// 生产线 /// [IgnoreUpdate] public string ProdLine { get; set; } - /// - /// 车间 - /// - [IgnoreUpdate] - public string Workshop { get; set; } - /// /// 使用在途库 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionRequests/InjectionRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionRequests/InjectionRequestManager.cs index 53b2f4cee..b00a4833e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionRequests/InjectionRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionRequests/InjectionRequestManager.cs @@ -25,6 +25,12 @@ public class InjectionRequestManager _issueJobRepository = issueJobRepository; } + + #region 东阳V2 + + #endregion + + /// /// 创建 /// @@ -58,7 +64,7 @@ public class InjectionRequestManager SetMaterialRequestDetailStatus(detail); } - await SetMaterialRequestStatus(oldEntity).ConfigureAwait(false); + await SetMaterialRequestStatusAsync(oldEntity).ConfigureAwait(false); await Repository.UpdateAsync(oldEntity).ConfigureAwait(false); } @@ -77,7 +83,7 @@ public class InjectionRequestManager } } - private async Task SetMaterialRequestStatus(InjectionRequest materialRequest) + private async Task SetMaterialRequestStatusAsync(InjectionRequest materialRequest) { if (materialRequest.Details.All(p => p.Status == EnumStatus.Close)) { diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/InjectionRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/InjectionRequestEventHandler.cs index f58926048..57dcfbc96 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/InjectionRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/InjectionRequestEventHandler.cs @@ -71,7 +71,6 @@ public class InjectionRequestEventHandler { await _injectionRequestManager.SubmitAsync(entity).ConfigureAwait(false); } - } }