From 93d720f5958238d71b8fcbc0920af33c46343bf2 Mon Sep 17 00:00:00 2001
From: icewint <icewint@qq.com>
Date: Mon, 15 Jul 2024 14:10:46 +0800
Subject: [PATCH] =?UTF-8?q?<fix>[important]=E4=BF=AE=E5=A4=8Djson=E5=BA=8F?=
 =?UTF-8?q?=E5=88=97=E5=8C=96=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataEntity/WmsEntity/ApplyInRequest.cs          | 11 ++++++-----
 .../WmsEntity/SendWmsTaskStatusRequest.cs           | 13 +++++++------
 .../DataEntity/WmsEntity/UploadPickStandRequest.cs  |  9 +++++----
 .../ApiClient/DataEntity/WmsEntity/WmsResponse.cs   |  7 ++++---
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/WcsMain/ApiClient/DataEntity/WmsEntity/ApplyInRequest.cs b/WcsMain/ApiClient/DataEntity/WmsEntity/ApplyInRequest.cs
index 98d758b..189b4df 100644
--- a/WcsMain/ApiClient/DataEntity/WmsEntity/ApplyInRequest.cs
+++ b/WcsMain/ApiClient/DataEntity/WmsEntity/ApplyInRequest.cs
@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace WcsMain.ApiClient.DataEntity.WmsEntity;
 
@@ -20,25 +21,25 @@ public class ApplyInRequest
     /// <summary>
     /// 申请点位
     /// </summary>
-    [JsonPropertyName("point")]
+    [JsonProperty("point")]
     public string? Point { get; set; }
 
     /// <summary>
     /// 载具号
     /// </summary>
-    [JsonPropertyName("vehicleNo")]
+    [JsonProperty("vehicleNo")]
     public string? VehicleNo { get; set; }
 
     /// <summary>
     /// 条码信息
     /// </summary>
-    [JsonPropertyName("codeMessage")]
+    [JsonProperty("codeMessage")]
     public string? CodeMessage { get; set; }
 
     /// <summary>
     /// 备注
     /// </summary>
-    [JsonPropertyName("remark")]
+    [JsonProperty("remark")]
     public string? Remark { get; set; }
 
 }
\ No newline at end of file
diff --git a/WcsMain/ApiClient/DataEntity/WmsEntity/SendWmsTaskStatusRequest.cs b/WcsMain/ApiClient/DataEntity/WmsEntity/SendWmsTaskStatusRequest.cs
index 16600c6..b2b2080 100644
--- a/WcsMain/ApiClient/DataEntity/WmsEntity/SendWmsTaskStatusRequest.cs
+++ b/WcsMain/ApiClient/DataEntity/WmsEntity/SendWmsTaskStatusRequest.cs
@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace WcsMain.ApiClient.DataEntity.WmsEntity;
 
@@ -10,31 +11,31 @@ public class SendWmsTaskStatusRequest
     /// <summary>
     /// 任务号
     /// </summary>
-    [JsonPropertyName("taskId")]
+    [JsonProperty("taskId")]
     public string? TaskId { get; set; }
 
     /// <summary>
     /// 任务状态
     /// </summary>
-    [JsonPropertyName("taskStatus")]
+    [JsonProperty("taskStatus")]
     public int? TaskStatus { get; set; }
 
     /// <summary>
     /// 任务类型
     /// </summary>
-    [JsonPropertyName("destination")]
+    [JsonProperty("destination")]
     public string? Destination { get; set; }
 
     /// <summary>
     /// 载具号
     /// </summary>
-    [JsonPropertyName("vehicleNo")]
+    [JsonProperty("vehicleNo")]
     public string? VehicleNo { get; set; }
 
     /// <summary>
     /// 信息
     /// </summary>
-    [JsonPropertyName("message")]
+    [JsonProperty("message")]
     public string? Message { get; set; }
 
 }
\ No newline at end of file
diff --git a/WcsMain/ApiClient/DataEntity/WmsEntity/UploadPickStandRequest.cs b/WcsMain/ApiClient/DataEntity/WmsEntity/UploadPickStandRequest.cs
index 07be159..44f96a0 100644
--- a/WcsMain/ApiClient/DataEntity/WmsEntity/UploadPickStandRequest.cs
+++ b/WcsMain/ApiClient/DataEntity/WmsEntity/UploadPickStandRequest.cs
@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace WcsMain.ApiClient.DataEntity.WmsEntity;
 
@@ -10,18 +11,18 @@ public class UploadPickStandRequest
     /// <summary>
     /// 载具号
     /// </summary>
-    [JsonPropertyName("vehicleNo")]
+    [JsonProperty("vehicleNo")]
     public string? VehicleNo { get; set; }
 
     /// <summary>
     /// 拣选站台
     /// </summary>
-    [JsonPropertyName("pickStand")]
+    [JsonProperty("pickStand")]
     public string? PickStand { get; set; }
 
     /// <summary>
     /// 备注
     /// </summary>
-    [JsonPropertyName("remark")]
+    [JsonProperty("remark")]
     public string? Remark { get; set; }
 }
\ No newline at end of file
diff --git a/WcsMain/ApiClient/DataEntity/WmsEntity/WmsResponse.cs b/WcsMain/ApiClient/DataEntity/WmsEntity/WmsResponse.cs
index ba6fec1..464c132 100644
--- a/WcsMain/ApiClient/DataEntity/WmsEntity/WmsResponse.cs
+++ b/WcsMain/ApiClient/DataEntity/WmsEntity/WmsResponse.cs
@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace WcsMain.ApiClient.DataEntity.WmsEntity;
 
@@ -7,12 +8,12 @@ public class WmsResponse
     /// <summary>
     /// 代码
     /// </summary>
-    [JsonPropertyName("code")]
+    [JsonProperty("code")]
     public int? Code { get; set; }
 
     /// <summary>
     /// 信息
     /// </summary>
-    [JsonPropertyName("message")]
+    [JsonProperty("message")]
     public string? Message { get; set; }
 }
\ No newline at end of file