From 4e025a9d507088ff6c8cd5007acb586bf6c6df97 Mon Sep 17 00:00:00 2001
From: mahao <hao.ma@ccwin-in.com>
Date: Mon, 31 Jul 2023 16:46:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E4=BB=B7=E6=A0=BC=E5=8D=95?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/Prices/PriceListDtoBase.cs       | 50 +++++++++++--------
 .../Entities/Prices/PriceListAppService.cs    | 14 ++----
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Prices/PriceListDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Prices/PriceListDtoBase.cs
index db6d348b..9ec961ed 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Prices/PriceListDtoBase.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Prices/PriceListDtoBase.cs
@@ -12,40 +12,46 @@ namespace Win.Sfs.SettleAccount.Entities.Prices;
 public class PriceListDto : EntityDto<Guid>
 {
     /// <summary>
-    /// 版本
+    /// 零件号
     /// </summary>
-    [Display(Name = "版本")]
-    public string Version { set; get; }
+    [Display(Name = "零件号")]
+    public string LU { get; set; }
+
     /// <summary>
-    ///开始时间
+    /// 价格
     /// </summary>
-    [Display(Name = "开始时间")]
-    public DateTime BeginDate { get; set; }
+    [Display(Name = "价格")]
+    public Decimal Price { set; get; }
+
     /// <summary>
-    ///结算时间
+    /// 开始时间
     /// </summary>
-    [Display(Name = "结算时间")]
-    public DateTime EndDate { get; set; }
+    [Display(Name = "开始时间")]
+    public DateTime BeginTime { set; get; }
+
     /// <summary>
-    ///价格
+    /// 结束时间
     /// </summary>
-    [Display(Name = "价格")]
-    public decimal Price { get; set; }
+    [Display(Name = "结束时间")]
+    public DateTime EndTime { set; get; }
+
     /// <summary>
-    ///物料编号
+    /// 客户编码
     /// </summary>
-    [Display(Name = "物料编号")]
-    public string MaterialCode { get; set; }
+    [Display(Name = "客户编码")]
+    public string ClientCode { get; set; }
+
     /// <summary>
-    ///价格类型
+    /// 合同签订时间
     /// </summary>
-    [Display(Name = "价格类型")]
-    public int Type { get; set; }
-
-    public Guid ParentId { set; get; }
-    [Display(Name = "客户")]
-    public string CustomerCode { get; set; }
+    [Display(Name = "合同签订时间")]
+    public DateTime Date { get; set; }
 
+    /// <summary>
+    /// 合同号
+    /// </summary>
+    [Display(Name = "合同号")]
+    public string ContractNo { get; set; }
 }
 
 /// <summary>
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs
index e32c83c9..64166057 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs
@@ -1,20 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Csv;
 using Magicodes.ExporterAndImporter.Excel;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using NPOI.SS.UserModel;
-using NPOI.SS.Util;
 using Shouldly;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
 using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
 using Win.Abp.Snowflakes;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.CommonManagers;
@@ -124,7 +119,6 @@ public class PriceListAppService : SettleAccountApplicationBase<PriceList>
     [HttpPost]
     public virtual async Task<string> ExportAsync(RequestDto input)
     {
-        IExporter _csv = new CsvExporter();
         IExporter _excel = new ExcelExporter();
         var entities = await _priceListManager.GetListAsync(input.Filters, input.Sorting, int.MaxValue, 0, true);
         var dtoDetails = ObjectMapper.Map<List<PriceList>, List<PriceListExportDto>>(entities);