1

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -3920,7 +3920,7 @@ Group by PriceType ", dto.diId);
                     JoinType.Left, i.Id == l.DiId && i.IsDel == 0
                 ))
                 .Where((f, c, s, g) => f.IsDel == 0 && f.DiId == dto.diId && 
-                    (f.ManagerConfirm == 1 ||  f.ManagerConfirm == null) && (f.SupervisorConfirm == 1 || f.SupervisorConfirm == null))
+                    (f.ManagerConfirm == 1 ||  f.ManagerConfirm == null || f.SupervisorConfirm == 1 || f.SupervisorConfirm == null))
                 .Select((f, c, s, g, r, l, s1, i) => new
                 {
                     c.PaymentCurrency,
@@ -4222,14 +4222,16 @@ Group by PriceType ", dto.diId);
                 fge.GetType().GetProperty(confirmStatusArr[dto.ConfirmId]).SetValue(fge, dto.status);
 
                 var isSaveCollectionStatement = true;
+
+                //确认后，同步修改收款账单
                 foreach (var item in confirmStatusArr.Keys)
                 {
                     var value = fge.GetType().GetProperty(confirmStatusArr[item]).GetValue(fge).ObjToInt();
-                    if (value == 0)
-                    {
-                        isSaveCollectionStatement = false;
-                        break;
-                    }
+                    //if (value == 0)
+                    //{
+                    //    isSaveCollectionStatement = false;
+                    //    break;
+                    //}
                 }
 
                 _sqlSugar.BeginTran();

OASystem/OASystem.Infrastructure/Repositories/Financial/ForeignReceivablesRepository.cs

@@ -522,7 +522,7 @@ Where ffr.IsDel=0 And ffr.Diid={0}", dto.DiId);
             //币种不同则计算rmb值
             var overspList = _sqlSugar.Queryable<Fin_GroupExtraCost, Grp_CreditCardPayment>
                 ((e, c) => c.CTable == 1015 && c.CId == e.Id && c.IsDel == 0).
-                Where((e, c) => e.IsDel == 0 && e.DiId == dto.DiId && e.SupervisorConfirm == 1 && e.ManagerConfirm == 1).
+                Where((e, c) => e.IsDel == 0 && e.DiId == dto.DiId && (e.SupervisorConfirm == 1 || e.ManagerConfirm == 1)).
                 Select((e, c) => new
                 {
                     e.Price,