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

src/WMS.Web.Repositories/OutStockRepositories.cs

@@ -185,5 +185,53 @@ namespace WMS.Web.Repositories
 
             return res.Clone();
         }
+        /// <summary>
+        /// 编辑
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="isTransaction"></param>
+        /// <returns></returns>
+        public async Task<OutStock> Edit(OutStock entity, bool isTransaction = true)
+        {
+            IDbContextTransaction _transaction = null;
+            if (isTransaction)
+                _transaction = _context.Database.BeginTransaction();
+
+            try
+            {
+                var res = await _context.OutStock
+                          .Include(s => s.Details)
+                         .FirstOrDefaultAsync(f => f.Id == entity.Id);
+                if (res == null) return null;
+
+                _mapper.Map(entity, res);
+                _mapper.ToMapList(entity.Details, res.Details);
+                await _context.SaveChangesAsync();
+
+                if (_transaction != null)
+                    _transaction.Commit();
+
+                return res;
+            }
+            catch (Exception)
+            {
+                if (_transaction != null)
+                    _transaction.Rollback();
+                return null;
+            }
+        }
+        /// <summary>
+        /// 根据任务单Id获取
+        /// </summary>
+        /// <param name="taskId"></param>
+        /// <returns></returns>
+        public async Task<OutStock> GetByTaskId(int taskId)
+        {
+            var res = await _context.OutStock
+               .Include(s => s.Details)
+               .FirstOrDefaultAsync(f => taskId == f.TaskId);
+
+            return res.Clone();
+        }
     }
 }

src/WMS.Web.Repositories/OutStockTaskRepositories.cs

@@ -140,6 +140,20 @@ namespace WMS.Web.Repositories
             return true;
 
         }
+        /// <summary>
+        /// 根据Id获取实体
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<OutStockTask> Get(int id)
+        {
+            var res = await _context.OutStockTask
+               .Include(s => s.Details)
+               .FirstOrDefaultAsync(f => id == f.Id);
+
+            return res.Clone();
+        }
+
         /// <summary>
         /// 根据单据头id获取数据
         /// </summary>

src/WMS.Web.Repositories/TakeStockRepositories.cs

@@ -100,7 +100,7 @@ namespace WMS.Web.Repositories
                 #region dto组装
                 Id = s.Id,
                 BillNo = s.BillNo,
-                Unit = _singleDataService.GetSingleData(SingleAction.Units, _loginRepositories.CompanyId, s.UnitId),
+                Unit = "",//物料带出来
                 Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockId),
                 SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockId),
                 BeforeQty = s.BeforeQty,