修改mes7请求数据混乱问题

TeamAAS-VM/Core/Management.cs

@@ -72,13 +72,13 @@ namespace TeamAAS_VP.Core
         /// <summary>
         /// 工单信息
         /// </summary>
-        string wo = "";
-        string model_num = "";//产品model_num
-        string color = "";//产品color
-        string ppid = "";//产品ppid
-        string revision = "";//产品revision
-        string stage = "";//产品revision
-        string kb_sn = "";//产品kb_sn
+        string[] wo = new string[10];
+        string[] model_num = new string[10];//产品model_num
+        string[] color = new string[10];//产品color
+        string[] ppid = new string[10];//产品ppid
+        string[] revision = new string[10];//产品revision
+        string[] stage = new string[10];//产品revision
+        string[] kb_sn = new string[10];//产品kb_sn
 
         /// <summary>
         /// 上次执行上传csv的日期
@@ -1719,44 +1719,44 @@ namespace TeamAAS_VP.Core
                                         string woItem = items.FirstOrDefault(f => f.Contains("wo="));
                                         if (woItem != null)
                                         {
-                                            wo = woItem.Replace("wo=", "").Trim();
+                                            wo[0] = woItem.Replace("wo=", "").Trim();
                                             SendTaskMessage($"产品wo:{wo}", MessageLevel.Info);
                                         }
                                         string modelItem = items.FirstOrDefault(f => f.Contains("model_num="));
                                         if (modelItem != null)
                                         {
-                                            model_num = modelItem.Replace("model_num=", "").Trim();
+                                            model_num[0] = modelItem.Replace("model_num=", "").Trim();
                                             SendTaskMessage($"model_num：{model_num}", MessageLevel.Info);
                                         }
                                         string colorItem = items.FirstOrDefault(f => f.Contains("color="));
                                         if (colorItem != null)
                                         {
-                                            color = colorItem.Replace("color=", "").Trim();
+                                            color[0] = colorItem.Replace("color=", "").Trim();
                                             SendTaskMessage($"color：{color}", MessageLevel.Info);
                                         }
                                         string ppidItem = items.FirstOrDefault(f => f.Contains("ppid="));
                                         if (ppidItem != null)
                                         {
-                                            ppid = ppidItem.Replace("ppid=", "").Trim();
+                                            ppid[0] = ppidItem.Replace("ppid=", "").Trim();
                                             SendTaskMessage($"ppid：{ppid}", MessageLevel.Info);
                                         }
                                         string stageItem = items.FirstOrDefault(f => f.Contains("stage="));
                                         if (stageItem != null)
                                         {
-                                            stage = stageItem.Replace("stage=", "").Trim();
+                                            stage[0] = stageItem.Replace("stage=", "").Trim();
                                             SendTaskMessage($"stage：{stage}", MessageLevel.Info);
                                         }
                                         string kbsnitem = items.FirstOrDefault(f => f.Contains("KB="));
                                         if (kbsnitem != null)
                                         {
-                                            kb_sn = kbsnitem.Replace("KB=", "").Trim();
+                                            kb_sn[0] = kbsnitem.Replace("KB=", "").Trim();
                                             SendTaskMessage($"KB：{kb_sn}", MessageLevel.Info);
                                         }
 
                                     }
                                     LogHelper.WriteLogMes($"【mes结束QUERY】");
                                     SendTaskMessage($"mes结束QUERY", MessageLevel.Info);
-                                    var q = await _systemDatabaseService.QueryProductFromMesAsync(model_num, color);
+                                    var q = await _systemDatabaseService.QueryProductFromMesAsync(model_num[0], color[0]);
                                     if (!string.IsNullOrEmpty(q))
                                     {
                                         ProductWithMes productWithMes = new ProductWithMes();
@@ -1770,7 +1770,7 @@ namespace TeamAAS_VP.Core
                                                 break;
                                             }
                                         }
-                                        if (currentProduct.ID != productId || productWithMes.ProductKBSN != kb_sn)
+                                        if (currentProduct.ID != productId || productWithMes.ProductKBSN != kb_sn[0])
                                         {
 
                                             _productService.Clear();
@@ -1866,44 +1866,44 @@ namespace TeamAAS_VP.Core
                                             string woItem = item.FirstOrDefault(f => f.Contains("wo="));
                                             if (woItem != null)
                                             {
-                                                wo = woItem.Replace("wo=", "").Trim();
-                                                SendTaskMessage($"产品wo:{wo}", MessageLevel.Info);
+                                                wo[0] = woItem.Replace("wo=", "").Trim();
+                                                SendTaskMessage($"产品wo:{wo[0]}", MessageLevel.Info);
                                             }
                                             string modelItem = item.FirstOrDefault(f => f.Contains("model_num="));
                                             if (modelItem != null)
                                             {
-                                                model_num = modelItem.Replace("model_num=", "").Trim();
-                                                SendTaskMessage($"model_num：{model_num}", MessageLevel.Info);
+                                                model_num[0] = modelItem.Replace("model_num=", "").Trim();
+                                                SendTaskMessage($"model_num：{model_num[0]}", MessageLevel.Info);
                                             }
                                             string colorItem = item.FirstOrDefault(f => f.Contains("color="));
                                             if (colorItem != null)
                                             {
-                                                color = colorItem.Replace("color=", "").Trim();
-                                                SendTaskMessage($"color：{color}", MessageLevel.Info);
+                                                color[0] = colorItem.Replace("color=", "").Trim();
+                                                SendTaskMessage($"color：{color[0]}", MessageLevel.Info);
                                             }
                                             string ppidItem = item.FirstOrDefault(f => f.Contains("ppid="));
                                             if (ppidItem != null)
                                             {
-                                                ppid = ppidItem.Replace("ppid=", "").Trim();
-                                                SendTaskMessage($"ppid：{ppid}", MessageLevel.Info);
+                                                ppid[0] = ppidItem.Replace("ppid=", "").Trim();
+                                                SendTaskMessage($"ppid：{ppid[0]}", MessageLevel.Info);
                                             }
                                             string stageItem = item.FirstOrDefault(f => f.Contains("stage="));
                                             if (stageItem != null)
                                             {
-                                                stage = stageItem.Replace("stage=", "").Trim();
-                                                SendTaskMessage($"stage：{stage}", MessageLevel.Info);
+                                                stage[0] = stageItem.Replace("stage=", "").Trim();
+                                                SendTaskMessage($"stage：{stage[0]}", MessageLevel.Info);
                                             }
                                             string kbsnitem = item.FirstOrDefault(f => f.Contains("KB="));
                                             if (kbsnitem != null)
                                             {
-                                                kb_sn = kbsnitem.Replace("KB=", "").Trim();
-                                                SendTaskMessage($"KB：{kb_sn}", MessageLevel.Info);
+                                                kb_sn[0] = kbsnitem.Replace("KB=", "").Trim();
+                                                SendTaskMessage($"KB：{kb_sn[0]}", MessageLevel.Info);
                                             }
                                         }
                                         LogHelper.WriteLogMes($"第二次询问mes成功");
                                         SendTaskMessage($"第二次询问mes成功:{response2}", MessageLevel.Debug);
 
-                                        var q = await _systemDatabaseService.QueryProductFromMesAsync(model_num, color);
+                                        var q = await _systemDatabaseService.QueryProductFromMesAsync(model_num[0], color[0]);
                                         if (!string.IsNullOrEmpty(q))
                                         {
                                             ProductWithMes productWithMes = new ProductWithMes();
@@ -1917,7 +1917,7 @@ namespace TeamAAS_VP.Core
                                                     break;
                                                 }
                                             }
-                                            if (currentProduct.ID != productId || productWithMes.ProductKBSN != kb_sn)
+                                            if (currentProduct.ID != productId || productWithMes.ProductKBSN != kb_sn[0])
                                             {
                                                 //切换产品
                                                 _productService.LoadProduct(productId);
@@ -2105,44 +2105,44 @@ namespace TeamAAS_VP.Core
                                                 string woItem = item.FirstOrDefault(f => f.Contains("wo="));
                                                 if (woItem != null)
                                                 {
-                                                    wo = woItem.Replace("wo=", "").Trim();
-                                                    SendTaskMessage($"产品wo:{wo}", MessageLevel.Info);
+                                                    wo[0] = woItem.Replace("wo=", "").Trim();
+                                                    SendTaskMessage($"产品wo:{wo[0]}", MessageLevel.Info);
                                                 }
                                                 string modelItem = item.FirstOrDefault(f => f.Contains("model_num="));
                                                 if (modelItem != null)
                                                 {
-                                                    model_num = modelItem.Replace("model_num=", "").Trim();
-                                                    SendTaskMessage($"model_num：{model_num}", MessageLevel.Info);
+                                                    model_num[0] = modelItem.Replace("model_num=", "").Trim();
+                                                    SendTaskMessage($"model_num：{model_num[0]}", MessageLevel.Info);
                                                 }
                                                 string colorItem = item.FirstOrDefault(f => f.Contains("color="));
                                                 if (colorItem != null)
                                                 {
-                                                    color = colorItem.Replace("color=", "").Trim();
-                                                    SendTaskMessage($"color：{color}", MessageLevel.Info);
+                                                    color[0] = colorItem.Replace("color=", "").Trim();
+                                                    SendTaskMessage($"color：{color[0]}", MessageLevel.Info);
                                                 }
                                                 string ppidItem = item.FirstOrDefault(f => f.Contains("ppid="));
                                                 if (ppidItem != null)
                                                 {
-                                                    ppid = ppidItem.Replace("ppid=", "").Trim();
-                                                    SendTaskMessage($"ppid：{ppid}", MessageLevel.Info);
+                                                    ppid[0] = ppidItem.Replace("ppid=", "").Trim();
+                                                    SendTaskMessage($"ppid：{ppid[0]}", MessageLevel.Info);
                                                 }
                                                 string stageItem = item.FirstOrDefault(f => f.Contains("stage="));
                                                 if (stageItem != null)
                                                 {
-                                                    stage = stageItem.Replace("stage=", "").Trim();
-                                                    SendTaskMessage($"stage：{stage}", MessageLevel.Info);
+                                                    stage[0] = stageItem.Replace("stage=", "").Trim();
+                                                    SendTaskMessage($"stage：{stage[0]}", MessageLevel.Info);
                                                 }
                                                 string kbsnitem = item.FirstOrDefault(f => f.Contains("KB="));
                                                 if (kbsnitem != null)
                                                 {
-                                                    kb_sn = kbsnitem.Replace("KB=", "").Trim();
-                                                    SendTaskMessage($"KB：{kb_sn}", MessageLevel.Info);
+                                                    kb_sn[0] = kbsnitem.Replace("KB=", "").Trim();
+                                                    SendTaskMessage($"KB：{kb_sn[0]}", MessageLevel.Info);
                                                 }
                                             }
                                             LogHelper.WriteLogMes($"第二次询问mes成功");
                                             SendTaskMessage($"第二次询问mes成功:{response2}", MessageLevel.Debug);
 
-                                            var q = await _systemDatabaseService.QueryProductFromMesAsync(model_num, color);
+                                            var q = await _systemDatabaseService.QueryProductFromMesAsync(model_num[0], color[0]);
                                             if (!string.IsNullOrEmpty(q))
                                             {
                                                 ProductWithMes productWithMes = new ProductWithMes();
@@ -2156,7 +2156,7 @@ namespace TeamAAS_VP.Core
                                                         break;
                                                     }
                                                 }
-                                                if (currentProduct.ID != productId || productWithMes.ProductKBSN != kb_sn)
+                                                if (currentProduct.ID != productId || productWithMes.ProductKBSN != kb_sn[0])
                                                 {
                                                     //切换产品
                                                     _productService.LoadProduct(productId);
@@ -2273,44 +2273,44 @@ namespace TeamAAS_VP.Core
                                             string woItem = items.FirstOrDefault(f => f.Contains("wo="));
                                             if (woItem != null)
                                             {
-                                                wo = woItem.Replace("wo=", "").Trim();
-                                                SendTaskMessage($"产品wo:{wo}", MessageLevel.Info);
+                                                wo[0] = woItem.Replace("wo=", "").Trim();
+                                                SendTaskMessage($"产品wo:{wo[0]}", MessageLevel.Info);
                                             }
                                             string modelItem = items.FirstOrDefault(f => f.Contains("model_num="));
                                             if (modelItem != null)
                                             {
-                                                model_num = modelItem.Replace("model_num=", "").Trim();
-                                                SendTaskMessage($"model_num：{model_num}", MessageLevel.Info);
+                                                model_num[0] = modelItem.Replace("model_num=", "").Trim();
+                                                SendTaskMessage($"model_num：{model_num[0]}", MessageLevel.Info);
                                             }
                                             string colorItem = items.FirstOrDefault(f => f.Contains("color="));
                                             if (colorItem != null)
                                             {
-                                                color = colorItem.Replace("color=", "").Trim();
-                                                SendTaskMessage($"color：{color}", MessageLevel.Info);
+                                                color[0] = colorItem.Replace("color=", "").Trim();
+                                                SendTaskMessage($"color：{color[0]}", MessageLevel.Info);
                                             }
                                             string ppidItem = items.FirstOrDefault(f => f.Contains("ppid="));
                                             if (ppidItem != null)
                                             {
-                                                ppid = ppidItem.Replace("ppid=", "").Trim();
-                                                SendTaskMessage($"ppid：{ppid}", MessageLevel.Info);
+                                                ppid[0] = ppidItem.Replace("ppid=", "").Trim();
+                                                SendTaskMessage($"ppid：{ppid[0]}", MessageLevel.Info);
                                             }
                                             string stageItem = items.FirstOrDefault(f => f.Contains("stage="));
                                             if (stageItem != null)
                                             {
-                                                stage = stageItem.Replace("stage=", "").Trim();
-                                                SendTaskMessage($"stage：{stage}", MessageLevel.Info);
+                                                stage[0] = stageItem.Replace("stage=", "").Trim();
+                                                SendTaskMessage($"stage：{stage[0]}", MessageLevel.Info);
                                             }
                                             string kbsnitem = items.FirstOrDefault(f => f.Contains("KB="));
                                             if (kbsnitem != null)
                                             {
-                                                kb_sn = kbsnitem.Replace("KB=", "").Trim();
-                                                SendTaskMessage($"KB：{kb_sn}", MessageLevel.Info);
+                                                kb_sn[0] = kbsnitem.Replace("KB=", "").Trim();
+                                                SendTaskMessage($"KB：{kb_sn[0]}", MessageLevel.Info);
                                             }
                                         }
                                         LogHelper.WriteLogMes($"【mes结束QUERY】");
                                         SendTaskMessage($"mes结束QUERY", MessageLevel.Info);
 
-                                        var q = await _systemDatabaseService.QueryProductFromMesAsync(model_num, color);
+                                        var q = await _systemDatabaseService.QueryProductFromMesAsync(model_num[0], color[0]);
                                         if (!string.IsNullOrEmpty(q))
                                         {
                                             ProductWithMes productWithMes = new ProductWithMes();
@@ -2324,7 +2324,7 @@ namespace TeamAAS_VP.Core
                                                     break;
                                                 }
                                             }
-                                            if (currentProduct.ID != productId || productWithMes.ProductKBSN != kb_sn)
+                                            if (currentProduct.ID != productId || productWithMes.ProductKBSN != kb_sn[0])
                                             {
                                                 //切换产品
                                                 _productService.LoadProduct(productId);
@@ -2780,9 +2780,9 @@ namespace TeamAAS_VP.Core
                                             string snItem = item.FirstOrDefault(f => f.Contains("sn="));
                                             if (snItem != null)
                                             {
-                                                ProductMainSN = snItem.Replace("sn=", "").Trim();
                                                 if (i == 0)
                                                 {
+                                                     ProductMainSN = snItem.Replace("sn=", "").Trim();
                                                     _productService.CurrentProductCode = ProductMainSN;
                                                 }
                                                 SendTaskMessage($"产品主sn：{ProductMainSN}", MessageLevel.Info);
@@ -2790,38 +2790,38 @@ namespace TeamAAS_VP.Core
                                             string woItem = item.FirstOrDefault(f => f.Contains("wo="));
                                             if (woItem != null)
                                             {
-                                                wo = woItem.Replace("wo=", "").Trim();
-                                                SendTaskMessage($"工单信息：{wo}", MessageLevel.Info);
+                                                wo[i] = woItem.Replace("wo=", "").Trim();
+                                                SendTaskMessage($"工单信息：{wo[i]}", MessageLevel.Info);
                                             }
                                             string modelItem = item.FirstOrDefault(f => f.Contains("model_num="));
                                             if (modelItem != null)
                                             {
-                                                model_num = modelItem.Replace("model_num=", "").Trim();
-                                                SendTaskMessage($"model_num：{model_num}", MessageLevel.Info);
+                                                model_num[i] = modelItem.Replace("model_num=", "").Trim();
+                                                SendTaskMessage($"model_num：{model_num[i]}", MessageLevel.Info);
                                             }
                                             string colorItem = item.FirstOrDefault(f => f.Contains("color="));
                                             if (colorItem != null)
                                             {
-                                                color = colorItem.Replace("color=", "").Trim();
-                                                SendTaskMessage($"color：{color}", MessageLevel.Info);
+                                                color[i] = colorItem.Replace("color=", "").Trim();
+                                                SendTaskMessage($"color：{color[i]}", MessageLevel.Info);
                                             }
                                             string ppidItem = item.FirstOrDefault(f => f.Contains("ppid="));
                                             if (ppidItem != null)
                                             {
-                                                ppid = ppidItem.Replace("ppid=", "").Trim();
-                                                SendTaskMessage($"ppid：{ppid}", MessageLevel.Info);
+                                                ppid[i] = ppidItem.Replace("ppid=", "").Trim();
+                                                SendTaskMessage($"ppid：{ppid[i]}", MessageLevel.Info);
                                             }
                                             string stageItem = item.FirstOrDefault(f => f.Contains("stage="));
                                             if (stageItem != null)
                                             {
-                                                stage = stageItem.Replace("stage=", "").Trim();
-                                                SendTaskMessage($"stage：{stage}", MessageLevel.Info);
+                                                stage[i] = stageItem.Replace("stage=", "").Trim();
+                                                SendTaskMessage($"stage：{stage[i]}", MessageLevel.Info);
                                             }
                                             string kbsnitem = item.FirstOrDefault(f => f.Contains("KB="));
                                             if (kbsnitem != null)
                                             {
-                                                kb_sn = kbsnitem.Replace("KB=", "").Trim();
-                                                SendTaskMessage($"KB：{kb_sn}", MessageLevel.Info);
+                                                kb_sn[i] = kbsnitem.Replace("KB=", "").Trim();
+                                                SendTaskMessage($"KB：{kb_sn[i]}", MessageLevel.Info);
                                             }
                                             ShowMes_Query = true;
 
@@ -2850,7 +2850,7 @@ namespace TeamAAS_VP.Core
                                                                     }
                                                                 }
 
-                                                                if (currentProduct.ID != productId && q.ProductKBSN == kb_sn && q.ProductColor == color && q.ProductCode == model_num)
+                                                                if (currentProduct.ID != productId && q.ProductKBSN == kb_sn[i] && q.ProductColor == color[i] && q.ProductCode == model_num[i])
                                                                 {
                                                                     //切换产品
                                                                     SendTaskMessage($"开始切换产品{q.ProductKBSN}", MessageLevel.Error);
@@ -3056,7 +3056,7 @@ namespace TeamAAS_VP.Core
                                     {
                                         string saveppid = "NA";
                                         string names = currentProduct.Name;
-                                        if (stationConfig.SaveCsvPPID) saveppid = ppid;
+                                        if (stationConfig.SaveCsvPPID) saveppid = ppid[i];
 
                                         // Dictionary<string, double> adjacentDiffDict1 = GetAdjacentDiffDict(keyData1);
                                         //判断锁付路径字符串是否为空，如果不为空则保存，否则不保存
@@ -3132,7 +3132,7 @@ namespace TeamAAS_VP.Core
                                                     SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
                                                     COMMODITY_TYPE = temp_COMMODITY_TYPE,
                                                     REVISION = stationConfig.DataInfo.REVISION + "_" + stage,//
-                                                    WO = wo,//
+                                                    WO = wo[i],//
                                                     MFG_LOT = stationConfig.DataInfo.MFG_LOT,//
                                                     MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
                                                     PROCESS_OUTCOME = item.PhotoPassed == "OK" ? "PASS" : "FAIL",
@@ -3166,7 +3166,7 @@ namespace TeamAAS_VP.Core
                                                         SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
                                                         COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,
                                                         REVISION = stationConfig.DataInfo.REVISION + "_" + stage,//
-                                                        WO = wo,//
+                                                        WO = wo[i],//
                                                         MFG_LOT = stationConfig.DataInfo.MFG_LOT,//
                                                         MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
                                                         PROCESS_OUTCOME = ok ? "Pass" : "FAIL",
@@ -3197,7 +3197,7 @@ namespace TeamAAS_VP.Core
                                                         SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
                                                         COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,
                                                         REVISION = stationConfig.DataInfo.REVISION + "_" + stage,//
-                                                        WO = wo,//
+                                                        WO = wo[i],//
                                                         MFG_LOT = stationConfig.DataInfo.MFG_LOT,//
                                                         MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
                                                         PROCESS_OUTCOME = ok ? "Pass" : "FAIL",