CCD20

JinYuan.MES/MesDataProcess.cs

@@ -1123,7 +1123,7 @@ namespace JinYuan.MES
                             qualityStatus = m.CSBYHOUTSTATIONJUDGMENTRESULT,
                         };
 
-                        payload1.tagDataVOList = GetTagDataVOList(m);
+                        payload1.tagDataVOList = GetTagDataVOList(m, equipNum,payload1);
                         #region old
                         //        payload1.tagDataVOList = new List<TagDataVOListItem>
                         //{
@@ -1211,7 +1211,7 @@ namespace JinYuan.MES
             #endregion
             return res;
         }
-        private List<TagDataVOListItem> GetTagDataVOList(BGearEntity m)
+        private List<TagDataVOListItem> GetTagDataVOList(BGearEntity m,  string equipNum, Payload1 payload1)
         {
             //var AGearList = 
             string insertTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -1241,47 +1241,78 @@ namespace JinYuan.MES
                 }
             }
             #region 本地字段没有，手动赋值
-            // 进站时间
-            if (string.IsNullOrEmpty(insertTime))
-            {
+
+            {//非Y项//工序名称
+                // 产线名称
+                // 设备编号
+                //操作员
+                //班次
+                //生产型号
+
+                // 工厂名称
                 datavolist.Add(new TagDataVOListItem()
                 {
-                    tagCode = "FV_F060_RES_002",
-                    tagValue = DateTime.Now.ToString(),//m
+                    tagCode = "factory_name",
+                    tagValue = payload1.siteCode,
                     tagTime = DateTime.Now.ToString(),
-                    tagCalculateResult = "Y",
-                    tagRemark = "采集时间"
+                    tagCalculateResult = "",
+                    tagRemark = "工厂名称"
                 });
-            }
-            else
-            {
+                // 工序名称
                 datavolist.Add(new TagDataVOListItem()
                 {
-                    tagCode = "FV_F060_RES_002",
-                    tagValue = insertTime,//m
+                    tagCode = "process_name",
+                    tagValue = m.CSBYHPROCESSNAME,
                     tagTime = DateTime.Now.ToString(),
-                    tagCalculateResult = "Y",
-                    tagRemark = "采集时间"
+                    tagCalculateResult = "",
+                    tagRemark = "工序名称"
+                });
+                // 产线名称
+                datavolist.Add(new TagDataVOListItem()
+                {
+                    tagCode = "production_line_name",
+                    tagValue = payload1.lineCode,
+                    tagTime = DateTime.Now.ToString(),
+                    tagCalculateResult = "",
+                    tagRemark = "工序名称"
+                });
+                // 设备编码
+                datavolist.Add(new TagDataVOListItem()
+                {
+                    tagCode = "equipment_id",
+                    tagValue = equipNum,
+                    tagTime = DateTime.Now.ToString(),
+                    tagCalculateResult = "",
+                    tagRemark = "设备编码"
+                });
+                // 操作员
+                datavolist.Add(new TagDataVOListItem()
+                {
+                    tagCode = "operator",
+                    tagValue = payload1.userName,
+                    tagTime = DateTime.Now.ToString(),
+                    tagCalculateResult = "",
+                    tagRemark = "操作员"
+                });
+                // 班次
+                datavolist.Add(new TagDataVOListItem()
+                {
+                    tagCode = "work_shift",
+                    tagValue = m.CSBYHSCHEDULE,
+                    tagTime = DateTime.Now.ToString(),
+                    tagCalculateResult = "",
+                    tagRemark = "班次"
+                });
+                // 生产型号
+                datavolist.Add(new TagDataVOListItem()
+                {
+                    tagCode = "product_model",
+                    tagValue = payload1.materialCode,
+                    tagTime = DateTime.Now.ToString(),
+                    tagCalculateResult = "",
+                    tagRemark = "生产型号"
                 });
             }
-            // 设备名称
-            datavolist.Add(new TagDataVOListItem()
-            {
-                tagCode = "FV_F060_RES_004",
-                tagValue = "",//m
-                tagTime = DateTime.Now.ToString(),
-                tagCalculateResult = "Y",
-                tagRemark = "设备名称"
-            });
-            // 操作员
-            datavolist.Add(new TagDataVOListItem()
-            {
-                tagCode = "FV_F060_RES_005",
-                tagValue = "",//m
-                tagTime = DateTime.Now.ToString(),
-                tagCalculateResult = "Y",
-                tagRemark = "操作员"
-            });
 
             #endregion