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

UAS-MES/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.cs

@@ -264,12 +264,11 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
 
         public void GetData()
         {
-            if (TextBox.Text != "")
-            {
+
                 DataHelper dh = new DataHelper();
                 string sql;
                 //将查询到的结果返回界面
-                if (TextBox.Text != null) { 
+                if (TextBox.Text != "") { 
                  sql = "select " + BaseUtil.AddField(setValueField) + " from " + tableName + " where " + Name + "='" + TextBox.Text + "'";
                 }
                 else { 
@@ -290,7 +289,7 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
                 }  
                 //不允许工单号为空的情况
                 LockCheckBox.Checked = true;
-            }
+            
         }
 
         private void fillControl(int i, Control ct)

UAS-MES/CustomControl/TextBoxWithIcon/SearchTextBox.cs

@@ -321,12 +321,10 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
 
         public void GetData()
         {
-            if (TextBox.Text != "")
-            {
                 DataHelper dh = new DataHelper();
                 string sql;
                 //将查询到的结果返回界面
-                if (TextBox.Text != null)
+                if (TextBox.Text != "")
                 {
                      sql = "select " + BaseUtil.AddField(setValueField) + " from " + tableName + " where " + Name + "='" + TextBox.Text + "'";
                 }
@@ -346,7 +344,7 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
                 catch(Exception e){
                     LogManager.DoLog(e.Message);
                 }     
-            }
+            
         }
     }
 }

UAS-MES/FunctionCode/Make/Make_LabelCheck.cs

@@ -60,7 +60,8 @@ namespace UAS_MES.Make
         {
             //关闭当前页面
             showResult.Clear();
-            this.Close();
+            //this.Close();
+            (this.Parent.Parent as TabControl).TabPages.Remove(this.Parent as TabPage);
         }
 
         private void sncode_KeyDown(object sender, KeyEventArgs e)

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -220,6 +220,12 @@ namespace UAS_MES.Make
         {
             if (checkbox.Checked == true)
             {
+                //如果勾选没有填值
+                if (textbox.Text == "")
+                {
+                    OperateResult.AppendText(">>勾选长度或者前缀需要填写内容\n", Color.Red);
+                    return false;
+                }
                 if (type == "长度")
                 {
                     //则判断输入转换前的序列号长度是否合法，不合法则提示

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -350,6 +350,11 @@ namespace UAS_MES.Make
         {
             if (checkbox.Checked == true)
             {
+                //如果勾选没有填值
+                if (textbox.Text=="") {
+                    OperateResult.AppendText(">>勾选长度或者前缀需要填写内容\n", Color.Red);
+                    return false;
+                }
                 if (type == "长度")
                 {
                     //则判断输入转换前的序列号长度是否合法，不合法则提示