aoi线体工单 回流焊

UAS_MES_BG/FunctionCode/Make/Make_CollectHLH.cs

@@ -467,13 +467,11 @@ namespace UAS_MES_NEW.Make
                                 response = Encoding.UTF8.GetString(receiveBuffer).TrimEnd('\0');
                                 OperateResult.AppendText($"收到响应: {response}" + "\n");
                                 Dictionary<string, string> hlh = ParseInputString(response);
-                                //                              string a = hlh["1212"];
-                                //                             string b = hlh["1212"];
 
-                                /*dh.ExecuteSql(" insert into hlh(HLH_ID,HLH_INDATE,SPEEDPV1,SPEEDPV2,ZONE1PV_UP,ZONE1PV_DOWN,ZONE2PV_UP,ZONE2PV_DOWN,ZONE3PV_UP,ZONE3PV_DOWN,ZONE4PV_UP,ZONE4PV_DOWN,ZONE5PV_UP,ZONE5PV_DOWN,ZONE6PV_UP,ZONE6PV_DOWN,ZONE7PV_UP,ZONE7PV_DOWN,ZONE8PV_UP,ZONE8PV_DOWN,ZONE9PV_UP,ZONE9PV_DOWN,ZONE10PV_UP,ZONE10PV_DOWN,ZONE11PV_UP,ZONE11PV_DOWN,ZONE12PV_UP,ZONE12PV_DOWN,FAN1_PV,FAN2_PV,FAN3_PV)" +
-                                    " values (hlh_seq.nextval,sysdate,'" + hlh["SPEEDPV1"] + "','" + hlh["SPEEDPV2"] + "' ,'" + hlh["ZONE1PV_UP"] + "','" + hlh["ZONE1PV_DOWN"] + "','" + hlh["ZONE2PV_UP"] + "','" + hlh["ZONE2PV_DOWN"] + "','" + hlh["ZONE3PV_UP"] + "','" + hlh["ZONE3PV_DOWN"] + "','" + hlh["ZONE4PV_UP"] + "'" +
-                                    ",'" + hlh["ZONE4PV_DOWN"] + "','" + hlh["ZONE5PV_UP"] + "','" + hlh["ZONE5PV_DOWN"] + "','" + hlh["ZONE6PV_UP"] + "','" + hlh["ZONE6PV_DOWN"] + "','" + hlh["ZONE7PV_UP"] + "','" + hlh["ZONE7PV_DOWN"] + "','" + hlh["ZONE8PV_UP"] + "','" + hlh["ZONE8PV_DOWN"] + "','" + hlh["ZONE9PV_UP"] + "'" +
-                                    ",'" + hlh["ZONE9PV_DOWN"] + "','" + hlh["ZONE10PV_UP"] + "','" + hlh["ZONE10PV_DOWN"] + "','" + hlh["ZONE11PV_UP"] + "','" + hlh["ZONE11PV_DOWN"] + "','" + hlh["ZONE12PV_UP"] + "','" + hlh["ZONE12PV_DOWN"] + "','" + hlh["FAN1_PV"] + "','" + hlh["FAN2_PV"] + "','" + hlh["FAN3_PV"] + "'  ) ", "insert");*/
+                                foreach (KeyValuePair<string, string> kvp in hlh)
+                                {
+                                    OperateResult.AppendText($"接收消息: {kvp.Key}|{kvp.Value}" + "\n");
+                                }
 
                                 dh.ExecuteSql($@"insert into hlh(hlh_id,hlh_indate,SPEEDPV1,ZONE1PV_UP,ZONE1PV_DOWN,ZONE2PV_UP,Zone2PV_Down,Zone3PV_UP,Zone3PV_Down,
                                                 Zone4PV_UP,Zone4PV_Down,Zone5PV_UP,Zone5PV_Down,Zone6PV_UP,Zone6PV_Down,Zone7PV_UP,Zone7PV_Down,

UAS_MES_BG/FunctionCode/Make/Make_ParseLog.cs

@@ -401,19 +401,18 @@ namespace UAS_MES_NEW.Make
                 {
                     foreach (string file in txtFiles)
                     {
+                        if (!File.Exists(file))
+                        {
+                            LogMessage($"文件不存在: {file}");
+                        }
+
+
                         if (Device.SelectedIndex == 0) // 劲拓SPI
                         {
-                            string fileType = Path.GetExtension(file).ToLower();
                             ParseLogInsert(file);
                         }
                         else if (Device.SelectedIndex == 1) // 思泰克SPI
                         {
-                            if (!File.Exists(file))
-                            {
-                                LogMessage($"文件不存在: {file}");
-                                continue;
-                            }
-
                             string fileName = Path.GetFileName(file);
                             string[] lines = File.ReadAllLines(file, Encoding.GetEncoding("GB2312"));
 
@@ -658,10 +657,6 @@ namespace UAS_MES_NEW.Make
                             {
                                 continue;
                             }
-                            if (!File.Exists(file))
-                            {
-                                LogMessage($"文件不存在: {file}");
-                            }
                             string xmlContent = File.ReadAllText(file);
                             var xmlList = ParseXml(xmlContent);
                             if (xmlList.Count == 0)
@@ -839,18 +834,33 @@ namespace UAS_MES_NEW.Make
                 {
                     if (string.IsNullOrEmpty(item)) continue;
                     string[] currItem = item.Split(',');
-                    string res = "";
+                    string res = "",wo = "";
                     if(equiType == "SPI")
                     {
                         res = currItem[1];
+                        wo = ma_code.Text;
                     }
                     else if (equiType == "AOI")
                     {
                         res = currItem[3];
+
+                        sql.Clear();
+                        sql.Append($"SELECT a.li_code,b.dl_macode FROM line_ipaoi a, deviceline b WHERE a.ipaddress = '{currItem[2]}' AND a.li_code = b.dl_linecode");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            wo = dt.Rows[0]["dd_name"].ToString();
+                        }
+                        else
+                        {
+                            LogMessage($"IP:{currItem[2]},无对应线体工单");
+                            return;
+                        }
                     }
                     Log itemLog = new Log()
                     {
                         SN = currItem[0],
+                        work_order = wo,
                         Result = res,
                         Details = equiType == "SPI" ? currItem[1] : currItem[3]
                     };
@@ -906,7 +916,7 @@ namespace UAS_MES_NEW.Make
                     }
 
                     param.Add(item.SN);
-                    param.Add(ma_code.Text ?? omakeCode);
+                    param.Add(item.work_order);
                     if (item.Result == "PASS")
                     {
                         param.Add(item.Result);
@@ -1222,6 +1232,7 @@ namespace UAS_MES_NEW.Make
 
         private class Log
         {
+            public string work_order {  get; set; }
             public string SN { set; get; }
             public string Result { set; get; }
             /*public List<NgData> Details { set; get; }*/