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

src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml

@@ -3856,6 +3856,16 @@
             操作时间（出库时间）
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.OutStock">
+            <summary>
+            出库人
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.OutStockTime">
+            <summary>
+            出库时间
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.SourceBillNo">
              <summary>
              来源单号

src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs

@@ -46,6 +46,16 @@ namespace WMS.Web.Core.Dto.OutStockTask
         [Column("出库时间")]
         public string OperateTime { get; set; }
         /// <summary>
+        /// 出库人
+        /// </summary>
+        [Column("出库人")]
+        public string OutStock { get; set; }
+        /// <summary>
+        /// 出库时间
+        /// </summary>
+        [Column("出库时间")]
+        public string OutStockTime { get; set; }
+        /// <summary>
         /// 来源单号
         ///</summary> 
         [Column("来源单号")]

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

@@ -191,6 +191,7 @@ namespace WMS.Web.Domain.Services
             {
                 var box = boxList.FirstOrDefault(f => f.Id == entity.BoxId);
                 var outstockDetail = outStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId);
+                if (outstockDetail == null) continue;
                 //修改序列号和箱绑定关系
                 entity.OutStock(outStock.BillNo, outStock.Type);
 

src/WMS.Web.Repositories/OutStockTaskRepositories.cs

@@ -152,7 +152,7 @@ namespace WMS.Web.Repositories
         public async Task<OutStockTask> Get(int id)
         {
             var res = await _context.OutStockTask
-               .Include(s => s.Details).ThenInclude(x=>x.ErpDetails)
+               .Include(s => s.Details).ThenInclude(x => x.ErpDetails)
                .FirstOrDefaultAsync(f => id == f.Id);
 
             return res.Clone();
@@ -292,6 +292,9 @@ namespace WMS.Web.Repositories
                 RealityQty = s.detail.RealityQty,
                 CreateTime = s.order.CreateTime.DateToStringSeconds(),
                 OperateTime = s.order.OperateTime.DateToStringSeconds(),
+                Operator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.OperatorId ?? 0),
+                OutStockTime = s.order.OperateTime.DateToStringSeconds(),
+                OutStock = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.OutStockId ?? 0),
                 OutStockBeginTime = s.detail.OutStockBeginTime.DateToStringSeconds(),
                 OutStockEndTime = s.detail.OutStockEndTime.DateToStringSeconds(),
                 Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode + s.order.OrgCode),
@@ -309,7 +312,7 @@ namespace WMS.Web.Repositories
                 #endregion
 
             }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
-            foreach(var l in list)
+            foreach (var l in list)
             {
                 l.SourceBillNo = string.Join(",", l.SourceBillNoList.Distinct());
                 l.SaleBillNo = string.Join(",", l.SaleBillNoList.Distinct());
@@ -341,7 +344,7 @@ namespace WMS.Web.Repositories
             {
                 var entity = list.FirstOrDefault(f => f.Id == r.Id);
                 r.StockCode = entity.StockCode;
-                r.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode+ entity.OrgCode);
+                r.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode + entity.OrgCode);
             }
             //获取物料信息 显示物料三件套
             foreach (var r in response.SelectMany(s => s.details))
@@ -428,7 +431,7 @@ namespace WMS.Web.Repositories
                     _transaction.Commit();
                 return true;
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 if (_transaction != null)
                     _transaction.Rollback();