From 6205cf4e15d849c6066d6bd7508f1eb1e80b9746 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Wed, 28 Feb 2024 10:14:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E7=A0=81=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=89=A9=E5=93=81=E5=90=8D=E7=A7=B0=E5=92=8C=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E5=90=8D=E7=A7=B0=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PositionCode/DTOs/PositionCodeDTO.cs | 18 ++++++++++--- .../Inputs/PositionCodeEditInput.cs | 17 ++++++++++--- .../Inputs/PositionCodeImportInput.cs | 25 +++++++++++++------ .../PositionCode/PositionCodeAppService.cs | 2 ++ .../PositionCode/PositionCode.cs | 17 ++++++++++--- 5 files changed, 63 insertions(+), 16 deletions(-) diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/DTOs/PositionCodeDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/DTOs/PositionCodeDTO.cs index 812121e4a..e2753acef 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/DTOs/PositionCodeDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/DTOs/PositionCodeDTO.cs @@ -20,14 +20,26 @@ public class PositionCodeDTO : SfsBaseDataDTOBase, IHasCode [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string PartCode { get; set; } /// - /// 标包数量 + /// 物料名称 /// - [Display(Name = "标包数量")] - public decimal StdPackQty { get; set; } + [Display(Name = "物料名称")] + [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] + public string PartName { get; set; } /// /// 库位 /// [Display(Name = "库位")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string LocationCode { get; set; } + /// + /// 库位名称 + /// + [Display(Name = "库位名称")] + [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] + public string LocationName { get; set; } + /// + /// 标包数量 + /// + [Display(Name = "标包数量")] + public decimal StdPackQty { get; set; } } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeEditInput.cs index d1d8c0cc7..f7c4408e5 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeEditInput.cs @@ -14,15 +14,26 @@ public class PositionCodeEditInput : SfsBaseDataCreateOrUpdateInputBase [Display(Name = "物料号")] public string PartCode { get; set; } /// - /// 标包数量 + /// 物料名称 /// - [Display(Name = "标包数量")] - public decimal StdPackQty { get; set; } + [Display(Name = "物料名称")] + public string PartName { get; set; } /// /// 库位 /// [Display(Name = "库位")] public string LocationCode { get; set; } + /// + /// 库位名称 + /// + [Display(Name = "库位名称")] + public string LocationName { get; set; } + /// + /// 标包数量 + /// + [Display(Name = "标包数量")] + public decimal StdPackQty { get; set; } + #endregion diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeImportInput.cs index 75b16138b..555c13aa9 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeImportInput.cs @@ -13,25 +13,36 @@ public class PositionCodeImportInput : SfsBaseDataImportInputBase [Display(Name = "代码")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string Code { get; set; } - /// /// 物料号 /// [Display(Name = "物料号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string PartCode { get; set; } - /// - /// 标包数量 + /// 物料名称 /// - [Display(Name = "标包数量")] - [Required(ErrorMessage = "{0}是必填项")] - public decimal StdPackQty { get; set; } - + [Display(Name = "物料名称")] + [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] + public string PartName { get; set; } /// /// 库位 /// [Display(Name = "库位")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string LocationCode { get; set; } + /// + /// 库位名称 + /// + [Display(Name = "库位名称")] + [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] + public string LocationName { get; set; } + /// + /// 标包数量 + /// + [Display(Name = "标包数量")] + [Required(ErrorMessage = "{0}是必填项")] + public decimal StdPackQty { get; set; } + + } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCode/PositionCodeAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCode/PositionCodeAppService.cs index cd8b7bd0b..6042a5f28 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCode/PositionCodeAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCode/PositionCodeAppService.cs @@ -40,9 +40,11 @@ public class PositionCodeAppService var itemBasic = await ItemBasicAppService.GetByCodeAsync(input.PartCode).ConfigureAwait(false); Check.NotNull(itemBasic, "物品代码", $"物品 {input.PartCode} 不存在"); + input.PartName = itemBasic.Desc1; var location = await LocationAppService.GetByCodeAsync(input.LocationCode).ConfigureAwait(false); Check.NotNull(location, "库位代码", $"库位 {input.LocationCode} 不存在"); + input.LocationName = location.Name; input.Code = "W" + input.Code; return await base.CreateAsync(input).ConfigureAwait(false); diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/PositionCode/PositionCode.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/PositionCode/PositionCode.cs index eecae256c..7b107f444 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/PositionCode/PositionCode.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/PositionCode/PositionCode.cs @@ -21,14 +21,25 @@ public class PositionCode : SfsBaseDataAggregateRootBase, IHasCode [Display(Name = "物料号")] public string PartCode { get; set; } /// - /// 标包数量 + /// 物料名称 /// - [Display(Name = "标包数量")] - public decimal StdPackQty { get; set; } + [Display(Name = "物料名称")] + public string PartName { get; set; } /// /// 库位 /// [Display(Name = "库位")] public string LocationCode { get; set; } + /// + /// 库位名称 + /// + [Display(Name = "库位名称")] + public string LocationName { get; set; } + /// + /// 标包数量 + /// + [Display(Name = "标包数量")] + public decimal StdPackQty { get; set; } + }