update

TeamAAS-VM/Core/Management.cs

@@ -78,6 +78,16 @@ namespace TeamAAS_VP.Core
         /// 超时自动停止秒数
         /// </summary>
         private int _pressureMaxDurationSeconds = 30; //超时自动停止秒数
+        DateTime[] StartCtqTime = new DateTime[3];//开始采集Ctq数据的时间
+
+        /// <summary>
+        /// 上次执行上传csv的日期
+        /// </summary>
+        private DateTime _lastCompressDate = DateTime.MinValue;
+        /// <summary>
+        /// 当天是否上传过csv
+        /// </summary>
+        private bool _hasCompressedToday = false;
         List<LockResult> lockResultsAll = new List<LockResult>();//一个产品的总结果
         string productSn = "";//产品sn
         DateTime StartScrewTime = DateTime.Now;//开始锁附的时间
@@ -2599,7 +2609,7 @@ namespace TeamAAS_VP.Core
                                                         }
                                                         else turnRes = false;
 
-                                                        string midValue = "", saveppid = "";
+                                                        string midValue = "NA", saveppid = "NA";
                                                         if (stationConfig.SaveCsvPPID) saveppid = ppid[i];
                                                         midValue = ((lockResult.TargetTorqueLowerLimit + lockResult.TargetTorqueUpperLimit) / 2).ToString("F3");
                                                         DFC.Add(new DataFormCtq
@@ -2623,11 +2633,11 @@ namespace TeamAAS_VP.Core
                                                             PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                                             CTQ_UNIT_OF_MEASURE = "kgf.cm",
                                                             ERROR_MESSAGE = torqueRes ? "" : "Torque_Spec OOS",
-                                                            PD_ATTR_01 = midValue,
-                                                            PD_ATTR_02 = ProductMainSN[i],
-                                                            PD_ATTR_03 = "",
-                                                            PD_ATTR_04 = "",
-                                                            PD_ATTR_05 = "",
+                                                            PD_ATTR_01 = ProductMainSN[i],
+                                                            PD_ATTR_02 = midValue,
+                                                            PD_ATTR_03 = "NA",
+                                                            PD_ATTR_04 = "NA",
+                                                            PD_ATTR_05 = "NA",
                                                         });
                                                         midValue = ((lockResult.TargetTurnsLowerLimit + lockResult.TargetTurnsUpperLimit) / 2).ToString("F3");
                                                         DFC.Add(new DataFormCtq
@@ -2651,11 +2661,11 @@ namespace TeamAAS_VP.Core
                                                             PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                                             CTQ_UNIT_OF_MEASURE = "圈",
                                                             ERROR_MESSAGE = turnRes ? "" : "Turn_Spec OOS",
-                                                            PD_ATTR_01 = midValue,
-                                                            PD_ATTR_02 = ProductMainSN[i],
-                                                            PD_ATTR_03 = "",
-                                                            PD_ATTR_04 = "",
-                                                            PD_ATTR_05 = "",
+                                                            PD_ATTR_01 = ProductMainSN[i],
+                                                            PD_ATTR_02 = midValue,
+                                                            PD_ATTR_03 = "NA",
+                                                            PD_ATTR_04 = "NA",
+                                                            PD_ATTR_05 = "NA",
                                                         });
                                                         midValue = ((stationConfig.DataInfo.CTQ_LSL_Pressure + stationConfig.DataInfo.CTQ_USL_Pressure) / 2).ToString("F3");
                                                         DFC.Add(new DataFormCtq
@@ -2679,11 +2689,11 @@ namespace TeamAAS_VP.Core
                                                             PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                                             CTQ_UNIT_OF_MEASURE = "N",
                                                             ERROR_MESSAGE = pressureRes ? "" : "Pressure_Spec OOS",
-                                                            PD_ATTR_01 = midValue,
-                                                            PD_ATTR_02 = ProductMainSN[i],
-                                                            PD_ATTR_03 = "",
-                                                            PD_ATTR_04 = "",
-                                                            PD_ATTR_05 = "",
+                                                            PD_ATTR_01 = ProductMainSN[i],
+                                                            PD_ATTR_02 = midValue,
+                                                            PD_ATTR_03 = "NA",
+                                                            PD_ATTR_04 = "NA",
+                                                            PD_ATTR_05 = "NA",
                                                         });
                                                     }
                                                 }
@@ -2707,6 +2717,7 @@ namespace TeamAAS_VP.Core
                                                                 LogHelper.WriteLogMes($"上传数据成功");
                                                                 SendTaskMessage($"上传数据成功", MessageLevel.Debug);
                                                                 string filePath = $"D:\\image\\Recored\\{dt.ToString("yyyy-MM")}\\{dt.ToString("MM-dd")}\\{currentProduct.Name}\\{ProductMainSN[i]}";
+                                                                string csvfilename = $"{i}_{stationConfig.DeviceName}_{dt.ToString("yyyy-MM-dd")}";
                                                                 //复制csv
                                                                 string source_csv = $"{stationConfig.SaveCsvPath}\\{dt.ToString("yyyy-MM")}\\{i}_{stationConfig.DeviceName}_{dt.ToString("yyyy-MM-dd")}.csv";
                                                                 string target_csv = Path.Combine(filePath, Path.GetFileName(source_csv));
@@ -2737,6 +2748,26 @@ namespace TeamAAS_VP.Core
                                                                     }
                                                                 }                                                                
                                                                 CompressionImage(filePath, filename, device.Station, device.FixtureId);
+                                                                //上传csv
+                                                                bool isAfter20 = dt.Hour >= 20;
+                                                                //判断是否是新的一天
+                                                                bool isNewDay = dt.Date != _lastCompressDate.Date;
+                                                                //当天还没执行过压缩
+                                                                if (isAfter20 && isNewDay && !_hasCompressedToday)
+                                                                {
+                                                                    // 执行压缩
+                                                                    CompressionImage(source_csv, csvfilename, device.Station, device.FixtureId);
+                                                                    _lastCompressDate = dt;
+                                                                    _hasCompressedToday = true;
+                                                                    LogHelper.WriteLogMes("csv上传数据成功");
+                                                                    SendTaskMessage($"csv上传数据成功", MessageLevel.Debug);
+                                                                }
+                                                                // 跨天后重置当天执行标记
+                                                                if (!isNewDay && _hasCompressedToday)
+                                                                {
+                                                                    _hasCompressedToday = false;
+                                                                }
+
                                                             }
                                                             else
                                                             {

TeamAAS-VM/Services/MesService.cs

@@ -106,11 +106,11 @@ namespace TeamAAS_VP.Services
             string url = "";
             if (device.F == "PTL")
             {
-                url = $"{device.MesUrl}?c=QUERY_RECORD&line={device.Line}&station={device.Station}&fixtureid={device.FixtureId}&sn={sn}&comp={device.comp}:{comp}&p=message,sn,wo,model_num,color,ppid,revision";
+                url = $"{device.MesUrl}?c=QUERY_RECORD&line={device.Line}&station={device.Station}&fixtureid={device.FixtureId}&sn={sn}&comp={device.comp}:{comp}&p=message,sn,wo,model_num,color,ppid,stage";
             }
             else
             {
-                url = $"{device.MesUrl}?c=QUERY_RECORD&line={device.Line}&station={device.Station}&fixtureid={device.FixtureId}&sn={sn}&p=message,sn,wo,model_num,color,ppid,revision";
+                url = $"{device.MesUrl}?c=QUERY_RECORD&line={device.Line}&station={device.Station}&fixtureid={device.FixtureId}&sn={sn}&p=message,sn,wo,model_num,color,ppid,stage";
             }
 
             LogHelper.WriteLogMes($"¡¾Ñ¯ÎÊURL¡¿{url}");