diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDTO.cs index ccdbdcaf8..76218bb62 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDTO.cs @@ -19,6 +19,12 @@ public class KittingDTO : EntityDto, IHasCode, IHasName [Display(Name = "底盘打包数量")] public decimal ChassisQty { get; set; } + [Display(Name = "备注")] + public string Remark { get; set; } + [Display(Name = "创建时间")] + public virtual DateTime CreationTime { get; set; } + [Display(Name = "最后修改时间")] + public virtual DateTime? LastModificationTime { get; set; } [Display(Name = "明细")] public List Details { set; get; }= new List(); diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDetailDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDetailDTO.cs index 694434bdb..c2440820e 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDetailDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDetailDTO.cs @@ -46,11 +46,6 @@ public class KittingDetailDTO: AuditedEntityDto, IMultiTenant, IRemark [Display(Name = "包装数量")] public decimal Qty { set; get; } - /// - /// 配置 - /// - [Display(Name = "配置")] - public string Conf { set; get; } [Display(Name = "配置")] public string Configuration { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingDetailInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingDetailInput.cs index 1e036718a..d674666bd 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingDetailInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingDetailInput.cs @@ -47,11 +47,6 @@ public class KittingDetailInput: EntityDto, IMultiTenant, IRemark /// [Display(Name = "包装数量")] public decimal Qty { set; get; } - /// - /// 配置 - /// - [Display(Name = "配置")] - public string Conf { set; get; } [Display(Name = "租户ID")] public Guid? TenantId { set; get; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingImportInput.cs index 4130690bf..1e305f522 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingImportInput.cs @@ -22,6 +22,7 @@ public class KittingImportInput : SfsBaseDataImportInputBase /// [Display(Name = "物料编码")] + [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { set; get; } /// /// 描述1 @@ -51,12 +52,9 @@ public class KittingImportInput : SfsBaseDataImportInputBase [Required(ErrorMessage = "{0}是必填项")] public decimal Qty { set; get; } - /// - /// 配置 - /// - [Display(Name = "配置")] - public string Conf { set; get; } - [Display(Name = "底盘打包数量")] public decimal ChassisQty { get; set; } + + [Display(Name = "备注")] + public string Remark { get; set; } } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs index ebab0bc02..3592628af 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs @@ -246,7 +246,7 @@ public class KittingAppService : SfsBaseDataWithCodeAppServiceBase x.Details) .Ignore(x => x.TenantId) .Ignore(x => x.ExtraProperties) - .Ignore(x => x.Remark) .Ignore(x => x.ConcurrencyStamp) .Ignore(x => x.Id); diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Kittings/KittingDetail.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Kittings/KittingDetail.cs index 853ba5629..35f8c0ef4 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Kittings/KittingDetail.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Kittings/KittingDetail.cs @@ -43,11 +43,6 @@ public class KittingDetail : AuditedEntity, IMultiTenant, IRemark /// public decimal Qty { set; get; } - /// - /// 配置 - /// - public string Conf { set; get; } - public Guid? TenantId { set; get; } public string Remark { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/NoOkConvertOKNotes/NoOkConvertOKNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/NoOkConvertOKNotes/NoOkConvertOKNoteAppService.cs index edd67d454..16cf0842f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/NoOkConvertOKNotes/NoOkConvertOKNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/NoOkConvertOKNotes/NoOkConvertOKNoteAppService.cs @@ -40,7 +40,7 @@ public class NoOkConvertOkNoteAppService : [HttpPost("")] //[Authorize(NoOkConvertOkNotePermissions.Create)] public override async Task CreateAsync(NoOkConvertOkNoteEditInput input) - { + { var createEntity = ObjectMapper.Map(input); var entity = await _nOOkConvertOKNoteManager.CreateAsync(createEntity).ConfigureAwait(false);