分档类型变更

JinYuan.MES/MesDataProcess.cs

@@ -1934,13 +1934,15 @@ namespace JinYuan.MES
                 }
                 if (row != null)
                 {
-                    MesMessage = row.message.ToString();
+                    MesMessage = "返回为空!";
+                  //  MesMessage = row.message.ToString();
                     MesGrading = row.rank;
-                    MesGradingFangAn = row.sortingScheme;
+                    MesGradingFangAn = row.sortingScheme;   
                 }
                 else
                 {
-                    MesMessage = "返回为空!";
+                    MesMessage = row.message.ToString();
+                  //  MesMessage = "返回为空!";
                     MesGrading = "NULL";
                     MesGradingFangAn = "NULL";
                 }

JinYuan.MES/Models/EqpStatusParam.cs

@@ -60,4 +60,61 @@ namespace JinYuan.MES.Models
         /// </summary>
         public string faultCode { get; set; }
     }
+    public class SafeEqptStatusParam
+    {
+        /// <summary>
+        /// 工厂代码
+        /// </summary>
+        public string siteCode { get; set; }
+        /// <summary>
+        ///  产线编号
+        /// </summary>
+        public string lineCode { get; set; }
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+        public string equipNum { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string materialCode { get; set; }
+        /// <summary>
+        /// 员工账号
+        /// </summary>
+        public string userName { get; set; }
+        /// <summary>
+        /// 库位ID
+        /// </summary>
+        public string seatId { get; set; }
+        /// <summary>
+        /// 采集时间
+        /// </summary>
+        public string recordDate { get; set; }
+        /// <summary>
+        ///  设备状态 。Run：（正常运行）、Alert：（故障调试）、Idle：（闲置待机）、Maintain（停止运行）
+        /// </summary>
+        public string statusCode { get; set; }
+        /// <summary>
+        /// 状态变更时间
+        /// </summary>
+        public string uploadTime { get; set; }
+        /// <summary>
+        /// 唯一标识符号
+        /// </summary>
+        public string guid { get; set; }
+        public List<SafeEqptCode> safeEqptCodeList { get; set; }
+    }
+
+    public class SafeEqptCode
+    {
+        /// <summary>
+        /// 安全装置编码
+        /// </summary>
+        public string equipNum { get; set; }
+        /// <summary>
+        /// 设备状态
+        /// </summary>
+        public string status { get; set; }
+
+    }
 }