From b64103e6f3e5fd73cd040ef7d4a04f0b7d340959 Mon Sep 17 00:00:00 2001
From: hehaibing-1996 <hehaibing1996@qq.com>
Date: Fri, 6 Jun 2025 08:12:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E6=9E=90=E5=A4=B1=E8=B4=A5=E6=8A=9B?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=B0=B1=E4=B8=8D=E4=B8=8A=E4=BC=A0=E4=BA=86?=
 =?UTF-8?q?=20=E9=81=BF=E5=85=8D=E4=B8=80=E7=9B=B4=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E9=80=A0=E6=88=90=E7=9A=84=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E7=B9=81=E5=A4=9A=20=E4=BB=A5=E5=8F=8A=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E6=AC=A1=E6=95=B0=E8=BF=87=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2.增加物料规格的显示
---
 WCS.BLL/HardWare/MXL4Shelf.cs                     | 15 +++++++++++++--
 .../MKYBackgroundThread/StockQueryResponse.cs     |  9 ++++++++-
 WCS.Model/WCS.Model.csproj                        |  3 +++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/WCS.BLL/HardWare/MXL4Shelf.cs b/WCS.BLL/HardWare/MXL4Shelf.cs
index a51d504..2f2af78 100644
--- a/WCS.BLL/HardWare/MXL4Shelf.cs
+++ b/WCS.BLL/HardWare/MXL4Shelf.cs
@@ -355,7 +355,18 @@ namespace WCS.BLL.HardWare
                                                     jsonString.Replace("\\\\\"\\", string.Empty);
                                                     // 去除所有双引号前面的反斜杠
                                                     jsonString = Regex.Replace(jsonString, @"\\(.)", "$1"); ;
-                                                    var data = JsonConvert.DeserializeObject<List<StockQueryResponseDataItem>>(jsonString);
+                                                    List<StockQueryResponseDataItem>? data = null;
+                                                    try
+                                                    {
+                                                        data = JsonConvert.DeserializeObject<List<StockQueryResponseDataItem>>(jsonString);
+                                                    }
+                                                    catch (Exception ex)
+                                                    {
+                                                        Logs.Write($"【库存信息反序列化失败】返回的json字符串为:\r\n{jsonString},无法成功反序列化");
+                                                        module.IsNeedRefresh = false;
+                                                        continue;
+                                                    }
+                                                    
                                                     if (data != null && data.Count > 0)
                                                     {
                                                         //硬件只能显示7个 只保留前7个
@@ -371,7 +382,7 @@ namespace WCS.BLL.HardWare
                                                                 module.SendTaskId(taskid++, TcpCleint);
                                                                 module.SendMatCode(item.material_code, TcpCleint);
                                                                 module.SendMatName(item.material_name, TcpCleint);
-                                                                module.SendMatSpec("-", TcpCleint);
+                                                                module.SendMatSpec(item.material_spec, TcpCleint);
                                                                 module.SendMatBatch(item.batch_no, TcpCleint);
                                                                 module.SendMatQty((int)item.qty, TcpCleint);
                                                             }
diff --git a/WCS.Model/ApiModel/MKYBackgroundThread/StockQueryResponse.cs b/WCS.Model/ApiModel/MKYBackgroundThread/StockQueryResponse.cs
index 6d4ca35..aed39f9 100644
--- a/WCS.Model/ApiModel/MKYBackgroundThread/StockQueryResponse.cs
+++ b/WCS.Model/ApiModel/MKYBackgroundThread/StockQueryResponse.cs
@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -27,5 +28,11 @@ namespace WCS.Model.ApiModel.MKYBackgroundThread
         public string material_name { get; set; } = "-";
 
         public string material_code { get; set; } = "-";
+
+        /// <summary>
+        /// 物料规格
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public string material_spec { get; set; } = "-";
     }
 }
diff --git a/WCS.Model/WCS.Model.csproj b/WCS.Model/WCS.Model.csproj
index 7bfca4f..bc87561 100644
--- a/WCS.Model/WCS.Model.csproj
+++ b/WCS.Model/WCS.Model.csproj
@@ -3,4 +3,7 @@
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 	</PropertyGroup>
+	<ItemGroup>
+	  <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+	</ItemGroup>
 </Project>