更改mes查询语句

TeamAAS-VM/Core/Management.cs

@@ -2344,11 +2344,11 @@ namespace TeamAAS_VP.Core
                                                         ppid[i] = ppidItem.Replace("ppid=", "").Trim();
                                                         SendTaskMessage($"ppid：{ppid[i]}", MessageLevel.Info);
                                                     }
-                                                    string revisionItem = item.FirstOrDefault(f => f.Contains("revision="));
+                                                    string revisionItem = item.FirstOrDefault(f => f.Contains("stage="));
                                                     if (revisionItem != null)
                                                     {
-                                                        revision[i] = revisionItem.Replace("revision=", "").Trim();
-                                                        SendTaskMessage($"revision：{revision[i]}", MessageLevel.Info);
+                                                        revision[i] = revisionItem.Replace("stage=", "").Trim();
+                                                        SendTaskMessage($"stage：{revision[i]}", MessageLevel.Info);
                                                     }
 
                                                     LogHelper.WriteLogMes($"第二次询问mes成功");
@@ -2448,11 +2448,11 @@ namespace TeamAAS_VP.Core
                                                     ppid[i] = ppidItem.Replace("ppid=", "").Trim();
                                                     SendTaskMessage($"ppid：{ppid[i]}", MessageLevel.Info);
                                                 }
-                                                string revisionItem = item.FirstOrDefault(f => f.Contains("revision="));
+                                                string revisionItem = item.FirstOrDefault(f => f.Contains("stage="));
                                                 if (revisionItem != null)
                                                 {
-                                                    revision[i] = revisionItem.Replace("revision=", "").Trim();
-                                                    SendTaskMessage($"revision：{revision[i]}", MessageLevel.Info);
+                                                    revision[i] = revisionItem.Replace("stage=", "").Trim();
+                                                    SendTaskMessage($"stage：{revision[i]}", MessageLevel.Info);
                                                 }
 
                                                 //切换产品
@@ -2615,7 +2615,7 @@ namespace TeamAAS_VP.Core
                                                             PROCESS_END_TIME = serverTimeResult.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffffff") + "+08:00",
                                                             SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
                                                             COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,
-                                                            REVISION = stationConfig.DataInfo.REVISION,
+                                                            REVISION = stationConfig.DataInfo.REVISION+"_"+ revision[i],
                                                             WO = wo[i],
                                                             MFG_LOT = stationConfig.DataInfo.MFG_LOT,
                                                             MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
@@ -2643,7 +2643,7 @@ namespace TeamAAS_VP.Core
                                                             PROCESS_END_TIME = serverTimeResult.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffffff") + "+08:00",
                                                             SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
                                                             COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,
-                                                            REVISION = stationConfig.DataInfo.REVISION,
+                                                            REVISION = stationConfig.DataInfo.REVISION + "_" + revision[i],
                                                             WO = wo[i],
                                                             MFG_LOT = stationConfig.DataInfo.MFG_LOT,
                                                             MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
@@ -2671,7 +2671,7 @@ namespace TeamAAS_VP.Core
                                                             PROCESS_END_TIME = serverTimeResult.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffffff") + "+08:00",
                                                             SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
                                                             COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,
-                                                            REVISION = stationConfig.DataInfo.REVISION,
+                                                            REVISION = stationConfig.DataInfo.REVISION + "_" + revision[i],
                                                             WO = wo[i],
                                                             MFG_LOT = stationConfig.DataInfo.MFG_LOT,
                                                             MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
@@ -2716,23 +2716,26 @@ namespace TeamAAS_VP.Core
                                                                 string target_log = Path.Combine(filePath, Path.GetFileName(source_log));
                                                                 File.Copy(source_log, target_log, true);
 
-                                                                string target_Directory = filePath + "\\扭力曲线\\";
-                                                                string source_Torque_Image = config.ScrewCurvePath + $"\\{dt.ToString("yyyy-MM")}\\{dt.ToString("yyyy-MM-dd")}\\{currentProduct.Name}\\{ProductMainSN[i]}";
-                                                                var col = Directory.GetFiles(source_Torque_Image);
-                                                                try
+                                                                //判断是否保存锁付曲线
+                                                                if (systemConfig.IsSaveScrewCurve)
                                                                 {
-                                                                    Directory.CreateDirectory(target_Directory);
-                                                                    foreach (var item in col)
+                                                                    string target_Directory = filePath + "\\扭力曲线\\";
+                                                                    string source_Torque_Image = config.ScrewCurvePath + $"\\{dt.ToString("yyyy-MM")}\\{dt.ToString("yyyy-MM-dd")}\\{currentProduct.Name}\\{ProductMainSN[i]}";
+                                                                    var col = Directory.GetFiles(source_Torque_Image);
+                                                                    try
                                                                     {
-                                                                        string target_Torque = target_Directory + item.Replace(source_Torque_Image, "");
-                                                                        File.Copy(item, target_Torque, true);
+                                                                        Directory.CreateDirectory(target_Directory);
+                                                                        foreach (var item in col)
+                                                                        {
+                                                                            string target_Torque = target_Directory + item.Replace(source_Torque_Image, "");
+                                                                            File.Copy(item, target_Torque, true);
+                                                                        }
                                                                     }
-                                                                }
-                                                                catch (Exception)
-                                                                {
-                                                                    SendTaskMessage($"扭力曲线图读取失败", MessageLevel.Error);
-                                                                }
-
+                                                                    catch (Exception)
+                                                                    {
+                                                                        SendTaskMessage($"扭力曲线图读取失败", MessageLevel.Error);
+                                                                    }
+                                                                }                                                                
                                                                 CompressionImage(filePath, filename, device.Station, device.FixtureId);
                                                             }
                                                             else

TeamAAS-VM/Services/MesService.cs

@@ -291,11 +291,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";
+                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";
+                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}");