Merge remote-tracking branch 'refs/remotes/origin/master'

UAS-MES/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.cs

@@ -279,8 +279,15 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
                 {
                     sql += " and " + condition;
                 }
-                dt = (DataTable)dh.ExecuteSql(sql, "select");
-                ReturnDataToFrom();
+                try
+                {
+                    dt = (DataTable)dh.ExecuteSql(sql, "select");
+                    if (dt.Rows.Count > 0)
+                        ReturnDataToFrom();
+                }
+                catch(Exception e){
+                    LogManager.DoLog(e.Message);
+                }  
                 //不允许工单号为空的情况
                 LockCheckBox.Checked = true;
             }

UAS-MES/CustomControl/TextBoxWithIcon/SearchTextBox.cs

@@ -337,8 +337,15 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
                 {
                     sql += " and " + condition;
                 }
-                dt = (DataTable)dh.ExecuteSql(sql, "select");
-                ReturnDataToForm();          
+                try
+                {
+                    dt = (DataTable)dh.ExecuteSql(sql, "select");
+                    if (dt.Rows.Count > 0)
+                        ReturnDataToForm();
+                }
+                catch(Exception e){
+                    LogManager.DoLog(e.Message);
+                }     
             }
         }
     }