diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs index e51b6c1c..876c4a05 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs @@ -80,7 +80,7 @@ public class ZhiGongJianBBACImportDto /// [Display(Name = "Pstng Date")] [ImporterHeader(Name = "Pstng Date")] - public DateTime SettleDate { set; get; } + public string SettleDate { set; get; } /// /// 客户零件号 @@ -124,7 +124,7 @@ public class ZhiGongJianHBPOImportDto /// [Display(Name = "结算日期")] [ImporterHeader(IsIgnore = true)] - public DateTime SettleDate { set; get; } + public string SettleDate { set; get; } /// /// 客户零件号 @@ -168,7 +168,7 @@ public class MaiDanJianHBPOImportDto /// [Display(Name = "买单日期")] [ImporterHeader(Name = "买单日期")] - public DateTime SettleDate { set; get; } + public string SettleDate { set; get; } /// /// 客户零件号 @@ -212,7 +212,7 @@ public class BeiJianImportDto : BeiJianExtraImportDto /// [Display(Name = "结算日期")] [ImporterHeader(Name = "零件时间")] - public DateTime SettleDate { set; get; } + public string SettleDate { set; get; } /// /// 客户零件号 @@ -244,12 +244,6 @@ public class BeiJianImportDto : BeiJianExtraImportDto [ImporterHeader(Name = "凭证号")] [Required(ErrorMessage = "{0}不能为空")] public string GroupNum { get; set; } - - ///// - ///// 备件扩展 - ///// - //[Display(Name = "备件扩展")] - //public BeiJianExtraImportDto beiJianExtraImportDto { get; set; } } /// @@ -373,7 +367,7 @@ public class YinDuJianImportDto /// [Display(Name = "Delivery Date")] [ImporterHeader(Name = "Delivery Date")] - public DateTime SettleDate { set; get; } + public string SettleDate { set; get; } /// /// 客户零件号 diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs index 4d2d1422..5a465445 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs +++ b/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;