From dd10a286a766991e01d5a3f7beea1888abb2409e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Thu, 9 Nov 2023 15:43:21 +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                    | 8 ++++++--
 .../Entities/BQ/HBPO_CAN_SA_SERVICE.cs                    | 2 +-
 .../Entities/BQ/PUB_CAN_SA_SERVICE.cs                     | 2 +-
 3 files changed, 8 insertions(+), 4 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 7b98b74e..b948720e 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
@@ -107,14 +107,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
 
                 var jischeck = checklist.Where(p => p.State == "0").ToList();
 
+
+
+               
+
                 foreach (var itm in jischeck)
                 {
-                    errors.Add(new ERR_EXP_DTO() { Remark = $"版本:{itm.Version},结算单:{itm.BillNum}+JIS业务没进行报表核对!" });
+                    errors.Add(new ERR_EXP_DTO() { Remark = $"版本:{itm.Version},结算单:{itm.BillNum}+此结算单JIS未比对，结算数据需要比对后才能开票!" });
                 }
                 var mcheck = checklist.Where(p => p.StateOther == "0").ToList();
                 foreach (var itm in mcheck)
                 {
-                    errors.Add(new ERR_EXP_DTO() { Remark = $"版本:{itm.Version},结算单:{itm.BillNum}+买单业务没进行报表核对!" });
+                    errors.Add(new ERR_EXP_DTO() { Remark = $"版本:{itm.Version},结算单:{itm.BillNum}+此结算单买单未比对，结算数据需要比对后才能开票!" });
                 }
                 if (errors.Count > 0)
                 {
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 6ad8aeef..4c3728db 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
@@ -95,7 +95,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 var checklist = _saRepository.Where(p => settleBillList.Contains(p.BillNum) && p.State == "0").ToList();
                 foreach (var itm in checklist)
                 {
-                    errors.Add(new ERR_EXP_DTO() { Remark = $"版本:{itm.Version},结算单:{itm.BillNum}+没进行报表核对!" });
+                    errors.Add(new ERR_EXP_DTO() { Remark = $"版本:{itm.Version},结算单:{itm.BillNum}此结算单未比对，结算数据需要比对后才能开票!" });
                 }
                 if (errors.Count > 0)
                 {
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 49e4f69c..7811eb33 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
@@ -136,7 +136,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 var checklist = _saRepository.Where(p => settleBillList.Contains(p.BillNum) && p.State == "0").ToList();
                 foreach (var itm in checklist)
                 {
-                    errors.Add(new ERR_EXP_DTO(){   Remark  = $"版本:{itm.Version},结算单:{itm.BillNum}+没进行报表核对!" });
+                    errors.Add(new ERR_EXP_DTO(){   Remark  = $"版本:{itm.Version},结算单:{itm.BillNum}此结算单未比对，结算数据需要比对后才能开票!" });
                 }
                 if (errors.Count > 0)
                 {