Merge branch 'glms/feature/1.4.2' of http://git.yiliantech.com/gitlab/otc-dev/zszq-trs into glms/feature/1.4.2

YLErpWeb/Controllers/entryexitController.cs

@@ -547,6 +547,7 @@ namespace YLErp.Web.Controllers
                 var skipCount = 0;
                 var duplicateCount = 0;
                 var invalidCounterpartyCount = 0;
+                var saveFailCount = 0;
                 var ids = new List<int>();
 
                 foreach (var flow in result.data)
@@ -609,10 +610,15 @@ namespace YLErp.Web.Controllers
                             existingFlowIds.Add(flow.flowId);
                             saveCount++;
                         }
+                        else
+                        {
+                            saveFailCount++;
+                        }
                     }
                     catch (Exception ex)
                     {
                         LogFactory.GetLogger<entryexitController>().Error($"保存银行流水记录失败：{ex.Message}", ex);
+                        saveFailCount++;
                     }
                 }
 
@@ -621,7 +627,8 @@ namespace YLErp.Web.Controllers
                     new ClientCashInCashOutDataService(CurUser).ExcuteEntryExit(ids, kafkaProduceHelper);
                 }
 
-                return JsonSuccess($"获取银行流水成功，共处理{result.data.Count}条，成功保存{saveCount}条，跳过{skipCount}条（无效对手方账号{invalidCounterpartyCount}条，重复{duplicateCount}条）");
+                return JsonSuccess($"获取银行流水成功，共处理{result.data.Count}条，成功保存{saveCount}条，跳过{skipCount}条（无效对手方账号{invalidCounterpartyCount}条，重复{duplicateCount}条），保存失败{saveFailCount}条");
+                
             }
             catch (Exception ex)
             {