From e25edec134bad0c1e25a8ff098b580b9ea062227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Sat, 7 Oct 2023 11:21:14 +0800
Subject: [PATCH] [CI SKIP]

---
 .../Bases/PD_SERVICE.cs                       |  9 ++++++++-
 .../BQ/Syncs/PendingDeductionService.cs       | 19 +++++++++----------
 .../src/SettleAccount.Domain/EnumBillState.cs |  4 +++-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs
index 904b9671..e57fc15f 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs
@@ -179,7 +179,14 @@ namespace Win.Sfs.SettleAccount.Bases
                     await _repository.DbContext.BulkDeleteAsync(pdDetailList);
                     foreach (var itm in pdinvList)
                     {
-                        itm.State = SettleBillState.财务已审核;
+                        if (itm.State == SettleBillState.已提交QAD)
+                        {
+                            itm.State = SettleBillState.红冲发票;
+                        }
+                        else
+                        {
+                            itm.State = SettleBillState.财务已审核;
+                        }  
                     }
                     await _repository.DbContext.BulkUpdateAsync(pdinvList);//更新发票为关联发票
                 }
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 3b70f30c..8ce4cfdd 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
@@ -259,10 +259,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                                 }
                                 foreach (var item in pdinvList)
                                 {
-                                    if(item.State!=SettleBillState.已提交QAD)
-                                    {
-                                        item.State = SettleBillState.客户已收票;
-                                    }                                  
+                                    
+                                    item.State = SettleBillState.客户已收票;
+                                   
                                 }
                                 _dbcontext.BulkUpdate(pdList);
                                 _dbcontext.BulkUpdate(pdinvList);
@@ -293,10 +292,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                                 }
                                 foreach (var item in bbacinvList)
                                 {
-                                    if (item.State != SettleBillState.已提交QAD)
-                                    {
+                                    //if (item.State != SettleBillState.已提交QAD)
+                                    //{
                                         item.State = SettleBillState.客户已收票;
-                                    }
+                                    //}
                                 }
                                 _dbcontext.BulkUpdate(bbacList);
                                 _dbcontext.BulkUpdate(bbacinvList);
@@ -327,10 +326,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                                 }
                                 foreach (var item in hbpoinvList)
                                 {
-                                    if (item.State != SettleBillState.已提交QAD)
-                                    {
+                                   // if (item.State != SettleBillState.已提交QAD)
+                                   // {
                                         item.State = SettleBillState.客户已收票;
-                                    }                           
+                                   // }                           
                                 }
                                 _dbcontext.BulkUpdate(hbpoList);
                                 _dbcontext.BulkUpdate(hbpoinvList);
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBillState.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBillState.cs
index 7f5a4efd..fe436613 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBillState.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBillState.cs
@@ -30,7 +30,9 @@ namespace Win.Sfs.SettleAccount
         [Description("撤销扣减进行中")]
         撤销扣减进行中 = 7,
         [Description("已提交QAD")]
-        已提交QAD = 8
+        已提交QAD = 8,
+        [Description("红冲")]
+        红冲发票 = 9
     }
 
     public enum PDBillState