明细重新添加

3.Service/SMP.Service/Compute/IComputeAmount.cs

@@ -550,7 +550,7 @@ namespace SMP.Service.Compute
                         if (mathZones.Count == 0)
                         {
                             //费用名含偏远关键词时，我们认为无异常。
-                            if (version.Name.Contains("偏远"))
+                            if (version.Name.Contains("偏远")||version.Name.Contains("UBI-EVRI航空清洁费"))
                             {
                                 result.IsSuccess = true;
                                 result.Message = $"取明细价格失败，分区未匹配，请检查订单信息与相关费用{version.Name}-{item.ExpenseItemId}设置";

3.Service/SMP.Service/Compute/IComputeExpenseService.cs

@@ -273,7 +273,7 @@ namespace SMP.Service.Compute
                 throw new Exception($"必须传入expense.Id");
             if (expense.VersionDate == null)
                 throw new Exception("版本日期[VersionDate]不可为空");
-            string existsSql = "select * from Compute_ExpenseVersion(nolock) where ExpenseId=@ExpenseId and VersionDate=@VersionDate and BindBillId=@BindBillId";
+            string existsSql = "select * from Compute_ExpenseVersion(nolock) where ExpenseId=@ExpenseId and VersionDate=@VersionDate and BindBillId=@BindBillId and  IsDelete=1";
             if (expense.BindBillId == 0)
             {
                 //如果绑定过提单Id的，我们不做日期版本限制
@@ -371,9 +371,6 @@ namespace SMP.Service.Compute
 
         public async Task InsertComputeExpense(Compute_Expense expense)
         {
-
-
-
             if (expense == null)
                 throw new Exception($"必须传入expense");
 
@@ -585,7 +582,7 @@ namespace SMP.Service.Compute
                 throw new Exception("未传入需要变更的版本");
 
 
-            string existsSql = "select * from Compute_ExpenseVersion(nolock) where ExpenseId=@ExpenseId and VersionDate=@VersionDate and Id<>@Id And BindBillId = @BindBillId";
+            string existsSql = "select * from Compute_ExpenseVersion(nolock) where ExpenseId=@ExpenseId and VersionDate=@VersionDate and Id<>@Id And BindBillId = @BindBillId and IsDelete=0";
             int countQty = await versionRepository.ExecuteScalarAsync<int>(existsSql,
                 new
                 {

3.Service/SMP.Service/CustomerFirst/Dto/CustomerFirstOrderDto.cs

@@ -20,7 +20,8 @@ namespace SMP.Service.CustomerFirst.Dto
         public int SalesmanId { get; set; }
         public string? SalesmanName { get; set; }
         public CustomerFirstOrderStatus OrderStatus { get; set; }
-        public CustomerFirstOrderStatus OriginOrderStatus { get { return OrderStatus; } }
+        public CustomerFirstOrderStatus OriginOrderStatus { get { return OrderStatus; 
+            } }
         public string OrderStatusName { get { return OrderStatus.GetName(); } }
         public FirstLegStatus FirstLegStatus { get; set; }
         public string FirstLegStatusName { get { return FirstLegStatus.GetName(); } }