Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

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
     /// </summary>
     public class HBPO_SA_DETAIL_IMPORT_DTO
     {
-        /// <summary>
+        ///// <summary>
-        /// 结算日期
+        ///// 结算日期
-        /// </summary>
+        ///// </summary>
-        [Display(Name = "ReceiveDate")]
+        //[Display(Name = "ReceiveDate")]
-        [ImporterHeader(Name = "ReceiveDate", Format = "yyyy/MM/dd HH:mm:ss")]
+        //[ImporterHeader(Name = "ReceiveDate", Format = "yyyy/MM/dd HH:mm:ss")]
-        public DateTime SettleDate { set; get; }
+        //public DateTime SettleDate { set; get; }
         /// <summary>
         /// 结算分组号
         /// </summary>
@@ -140,8 +140,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// </summary>
         [Display(Name = "DeliveryDate")]
         [Required(ErrorMessage = "{0}不能为空")]
-        [ImporterHeader(Name = "DeliveryDate", Format = "MM/yyyy/dd HH:mm:ss")]
+        [ImporterHeader(Name = "DeliveryDate", Format = "yyyy/MM/dd HH:mm:ss")]
-        public DateTime? DeliveryDate { get; set; }
+        public DateTime DeliveryDate { get; set; }
         /// <summary>
         /// 客户零件号
         /// </summary>

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

@@ -225,6 +225,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             var result = await exportImporter.UploadExcelImport<HBPO_SA_DETAIL_IMPORT_DTO>(files, _excelImportService).ConfigureAwait(false);
             var importHBOPSaDetails = ObjectMapper.Map<List<HBPO_SA_DETAIL_IMPORT_DTO>, List<HBPO_SA_DETAIL>>(result);
        
+
+
             return await SaDataGroupByPlaceAsync(importHBOPSaDetails).ConfigureAwait(false);
         }
 

code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs

@@ -995,13 +995,18 @@ namespace Win.Sfs.SettleAccount
             CreateMap<HBPO_SA_DETAIL, HBPO_SA_DETAIL_DTO>()
                 .ForMember(x => x.SettleDate, y => y.MapFrom(d => d.SettleDate.ToString("yyyy-MM-dd")));
             CreateMap<HBPO_SA_DETAIL, HBPO_CAN_SA_DETAIL>()
-                .ForMember(x => x.SettleBillNum, y => y.MapFrom(d => d.BillNum));
+               
+             .ForMember(x => x.SettleBillNum, y => y.MapFrom(d => d.BillNum));
             CreateMap<HBPO_SA_DETAIL, HBPO_NOT_SA_DETAIL>()
                 .ForMember(x => x.SettleBillNum, y => y.MapFrom(d => d.BillNum));
             CreateMap<HBPO_SA_DETAIL, HBPO_SA_DETAIL_EXPORT_DTO>();
 
-            CreateMap<HBPO_SA_DETAIL_IMPORT_DTO, HBPO_SA_DETAIL>();
+            CreateMap<HBPO_SA_DETAIL_IMPORT_DTO, HBPO_SA_DETAIL>().
+                 ForMember(x => x.SettleDate, y => y.MapFrom(d => d.DeliveryDate)).ReverseMap();
             CreateMap<MaiDanJianHBPOImportDto, HBPO_SA_DETAIL>();
+
+
+
         }
 
         /// <summary>