更新ECS业务处理代码

IMCS_CCS/Model/vo/ResponsePageData.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace IMCS_CCS.Model.vo
+{
+    public class ResponsePageData<T>
+    {
+
+        public String Msg { get; set; } = "success";
+
+        public int Code { get; set; } = 200;
+
+        public List<T> Data { get; set; }
+    }
+}

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -1640,7 +1640,7 @@ namespace IMCS.CCS.Services
                     if (!string.IsNullOrEmpty(actionAddress.Address) && !string.IsNullOrEmpty(actionAddress.Value))
                     {
                         var operateResult = s7.ReadInt16(actionAddress.Address);
-                        if (operateResult.ToString() == actionAddress.Value)
+                        if (operateResult.Content.ToString() == actionAddress.Value )
                         {
                             s7.ConnectClose();
                             Log.Instance.WriteLogAdd(ActionTypeEnum.QueryThreeCoordinatesFreePos + "三坐标检测空闲位置===>>"+ actionAddress.Address + JsonConvert.SerializeObject(req),
@@ -2036,9 +2036,10 @@ namespace IMCS.CCS.Services
 
                 if (Result.IsSuccess)
                 {
-                    ResponseFanucData responseFanucData = JsonConvert.DeserializeObject<ResponseFanucData>(Result.Message);
-                    //list = JsonConvert.DeserializeObject<List<ResponseToolData>>(Result.Message.ToolLife);
-                    list = JsonConvert.DeserializeObject<List<ResponseToolData>>(responseFanucData.ToolLife);
+                    List<ResponseToolData> responseFanucData = JsonConvert.DeserializeObject<List<ResponseToolData>>(Result.Message);
+                    //list = JsonConvert.DeserializeObject<List<ResponseToolData>>(Result.Message.ToolLife);                    
+                    //list = JsonConvert.DeserializeObject<List<ResponseToolData>>(responseFanucData.ToolLife);
+                    list = responseFanucData;
                 }
             }else if(device.ProtocolType == ProtocalTypeEnum.HEIDEHAIN.ToString())
             {

IMCS_CCS/Service/Impl/TaskJobService.cs

@@ -1439,17 +1439,19 @@ namespace IMCS.CCS.Service.Impl
                         {
                             //获取机械手报警信息
                             CcsTagValue plcWarnValue = tagValues.Where(x => x.Ip.Equals(changeEquipment.IP) && x.Address.Equals("DB200.34")).FirstOrDefault();
-                            ToolDto ccsDictionary = new ToolDto();
-                            ccsDictionary.Type = "PlcWarnInfo";
-                            ccsDictionary.state = true;
-                            ccsDictionary.Code = plcWarnValue.TagValue;
-
-                            List<ToolDto> dictList = await _dictionaryService.GetList(ccsDictionary);
-                            if (dictList.Count > 0 && dictList[0]!=null)
+                            if (plcWarnValue != null)
                             {
-                                if (!string.IsNullOrEmpty(dictList[0].DictValue))
+                                ToolDto ccsDictionary = new ToolDto();
+                                ccsDictionary.Type = "PlcWarnInfo";
+
+                                List<ToolDto> dictList = await _dictionaryService.GetList(ccsDictionary);
+                                if (dictList.Count > 0 && dictList[0] != null)
                                 {
-                                    productionStatus.alertMsg = dictList[0].DictValue.Trim();
+                                    ToolDto dictObj = dictList.Where(x => x.Code.Equals(plcWarnValue.TagValue) && x.state).FirstOrDefault();
+                                    if (!string.IsNullOrEmpty(dictObj.DictValue.Trim()))
+                                    {
+                                        productionStatus.alertMsg = dictObj.DictValue.Trim();
+                                    }
                                 }
                             }
                         }