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

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

@@ -49,6 +49,24 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="T:WMS.Web.Api.Controllers.FileDownManagerController">
+            <summary>
+            上传下载中心
+            </summary>
+        </member>
+        <member name="M:WMS.Web.Api.Controllers.FileDownManagerController.GetStatus">
+            <summary>
+            获取需要的状态列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Api.Controllers.FileDownManagerController.FileDownManagerQuery(WMS.Web.Core.Dto.FileDownManagerRequest)">
+            <summary>
+            列表
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Api.Controllers.InStockController">
             <summary>
             入库单-接口
@@ -286,6 +304,13 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.OutStockTaskController.Export(WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryRequest)">
+            <summary>
+            导出
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Api.Controllers.OutStockTaskController.Repeal(WMS.Web.Core.Dto.OperateRequest)">
             <summary>
             作废

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

@@ -272,7 +272,7 @@
         </member>
         <member name="P:WMS.Web.Core.Dto.BoxResponse.Id">
             <summary>
-            单据头ID
+            箱ID
             </summary>
         </member>
         <member name="P:WMS.Web.Core.Dto.BoxResponse.SupplierId">
@@ -480,6 +480,16 @@
             非采购上架方式
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.EnumStatusResponse.FileDownLoadOrderType">
+            <summary>
+            下载导出订单类型
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.EnumStatusResponse.ExportStatus">
+            <summary>
+            下载导出状态
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Erp.Customer.ErpCustomerDto">
             <summary>
             客户
@@ -1045,6 +1055,111 @@
             备注
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.FileDownManagerRequest">
+            <summary>
+            上传下载列表
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.FileDownManagerRequest.Type">
+            <summary>
+            单据类型(任务类型)
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.FileDownManagerRequest.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.FileDownManagerRequest.BeginDate">
+            <summary>
+            下单时间 开始
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.FileDownManagerRequest.EndDate">
+            <summary>
+            下单时间 结束
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.FileDownManagerRequest.User">
+            <summary>
+            操作人
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.FileDownManagerRequest.SupplierId">
+            <summary>
+            供应商用户Id
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.FileDownManagerResponse">
+            <summary>
+            上传下载列表
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.FileDownManagerResponse.List">
+            <summary>
+            查询列表内容
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.FileDownManagerResponse.Total">
+            <summary>
+            总条数
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.FileDownInfoManagerResponse">
+            <summary>
+            上传下载列表
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.FileDownInfoManagerResponse.Id">
+            <summary>
+            主键 订单编号
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.FileDownInfoManagerResponse.Date">
+            <summary>
+            日期
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.FileDownInfoManagerResponse.Type">
+            <summary>
+            单据类型(任务类型)
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.FileDownInfoManagerResponse.StatusKey">
+            <summary>
+            状态(Key）
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.FileDownInfoManagerResponse.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.FileDownInfoManagerResponse.FilePath">
+            <summary>
+            文件地址
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.FileDownInfoManagerResponse.UserName">
+            <summary>
+            操作人
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.FileDownInfoManagerResponse.Reason">
+            <summary>
+            失败原因
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.FileDownManagerStatusResponse.Type">
+            <summary>
+            任务类型
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.FileDownManagerStatusResponse.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.InStockTask.ContrastMaterialsRequest">
             <summary>
             采购订单物料明细和箱物料明细-对比请求对象
@@ -2847,12 +2962,12 @@
         </member>
         <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.BillNo">
             <summary>
-            单据编号
+            出库任务单号
             </summary>
         </member>
         <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.Status">
             <summary>
-            单据状态
+            出库状态
             </summary>
         </member>
         <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.Type">
@@ -2907,7 +3022,7 @@
         </member>
         <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.Stock">
              <summary>
-             仓库ID
+             仓库
             </summary> 
         </member>
         <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.AccruedQty">

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

@@ -311,6 +311,56 @@
             最新一次同步时间
             </summary>
         </member>
+        <member name="T:WMS.Web.Domain.Entitys.FileDownManager">
+            <summary>
+            文件下载类型
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.FileDownManager.Id">
+            <summary>
+            主键 订单编号
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.FileDownManager.Date">
+            <summary>
+            日期
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.FileDownManager.Type">
+            <summary>
+            单据类型(任务类型)
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.FileDownManager.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.FileDownManager.CompanyId">
+            <summary>
+            公司Id
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.FileDownManager.FilePath">
+            <summary>
+            文件地址
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.FileDownManager.UserId">
+            <summary>
+            操作人
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.FileDownManager.Reason">
+            <summary>
+            失败原因
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.FileDownManager.SupplierId">
+            <summary>
+            是否供应商用户
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Entitys.InStock">
             <summary>
             wms入库单
@@ -1339,6 +1389,13 @@
             备注
             </summary>
         </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IAllFielRepositories`1.GetListField(`0,System.Int32)">
+            <summary>
+            列表字段导出接口
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Infrastructure.IBackRecordRepositories">
             <summary>
             出入库回退记录-仓储接口
@@ -1475,6 +1532,26 @@
             定时任务最新一次时间管理
             </summary>
         </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IFileDownManagerRepositories.Add(WMS.Web.Domain.Entitys.FileDownManager)">
+            <summary>
+            保存
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IFileDownManagerRepositories.Edit(WMS.Web.Domain.Entitys.FileDownManager)">
+            <summary>
+            编辑
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IFileDownManagerRepositories.GetList(WMS.Web.Core.Dto.FileDownManagerRequest,System.Int32)">
+            <summary>
+            获取销售列表
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Infrastructure.IInStockRepositories">
             <summary>
             wms入库单-仓储接口
@@ -1756,6 +1833,50 @@
             改箱 移箱服务
             </summary>
         </member>
+        <member name="M:WMS.Web.Domain.IService.IExportExcelService.ExportAll``2(``1,System.String,System.Int32,System.Int32,WMS.Web.Domain.Values.FileDownLoadOrderType,Npoi.Mapper.Mapper,System.Nullable{System.Int32})">
+            <summary>
+            全字段导出数据
+            </summary>
+            <typeparam name="Response"></typeparam>
+            <typeparam name="Request"></typeparam>
+            <param name="request"></param>
+            <param name="fileName"></param>
+            <param name="mapper"></param>
+            <param name="userId"></param>
+            <param name="companyId"></param>
+            <param name="type"></param>
+            <param name="supplierId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.IService.IExportExcelService.ExportList``2(``1,System.String,System.Int32,System.Int32,WMS.Web.Domain.Values.FileDownLoadOrderType,Npoi.Mapper.Mapper,System.Nullable{System.Int32})">
+            <summary>
+            列表字段导出数据
+            </summary>
+            <typeparam name="Response"></typeparam>
+            <typeparam name="Request"></typeparam>
+            <param name="request"></param>
+            <param name="fileName"></param>
+            <param name="mapper"></param>
+            <param name="userId"></param>
+            <param name="companyId"></param>
+            <param name="type"></param>
+            <param name="supplierId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.IService.IExportExcelService.Export``1(System.Collections.Generic.List{``0},System.String,System.Int32,System.Int32,WMS.Web.Domain.Values.FileDownLoadOrderType,Npoi.Mapper.Mapper,System.Nullable{System.Int32})">
+            <summary>
+            列表页导出数据
+            </summary>
+            <typeparam name="T"></typeparam>
+            <param name="dataList"></param>
+            <param name="fileName"></param>
+            <param name="mapper"></param>
+            <param name="userId"></param>
+            <param name="type"></param>
+            <param name="companyId"></param>
+            <param name="supplierId"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.IService.IInStockService">
             <summary>
             入库单服务接口
@@ -1895,6 +2016,15 @@
             出库服务
             </summary>
         </member>
+        <member name="M:WMS.Web.Domain.IService.IQiniuUploadService.Upload(System.String,System.IO.Stream,System.Boolean)">
+            <summary>
+            上传文件
+            </summary>
+            <param name="fileName"></param>
+            <param name="stream"></param>
+            <param name="isAutoDelte">是否开启自动删除 如果开启  3天后自动删除 导出的execl文件</param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.IService.ISerialNumberService">
             <summary>
             序列号服务
@@ -2474,6 +2604,31 @@
             老ops对接
             </summary>
         </member>
+        <member name="T:WMS.Web.Domain.Options.QiniuOptions">
+            <summary>
+            七牛云 配置
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Options.QiniuOptions.AccessKey">
+            <summary>
+            访问key
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Options.QiniuOptions.SecretKey">
+            <summary>
+            秘钥
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Options.QiniuOptions.Bucket">
+            <summary>
+            区块文件夹
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Options.QiniuOptions.Url">
+            <summary>
+            访问域名
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Options.QuartzJobOptions">
             <summary>
             Quartz定时任务-配置项
@@ -2702,6 +2857,33 @@
             <param name="loginInfo"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.ExportExcelService.Export``1(System.Collections.Generic.List{``0},System.String,System.Int32,System.Int32,WMS.Web.Domain.Values.FileDownLoadOrderType,Npoi.Mapper.Mapper,System.Nullable{System.Int32})">
+            <summary>
+            列表页导出
+            </summary>
+            <typeparam name="T"></typeparam>
+            <param name="dataList"></param>
+            <param name="fileName"></param>
+            <param name="userId"></param>
+            <param name="companyId"></param>
+            <param name="type"></param>
+            <param name="mapper"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.Services.ExportExcelService.ExportAll``2(``1,System.String,System.Int32,System.Int32,WMS.Web.Domain.Values.FileDownLoadOrderType,Npoi.Mapper.Mapper,System.Nullable{System.Int32})">
+            <summary>
+            全字段导出
+            </summary>
+            <typeparam name="Response"></typeparam>
+            <typeparam name="Request"></typeparam>
+            <param name="request"></param>
+            <param name="fileName"></param>
+            <param name="userId"></param>
+            <param name="companyId"></param>
+            <param name="type"></param>
+            <param name="mapper"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Services.InStockService">
             <summary>
             入库单服务
@@ -3583,6 +3765,15 @@
             <param name="customerStockCode"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.QiniuUploadService.Upload(System.String,System.IO.Stream,System.Boolean)">
+            <summary>
+            上传文件
+            </summary>
+            <param name="fileName"></param>
+            <param name="stream"></param>
+            <param name="isAutoDelte"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Services.SerialNumberService">
             <summary>
             序列号服务
@@ -3804,6 +3995,36 @@
             客户
             </summary>
         </member>
+        <member name="T:WMS.Web.Domain.Values.ExportStatus">
+            <summary>
+            文件导出状态
+            </summary>
+        </member>
+        <member name="F:WMS.Web.Domain.Values.ExportStatus.Ing">
+            <summary>
+            正在导出
+            </summary>
+        </member>
+        <member name="F:WMS.Web.Domain.Values.ExportStatus.Success">
+            <summary>
+            导出成功
+            </summary>
+        </member>
+        <member name="F:WMS.Web.Domain.Values.ExportStatus.Fail">
+            <summary>
+            导出失败
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Domain.Values.FileDownLoadOrderType">
+            <summary>
+            导出单据类型
+            </summary>
+        </member>
+        <member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.OutStockTask">
+            <summary>
+            出库任务单
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Values.InstockStatus">
             <summary>
             入库状态