[CI SKIP]

code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs

@@ -178,9 +178,16 @@ namespace Win.Sfs.SettleAccount.Bases
                     await _repository.DbContext.BulkDeleteAsync(pdList);//删除待扣减
                     await _repository.DbContext.BulkDeleteAsync(pdDetailList);
                     foreach (var itm in pdinvList)
+                    {
+                        if (itm.State == SettleBillState.已提交QAD)
+                        {
+                            itm.State = SettleBillState.红冲发票;
+                        }
+                        else
                         {
                             itm.State = SettleBillState.财务已审核;
                         }  
+                    }
                     await _repository.DbContext.BulkUpdateAsync(pdinvList);//更新发票为关联发票
                 }
                 return "OK";

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.客户已收票;
-                                    }                                  
+                                   
                                 }
                                 _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);

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