针对工单锁定的勾选框和输入框失去焦点的勾选问题处理

UAS-MES/CustomControl/CustomCheckBox/LockCheckBox.Designer.cs

@@ -33,7 +33,7 @@
             // LockCheckBox
             // 
             this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CheckedChanged += new System.EventHandler(this.LockCheckBox_CheckedChanged);
+            this.CheckStateChanged += new System.EventHandler(this.LockCheckBox_CheckStateChanged);
             this.ResumeLayout(false);
 
         }

UAS-MES/CustomControl/CustomCheckBox/LockCheckBox.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 using UAS_MES.PublicMethod;
+using UAS_MES.CustomControl.TextBoxWithIcon;
 
 namespace UAS_MES.CustomControl.CustomCheckBox
 {
@@ -15,7 +16,7 @@ namespace UAS_MES.CustomControl.CustomCheckBox
         /// <summary>
         /// 存放工单的控件
         /// </summary>
-        Control MaCtl;
+        MaCodeSearchTextBox MaCtl;
 
         bool LeaveEvent1;
 
@@ -37,12 +38,12 @@ namespace UAS_MES.CustomControl.CustomCheckBox
             InitializeComponent();
         }
 
-        public void GetMakeCodeCtl(Control ctl)
+        public void GetMakeCodeCtl(MaCodeSearchTextBox ctl)
         {
             MaCtl = ctl;
         }
 
-        public void LockCheckBox_CheckedChanged(object sender, EventArgs e)
+        private void LockCheckBox_CheckStateChanged(object sender, EventArgs e)
         {
             if (Checked)
             {
@@ -63,10 +64,10 @@ namespace UAS_MES.CustomControl.CustomCheckBox
                     BaseUtil.ShowError("工单号不能为空");
                 }
             }
-            else if(!Checked&& !LeaveEvent1)
+            else
             {
                 MaCtl.Enabled = true;
-                //MaCtl.Focus();
+                MaCtl.Focus();
             }
         }
     }

UAS-MES/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.Designer.cs

@@ -63,7 +63,6 @@
             this.TextBox.Str2 = null;
             this.TextBox.TabIndex = 0;
             this.TextBox.TextChanged += new System.EventHandler(this.TextBox_TextChanged);
-            this.TextBox.Enter += new System.EventHandler(this.TextBox_Enter);
             this.TextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBox_KeyDown);
             this.TextBox.Leave += new System.EventHandler(this.TextBox_Leave);
             // 
@@ -84,6 +83,6 @@
         #endregion
 
         private ClickPicBox.ClickPicBox Search_Icon;
-        private MaCodeTextBox TextBox;
+        public MaCodeTextBox TextBox;
     }
 }

UAS-MES/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.cs

@@ -92,7 +92,6 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
             }
         }
 
-
         public string Caller
         {
             get
@@ -240,7 +239,7 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
         private void TextBox_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)
-                GetData();
+                GetData(true);
         }
 
         public void SetLockCheckBox(LockCheckBox ctl)
@@ -248,7 +247,7 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
             LockCheckBox = ctl;
         }
 
-        public void GetData()
+        public void GetData(bool CheckBoxCheck)
         {
             if (TextBox.Text != "")
             {
@@ -288,7 +287,7 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
                 else
                     LeaveFindData = false;
                 //不允许工单号为空的情况
-                LockCheckBox.Checked = true;
+                LockCheckBox.Checked = CheckBoxCheck;
             }
         }
 
@@ -308,16 +307,9 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
             }
         }
 
-        private void TextBox_Enter(object sender, EventArgs e)
-        {
-            TextBox.BackColor = System.Drawing.Color.GreenYellow;
-        }
-
         public void TextBox_Leave(object sender, EventArgs e)
         {
-            TextBox.BackColor = System.Drawing.Color.White;
-            LockCheckBox.LeaveEvent = false;
-            GetData();
+            GetData(false);
         }
 
         private void SearchTextBox_Load(object sender, EventArgs e)

UAS-MES/DbFind.cs

@@ -208,7 +208,7 @@ namespace UAS_MES
                 if (MainControl is MaCodeSearchTextBox)
                 {
                     MaCodeSearchTextBox ctl = (MainControl as MaCodeSearchTextBox);
-                    ctl.GetData();
+                    ctl.GetData(true);
                 }
                 if (MainControl is SearchTextBox)
                 {

UAS-MES/UAS-MES.csproj

@@ -41,7 +41,7 @@
     <MinimumRequiredVersion>1.0.0.201</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>226</ApplicationRevision>
+    <ApplicationRevision>227</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>