From 35083030e2da8460aa13eb27592711f5f569f93e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Thu, 12 Jun 2025 17:00:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 API/TaskManager.Entity/QRReturnInfo.cs        | 23 +++++++++++++++----
 .../CheryRecurringJobInputPageController.cs   | 12 +++++++---
 .../CherySupplierProAttachmentDataService.cs  |  3 +++
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/API/TaskManager.Entity/QRReturnInfo.cs b/API/TaskManager.Entity/QRReturnInfo.cs
index c612207..be4010f 100644
--- a/API/TaskManager.Entity/QRReturnInfo.cs
+++ b/API/TaskManager.Entity/QRReturnInfo.cs
@@ -19,27 +19,42 @@ namespace TaskManager.Entity
         public string apiName { get; set; }
 
         /// <summary>
-        /// 收到总数
+        /// 获取的总记录数
         /// </summary>
         public int totalGet { get; set; }
 
         /// <summary>
-        /// 未成功数量
+        /// 出错的总记录数
         /// </summary>
         public int totalError { get; set; }
 
         /// <summary>
-        /// 成功保存数量
+        /// 保存的总记录数
         /// </summary>
         public int totalSave { get; set; }
+
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        public DateTime? time { get; set; }
+
+
+
     }
 
     public class QRReturnInfo
     {
+
+
+            
+      //{"code":200,"data":{"batchNo":"BYE4NER8EGYEHV9F51CELEOCBU6CPGYZ","apiName":"supplier_pro_attachment_data","totalGet":1,"totalError":0,"totalSave":1,"time":null},"message":"操作成功"}       
+
+
+
         /// <summary>
         /// 返回信息，200成功，其他不成功
         /// </summary>
-        public string code { get; set; }
+        public int code { get; set; }
 
         /// <summary>
         /// 操作描述
diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
index 731ea3b..7f96ce0 100644
--- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
+++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
@@ -167,12 +167,14 @@ namespace TaskManager.Controllers
             {
                 foreach (var sub in sublist)
                 {
+                  
                     string querystr = $"select * from {sub.TableName} where TaskId='{sub.TaskId}' and WriteState=0 and ReadState=1 order by uid";//任务表
 
                     var entites = _jobDbContext.Database.GetDbConnection().Query<T>(querystr);//明细表
                     if (entites.Any())
                     {
                         var total = entites.Count();
+                        sub.DataCount = total;
                         int totalPages = (int)Math.Ceiling((double)total / pageSize);
                 
                         for (int i =  sub.SyncedPageCount; i <= totalPages; i++)
@@ -202,12 +204,14 @@ namespace TaskManager.Controllers
                                 itm.WriteState = true;
                             }
                             var result = await PostPageAsync(pagedRequest,sub.TaskId, DateTime.Now.ToString("yyyyMMdd"));
-                            if(result.code == "200")
+                            if(result.code == 200)
                             {
+                                
                                 _jobDbContext.BulkUpdate(records);
                                 sub.SyncedPageCount = i;
-                                if (i == total)
+                                if (i == totalPages)
                                 {
+                                   
                                     sub.WriteState = true;
                                     _jobDbContext.Set<TaskSub>().Update(sub);
                                     _jobDbContext.SaveChanges();
@@ -215,7 +219,9 @@ namespace TaskManager.Controllers
                             }                            
                             else
                             {
-                                await _logger.AddError($"第 {i} 页数据保存失败，请检查数据。", TaskName,sub.TaskId, DateTime.Now.ToString("yyyyMMdd"));
+                                sub.FailedCount = i*pageSize;
+
+                                await _logger.AddError($"第 {i} 页奇瑞数据保存失败 {result.message}。", TaskName,sub.TaskId, DateTime.Now.ToString("yyyyMMdd"));
                             }
                         }
 
diff --git a/API/Wood.Service/Controllers/CherySupplierProAttachmentDataService.cs b/API/Wood.Service/Controllers/CherySupplierProAttachmentDataService.cs
index 94be581..a4f440e 100644
--- a/API/Wood.Service/Controllers/CherySupplierProAttachmentDataService.cs
+++ b/API/Wood.Service/Controllers/CherySupplierProAttachmentDataService.cs
@@ -5,6 +5,9 @@ using TaskManager.EntityFramework;
 
 namespace TaskManager.Controllers
 {
+    /// <summary>
+    /// 附件类数据
+    /// </summary>
     public class CherySupplierProAttachmentDataService : CheryRecurringJobInputPageController<SUPPLIER_PRO_ATTACHMENT_DATA, SUPPLIER_PRO_ATTACHMENT_DATA_DTO>
     {
         public CherySupplierProAttachmentDataService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_ATTACHMENT_DATA> repository) : base(httpClient, jobDbContext, log, repository)