提交

API/TaskManager.Contracts/Dtos/Dtos.cs

@@ -1096,7 +1096,7 @@ namespace TaskManager.Contracts.Dtos
         public string MaterialDescription { get; set; }
         public string SummarySign { get; set; }
         public string DateRequired { get; set; }
-        public int QuantityDemand { get; set; }
+        public decimal? QuantityDemand { get; set; }
         public string ConfirmTime { get; set; }
         public decimal? CreatQuantity { get; set; }
         public decimal? QuantityDelivery { get; set; }

API/TaskManager.Entity/Entity.cs

@@ -29,10 +29,12 @@ namespace TaskManager.Entity
         /// </summary>
         [ExporterHeader(DisplayName = "API路径")]
         [ImporterHeader(Name = "API路径")]
+        [MaxLength(400)]
         public string? Api { get; set; }
         /// <summary>
         /// 任务周期设置
         /// </summary>
+        [MaxLength(400)]
         [ExporterHeader(DisplayName = "任务周期设置")]
         [ImporterHeader(Name = "任务周期设置")]
         public string? Corn { get; set; }
@@ -41,6 +43,7 @@ namespace TaskManager.Entity
         /// </summary>
         [ExporterHeader(IsIgnore = true)]
         [ImporterHeader(IsIgnore = true)]
+        [MaxLength(400)]
         public string? Module { get; set; }
 
         /// <summary>
@@ -48,6 +51,7 @@ namespace TaskManager.Entity
         /// </summary>
         [ExporterHeader(DisplayName = "客户")]
         [ImporterHeader(Name = "客户")]
+        [MaxLength(50)]
         public string? Client { get; set; }
 
 
@@ -56,10 +60,12 @@ namespace TaskManager.Entity
         /// </summary>
         [ExporterHeader(DisplayName = "备注")]
         [ImporterHeader(Name = "备注")]
+
         public string? Remark { get; set; }
         /// <summary>
         /// 表名
         /// </summary>
+        [MaxLength(100)]
         [ExporterHeader(DisplayName = "表名")]
         [ImporterHeader(Name = "表名")]
      
@@ -67,11 +73,13 @@ namespace TaskManager.Entity
         /// <summary>
         /// 任务名称
         /// </summary>
+        [MaxLength(200)]
         [ExporterHeader(DisplayName = "任务名称")]
         public string? TaskName { get; set; }
         /// <summary>
         /// 全路径
         /// </summary>
+        [MaxLength(500)]
         [ExporterHeader(DisplayName = "调用全路径")]
         [ImporterHeader(Name = "调用全路径")]
         public string?  Url { get; set; }
@@ -81,6 +89,17 @@ namespace TaskManager.Entity
         [ExporterHeader(DisplayName = "是否自动执行")]
         [ImporterHeader(Name = "是否自动执行")]
         public bool IsAuto { get; set; }
+
+        /// <summary>
+        /// 是否自动执行
+        /// </summary>
+        [ExporterHeader(DisplayName = "分页大小")]
+        [ImporterHeader(Name = "分页大小")]
+        public int PageSize { get; set; } = 500;
+
+
+
+
         public TaskConifgure()
         { }
 

API/TaskManager.EntityFramework/Migrations/20250610061746_z2025061000024.cs

@@ -0,0 +1,49 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace TaskManager.EntityFramework.Migrations
+{
+    /// <inheritdoc />
+    public partial class z2025061000024 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "PageSize",
+                table: "TaskConifgure",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Id",
+                table: "SUPPLIER_PRO_PLANING",
+                type: "nvarchar(50)",
+                maxLength: 50,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(450)",
+                oldNullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "PageSize",
+                table: "TaskConifgure");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Id",
+                table: "SUPPLIER_PRO_PLANING",
+                type: "nvarchar(450)",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(50)",
+                oldMaxLength: 50,
+                oldNullable: true);
+        }
+    }
+}

API/TaskManager.EntityFramework/Migrations/20250610062047_z20250610000240002.cs

@@ -0,0 +1,158 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace TaskManager.EntityFramework.Migrations
+{
+    /// <inheritdoc />
+    public partial class z20250610000240002 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "Url",
+                table: "TaskConifgure",
+                type: "nvarchar(500)",
+                maxLength: 500,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(max)",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "TaskName",
+                table: "TaskConifgure",
+                type: "nvarchar(200)",
+                maxLength: 200,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(max)",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "TableName",
+                table: "TaskConifgure",
+                type: "nvarchar(100)",
+                maxLength: 100,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(max)",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Module",
+                table: "TaskConifgure",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(max)",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Corn",
+                table: "TaskConifgure",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(max)",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Client",
+                table: "TaskConifgure",
+                type: "nvarchar(50)",
+                maxLength: 50,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(max)",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Api",
+                table: "TaskConifgure",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(max)",
+                oldNullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "Url",
+                table: "TaskConifgure",
+                type: "nvarchar(max)",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(500)",
+                oldMaxLength: 500,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "TaskName",
+                table: "TaskConifgure",
+                type: "nvarchar(max)",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(200)",
+                oldMaxLength: 200,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "TableName",
+                table: "TaskConifgure",
+                type: "nvarchar(max)",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(100)",
+                oldMaxLength: 100,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Module",
+                table: "TaskConifgure",
+                type: "nvarchar(max)",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(400)",
+                oldMaxLength: 400,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Corn",
+                table: "TaskConifgure",
+                type: "nvarchar(max)",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(400)",
+                oldMaxLength: 400,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Client",
+                table: "TaskConifgure",
+                type: "nvarchar(max)",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(50)",
+                oldMaxLength: 50,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Api",
+                table: "TaskConifgure",
+                type: "nvarchar(max)",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(400)",
+                oldMaxLength: 400,
+                oldNullable: true);
+        }
+    }
+}

API/TaskManager.EntityFramework/Migrations/JobDbContextModelSnapshot.cs

@@ -4303,8 +4303,8 @@ namespace TaskManager.EntityFramework.Migrations
                         .HasColumnType("datetime2");
 
                     b.Property<string>("Id")
-                        .HasColumnType("nvarchar(450)")
-                        .HasAnnotation("Relational:JsonPropertyName", "id");
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
 
                     b.Property<int>("IsDelete")
                         .HasColumnType("int")
@@ -5146,13 +5146,16 @@ namespace TaskManager.EntityFramework.Migrations
                     SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("UId"));
 
                     b.Property<string>("Api")
-                        .HasColumnType("nvarchar(max)");
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)");
 
                     b.Property<string>("Client")
-                        .HasColumnType("nvarchar(max)");
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
 
                     b.Property<string>("Corn")
-                        .HasColumnType("nvarchar(max)");
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)");
 
                     b.Property<DateTime>("CreationTime")
                         .HasColumnType("datetime2");
@@ -5161,7 +5164,11 @@ namespace TaskManager.EntityFramework.Migrations
                         .HasColumnType("bit");
 
                     b.Property<string>("Module")
-                        .HasColumnType("nvarchar(max)");
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)");
+
+                    b.Property<int>("PageSize")
+                        .HasColumnType("int");
 
                     b.Property<bool>("ReadState")
                         .HasColumnType("bit");
@@ -5170,16 +5177,19 @@ namespace TaskManager.EntityFramework.Migrations
                         .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("TableName")
-                        .HasColumnType("nvarchar(max)");
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
 
                     b.Property<Guid>("TaskId")
                         .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("TaskName")
-                        .HasColumnType("nvarchar(max)");
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
 
                     b.Property<string>("Url")
-                        .HasColumnType("nvarchar(max)");
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
 
                     b.Property<bool>("WriteState")
                         .HasColumnType("bit");

API/Wood.Admin.WebApi/Wood.Admin.WebApi.csproj

@@ -20,6 +20,14 @@
 
   <ItemGroup>
     <Content Remove="wwwroot\DataSeed.sql" />
+    <Content Remove="奇瑞RDC共享库存.json" />
+    <Content Remove="整车月度生产计划1.json" />
+    <Content Remove="日MRP状态监控.json" />
+    <Content Remove="日物料需求计划.json" />
+    <Content Remove="计划协议.json" />
+    <Content Remove="过涂装未过总装.json" />
+    <Content Remove="过焊装未过总装.json" />
+    <Content Remove="采购订单.json" />
   </ItemGroup>
 
   <ItemGroup>

API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs

@@ -164,7 +164,7 @@ namespace TaskManager.Controllers
                 return;
             }
             var sublist = _jobDbContext.TaskSub.Where(p => taskName.Contains(p.TaskName)  && p.WriteState == false && p.Subscriber == client ).ToList();
-            int pageSize = 10; 
+            int pageSize = CPageSize; 
             if (sublist.Any())
             {
                 foreach (var sub in sublist)

API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs

@@ -84,7 +84,7 @@ namespace TaskManager.Controllers
             var readedcount = _jobDbContext.Set<T>().Where(p => p.RequestDate == inputdate).Count();
             if (readedcount == 0)//第一次请求用false,接口人胡启名要求
             {
-                PagedResponse<ToutputDetial> firstResponse = await GetPageAsync(new PAGE_DTO() { Date = date,PageSize=100, IsForce = false},taskId,version);
+                PagedResponse<ToutputDetial> firstResponse = await GetPageAsync(new PAGE_DTO() { Date = date,PageSize=CPageSize, IsForce = false},taskId,version);
 
                 if (firstResponse == null || firstResponse.Code != 200)
                 {
@@ -108,12 +108,6 @@ namespace TaskManager.Controllers
                    // firstResponse.Data.Rows.Select(p=>p.Id)
 
 
-
-
-
-
-
-
                     foreach (var itm in firstResponse.Data.Rows)
                     {
                         T entity = new T();
@@ -161,7 +155,7 @@ namespace TaskManager.Controllers
                     // 循环请求剩余页面
                     for (currentPage = 2; currentPage <= totalPages; currentPage++)
                     {
-                        PAGE_DTO pageinput = new PAGE_DTO() { Date = date, PageNum = currentPage, PageSize = 100, IsForce = false };
+                        PAGE_DTO pageinput = new PAGE_DTO() { Date = date, PageNum = currentPage, PageSize = CPageSize, IsForce = false };
 
                         Console.WriteLine($"正在请求第 {currentPage} 页...");
                         PagedResponse<ToutputDetial> pageResponse = await GetPageAsync(pageinput, taskId, version);
@@ -223,7 +217,7 @@ namespace TaskManager.Controllers
             else
             {
 
-                PagedResponse<ToutputDetial> firstResponse = await GetPageAsync(new PAGE_DTO() { Date = date, PageSize = 100, IsForce = true },taskId,version);
+                PagedResponse<ToutputDetial> firstResponse = await GetPageAsync(new PAGE_DTO() { Date = date, PageSize = CPageSize, IsForce = true },taskId,version);
                 if (firstResponse == null || firstResponse.Code != 200)
                 {
                     await _logger.AddInfo("首次请求失败，无法获取分页信息。", TaskName, taskId, version);
@@ -287,7 +281,7 @@ namespace TaskManager.Controllers
                     // 循环请求剩余页面
                     for (currentPage = 2; currentPage <= totalPages; currentPage++)
                     {
-                        PAGE_DTO pageinput = new PAGE_DTO() { Date = date, PageNum = currentPage, PageSize = 100, IsForce = true };
+                        PAGE_DTO pageinput = new PAGE_DTO() { Date = date, PageNum = currentPage, PageSize = CPageSize, IsForce = true };
                         //Console.WriteLine($"正在请求第 {currentPage} 页...");
                         PagedResponse<ToutputDetial> pageResponse = await GetPageAsync(pageinput,taskId,version);
                         if (pageResponse?.Data.Rows != null && pageResponse.Data.Rows.Count > 0)

API/Wood.Service/Controllers/LogService.cs

@@ -81,8 +81,61 @@ namespace Wood.Service.Controllers
 
        
 
+        //[HttpGet("AddError")]
+        //public async Task<bool> AddError(string message, string taskname, Guid taskid, Version version)
+        //{
+        //    var log = new TaskLog
+        //    {
+        //        Info = message,
+        //        Type = "错误",
+        //        TaskName = taskname,
+        //        CreationTime = DateTime.Now,
+        //        TaskId = taskid,
+        //        Version = version?.ToString()
+        //    };
+
+        //    EnqueueLog(log);
+
+        //    return true; // 日志已入队，视为成功
+        //}
+
+        //[HttpGet("AddInfo")]
+        //public async Task<bool> AddInfo(string message, string taskname, Guid taskid, Version version)
+        //{
+        //    var log = new TaskLog
+        //    {
+        //        Info = message,
+        //        Type = "错误",
+        //        TaskName = taskname,
+        //        CreationTime = DateTime.Now,
+        //        TaskId = taskid,
+        //        Version = version?.ToString()
+        //    };
+
+        //    EnqueueLog(log);
+
+        //    return true;
+        //}
+
+        //[HttpGet("AddInfoRemark")]
+        //public async Task<bool> AddInfoRemark(string message, string taskname, string remark)
+        //{
+        //    var log = new TaskLog
+        //    {
+        //        Info = message,
+        //        Type = "记录",
+        //        TaskName = taskname,
+        //        CreationTime = DateTime.Now,
+        //        Remark = remark
+        //    };
+
+        //    EnqueueLog(log);
+
+        //    return true;
+        //}
+
         [HttpGet("AddError")]
-        public async Task<bool> AddError(string message, string taskname, Guid taskid, Version version)
+        public async Task<bool> AddError(string message, string taskname, Guid taskid, string version)
         {
             var log = new TaskLog
             {
@@ -96,16 +149,18 @@ namespace Wood.Service.Controllers
 
             EnqueueLog(log);
 
+        
+
             return true; // 日志已入队，视为成功
         }
 
         [HttpGet("AddInfo")]
-        public async Task<bool> AddInfo(string message, string taskname, Guid taskid, Version version)
+        public async Task<bool> AddInfo(string message, string taskname, Guid taskid, string version)
         {
             var log = new TaskLog
             {
                 Info = message,
-                Type = "错误",
+                Type = "信息",
                 TaskName = taskname,
                 CreationTime = DateTime.Now,
                 TaskId = taskid,
@@ -114,26 +169,48 @@ namespace Wood.Service.Controllers
 
             EnqueueLog(log);
 
+
             return true;
         }
-
-        [HttpGet("AddInfoRemark")]
-        public async Task<bool> AddInfoRemark(string message, string taskname, string remark)
+        [HttpGet("AddPostRequest")]
+        public async Task<bool> AddPostRequest(string message, string taskname, Guid taskid, string version, string remark)
         {
             var log = new TaskLog
             {
                 Info = message,
-                Type = "记录",
+                Type = "请求",
                 TaskName = taskname,
                 CreationTime = DateTime.Now,
+                TaskId = taskid,
+                Version = version?.ToString(),
                 Remark = remark
             };
+            EnqueueLog(log);
 
+            return true;
+        }
+        [HttpGet("AddPostResponse")]
+        public async Task<bool> AddPostResponse(string message, string taskname, Guid taskid, string version, string remaek)
+        {
+            var log = new TaskLog
+            {
+                Info = message,
+                Type = "应答",
+                TaskName = taskname,
+                CreationTime = DateTime.Now,
+                TaskId = taskid,
+                Version = version?.ToString(),
+                Remark = remaek
+            };
             EnqueueLog(log);
 
             return true;
         }
-  
+
+
+
+
+
 
         // 其他方法保持不变...
 

API/Wood.Service/Controllers/RecurringJobBaseController.cs

@@ -33,6 +33,9 @@ namespace TaskManager.Controllers
         protected string Client { set; get; } = "Wood";
         protected string Path { set; get; } = "/v2/get/supplierProPlaning";
         protected string Url { set; get; } = "/v2/get/supplierProPlaning";
+
+        protected int CPageSize { set; get; } = 1000;
+
         protected virtual string TaskName { set; get; } = "SupplierProPlaning";
 
         protected readonly LogController _logger;