PG
/
Win.Sfs.SmartSettlementSystem.PG
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

导出设置继承字段不输出

FoShanPG
44673626 3 years ago
parent
431f5b61dd
commit
0a3dc602fe
3 changed files with 124 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 72
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
  2. 9
      src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
  3. 80
      src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs

72
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
View File

@ -230,44 +230,44 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
/// <summary> ///// <summary>
/// 准时化出库明细 ///// 准时化出库明细
/// </summary> ///// </summary>
/// <param name="input"></param> ///// <param name="input"></param>
/// <returns></returns> ///// <returns></returns>
[HttpPost] //[HttpPost]
[Route("Export")] //[Route("Export")]
//[Authorize(SettleAccountPermissions.SettleAccounts.Default)] ////[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
virtual public async Task<string> ExportAsync(WmsJitOutPutDetialRequestDto input) //virtual public async Task<string> ExportAsync(WmsJitOutPutDetialRequestDto input)
{ //{
input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum }); // 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, // var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
input.SkipCount, true); // input.SkipCount, true);
IExporter _csv = new CsvExporter(); // IExporter _csv = new CsvExporter();
IExporter _excel = new ExcelExporter(); // IExporter _excel = new ExcelExporter();
string _fileName = string.Empty; // string _fileName = string.Empty;
//声明导出容器 // //声明导出容器
byte[] result = null; // byte[] result = null;
_fileName = string.Format("准时化出库单_{0}.xlsx", Guid.NewGuid().ToString()); // _fileName = string.Format("准时化出库单_{0}.xlsx", Guid.NewGuid().ToString());
result = await _csv.ExportAsByteArray(entities); // result = await _csv.ExportAsByteArray(entities);
result.ShouldNotBeNull(); // result.ShouldNotBeNull();
//保存导出文件到服务器存成二进制 // //保存导出文件到服务器存成二进制
await _excelImportService.SaveBlobAsync( // await _excelImportService.SaveBlobAsync(
new SaveExcelImportInputDto // new SaveExcelImportInputDto
{ // {
Name = _fileName, // Name = _fileName,
Content = result // Content = result
} // }
); // );
return _fileName; // return _fileName;
} //}

9
src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
View File

@ -2333,7 +2333,7 @@
</member> </member>
<member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSSharePartAppService.ExportAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsKanbanOutPutDetialRequestDto)"> <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSSharePartAppService.ExportAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsKanbanOutPutDetialRequestDto)">
<summary> <summary>
导出 出库单导出
</summary> </summary>
<param name="input"></param> <param name="input"></param>
<returns></returns> <returns></returns>
@ -3376,6 +3376,13 @@
<param name="input"></param> <param name="input"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Win.Sfs.SettleAccount.Entities.WMS.WMSSharePart90AppService.ExportAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsSharePartOutPutRequestDto)">
<summary>
出库单导出
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Win.Sfs.SettleAccount.Entities.WMS.WMSSharePart90AppService.GetListAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsSharePartOutPutRequestDto)"> <member name="M:Win.Sfs.SettleAccount.Entities.WMS.WMSSharePart90AppService.GetListAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsSharePartOutPutRequestDto)">
<summary> <summary>
准时化出库主表 准时化出库主表

80
src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs
View File

@ -212,7 +212,46 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
[ImporterHeader(Name = "结算数量")] [ImporterHeader(Name = "结算数量")]
public decimal Qty { set; get; } 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 = "开票金额")] [ExporterHeader(DisplayName = "开票金额")]
public decimal Amt { set; get; } 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; }
} }

Write Preview
Loading…
Cancel
Save