优化印刷机界面交互，回流焊字典提取

UAS_MES_BG/FunctionCode/Make/Make_CollectHLH.Designer.cs

@@ -48,7 +48,7 @@
             // timer1
             // 
             this.timer1.Enabled = true;
-            this.timer1.Interval = 300000;
+            this.timer1.Interval = 10000;
             this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
             // 
             // OperateResult

UAS_MES_BG/FunctionCode/Make/Make_CollectHLH.cs

@@ -396,7 +396,7 @@ namespace UAS_MES_NEW.Make
 
         private void timer1_Tick(object sender, EventArgs e)
         {
-            string serverIP = "192.168.110.42";
+            string serverIP = "192.168.10.171";
             int port = 8008;
 
             try
@@ -470,12 +470,17 @@ namespace UAS_MES_NEW.Make
                                 //                              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)" +
+                                /*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");
-
-
+                                    ",'" + 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");*/
+
+                                dh.ExecuteSql($@"insert into hlh(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,
+                                                Zone8PV_UP,Zone8PV_Down,Fan1_PV,Fan2_PV,Fan3_PV) values 
+                                                ({hlh["SpeedPV"]},{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["Fan1_PV"]},{hlh["Fan2_PV"]},{hlh["Fan3_PV"]})", "insert");
                             }
 
 

UAS_MES_BG/FunctionCode/Make/Make_ParseLog.cs

@@ -74,6 +74,13 @@ namespace UAS_MES_NEW.Make
 
         private void Device_SelectedIndexChanged(object sender, EventArgs e)
         {
+            if (Device.SelectedIndex == 3)
+            {
+                ma_code.Enabled = false;
+                txtPath.Focus();
+                txtPath.SelectAll();
+                return;
+            }
             if (string.IsNullOrEmpty(ma_code.Text))
             {
                 Device.SelectedIndex = -1;
@@ -132,22 +139,22 @@ namespace UAS_MES_NEW.Make
                     case 0:
                         dialog.Description = "请选择读取SPI设备文件夹";
                         currFileType = "txt";
-                        equiType = "1";
+                        equiType = "SPI";
                         break;
                     case 1:
                         dialog.Description = "请选择读取AOI设备文本文件";
                         currFileType = "txt";
-                        equiType = "2";
+                        equiType = "AOI";
                         break;
                     case 2:
                         dialog.Description = "请选择读取印刷机设备的文本文件夹";
                         currFileType = "xml";
-                        equiType = "3";
+                        equiType = "印刷机";
                         break;
                     case 3:
                         dialog.Description = "请选择读取贴片机的文本文件夹";
                         currFileType = "xml";
-                        equiType = "4";
+                        equiType = "贴片机";
                         break;
                 }
                 if (dialog.ShowDialog() == DialogResult.OK)
@@ -358,7 +365,7 @@ namespace UAS_MES_NEW.Make
                     string[] currItem = item.Split(',');
                     string res = "";
                     /*List<NgData> data = new List<NgData>();*/
-                    if(equiType == "1")
+                    if(equiType == "SPI")
                     {
                         if (currItem[1] != "PASS")
                         {
@@ -381,7 +388,7 @@ namespace UAS_MES_NEW.Make
                         {
                             res = "PASS";
                         }
-                    }else if (equiType == "2")
+                    }else if (equiType == "AOI")
                     {
                         if (currItem[3] != "PASS")
                         {
@@ -396,7 +403,7 @@ namespace UAS_MES_NEW.Make
                     {
                         SN = currItem[0],
                         Result = res,
-                        Details = equiType == "1" ? currItem[1] : currItem[3]
+                        Details = equiType == "SPI" ? currItem[1] : currItem[3]
                     };
                     logArr.Add(itemLog);