diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeCompareDetailReport.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeCompareDetailReport.cs index b9177b99..02e1aa22 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeCompareDetailReport.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeCompareDetailReport.cs @@ -122,6 +122,6 @@ namespace Win.Sfs.SettleAccount.Reports /// 价格 /// [Display(Name = "价格")] - public decimal Price { get; set; } + public decimal? Price { get; set; } } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeCompareDiff.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeCompareDiff.cs index b4e5c88f..0d322da1 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeCompareDiff.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeCompareDiff.cs @@ -133,7 +133,7 @@ namespace Win.Sfs.SettleAccount.Reports /// /// 价格 /// - public decimal Price { get; set; } + public decimal? Price { get; set; } } /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReport.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReport.cs index fe63d8dc..1834733b 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReport.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReport.cs @@ -189,6 +189,6 @@ namespace Win.Sfs.SettleAccount.Reports /// 价格 /// [Display(Name = "价格")] - public decimal Price { get; set; } + public decimal? Price { get; set; } } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDiff.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDiff.cs index fcdd0e93..f9b87d29 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDiff.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDiff.cs @@ -139,7 +139,7 @@ namespace Win.Sfs.SettleAccount.Reports /// /// 价格 /// - public decimal Price { get; set; } + public decimal? Price { get; set; } } /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs index 49100def..8e74be04 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs @@ -393,8 +393,8 @@ namespace SettleAccount.Job.Services.Report SaCustomerPartCode = sa.CustomerPartCodeNoSpace, SaFactoryPartCode = sa.PartCode, CustomerPartCode = sa.LU, - Site = sa.Site, - Price = sa.Price + Site = default, + Price = default }).ToList(); //无结算有发运 var notHaveSaHaveSeList = (from se in seGroup