序列号转换修改

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -811,8 +811,6 @@ namespace UAS_MES.Make
             {
                 try
                 {
-
-
                     if (step == ListA.Rows.Count + 1 && (CollectRemark.Checked || SameReamrk.Checked) && Remark.Text != "")
                     {
                         code.Enabled = true;

UAS-MES/FunctionCode/Make/Make_SeqTransform.Designer.cs

@@ -320,7 +320,9 @@
             this.Remark.Str1 = null;
             this.Remark.Str2 = null;
             this.Remark.TabIndex = 221;
+            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/FunctionCode/Make/Make_SeqTransform.cs

@@ -243,6 +243,9 @@ namespace UAS_MES.Make
                                             return;
                                         }
                                         LogicHandler.CollectRemarkInf(show_sncode.Text, "", "", oMakeCode, ma_prodcode.Text, Remark.Text);
+                                        if (CollectRemark.Checked) {
+                                            Remark.Text = "";
+                                        }
                                     }
                                     else 
                                     {
@@ -251,6 +254,10 @@ namespace UAS_MES.Make
                                             return;
                                         }
                                         LogicHandler.CollectRemarkInf(show_sncode.Text, "", "", oMakeCode, ma_prodcode.Text, Remark.Text);
+                                        if (CollectRemark.Checked)
+                                        {
+                                            Remark.Text = "";
+                                        }
                                     }
                                 }
 
@@ -513,13 +520,24 @@ namespace UAS_MES.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 +603,15 @@ namespace UAS_MES.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;
+        }
     }
 }