20260708

2026-07-08 10:58:42 +08:00
parent 053a90d34f
commit 7d7d6bc3bf
21 changed files with 1528 additions and 1283 deletions
@@ -1233,7 +1233,8 @@ namespace JinYuan.MES
                    datavolist.Add(new TagDataVOListItem()
                    {
                        tagCode = keys[0],
-                        tagValue = temp == null ? "0" : temp.ToString(),//m
+                        //tagValue = temp == null ? "0" : temp.ToString(),//m
+                        tagValue = temp == null ? "0" : (temp.ToString()=="OK"?"1":"0"),//m
                        tagTime = DateTime.Now.ToString(),
                        tagCalculateResult = "Y",
                        tagRemark = keys[2]
@@ -1306,7 +1307,7 @@ namespace JinYuan.MES
                // 生产型号
                datavolist.Add(new TagDataVOListItem()
                {
-                    tagCode = "product_model",
+                    tagCode = "PRODUCTION_MODEL_WGJC",
                    tagValue = payload1.materialCode,
                    tagTime = DateTime.Now.ToString(),
                    tagCalculateResult = "",
@@ -1686,7 +1687,12 @@ namespace JinYuan.MES
                {
                    if (res1.category == null)
                    {
-                        mesResType = MesResType.B;
+                        if (res1.code== "EVEDL_PM_0406")
+                        {
+                            mesResType = MesResType.C;
+                        }
+                        else
+                            mesResType = MesResType.B;
                        MesMessage = res1.message;
                    }
                    else
@@ -60,4 +60,63 @@ 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; }
+
+    }
 }