From 96a365d1a585c4a33e0c6702103f922418c6dc8a Mon Sep 17 00:00:00 2001
From: mahao <hao.ma@ccwin-in.com>
Date: Fri, 3 Nov 2023 13:09:12 +0800
Subject: [PATCH] up

---
 .../Reports/SaSeCompareDetailReport.cs        |  8 ++++++++
 .../Reports/SaSeEdiCompareDetailReport.cs     | 19 ++++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)

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
         /// 价格
         /// </summary>
         [Display(Name = "价格")]
+        [ExporterHeader(DisplayName = "价格", IsIgnore = true)]
         public decimal? Price { get; set; }
+        /// <summary>
+        /// 是否有价格
+        /// </summary>
+        [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;
         /// <summary>
         /// 交货单号
         /// </summary>
@@ -156,12 +151,6 @@ namespace Win.Sfs.SettleAccount.Reports
         [ValueMapping("否", false)]
         public bool MateType => SaSeQty == 0 && SaEdiQty == 0 && SeEdiQty == 0;
         /// <summary>
-        /// 定价
-        /// </summary>
-        [Display(Name = "定价")]
-        [ExporterHeader(DisplayName = "定价", IsIgnore = true)]
-        public decimal? FixPrice { get; set; }
-        /// <summary>
         /// ERP销售库位
         /// </summary>
         [Display(Name = "ERP销售库位")]
@@ -189,6 +178,14 @@ namespace Win.Sfs.SettleAccount.Reports
         /// 价格
         /// </summary>
         [Display(Name = "价格")]
+        [ExporterHeader(DisplayName = "价格", IsIgnore = true)]
         public decimal? Price { get; set; }
+        /// <summary>
+        /// 是否有价格
+        /// </summary>
+        [Display(Name = "是否有价格")]
+        [ValueMapping("是", true)]
+        [ValueMapping("否", false)]
+        public bool IsHavePrice => Price != null && Price != 0M;
     }
 }