From b998322fadb4666c1388a9cc8ffd4f87f7e8d7b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Wed, 23 Aug 2023 08:50:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/BQ/BBAC_CAN_SA_SERVICE.cs                      | 2 +-
 .../Entities/BQ/HBPO_CAN_SA_SERVICE.cs                      | 3 +--
 .../Entities/BQ/PUB_CAN_SA_SERVICE.cs                       | 2 +-
 .../Entities/BQ/Syncs/PendingDeductionService.cs            | 6 ------
 .../Entities/BQ/Managers/PUB_NOT_SA_MNG.cs                  | 4 +++-
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs
index ba258f8a..00e9edba 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs
@@ -165,7 +165,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             }
             else
             {
-                return new JsonResult(new { Code = 400, Message = "不存在发票记录" });
+                return new JsonResult(new { Code = 400, Message = "不存在可结算单记录" });
             }
             return   new JsonResult(new { Code = 200, Message = "生成成功" }); 
         }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs
index ee8bcbcf..c1b0458c 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs
@@ -84,7 +84,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             {
                 if (main.State != SettleBillState.未结状态)
                 {
-
                     return new JsonResult(new { Code = 400, Message = "已创建发票不能重复创建" });
                 }
 
@@ -162,7 +161,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             }
             else
             {
-                return new JsonResult(new { Code = 400, Message = "不存在发票记录" });
+                return new JsonResult(new { Code = 400, Message = "不存在可结算单记录" });
             }
             return  new JsonResult(new { Code = 200, Message = "生成成功" });
         }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs
index 1c1e85f3..e509b0f3 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs
@@ -144,7 +144,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             }
             else
             {
-                return new JsonResult(new { Code = 400, Message = "不存在发票记录" });
+                return new JsonResult(new { Code = 400, Message = "不存在可结算单记录" });
             }
 
             return  new JsonResult(new { Code = 200, Message = "生成成功" });
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
index 88b53f7d..5e3fc963 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
@@ -57,9 +57,6 @@ public class PendingDeductionService : ITransientDependency, IExportJob
 
         if (type == "JisBBAC")
         {
-
-         
-
             var jisdetail = _bbacRepository.Where(p => list.Contains(p.BillNum) && p.IsMaiDan==false);
             var mdetail = _bbacRepository.Where(p => list.Contains(p.BillNum) && p.IsMaiDan ==true);
             var query = from itm in jisdetail    
@@ -244,9 +241,6 @@ public class PendingDeductionService : ITransientDependency, IExportJob
                             }).ConfigureAwait(false);
                         }
                     }
-
-
-
                     break;
                 case "MaiDanJianBBAC":
 
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs
index 5d01a320..66529bf2 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs
@@ -72,8 +72,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                 var ls = p_list.Select(p => p.GroupNum).Distinct().ToList();
                 var notlist = _notRepository.Where(p => ls.Contains(p.GroupNum)).ToList();//JIT_ASN整发
                 List<PUB_NOT_SA_DETAIL> priceErrors = new List<PUB_NOT_SA_DETAIL>();
+                string name = "ASN单号或发运ID";
                 if (first.BusinessType == EnumBusinessType.BeiJian)
                 {
+                    name = "备件";  
                     priceErrors = await _service.CheckPriceList(notlist,true);
                 }
                 else
@@ -87,7 +89,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                 {
                     foreach (var itm in priceErrors)
                     {
-                        errors.Add($"发货单号或交付识别号零件{itm.LU}结算日期{itm.SettleDate}无价格区间数据");
+                        errors.Add($"{name}零件{itm.LU}结算日期{itm.SettleDate}无价格区间数据");
                     }
                 }
                 if (errors.Count > 0)