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 02e1aa22..af437c08 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,14 @@ namespace Win.Sfs.SettleAccount.Reports /// 价格 /// [Display(Name = "价格")] + [ExporterHeader(DisplayName = "价格", IsIgnore = true)] public decimal? Price { get; set; } + /// + /// 是否有价格 + /// + [Display(Name = "是否有价格")] + [ValueMapping("是", true)] + [ValueMapping("否", false)] + public bool IsHavePrice => Price != null && Price != 0M; } } 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 1834733b..df896c36 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReport.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/SaSeEdiCompareDetailReport.cs @@ -40,11 +40,6 @@ namespace Win.Sfs.SettleAccount.Reports }; } } - [Display(Name = "价格信息")] - [ExporterHeader(DisplayName = "价格信息", IsIgnore = true)] - [ValueMapping("有价格信息", true)] - [ValueMapping("无价格信息", false)] - public bool IsHavePrice => FixPrice != null && FixPrice != 0; /// /// 交货单号 /// @@ -156,12 +151,6 @@ namespace Win.Sfs.SettleAccount.Reports [ValueMapping("否", false)] public bool MateType => SaSeQty == 0 && SaEdiQty == 0 && SeEdiQty == 0; /// - /// 定价 - /// - [Display(Name = "定价")] - [ExporterHeader(DisplayName = "定价", IsIgnore = true)] - public decimal? FixPrice { get; set; } - /// /// ERP销售库位 /// [Display(Name = "ERP销售库位")] @@ -189,6 +178,14 @@ namespace Win.Sfs.SettleAccount.Reports /// 价格 /// [Display(Name = "价格")] + [ExporterHeader(DisplayName = "价格", IsIgnore = true)] public decimal? Price { get; set; } + /// + /// 是否有价格 + /// + [Display(Name = "是否有价格")] + [ValueMapping("是", true)] + [ValueMapping("否", false)] + public bool IsHavePrice => Price != null && Price != 0M; } }