diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs index 640e5993..ceea76cb 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs @@ -230,44 +230,44 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts - /// - /// 准时化出库明细 - /// - /// - /// - [HttpPost] - [Route("Export")] - //[Authorize(SettleAccountPermissions.SettleAccounts.Default)] - virtual public async Task ExportAsync(WmsJitOutPutDetialRequestDto input) - { - - input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); - var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, - input.SkipCount, true); - - IExporter _csv = new CsvExporter(); - IExporter _excel = new ExcelExporter(); - string _fileName = string.Empty; - //声明导出容器 - - byte[] result = null; + ///// + ///// 准时化出库明细 + ///// + ///// + ///// + //[HttpPost] + //[Route("Export")] + ////[Authorize(SettleAccountPermissions.SettleAccounts.Default)] + //virtual public async Task ExportAsync(WmsJitOutPutDetialRequestDto input) + //{ + + // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); + // var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount, + // input.SkipCount, true); + + // IExporter _csv = new CsvExporter(); + // IExporter _excel = new ExcelExporter(); + // string _fileName = string.Empty; + // //声明导出容器 + + // byte[] result = null; - _fileName = string.Format("准时化出库单_{0}.xlsx", Guid.NewGuid().ToString()); - result = await _csv.ExportAsByteArray(entities); + // _fileName = string.Format("准时化出库单_{0}.xlsx", Guid.NewGuid().ToString()); + // result = await _csv.ExportAsByteArray(entities); - result.ShouldNotBeNull(); - - //保存导出文件到服务器存成二进制 - await _excelImportService.SaveBlobAsync( - new SaveExcelImportInputDto - { - Name = _fileName, - Content = result - } - ); - return _fileName; - - } + // result.ShouldNotBeNull(); + + // //保存导出文件到服务器存成二进制 + // await _excelImportService.SaveBlobAsync( + // new SaveExcelImportInputDto + // { + // Name = _fileName, + // Content = result + // } + // ); + // return _fileName; + + //} diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml index 292081e2..d2037f6f 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml @@ -2333,7 +2333,7 @@ - 导出 + 出库单导出 @@ -3376,6 +3376,13 @@ + + + 出库单导出 + + + + 准时化出库主表 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs index 13c7e2d6..f1449513 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs @@ -212,7 +212,46 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [ImporterHeader(Name = "结算数量")] public decimal Qty { set; get; } + //以下继承的全部不导出 + [ExporterHeader(DisplayName = "BranchId", IsIgnore = true)] + public Guid BranchId { set; get; } + + [ExporterHeader(DisplayName = "Enabled", IsIgnore = true)] + public bool Enabled { set; get; } + + [ExporterHeader(DisplayName = "Remark", IsIgnore = true)] + public string Remark { set; get; } + + [ExporterHeader(DisplayName = "IsDeleted", IsIgnore = true)] + public bool IsDeleted { set; get; } + + [ExporterHeader(DisplayName = "DeleterId", IsIgnore = true)] + public bool DeleterId { set; get; } + + [ExporterHeader(DisplayName = "DeletionTime", IsIgnore = true)] + public DateTime DeletionTime { set; get; } + + [ExporterHeader(DisplayName = "LastModificationTime", IsIgnore = true)] + public DateTime LastModificationTime { set; get; } + + [ExporterHeader(DisplayName = "LastModifierId", IsIgnore = true)] + public Guid LastModifierId { set; get; } + + [ExporterHeader(DisplayName = "CreationTime", IsIgnore = true)] + public DateTime CreationTime { set; get; } + + [ExporterHeader(DisplayName = "CreatorId", IsIgnore = true)] + public Guid CreatorId { set; get; } + + [ExporterHeader(DisplayName = "ExtraProperties", IsIgnore = true)] + public string ExtraProperties { set; get; } + + [ExporterHeader(DisplayName = "ConcurrencyStamp", IsIgnore = true)] + public DateTime ConcurrencyStamp { set; get; } + + [ExporterHeader(DisplayName = "Id", IsIgnore = true)] + public Guid Id { set; get; } @@ -475,6 +514,47 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [ExporterHeader(DisplayName = "开票金额")] public decimal Amt { set; get; } + //以下继承的全部不导出 + + [ExporterHeader(DisplayName = "BranchId", IsIgnore = true)] + public Guid BranchId { set; get; } + + [ExporterHeader(DisplayName = "Enabled", IsIgnore = true)] + public bool Enabled { set; get; } + + [ExporterHeader(DisplayName = "Remark", IsIgnore = true)] + public string Remark { set; get; } + + [ExporterHeader(DisplayName = "IsDeleted", IsIgnore = true)] + public bool IsDeleted { set; get; } + + [ExporterHeader(DisplayName = "DeleterId", IsIgnore = true)] + public bool DeleterId { set; get; } + + [ExporterHeader(DisplayName = "DeletionTime", IsIgnore = true)] + public DateTime DeletionTime { set; get; } + + [ExporterHeader(DisplayName = "LastModificationTime", IsIgnore = true)] + public DateTime LastModificationTime { set; get; } + + [ExporterHeader(DisplayName = "LastModifierId", IsIgnore = true)] + public Guid LastModifierId { set; get; } + + [ExporterHeader(DisplayName = "CreationTime", IsIgnore = true)] + public DateTime CreationTime { set; get; } + + [ExporterHeader(DisplayName = "CreatorId", IsIgnore = true)] + public Guid CreatorId { set; get; } + + [ExporterHeader(DisplayName = "ExtraProperties", IsIgnore = true)] + public string ExtraProperties { set; get; } + + [ExporterHeader(DisplayName = "ConcurrencyStamp", IsIgnore = true)] + public DateTime ConcurrencyStamp { set; get; } + + [ExporterHeader(DisplayName = "Id", IsIgnore = true)] + public Guid Id { set; get; } + }