bug修复

YLErpDAL/Modules/EodModule/SettlementModule/EodClientBalanceCalc.cs

@@ -1303,6 +1303,25 @@ namespace YLErp.Modules.EodModule.SettlementModule
 
             return true;
         }
+
+        /// <summary>
+        /// 客户资金未确认状态检查
+        /// </summary>
+        public void ClientCashInCashOutCheck()
+        {
+            var balanceDate = _context.SettleDate;
+            var reqClientIds = _context.Request.ClientIds;
+            var newValuedate = balanceDate.AddDays(1);
+            var cashInCashOuts = DbContext.ClientCashInCashOut.Where(x => x.HappenDate >= balanceDate && x.HappenDate < newValuedate && x.ValidState != ConsGlobal.InValid && ClientCashInCashOut.calcCashs.Contains(x.State) && ClientCashInCashOut.cashStateChecks.Contains(x.Direction)).AsNoTracking().ToList();
+            if (reqClientIds != null && reqClientIds.Any())
+            {
+                cashInCashOuts = cashInCashOuts.Where(x => reqClientIds.Contains(x.ClientId ?? 0)).ToList();
+            }
+            if (cashInCashOuts.Any())
+            {
+                _context.RaiseError("客户资金结算", $"{balanceDate:yyyy年MM月dd日}存在未确认的资金，请先将资金确认后再操作");
+            }
+        }
         private void AddToFund(Dictionary<string, double> fundDictionary, string currencyCode, double amount)
         {
             if (fundDictionary.ContainsKey(currencyCode))

YLErpDAL/Modules/EodModule/SettlementModule/EodTaskRunner.cs

@@ -503,6 +503,8 @@ where {nameof(t.TaskStartTime)}>'{startDateStr}' and {nameof(t.TaskState)}={(int
                             SetTaskStep("为处于节假日的交易标的复制上日收盘价");
                             new EodCopyPreSettlePrice(_context).Execute();
                         }
+                        SetTaskStep("检查标的出入金状态");
+                        new EodClientBalanceCalc(_context).ClientCashInCashOutCheck();
 
                         SetTaskStep("检查标的结算价格缺失");
                         new EodCheckSettlePrice(_context).Execute();//t