浏览代码

标签核对增加长度超过40的验证

shim 8 年之前
父节点
当前提交
65cdb36572

+ 3 - 1
UAS-MES/FunctionCode/Make/Make_LabelCheck.cs

@@ -116,7 +116,9 @@ namespace UAS_MES.Make
                 else
                 {
                     OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
-                    if (needCheckedInfo == sncode.Text||((needCheckedInfo == sncode.Text.Replace(":", "").Replace("-", ""))&&(checkItemInfo.Rows[checkIndex]["checkitem"].ToString() == "MAC"|| checkItemInfo.Rows[checkIndex]["checkitem"].ToString() == "BT")))
+
+                    if (needCheckedInfo == sncode.Text||((needCheckedInfo == sncode.Text.Replace(":", "").Replace("-", ""))&&(checkItemInfo.Rows[checkIndex]["checkitem"].ToString() == "MAC"|| checkItemInfo.Rows[checkIndex]["checkitem"].ToString() == "BT"))
+                        ||(sncode.Text.Length>40&&needCheckedInfo==sncode.Text.Substring(0,40).Replace(":", "").Replace("-", "")))
                     {
                         checkIndex += 1;//序号+1,进入下一步
                         if (checkIndex == checkItemInfo.Rows.Count)

+ 1 - 1
UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.Designer.cs

@@ -435,7 +435,7 @@
             this.Name = "Make_SeqProgramTransform";
             this.Tag = "Make!SeqProgramTransform";
             this.Load += new System.EventHandler(this.Make_SeqProgramTransform_Load);
-            this.SizeChanged += new System.EventHandler(this.序列烧录转换_SizeChanged);
+            this.SizeChanged += new System.EventHandler(this.Make_SeqProgramTransform_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();

+ 6 - 6
UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -81,12 +81,7 @@ namespace UAS_MES.Make
             OperateResult.AppendText(">>请输入TSN号\n", Color.Black);
             dh = new DataHelper();
         }
-
-        private void 序列烧录转换_SizeChanged(object sender, EventArgs e)
-        {
-            asc.controlAutoSize(this);
-        }
-
+        
         private void code_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)
@@ -922,5 +917,10 @@ namespace UAS_MES.Make
                 dh.ExecuteSql(sql.GetString(), "update");
             }
         }
+
+        private void Make_SeqProgramTransform_SizeChanged(object sender, EventArgs e)
+        {
+            asc.controlAutoSize(this);
+        }
     }
 }