From 7f225b1d24bc446acbeb73d0dee8feb863f9ca11 Mon Sep 17 00:00:00 2001
From: mahao <hao.ma@ccwin-in.com>
Date: Sat, 7 Oct 2023 11:40:53 +0800
Subject: [PATCH] =?UTF-8?q?[179]=20=E9=94=80=E5=94=AE=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E5=A4=87=E4=BB=B6=E4=BB=B7=E6=A0=BC=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=90=AF=E7=94=A8=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/Prices/PriceListDtoBase.cs       | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Prices/PriceListDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Prices/PriceListDtoBase.cs
index 7e809fcf..ce1e9d91 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Prices/PriceListDtoBase.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Prices/PriceListDtoBase.cs
@@ -110,6 +110,14 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
         [Display(Name = "合同号")]
         [ExporterHeader(DisplayName = "合同号")]
         public string ContractNo { get; set; }
+        /// <summary>
+        /// 是否作废
+        /// </summary>
+        [Display(Name = "是否作废")]
+        [ExporterHeader(DisplayName = "是否已经停用")]
+        [ValueMapping("否", false)]
+        [ValueMapping("是", true)]
+        public bool IsCancel { get; set; }
     }
 
     /// <summary>
@@ -269,48 +277,50 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
         [Display(Name = "客户零件号")]
         [ExporterHeader(DisplayName = "客户零件号")]
         public string LU { get; set; }
-
         /// <summary>
         /// 价格
         /// </summary>
         [Display(Name = "价格")]
         [ExporterHeader(DisplayName = "价格")]
         public decimal Price { get; set; }
-
         /// <summary>
         /// 开始时间
         /// </summary>
         [Display(Name = "开始时间")]
         [ExporterHeader(DisplayName = "开始时间")]
         public DateTime BeginDate { set; get; }
-
         /// <summary>
         /// 结束时间
         /// </summary>
         [Display(Name = "结束时间")]
         [ExporterHeader(DisplayName = "结束时间")]
         public DateTime EndDate { set; get; }
-
         /// <summary>
         /// 客户编码
         /// </summary>
         [Display(Name = "客户编码")]
         [ExporterHeader(DisplayName = "客户编码")]
         public string ClientCode { get; set; }
-
         /// <summary>
         /// 合同签订时间
         /// </summary>
         [Display(Name = "合同签订时间")]
         [ExporterHeader(DisplayName = "合同签订时间")]
         public DateTime Date { get; set; }
-
         /// <summary>
         /// 合同号
         /// </summary>
         [Display(Name = "合同号")]
         [ExporterHeader(DisplayName = "合同号")]
         public string ContractNo { get; set; }
+        /// <summary>
+        /// 是否作废
+        /// </summary>
+        [Display(Name = "是否作废")]
+        [ExporterHeader(DisplayName = "是否已经停用")]
+        [ValueMapping("否", false)]
+        [ValueMapping("是", true)]
+        public bool IsCancel { get; set; }
     }
 
     /// <summary>