Merge branch 'master' of http://dev.ccwin-in.com:3000/zhibinlv/QRAPI

API/TaskManager.Entity/Entity.cs

@@ -541,10 +541,12 @@ namespace TaskManager.Entity
         [ExporterHeader(DisplayName = "版本号")]
         public int Version { get; set; } =0;
 
+        [MaxLength(50)]
         [JsonProperty("omterior")]
         [ExporterHeader(DisplayName = "内外饰")] // 推测拼写错误并自定义显示名
         public string? Omterior { get; set; } = String.Empty;
 
+        [MaxLength(50)]
         [JsonProperty("salseDepartment")]
         [ExporterHeader(DisplayName = "销售部门")] // 推测拼写错误并自定义显示名
         public string? SalseDepartment { get; set; } = String.Empty;

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>
         /// 操作描述

API/Wood.Admin.WebApi/Startup.cs

@@ -74,10 +74,6 @@ namespace Wood.Admin.WebApi
 			GlobalContext.JwtConfig = Configuration.GetSection("JwtConfig").Get<JwtConfig>()!;
 			GlobalContext.Services = services;
 			GlobalContext.Configuration = Configuration;
-         
-		
-
-
 
             //初始化 eventbus
             services.AddEventBus();
@@ -93,6 +89,7 @@ namespace Wood.Admin.WebApi
             // 配置 DbContext 使用 SQL Server 连接字符串
             services.AddDbContext<JobDbContext>(options =>
                 options.UseSqlServer(GlobalContext.SystemConfig.CustomerDb));
+           
 
             // 配置 Hangfire 使用 SQL Server 存储
             services.AddHangfire(

API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs

@@ -87,17 +87,11 @@ namespace TaskManager.Controllers
                    new JsonSerializerOptions
                    {
                        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-                       
-                       Converters= { new DecimalTrimConverter() },
-
-                       WriteIndented = true // 可选，用于格式化输出
-
-
-
-
+                       Converters = { new DecimalTrimConverter() },
+                       WriteIndented = false // 可选，用于格式化输出
                    }
                    );
-                inputjson = RemoveWhitespace(inputjson);
+                //inputjson = RemoveWhitespace(inputjson);
                 var content = await Post(Url, Path, inputjson,taskId,version);
                 if (!string.IsNullOrEmpty(content))
                 {
@@ -173,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++)
@@ -208,13 +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 (result.data.totalGet == total)
+                                if (i == totalPages)
                                 {
+                                   
                                     sub.WriteState = true;
                                     _jobDbContext.Set<TaskSub>().Update(sub);
                                     _jobDbContext.SaveChanges();
@@ -222,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"));
                             }
                         }
 

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)