任务详情

src/WMS.Web.Domain/Entitys/InStockTaskBox.cs

@@ -39,9 +39,24 @@ namespace WMS.Web.Domain.Entitys
         /// </summary>
         public DateTime? CreateTime { get; set; } = DateTime.Now;
 
+        /// <summary>
+        /// 收货人
+        /// </summary>
+        public int? ReceiverId { get; set; }
+
         /// <summary>
         /// 明细
         /// </summary>
         public List<InStockTaskBoxDetails> Details { get; set; } = new List<InStockTaskBoxDetails>();
+
+        /// <summary>
+        /// 收货
+        /// </summary>
+        /// <param name="staffId"></param>
+        public void Receiver(int staffId) 
+        {
+            this.ReceiverId = staffId;
+            this.CreateTime = DateTime.Now;
+        }
     }
 }

src/WMS.Web.Domain/Entitys/InstockTask.cs

@@ -27,6 +27,12 @@ namespace WMS.Web.Domain.Entitys
         /// 来源单号
         /// </summary>
         public string SourceBillNo { get; set; }
+
+        /// <summary>
+        /// 销售订单号
+        /// </summary>
+        public string SaleBillNo { get; set; }
+
         /// <summary>
         /// 入库状态
         /// </summary>
@@ -68,6 +74,16 @@ namespace WMS.Web.Domain.Entitys
         /// </summary>
         public DateTime? RepealTime { get; set; }
 
+        /// <summary>
+        /// 供应商Id
+        /// </summary>
+        public int SupplierId { get; set; }
+
+        /// <summary>
+        /// 组织编码
+        /// </summary>
+        public string OrgCode { get; set; }
+
         /// <summary>
         /// 明细
         /// </summary>

src/WMS.Web.Domain/Infrastructure/IInStockTaskRepositories.cs

@@ -29,6 +29,14 @@ namespace WMS.Web.Domain.Infrastructure
         /// <returns></returns>
         Task<InStockTask> Get(int id);
 
+        /// <summary>
+        /// 详情
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="companyId"></param>
+        /// <returns></returns>
+        Task<InStockTaskInfoDto> GetInfo(int id, int companyId);
+
         /// <summary>
         /// 实体：根据来源单号
         /// </summary>

src/WMS.Web.Domain/Mappers/InStockMapper.cs

@@ -45,8 +45,8 @@ namespace WMS.Web.Domain.Mappers
             CreateMap<NoPurchaseShelfDetailsRequest, BoxInventoryGenerateDetailsDto>();
             
 
-            CreateMap<InStockTask, InStockTaskInfoDto>()
-                 .ForMember(x => x.Details, ops => ops.Ignore());
+            //CreateMap<InStockTask, InStockTaskInfoDto>()
+            //     .ForMember(x => x.Details, ops => ops.Ignore());
             CreateMap<InStockTaskDetails, InStockTaskDetailsInfoDto>();
 
             
@@ -58,6 +58,9 @@ namespace WMS.Web.Domain.Mappers
             //ERP-同步结果对象统一映射
             CreateMap<ErpInStockResultDto, InStockTask>()
                 .ForMember(x => x.SourceBillNo, ops => ops.MapFrom(x => x.BillNo))
+                .ForMember(x => x.SaleBillNo, ops => ops.MapFrom(x => x.SaleBillNo))
+                .ForMember(x => x.OrgCode, ops => ops.MapFrom(x => x.OrgCode))
+                .ForMember(x => x.SupplierId, ops => ops.MapFrom(x => x.SupplierId))
                 .ForMember(x => x.CreateTime, ops => ops.MapFrom(x => x.CreateTime));
 
             CreateMap<ErpInStockResultDto, InStockTaskDetails>()

src/WMS.Web.Domain/Services/InStockService.cs

@@ -556,7 +556,8 @@ namespace WMS.Web.Domain.Services
             foreach (var item in dto.Boxs)
             {
                 var taskBox = _mapper.Map<InStockTaskBox>(item);
-                taskBox.TaskId = entity.Id;
+                taskBox.TaskId = entity.Id;                
+                taskBox.Receiver(staffId);
                 var current_dto_box_dets = boxEntitys.Where(x => x.Id == item.BoxId).SelectMany(x => x.Details).ToList();
                 taskBox.Details = _mapper.Map<List<InStockTaskBoxDetails>>(current_dto_box_dets);
                 taskBox.Details.ForEach(x => { x.ErpDetailId = item.ErpDetailId; });