更新结构

API/TaskManager.Contracts/Dtos/Dtos.cs

@@ -1091,7 +1091,7 @@ namespace TaskManager.Contracts.Dtos
         public string MaterialCode { get; set; }
         public string MaterialDescription { get; set; }
         public string SummarySign { get; set; }
-        public string DateRequired { get; set; }
+        public string? DateRequired { get; set; }
         public decimal? QuantityDemand { get; set; }
         public string ConfirmTime { get; set; }
         public decimal? CreatQuantity { get; set; }
@@ -1132,7 +1132,7 @@ public class SUPPLIER_MRP_WARNING_DETAIL_DTO : CherryReadBaseEntityDto
         public string MaterialCode { get; set; }
         public string MaterialDescription { get; set; }
         public decimal? QuantityCurrent { get; set; }
-        public string ReckonDate { get; set; }
+        public string? ReckonDate { get; set; }
         public decimal? QuantityPlanned { get; set; }
         public decimal? QuantityPlannedDelivery { get; set; }
         public decimal? QuantityInTransit { get; set; }

API/TaskManager.Entity/Entity.cs

@@ -1,17 +1,17 @@
-using System;
+using Magicodes.ExporterAndImporter.Core;
+using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using System.Xml.Linq;
-using Magicodes.ExporterAndImporter.Core;
-
-using Newtonsoft.Json;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
-using Microsoft.EntityFrameworkCore;
 
 namespace TaskManager.Entity
 {
@@ -2082,7 +2082,7 @@ namespace TaskManager.Entity
         /// 需求日期
         /// </summary>
         [ExporterHeader(DisplayName = "需求日期", Format = "yyyy-MM-dd")]
-        public DateTime? DateRequired { get; set; }
+        public string? DateRequired { get; set; }
 
         /// <summary>
         /// 需求数量
@@ -2232,8 +2232,10 @@ namespace TaskManager.Entity
         /// <summary>
         /// 需求日期
         /// </summary>
-        [ExporterHeader(DisplayName = "需求日期", Format = "yyyy-MM-dd")]
-        public DateTime? ReckonDate { get; set; }
+        [ExporterHeader(DisplayName = "需求日期")]
+
+        
+        public string? ReckonDate { get; set; }
 
         /// <summary>
         /// 需求数量
@@ -3971,7 +3973,7 @@ namespace TaskManager.Entity
         /// 需求日期
         /// </summary>
         [ExporterHeader(DisplayName = "需求日期", Format = "yyyy-MM-dd")]
-        public DateTime? DateRequired { get; set; }
+        public string? DateRequired { get; set; }
 
         /// <summary>
         /// 需求数量
@@ -4122,7 +4124,8 @@ namespace TaskManager.Entity
         /// 需求日期
         /// </summary>
         [ExporterHeader(DisplayName = "需求日期", Format = "yyyy-MM-dd")]
-        public DateTime? ReckonDate { get; set; }
+     
+        public string? ReckonDate { get; set; }
 
         /// <summary>
         /// 需求数量
@@ -4209,5 +4212,28 @@ namespace TaskManager.Entity
         public long TableId { get; set; }
         public string RecordJson { get; set; } // 存储记录的JSON
     }
+    public class DateTimeYYYYMMDDConverter : System.Text.Json.Serialization.JsonConverter<DateTime>
+    {
+        private const string Format = "yyyy-MM-dd";
+
+        public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            if (reader.TokenType == JsonTokenType.String)
+            {
+                if (DateTime.TryParse(reader.GetString(), out var dateTime))
+                {
+                    return dateTime;
+                }
+            }
+            return reader.GetDateTime();
+        }
+
+        public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(value.ToString(Format));
+        }
+    }
+
+
 
 }

API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -3,7 +3,7 @@
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>D:\QRAPI20250528\API\Wood.Admin.WebApi\bin\Release\net8.0\publish\</_PublishTargetUrl>
-    <History>True|2025-07-22T01:42:45.6864831Z||;True|2025-07-16T10:56:51.1743874+08:00||;True|2025-07-16T10:10:16.1423887+08:00||;True|2025-07-16T09:39:41.5264925+08:00||;True|2025-07-15T11:43:41.1216193+08:00||;True|2025-07-14T17:27:09.0814705+08:00||;True|2025-07-10T13:41:17.5416106+08:00||;True|2025-07-10T09:53:47.6480408+08:00||;True|2025-07-08T11:09:12.4661351+08:00||;True|2025-07-08T10:48:35.1871554+08:00||;False|2025-07-08T10:47:14.6770264+08:00||;True|2025-07-04T13:12:49.8129504+08:00||;True|2025-07-04T11:57:19.4307706+08:00||;True|2025-07-03T09:24:39.8368797+08:00||;True|2025-07-02T17:18:03.6042427+08:00||;True|2025-07-02T10:15:44.3531626+08:00||;True|2025-07-02T10:14:19.3576521+08:00||;True|2025-07-01T18:51:45.0206266+08:00||;True|2025-06-30T15:39:43.7918723+08:00||;True|2025-06-30T14:40:36.2678533+08:00||;True|2025-06-30T14:22:36.2631903+08:00||;True|2025-06-30T09:23:23.0780295+08:00||;True|2025-06-28T10:37:00.4525422+08:00||;True|2025-06-27T14:51:18.0006510+08:00||;True|2025-06-27T14:46:36.7189818+08:00||;True|2025-06-25T10:54:54.0406425+08:00||;True|2025-06-24T15:53:07.6141315+08:00||;True|2025-06-24T15:48:22.4116425+08:00||;True|2025-06-24T15:47:33.3794364+08:00||;True|2025-06-24T15:21:28.5600646+08:00||;True|2025-06-23T17:18:30.1990173+08:00||;True|2025-06-23T17:12:33.6485743+08:00||;True|2025-06-19T17:18:07.6086155+08:00||;</History>
+    <History>True|2025-07-23T05:22:16.5102002Z||;True|2025-07-23T13:21:32.7756431+08:00||;True|2025-07-23T13:07:08.2385667+08:00||;True|2025-07-23T11:40:00.2171512+08:00||;True|2025-07-22T09:42:45.6864831+08:00||;True|2025-07-16T10:56:51.1743874+08:00||;True|2025-07-16T10:10:16.1423887+08:00||;True|2025-07-16T09:39:41.5264925+08:00||;True|2025-07-15T11:43:41.1216193+08:00||;True|2025-07-14T17:27:09.0814705+08:00||;True|2025-07-10T13:41:17.5416106+08:00||;True|2025-07-10T09:53:47.6480408+08:00||;True|2025-07-08T11:09:12.4661351+08:00||;True|2025-07-08T10:48:35.1871554+08:00||;False|2025-07-08T10:47:14.6770264+08:00||;True|2025-07-04T13:12:49.8129504+08:00||;True|2025-07-04T11:57:19.4307706+08:00||;True|2025-07-03T09:24:39.8368797+08:00||;True|2025-07-02T17:18:03.6042427+08:00||;True|2025-07-02T10:15:44.3531626+08:00||;True|2025-07-02T10:14:19.3576521+08:00||;True|2025-07-01T18:51:45.0206266+08:00||;True|2025-06-30T15:39:43.7918723+08:00||;True|2025-06-30T14:40:36.2678533+08:00||;True|2025-06-30T14:22:36.2631903+08:00||;True|2025-06-30T09:23:23.0780295+08:00||;True|2025-06-28T10:37:00.4525422+08:00||;True|2025-06-27T14:51:18.0006510+08:00||;True|2025-06-27T14:46:36.7189818+08:00||;True|2025-06-25T10:54:54.0406425+08:00||;True|2025-06-24T15:53:07.6141315+08:00||;True|2025-06-24T15:48:22.4116425+08:00||;True|2025-06-24T15:47:33.3794364+08:00||;True|2025-06-24T15:21:28.5600646+08:00||;True|2025-06-23T17:18:30.1990173+08:00||;True|2025-06-23T17:12:33.6485743+08:00||;True|2025-06-19T17:18:07.6086155+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

API/Wood.Admin.WebApi/Startup.cs

@@ -105,9 +105,6 @@ namespace Wood.Admin.WebApi
                 {
                     // 可从配置中读取 Hangfire 存储选项（如队列、重试策略等）
 
-
-					 
-
                     CommandBatchMaxTimeout = TimeSpan.FromMinutes(5),
                     SlidingInvisibilityTimeout = TimeSpan.FromMinutes(5),
                     QueuePollInterval = TimeSpan.Zero,

API/Wood.Admin.WebApi/appsettings.json

@@ -20,7 +20,7 @@
     "DBEnableDiffLog": true, //是否开启差异化日志
     "LogDays": 90, //系统日志保存的天数
     "RunAutoJob": true, //是否执行自动job
-    "CustomerDb": "Server = 192.168.1.228; Database = TaskManager; User ID = sa; Password = ChangkeTec@2021; TrustServerCertificate = True"
+    "CustomerDb": "Server = 192.168.1.228; Database = TaskManager2; User ID = sa; Password = ChangkeTec@2021; TrustServerCertificate = True"
   },
   "JwtConfig": {
     "SecretKey": "3c1cac3f546eda35168c3aa3cn91780fbe703f0996c6d123ea96dc85c70bbc0a", // 密钥，string 类型，必须是复杂密钥，长度大于16

API/Wood.Service/Controllers/RecurringJobBaseController.cs

@@ -115,8 +115,10 @@ namespace TaskManager.Controllers
             ////string jsonContent = System.IO.File.ReadAllText("过涂装未过总装.json");
             // await _logger.AddPostResponse("响应", TaskName, taskid, version, jsonContent);
 
+            // string jsonContent = System.IO.File.ReadAllText("日MRP预警推移.json");
 
-            // return jsonContent;
+
+            //return jsonContent;