From 97f6d9a4b6516afe768bb65340d7ba7eee7905d9 Mon Sep 17 00:00:00 2001
From: mahao <hao.ma@ccwin-in.com>
Date: Thu, 7 Sep 2023 15:59:21 +0800
Subject: [PATCH] UP

---
 .../BQ/Syncs/JisHBPOSeEdiCompareAppService.cs |  1 -
 .../Entities/Prices/PriceListAppService.cs    |  1 -
 .../Entities/Prices/PriceListAppServiceBJ.cs  |  1 -
 .../Entities/Prices/PriceList.cs              | 21 +++++++++----------
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeEdiCompareAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeEdiCompareAppService.cs
index 62af0ff4..8af42ea8 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeEdiCompareAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeEdiCompareAppService.cs
@@ -8,7 +8,6 @@ using LinqToDB;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using SettleAccount.Domain.BQ;
-using ShardingCore.Extensions;
 using Volo.Abp.Application.Services;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs;
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs
index f2c77895..17b50d64 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs
@@ -13,7 +13,6 @@ using Volo.Abp.Caching;
 using Win.Abp.Snowflakes;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
 using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 using Win.Sfs.SettleAccount.Entities.ImportMap;
 using Win.Sfs.SettleAccount.Entities.TaskJobs;
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs
index 1e2c5e16..95d1bb46 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs
@@ -11,7 +11,6 @@ using Volo.Abp.Caching;
 using Win.Abp.Snowflakes;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
 using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 using Win.Sfs.SettleAccount.ExcelImporter;
 using Win.Sfs.SettleAccount.ExportReports;
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Prices/PriceList.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Prices/PriceList.cs
index 527b6d3e..829f717d 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Prices/PriceList.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Prices/PriceList.cs
@@ -75,43 +75,41 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
         /// </summary>
         [Display(Name = "零件号")]
         public string LU { get; set; }
-
         /// <summary>
         /// 价格
         /// </summary>
         [Display(Name = "价格")]
         public Decimal Price { set; get; }
-
         /// <summary>
         /// 开始时间
         /// </summary>
         [Display(Name = "开始时间")]
         public DateTime BeginTime { set; get; }
-
         /// <summary>
         /// 结束时间
         /// </summary>
         [Display(Name = "结束时间")]
         public DateTime EndTime { set; get; }
-
         /// <summary>
         /// 客户编码
         /// </summary>
         [Display(Name = "客户编码")]
         public string ClientCode { get; set; }
-
         /// <summary>
         /// 合同签订时间
         /// </summary>
         [Display(Name = "合同签订时间")]
         public DateTime Date { get; set; }
-
         /// <summary>
         /// 合同号
         /// </summary>
         [Display(Name = "合同号")]
         public string ContractNo { get; set; }
-
+        /// <summary>
+        /// 是否作废
+        /// </summary>
+        [Display(Name = "是否作废")]
+        public bool IsCancel { get; set; }
 
 
 
@@ -227,25 +225,26 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
         /// </summary>
         [Display(Name = "结算时间")]
         public DateTime EndDate { set; get; }
-
         /// <summary>
         /// 客户编码
         /// </summary>
         [Display(Name = "客户编码")]
         public string ClientCode { get; set; }
-
         /// <summary>
         /// 合同签订时间
         /// </summary>
         [Display(Name = "合同签订时间")]
         public DateTime Date { get; set; }
-
         /// <summary>
         /// 合同号
         /// </summary>
         [Display(Name = "合同号")]
         public string ContractNo { get; set; }
-
+        /// <summary>
+        /// 是否作废
+        /// </summary>
+        [Display(Name = "是否作废")]
+        public bool IsCancel { get; set; }