出入库回退导出

src/WMS.Web.Api/Controllers/BackRecordController.cs

@@ -1,15 +1,19 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using WMS.Web.Core;
 using WMS.Web.Core.Dto;
 using WMS.Web.Core.Dto.BackRecord;
+using WMS.Web.Core.Help;
 using WMS.Web.Core.Internal.Results;
 using WMS.Web.Domain.Infrastructure;
 using WMS.Web.Domain.IService;
 using WMS.Web.Domain.IService.Public;
+using WMS.Web.Domain.Options;
 using WMS.Web.Domain.Values;
 
 namespace WMS.Web.Api.Controllers
@@ -22,10 +26,17 @@ namespace WMS.Web.Api.Controllers
     public class BackRecordController : ControllerBase
     {
         private readonly ILoginService _loginService;
+        private readonly QiniuOptions _option;
+        private readonly IExportExcelService _exportExcelService;
         private readonly IBackRecordService _backRecordService;
         private readonly IBackRecordRepositories _backRecordRepositories;
-        public BackRecordController(ILoginService loginService, IBackRecordRepositories backRecordRepositories, IBackRecordService backRecordService)
+        public BackRecordController(ILoginService loginService,
+             IOptions<QiniuOptions> option,
+            IExportExcelService exportExcelService,
+            IBackRecordRepositories backRecordRepositories, IBackRecordService backRecordService)
         {
+            _option = option?.Value;
+            this._exportExcelService = exportExcelService;
             this._loginService = loginService;
             this._backRecordService = backRecordService;
             this._backRecordRepositories = backRecordRepositories;
@@ -43,8 +54,31 @@ namespace WMS.Web.Api.Controllers
             var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
             if (loginInfo == null || loginInfo.UserInfo == null)
                 return ResultPagedList<BackRecordQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
-            var result = await _backRecordRepositories.GetPagedList(dto);
+            var (list,total) = await _backRecordRepositories.GetPagedList(dto);
-            return result;
+            return ResultPagedList<BackRecordQueryResponse>.ReSuccess(list, total);
+        }
+
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Export")]
+        public Task<Result<string>> Export([FromBody] BackRecordQueryRequest dto)
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null)
+                return Task.FromResult(Result<string>.ReFailure(ResultCodes.Token_Invalid_Error));
+            string fileName = FileDownLoadOrderType.BackRecord.GetRemark() + loginInfo.UserInfo.CompanyId + DateTime.Now.DateTimeToLongTimeStamp() + ".xlsx";
+            string res = _option.Url + fileName;
+
+            Task.Run(async () =>
+            {
+                await _exportExcelService.ExportList<BackRecordQueryResponse, BackRecordQueryRequest>(dto, fileName, loginInfo.UserInfo.StaffId, loginInfo.UserInfo.CompanyId, FileDownLoadOrderType.OutStock);
+            });
+
+            return Task.FromResult(Result<string>.ReSuccess(res));
         }
 
         /// <summary>

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

@@ -16,6 +16,13 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.BackRecordController.Export(WMS.Web.Core.Dto.BackRecordQueryRequest)">
+            <summary>
+            导出
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Api.Controllers.BackRecordController.OnShelf(WMS.Web.Core.Dto.BackRecord.SaveBackRecordRequest)">
             <summary>
             出库回退上架-pda

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

@@ -481,6 +481,11 @@
             同步时间
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.InStock.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
         <member name="F:WMS.Web.Domain.Entitys.InStock.Details">
             <summary>
             明细
@@ -492,6 +497,14 @@
             </summary>
             <param name="creatorId"></param>
         </member>
+        <member name="M:WMS.Web.Domain.Entitys.InStock.Sync(System.Boolean,System.Int32,System.String)">
+            <summary>
+            同步金蝶
+            </summary>
+            <param name="isSuccess"></param>
+            <param name="operateId"></param>
+            <param name="remark"></param>
+        </member>
         <member name="M:WMS.Web.Domain.Entitys.InStock.GenerateNo">
             <summary>
             生成单据号
@@ -4238,6 +4251,11 @@
             箱库存明细
             </summary>
         </member>
+        <member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.BackRecord">
+            <summary>
+            出入库回退上下架
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Values.InstockStatus">
             <summary>
             入库状态

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

@@ -18,7 +18,7 @@ namespace WMS.Web.Domain.Infrastructure
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        Task<ResultPagedList<BackRecordQueryResponse>> GetPagedList(BackRecordQueryRequest dto);
+        Task<(List<BackRecordQueryResponse> list, int total)> GetPagedList(BackRecordQueryRequest dto);
 
         /// <summary>
         /// 新增

src/WMS.Web.Domain/Values/FileDownLoadOrderType.cs

@@ -60,5 +60,10 @@ namespace WMS.Web.Domain.Values
         /// </summary>
         [EnumRemark("箱库存明细")]
         BoxInventoryDetails = 10,
+        /// <summary>
+        /// 出入库回退上下架
+        /// </summary>
+        [EnumRemark("出入库回退上下架")]
+        BackRecord = 11,
     }
 }

src/WMS.Web.Repositories/BackRecordRepositories.cs

@@ -21,7 +21,7 @@ namespace WMS.Web.Repositories
     /// <summary>
     /// 出入库回退记录-仓储
     /// </summary>
-    public class BackRecordRepositories: IBackRecordRepositories
+    public class BackRecordRepositories : IAllFielRepositories<BackRecordQueryRequest>, IBackRecordRepositories
     {
         private readonly IMapper _mapper;
         private readonly IServiceProvider _serviceProvider;
@@ -46,6 +46,7 @@ namespace WMS.Web.Repositories
             _serviceProvider = serviceProvider;
             _loginRepositories = loginRepositories;
             _singleDataService = singleDataService;
+            _erpBasicDataExtendService = erpBasicDataExtendService;
         }
 
         /// <summary>
@@ -53,12 +54,12 @@ namespace WMS.Web.Repositories
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        public async Task<ResultPagedList<BackRecordQueryResponse>> GetPagedList(BackRecordQueryRequest dto) 
+        public async Task<(List<BackRecordQueryResponse> list,int total)> GetPagedList(BackRecordQueryRequest dto) 
         {
             //1.获取物料集合和组织集合和供应商的集合
             var materials_result = await _erpService.BillQueryForMaterial();
             if (!materials_result.IsSuccess)
-                return ResultPagedList<BackRecordQueryResponse>.ReFailure(materials_result);
+                return (new List<BackRecordQueryResponse>(), 0);
             var materials = materials_result.Data.ToList();
 
             var query = _context.BackRecordDetails
@@ -74,10 +75,7 @@ namespace WMS.Web.Repositories
             if (dto.CreateEndDate != null)
                 query = query.Where(w => w.order.CreateTime <= dto.CreateEndDate.Value);
 
-            var response = new ResultPagedList<BackRecordQueryResponse>();
             int total = await query.CountAsync();
-            response.TotalCount = total;
-
             var list = await query.Select(s => new BackRecordQueryResponse()
             {
                 Id = s.order.Id,
@@ -95,8 +93,7 @@ namespace WMS.Web.Repositories
                 SerialNumbers = JsonConvert.SerializeObject(s.detail.SerialNumbers),
             }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
 
-            response.Data = list;
+            return (list,total);
-            return response;
         }
 
         /// <summary>
@@ -132,5 +129,16 @@ namespace WMS.Web.Repositories
             }
 
         }
+
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <param name="companyId"></param>
+        /// <returns></returns>
+        public async Task<(object obj, int total)> GetListField(BackRecordQueryRequest dto, int companyId)
+        {
+            return await GetPagedList(dto);
+        }
     }
 }

src/WMS.Web.Repositories/DependencyInjection/AppBuilderExtensions.cs

@@ -56,6 +56,7 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddTransient<IAllFielRepositories<InventoryDetailsQueryRequest>, InventoryDetailsRepositories>();
             services.AddTransient<IAllFielRepositories<InventoryInOutDetailsQueryRequest>, InventoryInOutDetailsRepositories>();
             services.AddTransient<IAllFielRepositories<BoxInventoryQueryRequest>, BoxInventoryRepositories>();
+            services.AddTransient<IAllFielRepositories<BackRecordQueryRequest>, BackRecordRepositories>();
             #endregion