diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_SA_DTO.cs
index a073b62e..a0103408 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_SA_DTO.cs
@@ -122,12 +122,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
///
public class HBPO_SA_DETAIL_IMPORT_DTO
{
- ///
- /// 结算日期
- ///
- [Display(Name = "ReceiveDate")]
- [ImporterHeader(Name = "ReceiveDate", Format = "yyyy/MM/dd HH:mm:ss")]
- public DateTime SettleDate { set; get; }
+ /////
+ ///// 结算日期
+ /////
+ //[Display(Name = "ReceiveDate")]
+ //[ImporterHeader(Name = "ReceiveDate", Format = "yyyy/MM/dd HH:mm:ss")]
+ //public DateTime SettleDate { set; get; }
///
/// 结算分组号
///
@@ -140,8 +140,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
///
[Display(Name = "DeliveryDate")]
[Required(ErrorMessage = "{0}不能为空")]
- [ImporterHeader(Name = "DeliveryDate", Format = "MM/yyyy/dd HH:mm:ss")]
- public DateTime? DeliveryDate { get; set; }
+ [ImporterHeader(Name = "DeliveryDate", Format = "yyyy/MM/dd HH:mm:ss")]
+ public DateTime DeliveryDate { get; set; }
///
/// 客户零件号
///
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs
index bf254557..6b10a5f3 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs
@@ -224,6 +224,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
var exportImporter = new ExportImporter();
var result = await exportImporter.UploadExcelImport(files, _excelImportService).ConfigureAwait(false);
var importHBOPSaDetails = ObjectMapper.Map, List>(result);
+
+
return await SaDataGroupByPlaceAsync(importHBOPSaDetails).ConfigureAwait(false);
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
index a14d3cf4..7c30f74c 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
@@ -995,13 +995,18 @@ namespace Win.Sfs.SettleAccount
CreateMap()
.ForMember(x => x.SettleDate, y => y.MapFrom(d => d.SettleDate.ToString("yyyy-MM-dd")));
CreateMap()
- .ForMember(x => x.SettleBillNum, y => y.MapFrom(d => d.BillNum));
+
+ .ForMember(x => x.SettleBillNum, y => y.MapFrom(d => d.BillNum));
CreateMap()
.ForMember(x => x.SettleBillNum, y => y.MapFrom(d => d.BillNum));
CreateMap();
- CreateMap();
+ CreateMap().
+ ForMember(x => x.SettleDate, y => y.MapFrom(d => d.DeliveryDate)).ReverseMap();
CreateMap();
+
+
+
}
///