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

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

@@ -14,6 +14,10 @@ namespace WMS.Web.Core.Dto.OutStockTask
         /// </summary>
         public int Id { get; set; }
         /// <summary>
+        /// 明细Id
+        /// </summary>
+        public int DetailId { get; set; }
+        /// <summary>
         /// 单据编号
         /// </summary>
         public string BillNo { get; set; }

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

@@ -9,6 +9,10 @@ namespace WMS.Web.Core.Dto.OutStockTask
     /// </summary>
    public class OutStockTaskQueryRequest : PaginationBaseRequestDto
     {
+        /// <summary>
+        /// 刷新 明细Id
+        /// </summary>
+        public List<int> Ids { get; set; } = new List<int>();
         /// <summary>
         /// 单据类型(出库单下拉列表)
         /// </summary>

src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs

@@ -11,6 +11,8 @@ using WMS.Web.Core.Dto.ChangeBoxRecord;
 using WMS.Web.Core.Help;
 using WMS.Web.Domain.Entitys;
 using WMS.Web.Domain.Infrastructure;
+using WMS.Web.Domain.IService.Public;
+using WMS.Web.Domain.Values.Single;
 using WMS.Web.Repositories.Configuration;
 
 namespace WMS.Web.Repositories
@@ -20,13 +22,18 @@ namespace WMS.Web.Repositories
         private readonly IMapper _mapper;
         private readonly IServiceProvider _serviceProvider;
         private readonly RepositoryDbContext _context;
+        private readonly ISingleDataService _singleDataService;
+        private readonly ILoginRepositories _loginRepositories;
 
 
-        public ChangeBoxRecordRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider)
+        public ChangeBoxRecordRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider,
+            ISingleDataService singleDataService, ILoginRepositories loginRepositories)
         {
             _context = context;
             _mapper = mapper;
             _serviceProvider = serviceProvider;
+            _singleDataService = singleDataService;
+            _loginRepositories = loginRepositories;
         }
         /// <summary>
         /// 新增
@@ -85,13 +92,13 @@ namespace WMS.Web.Repositories
                 MaterialName = "",
                 MaterialNumber = "",
                 Specifications = "",
-                Stock = "",
+                Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockId),
                 SerialNumber = "",
                 SrcBox = "",
                 DestBox = "",
                 SrcSubStock = "",
                 DestSubStock = "",
-                Creator = "",
+                Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.CreatorId),
                 CreateTime =s.CreateTime.DateToStringSeconds()
                 #endregion
 

src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs

@@ -6,10 +6,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using WMS.Web.Core;
 using WMS.Web.Core.Dto.MoveBoxRecord;
 using WMS.Web.Core.Help;
 using WMS.Web.Domain.Entitys;
 using WMS.Web.Domain.Infrastructure;
+using WMS.Web.Domain.IService.Public;
+using WMS.Web.Domain.Values.Single;
 using WMS.Web.Repositories.Configuration;
 
 namespace WMS.Web.Repositories
@@ -19,13 +22,18 @@ namespace WMS.Web.Repositories
         private readonly IMapper _mapper;
         private readonly IServiceProvider _serviceProvider;
         private readonly RepositoryDbContext _context;
+        private readonly ISingleDataService _singleDataService;
+        private readonly ILoginRepositories _loginRepositories;
 
 
-        public MoveBoxRecordRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider)
+        public MoveBoxRecordRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider,
+            ISingleDataService singleDataService, ILoginRepositories loginRepositories)
         {
             _context = context;
             _mapper = mapper;
             _serviceProvider = serviceProvider;
+            _singleDataService = singleDataService;
+            _loginRepositories = loginRepositories;
         }
         /// <summary>
         /// 新增
@@ -85,9 +93,9 @@ namespace WMS.Web.Repositories
                 SrcSubStock = "",
                 Specifications = "",
                 DestSubStock = "",
-                Qty = 0,
+                Qty = s.Qty,
-                Type = "",
+                Type = s.Type.GetRemark(),
-                Creator = "",
+                Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.CreatorId),
                 CreateTime = s.CreateTime.DateToStringSeconds()
                 #endregion
 

src/WMS.Web.Repositories/OutStockRepositories.cs

@@ -6,11 +6,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using WMS.Web.Core;
 using WMS.Web.Core.Dto.OutStock;
 using WMS.Web.Core.Help;
 using WMS.Web.Domain.Entitys;
 using WMS.Web.Domain.Infrastructure;
+using WMS.Web.Domain.IService.Public;
 using WMS.Web.Domain.Mappers;
+using WMS.Web.Domain.Values.Single;
 using WMS.Web.Repositories.Configuration;
 
 namespace WMS.Web.Repositories
@@ -20,13 +23,18 @@ namespace WMS.Web.Repositories
         private readonly IMapper _mapper;
         private readonly IServiceProvider _serviceProvider;
         private readonly RepositoryDbContext _context;
+        private readonly ISingleDataService _singleDataService;
+        private readonly ILoginRepositories _loginRepositories;
 
 
-        public OutStockRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider)
+        public OutStockRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider,
+            ISingleDataService singleDataService, ILoginRepositories loginRepositories)
         {
             _context = context;
             _mapper = mapper;
             _serviceProvider = serviceProvider;
+            _singleDataService = singleDataService;
+            _loginRepositories = loginRepositories;
         }
         /// <summary>
         /// 新增
@@ -84,22 +92,22 @@ namespace WMS.Web.Repositories
             var list = await query.Select(s => new OutStockQueryInfoResponse()
             {
                 #region dto组装
-                Id = 0,
+                Id = s.order.Id,
                 BillNo=s.order.BillNo,
-                Status = "",
+                Status = s.order.Status.GetRemark(),
-                Type = "",
+                Type = s.order.Type.GetRemark(),
-                Creator = "",
+                Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
                 CreateTime=s.order.CreateTime.DateToStringSeconds(),
                 SuccessSync = s.order.SuccessSync,
-                Stock = "",
+                Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),
-                SourceBillNo="",
+                SourceBillNo=s.detail.SourceBillNo,
-                SaleBillNo = "",
+                SaleBillNo = s.detail.SaleBillNo,
                 DeliveryOrg = "",
                 ReceiptCustomer = "",
                 MaterialName = "",
                 MaterialNumber = "",
                 Specifications = "",
-                Qty=0
+                Qty=s.detail.Qty
                 #endregion
 
             }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();

src/WMS.Web.Repositories/OutStockTaskRepositories.cs

@@ -6,11 +6,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using WMS.Web.Core;
 using WMS.Web.Core.Dto.OutStockTask;
 using WMS.Web.Core.Help;
 using WMS.Web.Domain.Entitys;
 using WMS.Web.Domain.Infrastructure;
+using WMS.Web.Domain.IService.Public;
 using WMS.Web.Domain.Mappers;
+using WMS.Web.Domain.Values.Single;
 using WMS.Web.Repositories.Configuration;
 
 namespace WMS.Web.Repositories
@@ -20,13 +23,18 @@ namespace WMS.Web.Repositories
         private readonly IMapper _mapper;
         private readonly IServiceProvider _serviceProvider;
         private readonly RepositoryDbContext _context;
+        private readonly ISingleDataService _singleDataService;
+        private readonly ILoginRepositories _loginRepositories;
 
 
-        public OutStockTaskRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider)
+        public OutStockTaskRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider,
+            ISingleDataService singleDataService, ILoginRepositories loginRepositories)
         {
             _context = context;
             _mapper = mapper;
             _serviceProvider = serviceProvider;
+            _singleDataService = singleDataService;
+            _loginRepositories = loginRepositories;
         }
         /// <summary>
         /// 新增
@@ -168,14 +176,15 @@ namespace WMS.Web.Repositories
             var list = await query.Select(s => new OutStockTaskQueryInfoResponse()
             {
                 #region dto组装
-                Id = 0,
+                Id = s.order.Id,
-                BillNo=s.order.BillNo,
+                DetailId=s.detail.Id,
-                Status = "",
+                BillNo =s.order.BillNo,
-                Type = "",
+                Status = s.order.Status.GetRemark(),
+                Type = s.order.Type.GetRemark(),
                 CreateTime = s.order.OperateTime.DateToStringSeconds(),
-                Stock = "",
+                Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),
-                SourceBillNo = "",
+                SourceBillNo = s.detail.SourceBillNo,
-                SaleBillNo = "",
+                SaleBillNo = s.detail.SaleBillNo,
                 DeliveryOrg = "",
                 ReceiptCustomer = "",
                 MaterialName = "",

src/WMS.Web.Repositories/TakeStockRepositories.cs

@@ -6,26 +6,34 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using WMS.Web.Core;
 using WMS.Web.Core.Dto.TakeStock;
 using WMS.Web.Core.Help;
 using WMS.Web.Domain.Entitys;
 using WMS.Web.Domain.Infrastructure;
+using WMS.Web.Domain.IService.Public;
+using WMS.Web.Domain.Values.Single;
 using WMS.Web.Repositories.Configuration;
 
 namespace WMS.Web.Repositories
 {
-   public class TakeStockRepositories: ITakeStockRepositories
+    public class TakeStockRepositories : ITakeStockRepositories
     {
         private readonly IMapper _mapper;
         private readonly IServiceProvider _serviceProvider;
         private readonly RepositoryDbContext _context;
+        private readonly ISingleDataService _singleDataService;
+        private readonly ILoginRepositories _loginRepositories;
 
 
-        public TakeStockRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider)
+        public TakeStockRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider,
+            ISingleDataService singleDataService, ILoginRepositories loginRepositories)
         {
             _context = context;
             _mapper = mapper;
             _serviceProvider = serviceProvider;
+            _singleDataService = singleDataService;
+            _loginRepositories = loginRepositories;
         }
         /// <summary>
         /// 新增
@@ -83,19 +91,19 @@ namespace WMS.Web.Repositories
             var list = await query.Select(s => new TakeStockQueryInfoResponse()
             {
                 #region dto组装
-                Id = 0,
+                Id = s.order.Id,
-                BillNo = "",
+                BillNo = s.order.BillNo,
-                Unit = "",
+                Unit = _singleDataService.GetSingleData(SingleAction.Units, _loginRepositories.CompanyId, s.detail.UnitId),
-                Stock = "",
+                Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),
                 SubStock = "",
-                BeforeQty = 0,
+                BeforeQty = s.detail.BeforeQty,
-                AfterQty = 0,
+                AfterQty = s.detail.AfterQty,
-                FinalQty = 0,
+                FinalQty = s.detail.FinalQty,
-                ResultType="",
+                ResultType = s.detail.ResultType.GetRemark(),
-                Remark="",
+                Remark = s.detail.Remark,
-                Creator = "",
+                Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
                 Date = s.order.Date.DateToStringSeconds(),
-                SuccessSync=s.order.SuccessSync
+                SuccessSync = s.order.SuccessSync
                 #endregion
 
             }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();