kitting修改

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDTO.cs

@@ -19,6 +19,12 @@ public class KittingDTO : EntityDto<Guid>, 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<KittingDetailDTO> Details { set; get; }= new List<KittingDetailDTO>();

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDetailDTO.cs

@@ -46,11 +46,6 @@ public class KittingDetailDTO: AuditedEntityDto<Guid>, IMultiTenant, IRemark
     [Display(Name = "包装数量")]
     public decimal Qty { set; get; }
 
-    /// <summary>
-    /// 配置
-    /// </summary>
-    [Display(Name = "配置")]
-    public string Conf { set; get; }
 
     [Display(Name = "配置")]
     public string Configuration { get; set; }

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingDetailInput.cs

@@ -47,11 +47,6 @@ public class KittingDetailInput: EntityDto<Guid>, IMultiTenant, IRemark
     /// </summary>
     [Display(Name = "包装数量")]
     public decimal Qty { set; get; }
-    /// <summary>
-    /// 配置
-    /// </summary>
-    [Display(Name = "配置")]
-    public string Conf { set; get; }
     [Display(Name = "租户ID")]
     public Guid? TenantId { set; get;
     }

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; }
     /// <summary>
     /// 描述1
@@ -51,12 +52,9 @@ public class KittingImportInput : SfsBaseDataImportInputBase
     [Required(ErrorMessage = "{0}是必填项")]
     public decimal Qty { set; get; }
 
-    /// <summary>
-    ///     配置
-    /// </summary>
-    [Display(Name = "配置")]
-    public string Conf { set; get; }
-
     [Display(Name = "底盘打包数量")]
     public decimal ChassisQty { get; set; }
+
+    [Display(Name = "备注")]
+    public string Remark { get; set; }
 }

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs

@@ -246,7 +246,7 @@ public class KittingAppService : SfsBaseDataWithCodeAppServiceBase<Kitting, Kitt
                         itm.ItemDesc1 = entity.ItemDesc1;
                         itm.ItemDesc2 = entity.ItemDesc2;
                         itm.Qty = entity.Qty;
-                        itm.Conf = entity.Conf;
+                        itm.Configuration = entity.Configuration;
                     }
                 }
                 var leftExist = from itm in newDetail

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAutoMapperProfile.cs

@@ -22,7 +22,6 @@ public partial class BasedataApplicationAutoMapperProfile : Profile
            .Ignore(x => x.Details)
            .Ignore(x => x.TenantId)
            .Ignore(x => x.ExtraProperties)
-           .Ignore(x => x.Remark)
            .Ignore(x => x.ConcurrencyStamp)
            .Ignore(x => x.Id);
 

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Kittings/KittingDetail.cs

@@ -43,11 +43,6 @@ public class KittingDetail : AuditedEntity<Guid>, IMultiTenant, IRemark
     /// </summary>
     public decimal Qty { set; get; }
 
-    /// <summary>
-    /// 配置
-    /// </summary>
-    public string Conf {  set; get; }
-
     public Guid? TenantId { set; get; }
 
     public string Remark { get; set; }

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<NoOkConvertOkNoteDTO> CreateAsync(NoOkConvertOkNoteEditInput input)
-    {
+    {       
         var createEntity = ObjectMapper.Map<NoOkConvertOkNoteEditInput, NoOkConvertOkNote>(input);
 
         var entity = await _nOOkConvertOKNoteManager.CreateAsync(createEntity).ConfigureAwait(false);