1

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs

@@ -80,7 +80,7 @@ public class ZhiGongJianBBACImportDto
     /// </summary>
     [Display(Name = "Pstng Date")]
     [ImporterHeader(Name = "Pstng Date")]
-    public DateTime SettleDate { set; get; }
+    public string SettleDate { set; get; }
 
     /// <summary>
     /// 客户零件号
@@ -124,7 +124,7 @@ public class ZhiGongJianHBPOImportDto
     /// </summary>
     [Display(Name = "结算日期")]
     [ImporterHeader(IsIgnore = true)]
-    public DateTime SettleDate { set; get; }
+    public string SettleDate { set; get; }
 
     /// <summary>
     /// 客户零件号
@@ -168,7 +168,7 @@ public class MaiDanJianHBPOImportDto
     /// </summary>
     [Display(Name = "买单日期")]
     [ImporterHeader(Name = "买单日期")]
-    public DateTime SettleDate { set; get; }
+    public string SettleDate { set; get; }
 
     /// <summary>
     /// 客户零件号
@@ -212,7 +212,7 @@ public class BeiJianImportDto : BeiJianExtraImportDto
     /// </summary>
     [Display(Name = "结算日期")]
     [ImporterHeader(Name = "零件时间")]
-    public DateTime SettleDate { set; get; }
+    public string SettleDate { set; get; }
 
     /// <summary>
     /// 客户零件号
@@ -244,12 +244,6 @@ public class BeiJianImportDto : BeiJianExtraImportDto
     [ImporterHeader(Name = "凭证号")]
     [Required(ErrorMessage = "{0}不能为空")]
     public string GroupNum { get; set; }
-
-    ///// <summary>
-    ///// 备件扩展
-    ///// </summary>
-    //[Display(Name = "备件扩展")]
-    //public BeiJianExtraImportDto beiJianExtraImportDto { get; set; }
 }
 
 /// <summary>
@@ -373,7 +367,7 @@ public class YinDuJianImportDto
     /// </summary>
     [Display(Name = "Delivery Date")]
     [ImporterHeader(Name = "Delivery Date")]
-    public DateTime SettleDate { set; get; }
+    public string SettleDate { set; get; }
 
     /// <summary>
     /// 客户零件号

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs

@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using OfficeOpenXml;
 using SettleAccount.Domain.BQ;
 using Volo.Abp;
 using Volo.Abp.Application.Dtos;