代码同步至NEW项目

UAS_MES_NEW/FunctionCode/Make/Make_SeqProgramTransform.Designer.cs

@@ -50,6 +50,7 @@
             this.label1 = new System.Windows.Forms.Label();
             this.IFONLY = new System.Windows.Forms.CheckBox();
             this.CollectRemark = new System.Windows.Forms.CheckBox();
+            this.Remark = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.Seq_Remark_PreFix = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             this.StepCount = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SourceStepCount();
@@ -62,7 +63,6 @@
             this.TSNPre = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.SNLength = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.TSNLength = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.Remark = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).BeginInit();
             this.SuspendLayout();
             // 
@@ -310,6 +310,26 @@
             this.CollectRemark.UseVisualStyleBackColor = true;
             this.CollectRemark.CheckedChanged += new System.EventHandler(this.CollectRemark_CheckedChanged);
             // 
+            // Remark
+            // 
+            this.Remark.AllPower = null;
+            this.Remark.BackColor = System.Drawing.Color.White;
+            this.Remark.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.Remark.ID = null;
+            this.Remark.Location = new System.Drawing.Point(458, 377);
+            this.Remark.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.Remark.Multiline = true;
+            this.Remark.Name = "Remark";
+            this.Remark.Power = null;
+            this.Remark.Size = new System.Drawing.Size(143, 37);
+            this.Remark.Str = null;
+            this.Remark.Str1 = null;
+            this.Remark.Str2 = null;
+            this.Remark.TabIndex = 220;
+            this.Remark.Enter += new System.EventHandler(this.Remark_Enter);
+            this.Remark.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Remark_KeyDown);
+            this.Remark.Leave += new System.EventHandler(this.Remark_Leave);
+            // 
             // Seq_Remark_PreFix
             // 
             this.Seq_Remark_PreFix.AllPower = null;
@@ -484,24 +504,6 @@
             this.TSNLength.Str2 = null;
             this.TSNLength.TabIndex = 14;
             // 
-            // Remark
-            // 
-            this.Remark.AllPower = null;
-            this.Remark.BackColor = System.Drawing.Color.White;
-            this.Remark.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.Remark.ID = null;
-            this.Remark.Location = new System.Drawing.Point(458, 377);
-            this.Remark.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
-            this.Remark.Multiline = true;
-            this.Remark.Name = "Remark";
-            this.Remark.Power = null;
-            this.Remark.Size = new System.Drawing.Size(143, 37);
-            this.Remark.Str = null;
-            this.Remark.Str1 = null;
-            this.Remark.Str2 = null;
-            this.Remark.TabIndex = 220;
-            this.Remark.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Remark_KeyDown);
-            // 
             // Make_SeqProgramTransform
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

UAS_MES_NEW/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -576,6 +576,10 @@ namespace UAS_MES_NEW.Make
                             return false;
                         }
                         LogicHandler.CollectRemarkInf(show_sncode.Text, "", "", ms_macode.Text, ma_prodcode.Text, Remark.Text);
+                        if (CollectRemark.Checked)
+                        {
+                            Remark.Text = "";
+                        }
                     }
                     else
                     {
@@ -585,6 +589,10 @@ namespace UAS_MES_NEW.Make
                             return false;
                         }
                         LogicHandler.CollectRemarkInf(show_sncode.Text, "", "", ms_macode.Text, ma_prodcode.Text, Remark.Text);
+                        if (CollectRemark.Checked)
+                        {
+                            Remark.Text = "";
+                        }
                     }
                 }
             }
@@ -802,13 +810,25 @@ namespace UAS_MES_NEW.Make
         {
             if (e.KeyCode == Keys.Enter)
             {
-                if (step == ListA.Rows.Count + 1 && (CollectRemark.Checked || SameReamrk.Checked) && Remark.Text != "")
+                try
                 {
-                    code.Focus();
-                    code_KeyDown(this, new KeyEventArgs(Keys.Enter));
+                    if (step == ListA.Rows.Count + 1 && (CollectRemark.Checked || SameReamrk.Checked) && Remark.Text != "")
+                    {
+                        code.Enabled = true;
+                        code.Focus();
+                        code_KeyDown(this, new KeyEventArgs(Keys.Enter));
+                    }
+                    else
+                    {
+                        code.Enabled = true;
+                        code.Focus();
+                    }
                 }
-                else
+                catch
+                {
+                    code.Enabled = true;
                     code.Focus();
+                }
             }
         }
 
@@ -837,5 +857,15 @@ namespace UAS_MES_NEW.Make
                 SameReamrk.Checked = false;
             }
         }
+
+        private void Remark_Enter(object sender, EventArgs e)
+        {
+            code.Enabled = false;
+        }
+
+        private void Remark_Leave(object sender, EventArgs e)
+        {
+            code.Enabled = true;
+        }
     }
 }

UAS_MES_NEW/FunctionCode/Make/Make_SeqTransform.Designer.cs

@@ -419,7 +419,9 @@
             this.Remark.Str1 = null;
             this.Remark.Str2 = null;
             this.Remark.TabIndex = 226;
+            this.Remark.Enter += new System.EventHandler(this.Remark_Enter);
             this.Remark.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Remark_KeyDown);
+            this.Remark.Leave += new System.EventHandler(this.Remark_Leave);
             // 
             // Seq_Remark_PreFix
             // 

UAS_MES_NEW/FunctionCode/Make/Make_SeqTransform.cs

@@ -243,6 +243,10 @@ namespace UAS_MES_NEW.Make
                                             return;
                                         }
                                         LogicHandler.CollectRemarkInf(show_sncode.Text, "", "", oMakeCode, ma_prodcode.Text, Remark.Text);
+                                        if (CollectRemark.Checked)
+                                        {
+                                            Remark.Text = "";
+                                        }
                                     }
                                     else
                                     {
@@ -251,6 +255,10 @@ namespace UAS_MES_NEW.Make
                                             return;
                                         }
                                         LogicHandler.CollectRemarkInf(show_sncode.Text, "", "", oMakeCode, ma_prodcode.Text, Remark.Text);
+                                        if (CollectRemark.Checked)
+                                        {
+                                            Remark.Text = "";
+                                        }
                                     }
                                 }
 
@@ -513,13 +521,25 @@ namespace UAS_MES_NEW.Make
         {
             if (e.KeyCode == Keys.Enter)
             {
-                if ((CollectRemark.Checked || SameReamrk.Checked) && Remark.Text != "")
+                try
                 {
-                    sncode.Focus();
-                    sncode_KeyDown(this, new KeyEventArgs(Keys.Enter));
+                    if ((CollectRemark.Checked || SameReamrk.Checked) && Remark.Text != "")
+                    {
+                        sncode.Enabled = true;
+                        sncode.Focus();
+                        sncode_KeyDown(this, new KeyEventArgs(Keys.Enter));
+                    }
+                    else
+                    {
+                        sncode.Enabled = true;
+                        sncode.Focus();
+                    }
                 }
-                else
+                catch
+                {
+                    sncode.Enabled = true;
                     sncode.Focus();
+                }
             }
         }
 
@@ -585,5 +605,15 @@ namespace UAS_MES_NEW.Make
                 SameReamrk.Checked = false;
             }
         }
+
+        private void Remark_Leave(object sender, EventArgs e)
+        {
+            sncode.Enabled = true;
+        }
+
+        private void Remark_Enter(object sender, EventArgs e)
+        {
+            sncode.Enabled = false;
+        }
     }
 }