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>(jsonString); + List? data = null; + try + { + data = JsonConvert.DeserializeObject>(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; } = "-"; + + /// + /// 物料规格 + /// + [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 @@ netstandard2.0 latest + + +