Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

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

@@ -59,16 +59,26 @@ namespace WMS.Web.Domain.Entitys
         [Column("Type")]
         public OutStockType Type { get; set; } = OutStockType.Sal;
         /// <summary>
-        /// 操作人（出库人）
+        /// 操作人
         /// </summary>
         [Column("OperatorId")]
         public int? OperatorId { get; set; }
         /// <summary>
-        /// 操作时间（出库时间）
+        /// 操作时间
         /// </summary>
         [Column("OperateTime")]
         public DateTime? OperateTime { get; set; }
         /// <summary>
+        /// 出库人
+        /// </summary>
+        [Column("OutStockId")]
+        public int? OutStockId { get; set; }
+        /// <summary>
+        /// 出库时间
+        /// </summary>
+        [Column("OutStockTime")]
+        public DateTime? OutStockTime { get; set; }
+        /// <summary>
         /// 创建时间（erp那边的创建时间）
         ///</summary> 
         [Column("CreateTime")]
@@ -92,7 +102,7 @@ namespace WMS.Web.Domain.Entitys
         /// <param name="materialId"></param>
         /// <param name="qty"></param>
         /// <returns></returns>
-        public Result<List<(int erpDetailId, decimal qty)>> OutStock(int materialId, decimal qty)
+        public Result<List<(int erpDetailId, decimal qty)>> OutStock(int materialId, decimal qty,int outStockId)
         {
             if (this.Status == OutStockStatus.Already)
                 return Result<List<(int erpDetailId, decimal qty)>>.ReFailure(ResultCodes.OutStockTaskAlready);
@@ -131,6 +141,9 @@ namespace WMS.Web.Domain.Entitys
 
             detail.RealityQty = detail.RealityQty + qty;
 
+            this.OutStockId = outStockId;
+            this.OutStockTime = DateTime.Now;
+
             GenerateStatus();
 
             return Result<List<(int erpDetailId, decimal qty)>>.ReSuccess(resList);

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

@@ -119,7 +119,7 @@ namespace WMS.Web.Domain.Services
                 var qty = dtoDetails.Sum(s => s.Qty);
 
                 if (tDetail == null) continue;
-                var res = outStockTask.OutStock(mid, qty);
+                var res = outStockTask.OutStock(mid, qty, loginInfo.UserInfo.StaffId);
                 if (!res.IsSuccess) return res;
 
                 var outd = _mapper.Map<OutStockDetails>(tDetail);