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

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

@@ -1,17 +1,21 @@
 using AutoMapper;
 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.ChangeBoxRecord;
+using WMS.Web.Core.Help;
 using WMS.Web.Core.Internal.Results;
 using WMS.Web.Domain.Entitys;
 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
@@ -27,12 +31,17 @@ namespace WMS.Web.Api.Controllers
         private readonly ILoginService _loginService;
         private readonly IChangeBoxRecordRepositories _repositories;
         private readonly IChangeMoveBoxService _changeMoveBoxService;
-        public ChangeBoxRecordController(IMapper mapper, ILoginService loginService, IChangeBoxRecordRepositories repositories, IChangeMoveBoxService changeMoveBoxService)
+        private readonly QiniuOptions _option;
+        private readonly IExportExcelService _exportExcelService;
+        public ChangeBoxRecordController(IMapper mapper, ILoginService loginService, IChangeBoxRecordRepositories repositories,
+            IChangeMoveBoxService changeMoveBoxService, IOptions<QiniuOptions> option, IExportExcelService exportExcelServic)
         {
             _mapper = mapper;
             _loginService = loginService;
             _repositories = repositories;
             _changeMoveBoxService = changeMoveBoxService;
+            _option = option?.Value;
+            _exportExcelService = exportExcelServic;
         }
         /// <summary>
         /// 列表
@@ -52,6 +61,28 @@ namespace WMS.Web.Api.Controllers
             return result;
         }
         /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Export")]
+        public Task<Result<string>> Export([FromBody] ChangeBoxRecordQueryRequest 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.ChangeBox.GetRemark() + loginInfo.UserInfo.CompanyId + DateTime.Now.DateTimeToLongTimeStamp() + ".xlsx";
+            string res = _option.Url + fileName;
+
+            Task.Run(async () =>
+            {
+                await _exportExcelService.ExportList<ChangeBoxRecordQueryInfoResponse, ChangeBoxRecordQueryRequest>(dto, fileName, loginInfo.UserInfo.StaffId, loginInfo.UserInfo.CompanyId, FileDownLoadOrderType.ChangeBox);
+            });
+
+            return Task.FromResult(Result<string>.ReSuccess(res));
+        }
+        /// <summary>
         /// 改箱保存-PDA
         /// </summary>
         /// <param name="dto"></param>

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

@@ -1,18 +1,22 @@
 using AutoMapper;
 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.ChangeBoxRecord;
 using WMS.Web.Core.Dto.MoveBoxRecord;
+using WMS.Web.Core.Help;
 using WMS.Web.Core.Internal.Results;
 using WMS.Web.Domain.Entitys;
 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
@@ -25,12 +29,18 @@ namespace WMS.Web.Api.Controllers
         private readonly ILoginService _loginService;
         private readonly IMoveBoxRecordRepositories _repositories;
         private readonly IChangeMoveBoxService _changeMoveBoxService;
-        public MoveBoxRecordController(IMapper mapper, ILoginService loginService, IMoveBoxRecordRepositories repositories, IChangeMoveBoxService changeMoveBoxService)
+        private readonly QiniuOptions _option;
+        private readonly IExportExcelService _exportExcelService;
+        public MoveBoxRecordController(IMapper mapper, ILoginService loginService, IMoveBoxRecordRepositories repositories, 
+            IChangeMoveBoxService changeMoveBoxService
+            , IOptions<QiniuOptions> option, IExportExcelService exportExcelServic)
         {
             _mapper = mapper;
             _loginService = loginService;
             _repositories = repositories;
             _changeMoveBoxService = changeMoveBoxService;
+            _option = option?.Value;
+            _exportExcelService = exportExcelServic;
         }
         /// <summary>
         /// 列表
@@ -50,6 +60,28 @@ namespace WMS.Web.Api.Controllers
             return result;
         }
         /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Export")]
+        public Task<Result<string>> Export([FromBody] MoveBoxRecordQueryRequest 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.MoveBox.GetRemark() + loginInfo.UserInfo.CompanyId + DateTime.Now.DateTimeToLongTimeStamp() + ".xlsx";
+            string res = _option.Url + fileName;
+
+            Task.Run(async () =>
+            {
+                await _exportExcelService.ExportList<MoveBoxRecordQueryInfoResponse, MoveBoxRecordQueryRequest>(dto, fileName, loginInfo.UserInfo.StaffId, loginInfo.UserInfo.CompanyId, FileDownLoadOrderType.MoveBox);
+            });
+
+            return Task.FromResult(Result<string>.ReSuccess(res));
+        }
+        /// <summary>
         /// 移箱下架保存-PDA
         /// </summary>
         /// <param name="dto"></param>

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

@@ -1,16 +1,20 @@
 using AutoMapper;
 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.OutStock;
+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
@@ -26,13 +30,18 @@ namespace WMS.Web.Api.Controllers
         private readonly ILoginService _loginService;
         private readonly IOutStockRepositories _repositories;
         private readonly IOutStockService _outStockService;
+        private readonly QiniuOptions _option;
+        private readonly IExportExcelService _exportExcelService;
         public OutStockController(IMapper mapper, ILoginService loginService,
-            IOutStockRepositories repositories, IOutStockService outStockService)
+            IOutStockRepositories repositories, IOutStockService outStockService
+            , IOptions<QiniuOptions> option, IExportExcelService exportExcelServic)
         {
             _mapper = mapper;
             _loginService = loginService;
             _repositories = repositories;
             _outStockService = outStockService;
+            _option = option?.Value;
+            _exportExcelService = exportExcelServic;
         }
         /// <summary>
         /// 列表
@@ -51,7 +60,28 @@ namespace WMS.Web.Api.Controllers
             var result = ResultPagedList<OutStockQueryInfoResponse>.ReSuccess(list, count);
             return result;
         }
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Export")]
+        public Task<Result<string>> Export([FromBody] OutStockQueryRequest 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.OutStock.GetRemark() + loginInfo.UserInfo.CompanyId + DateTime.Now.DateTimeToLongTimeStamp() + ".xlsx";
+            string res = _option.Url + fileName;
 
+            Task.Run(async () =>
+            {
+                await _exportExcelService.ExportList<OutStockQueryInfoResponse, OutStockQueryRequest>(dto, fileName, loginInfo.UserInfo.StaffId, loginInfo.UserInfo.CompanyId, FileDownLoadOrderType.OutStock);
+            });
+
+            return Task.FromResult(Result<string>.ReSuccess(res));
+        }
         /// <summary>
         /// 获取详情
         /// </summary>

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

@@ -1,16 +1,20 @@
 using AutoMapper;
 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.TakeStock;
+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
@@ -26,13 +30,18 @@ namespace WMS.Web.Api.Controllers
         private readonly ILoginService _loginService;
         private readonly ITakeStockRepositories _repositories;
         private readonly ITakeStockService _takeStockService;
+        private readonly QiniuOptions _option;
+        private readonly IExportExcelService _exportExcelService;
         public TakeStockController(IMapper mapper, ILoginService loginService, 
-            ITakeStockRepositories repositories, ITakeStockService takeStockService)
+            ITakeStockRepositories repositories, ITakeStockService takeStockService
+            , IOptions<QiniuOptions> option, IExportExcelService exportExcelServic)
         {
             _mapper = mapper;
             _loginService = loginService;
             _repositories = repositories;
             _takeStockService = takeStockService;
+            _option = option?.Value;
+            _exportExcelService = exportExcelServic;
         }
         /// <summary>
         /// 列表
@@ -51,7 +60,28 @@ namespace WMS.Web.Api.Controllers
             var result = ResultPagedList<TakeStockQueryInfoResponse>.ReSuccess(list, count);
             return result;
         }
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Export")]
+        public Task<Result<string>> Export([FromBody] TakeStockQueryRequest 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.TakeStock.GetRemark() + loginInfo.UserInfo.CompanyId + DateTime.Now.DateTimeToLongTimeStamp() + ".xlsx";
+            string res = _option.Url + fileName;
 
+            Task.Run(async () =>
+            {
+                await _exportExcelService.ExportList<TakeStockQueryInfoResponse, TakeStockQueryRequest>(dto, fileName, loginInfo.UserInfo.StaffId, loginInfo.UserInfo.CompanyId, FileDownLoadOrderType.TakeStock);
+            });
+
+            return Task.FromResult(Result<string>.ReSuccess(res));
+        }
         /// <summary>
         /// 盘点保存-PDA
         /// </summary>

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

@@ -40,8 +40,8 @@ namespace WMS.Web.Api.Controllers
         [Route("hj")]
         public async Task<string> TestHJ()
         {
-            //await _boxService.Sync();
+            await _boxService.Sync();
-            var res = await this._erpService.BillQueryForDeliveryNoticeOutStock(null,DateTime.Now.AddDays(-300));
+            //var res = await this._erpService.BillQueryForDeliveryNoticeOutStock(null,DateTime.Now.AddDays(-300));
             //var result= await this._erpService.BillQueryForPurchaseInStock();
             //var result = await this._erpService.BillQueryForOrg();
             var result = await this._erpService.BillQueryForMaterial();

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

@@ -42,6 +42,13 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.ChangeBoxRecordController.Export(WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryRequest)">
+            <summary>
+            导出
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Api.Controllers.ChangeBoxRecordController.Save(WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest)">
             <summary>
             改箱保存-PDA
@@ -245,6 +252,13 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.MoveBoxRecordController.Export(WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryRequest)">
+            <summary>
+            导出
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Api.Controllers.MoveBoxRecordController.Down_Save(WMS.Web.Core.Dto.MoveBoxRecord.SaveMoveBoxRecordRequest)">
             <summary>
             移箱下架保存-PDA
@@ -271,6 +285,13 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.OutStockController.Export(WMS.Web.Core.Dto.OutStock.OutStockQueryRequest)">
+            <summary>
+            导出
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Api.Controllers.OutStockController.GetInfo(System.Int32)">
             <summary>
             获取详情
@@ -438,6 +459,13 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.TakeStockController.Export(WMS.Web.Core.Dto.TakeStock.TakeStockQueryRequest)">
+            <summary>
+            导出
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Api.Controllers.TakeStockController.Save(System.Collections.Generic.List{WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest})">
             <summary>
             盘点保存-PDA

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

@@ -2850,6 +2850,11 @@
             完成装箱时间
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.OpsBoxResponse.CompleteCartonUser">
+            <summary>
+            完成装箱用户
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.OpsBoxResponse.CreateUser">
             <summary>
             箱子创建用户

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

@@ -125,6 +125,11 @@
             完成装箱时间
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.Box.CompleteCartonUser">
+            <summary>
+            完成装箱用户
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.Box.CreateUser">
             <summary>
             箱子创建用户
@@ -1218,15 +1223,15 @@
             解绑
             </summary>
         </member>
-        <member name="M:WMS.Web.Domain.Entitys.SerialNumbers.OutStock(System.String)">
+        <member name="M:WMS.Web.Domain.Entitys.SerialNumbers.OutStock(System.String,WMS.Web.Domain.Values.OutStockType)">
             <summary>
             出库
             </summary>
             <param name="outStockBillNo">出库单号</param>
         </member>
-        <member name="M:WMS.Web.Domain.Entitys.SerialNumbers.InStock(System.String)">
+        <member name="M:WMS.Web.Domain.Entitys.SerialNumbers.InStock(System.String,WMS.Web.Domain.Values.InstockType)">
             <summary>
-            出库
+            入库
             </summary>
             <param name="inStockBillNo">出库单号</param>
         </member>
@@ -4044,6 +4049,36 @@
             出库任务单
             </summary>
         </member>
+        <member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.OutStock">
+            <summary>
+            出库单
+            </summary>
+        </member>
+        <member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.InStockTask">
+            <summary>
+            入库任务单
+            </summary>
+        </member>
+        <member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.InStock">
+            <summary>
+            出库单
+            </summary>
+        </member>
+        <member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.ChangeBox">
+            <summary>
+            改箱
+            </summary>
+        </member>
+        <member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.MoveBox">
+            <summary>
+            移箱
+            </summary>
+        </member>
+        <member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.TakeStock">
+            <summary>
+            盘点
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Values.InstockStatus">
             <summary>
             入库状态

src/WMS.Web.Core/Dto/OpsBoxResponse.cs

@@ -36,9 +36,14 @@ namespace WMS.Web.Core.Dto
         [JsonProperty("CompleteCartonTime")]
         public DateTime CompleteCartonTime { get; set; } = DateTime.Now;
         /// <summary>
-        /// 箱子创建用户
+        /// 完成装箱用户
         /// </summary>
         [JsonProperty("BoxUser")]
+        public string CompleteCartonUser { get; set; }
+        /// <summary>
+        /// 箱子创建用户
+        /// </summary>
+        [JsonProperty("Create_user")]
         public string CreateUser { get; set; }
         /// <summary>
         /// 创建时间（对应老OPS的创建时间）

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

@@ -43,6 +43,10 @@ namespace WMS.Web.Domain.Entitys
         /// </summary>
         public DateTime CompleteCartonTime { get; set; } = DateTime.Now;
         /// <summary>
+        /// 完成装箱用户
+        /// </summary>
+        public string CompleteCartonUser { get; set; }
+        /// <summary>
         /// 箱子创建用户
         /// </summary>
         public string CreateUser { get; set; }

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

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text;
 using WMS.Web.Core;
+using WMS.Web.Domain.Values;
 
 namespace WMS.Web.Domain.Entitys
 {
@@ -14,7 +15,7 @@ namespace WMS.Web.Domain.Entitys
     public class SerialNumbers : EntityBase
     {
         public SerialNumbers() { }
-        public SerialNumbers(string serialNumber,int materialId,int boxId,int opsBoxId,string creator,DateTime? createTime) 
+        public SerialNumbers(string serialNumber, int materialId, int boxId, int opsBoxId, string creator, DateTime? createTime)
         {
             this.SerialNumber = serialNumber;
             this.MaterialId = materialId;
@@ -88,18 +89,20 @@ namespace WMS.Web.Domain.Entitys
         /// 出库
         /// </summary>
         /// <param name="outStockBillNo">出库单号</param>
-        public void OutStock(string outStockBillNo)
+        public void OutStock(string outStockBillNo, OutStockType type)
         {
             this.BoxId = 0;
-            this.OutStockBillNo = outStockBillNo;
+            if (type == OutStockType.Sal)
+                this.OutStockBillNo = outStockBillNo;
         }
         /// <summary>
-        /// 出库
+        /// 入库
         /// </summary>
         /// <param name="inStockBillNo">出库单号</param>
-        public void InStock(string inStockBillNo)
+        public void InStock(string inStockBillNo, InstockType type)
         {
-            this.InStockBillNo = inStockBillNo;
+            if (type == InstockType.Purchase)
+                this.InStockBillNo = inStockBillNo;
         }
     }
 }

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

@@ -188,7 +188,7 @@ namespace WMS.Web.Domain.Services
             {
                 var box = boxList.FirstOrDefault(f => f.Id == entity.BoxId);
                 //修改序列号和箱绑定关系
-                entity.OutStock(outStock.BillNo);
+                entity.OutStock(outStock.BillNo, outStock.Type);
 
                 //记录序列号操作日志
                 SerialNumberOperate op = new SerialNumberOperate()
@@ -316,7 +316,7 @@ namespace WMS.Web.Domain.Services
                 var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId);
                 var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, instockDetail.SubStockId);
                 //修改序列号和箱绑定关系
-                entity.InStock(inStock.BillNo);
+                entity.InStock(inStock.BillNo, inStock.Type);
 
                 //记录序列号操作日志
                 SerialNumberOperate op = new SerialNumberOperate()

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

@@ -15,5 +15,35 @@ namespace WMS.Web.Domain.Values
         /// </summary>
         [EnumRemark("出库任务单")]
         OutStockTask = 1,
+        /// <summary>
+        /// 出库单
+        /// </summary>
+        [EnumRemark("出库单")]
+        OutStock = 2,
+        /// <summary>
+        /// 入库任务单
+        /// </summary>
+        [EnumRemark("入库任务单")]
+        InStockTask = 3,
+        /// <summary>
+        /// 出库单
+        /// </summary>
+        [EnumRemark("入库单")]
+        InStock = 4,
+        /// <summary>
+        /// 改箱
+        /// </summary>
+        [EnumRemark("改箱单")]
+        ChangeBox = 5,
+        /// <summary>
+        /// 移箱
+        /// </summary>
+        [EnumRemark("移箱单")]
+        MoveBox = 6,
+        /// <summary>
+        /// 盘点
+        /// </summary>
+        [EnumRemark("盘点单")]
+        TakeStock = 7,
     }
 }

src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs

@@ -18,7 +18,7 @@ using WMS.Web.Repositories.Configuration;
 
 namespace WMS.Web.Repositories
 {
-    public class ChangeBoxRecordRepositories : IChangeBoxRecordRepositories
+    public class ChangeBoxRecordRepositories : IAllFielRepositories<ChangeBoxRecordQueryRequest>, IChangeBoxRecordRepositories
     {
         private readonly IMapper _mapper;
         private readonly IServiceProvider _serviceProvider;
@@ -175,5 +175,10 @@ namespace WMS.Web.Repositories
             }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
             return (list, total);
         }
+
+        public async Task<(object obj, int total)> GetListField(ChangeBoxRecordQueryRequest dto, int companyId)
+        {
+            return await GetListAsync(dto);
+        }
     }
 }

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

@@ -188,6 +188,8 @@ namespace WMS.Web.Repositories.DependencyInjection
         {
             var options = Configuration.GetSection("QuartzJobOptions").Get<QuartzJobOptions>();
             Services.AddTransient<InStockOrderQuartzJob>();//添加注入定时服务
+            Services.AddTransient<OutStockOrderQuartzJob>();//添加注入定时服务
+            Services.AddTransient<BoxQuartzJob>();//添加注入定时服务
             //Services.AddTransient<OrderContractQuartzJob>();//添加注入定时服务
             Services.AddQuartz(q =>
             {
@@ -227,6 +229,30 @@ namespace WMS.Web.Repositories.DependencyInjection
                 //.WithCronSchedule(CronScheduleBuilder.DailyAtHourAndMinute(options.JobStartHour[5], options.JobStartMinute[5]))
                 .WithDescription("InStockOrderQuartzJobTriggerDecs"));
                 #endregion
+
+                #region  出库任务单
+                var jobKey_out = new JobKey("OutStockOrderQuartzJob", options.QuartzJobValue);
+                q.AddJob<InStockOrderQuartzJob>(jobKey_out, j => j.WithDescription("OutStockOrderQuartzJob"));
+                q.AddTrigger(t => t
+                .WithIdentity("OutStockOrderQuartzJobTrigger")
+                .ForJob(jobKey_out)
+                .StartNow()
+                .WithCronSchedule(options.JobStartExpre)
+                //.WithCronSchedule(CronScheduleBuilder.DailyAtHourAndMinute(options.JobStartHour[5], options.JobStartMinute[5]))
+                .WithDescription("OutStockOrderQuartzJobTriggerDecs"));
+                #endregion
+
+                #region  箱信息老ops
+                var jobKey_box = new JobKey("BoxQuartzJob", options.QuartzJobValue);
+                q.AddJob<InStockOrderQuartzJob>(jobKey_box, j => j.WithDescription("BoxQuartzJob"));
+                q.AddTrigger(t => t
+                .WithIdentity("BoxQuartzJobTrigger")
+                .ForJob(jobKey_box)
+                .StartNow()
+                .WithCronSchedule(options.JobStartExpre)
+                //.WithCronSchedule(CronScheduleBuilder.DailyAtHourAndMinute(options.JobStartHour[5], options.JobStartMinute[5]))
+                .WithDescription("BoxQuartzJobTriggerDecs"));
+                #endregion
             });
             //.net core核心托管-添加Quartz服务器
             Services.AddQuartzServer(options =>

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

@@ -2,7 +2,11 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using WMS.Web.Core.Dto.ChangeBoxRecord;
+using WMS.Web.Core.Dto.MoveBoxRecord;
+using WMS.Web.Core.Dto.OutStock;
 using WMS.Web.Core.Dto.OutStockTask;
+using WMS.Web.Core.Dto.TakeStock;
 using WMS.Web.Domain.Infrastructure;
 using WMS.Web.Repositories;
 using WMS.Web.Repositories.Configuration;
@@ -40,6 +44,10 @@ namespace Microsoft.Extensions.DependencyInjection
 
             #region 导出
             services.AddTransient<IAllFielRepositories<OutStockTaskQueryRequest>, OutStockTaskRepositories>();
+            services.AddTransient<IAllFielRepositories<TakeStockQueryRequest>, TakeStockRepositories>();
+            services.AddTransient<IAllFielRepositories<OutStockQueryRequest>, OutStockRepositories>();
+            services.AddTransient<IAllFielRepositories<MoveBoxRecordQueryRequest>, MoveBoxRecordRepositories>();
+            services.AddTransient<IAllFielRepositories<ChangeBoxRecordQueryRequest>, ChangeBoxRecordRepositories>();
             #endregion
 
 

src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs

@@ -18,7 +18,7 @@ using WMS.Web.Repositories.Configuration;
 
 namespace WMS.Web.Repositories
 {
-    public class MoveBoxRecordRepositories : IMoveBoxRecordRepositories
+    public class MoveBoxRecordRepositories : IAllFielRepositories<MoveBoxRecordQueryRequest>,IMoveBoxRecordRepositories
     {
         private readonly IMapper _mapper;
         private readonly IServiceProvider _serviceProvider;
@@ -123,5 +123,10 @@ namespace WMS.Web.Repositories
             }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
             return (list, total);
         }
+
+        public async Task<(object obj, int total)> GetListField(MoveBoxRecordQueryRequest dto, int companyId)
+        {
+            return await GetListAsync(dto);
+        }
     }
 }

src/WMS.Web.Repositories/OutStockRepositories.cs

@@ -19,7 +19,7 @@ using WMS.Web.Repositories.Configuration;
 
 namespace WMS.Web.Repositories
 {
-    public class OutStockRepositories : IOutStockRepositories
+    public class OutStockRepositories : IAllFielRepositories<OutStockQueryRequest>, IOutStockRepositories
     {
         private readonly IMapper _mapper;
         private readonly IServiceProvider _serviceProvider;
@@ -292,5 +292,10 @@ namespace WMS.Web.Repositories
             };
             return response;
         }
+
+        public async Task<(object obj, int total)> GetListField(OutStockQueryRequest dto, int companyId)
+        {
+            return await GetListAsync(dto);
+        }
     }
 }

src/WMS.Web.Repositories/TakeStockRepositories.cs

@@ -18,7 +18,7 @@ using WMS.Web.Repositories.Configuration;
 
 namespace WMS.Web.Repositories
 {
-    public class TakeStockRepositories : ITakeStockRepositories
+    public class TakeStockRepositories : IAllFielRepositories<TakeStockQueryRequest>, ITakeStockRepositories
     {
         private readonly IMapper _mapper;
         private readonly IServiceProvider _serviceProvider;
@@ -212,5 +212,10 @@ namespace WMS.Web.Repositories
             }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
             return (list, total);
         }
+
+        public async Task<(object obj, int total)> GetListField(TakeStockQueryRequest dto, int companyId)
+        {
+            return await GetListAsync(dto);
+        }
     }
 }