添加扫码尺寸下拉框

UAS_MES_ZT/FunctionCode/Make/Make_TestCollectionSplitIn.Designer.cs

@@ -118,6 +118,8 @@ namespace UAS_MES_NEW.Make
             this.oth = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.label14 = new System.Windows.Forms.Label();
             this.BigSN = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.Size = new System.Windows.Forms.ComboBox();
+            this.label15 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.BadInfSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.XmlWatcher)).BeginInit();
             this.SuspendLayout();
@@ -1109,7 +1111,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.label14.AutoSize = true;
             this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label14.Location = new System.Drawing.Point(423, 995);
+            this.label14.Location = new System.Drawing.Point(578, 994);
             this.label14.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(82, 41);
@@ -1122,7 +1124,7 @@ namespace UAS_MES_NEW.Make
             this.BigSN.BackColor = System.Drawing.Color.White;
             this.BigSN.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.BigSN.ID = null;
-            this.BigSN.Location = new System.Drawing.Point(515, 996);
+            this.BigSN.Location = new System.Drawing.Point(670, 995);
             this.BigSN.Margin = new System.Windows.Forms.Padding(5);
             this.BigSN.Name = "BigSN";
             this.BigSN.Power = null;
@@ -1134,12 +1136,37 @@ namespace UAS_MES_NEW.Make
             this.BigSN.Tag = "IfRead";
             this.BigSN.KeyDown += new System.Windows.Forms.KeyEventHandler(this.BigSN_KeyDown);
             // 
+            // Size
+            // 
+            this.Size.Items.AddRange(new object[] {
+            "14寸FHD",
+            "14寸WU",
+            "15.6寸",
+            "16寸"});
+            this.Size.Location = new System.Drawing.Point(449, 1003);
+            this.Size.Name = "Size";
+            this.Size.Size = new System.Drawing.Size(121, 32);
+            this.Size.TabIndex = 233;
+            // 
+            // label15
+            // 
+            this.label15.AutoSize = true;
+            this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label15.Location = new System.Drawing.Point(359, 998);
+            this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label15.Name = "label15";
+            this.label15.Size = new System.Drawing.Size(82, 41);
+            this.label15.TabIndex = 234;
+            this.label15.Text = "尺寸";
+            // 
             // Make_TestCollectionSplitIn
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(1719, 1069);
+            this.Controls.Add(this.label15);
+            this.Controls.Add(this.Size);
             this.Controls.Add(this.label14);
             this.Controls.Add(this.BigSN);
             this.Controls.Add(this.ma_endremark);
@@ -1317,5 +1344,7 @@ namespace UAS_MES_NEW.Make
         private CustomControl.TextBoxWithIcon.SnCollectionBox oth;
         private System.Windows.Forms.Label label14;
         private CustomControl.TextBoxWithIcon.SnCollectionBox BigSN;
+        private System.Windows.Forms.ComboBox Size;
+        private System.Windows.Forms.Label label15;
     }
 }

UAS_MES_ZT/FunctionCode/Make/Make_TestCollectionSplitIn.cs

@@ -1078,50 +1078,228 @@ namespace UAS_MES_NEW.Make
         {
             if (Keys.Enter == e.KeyCode)
             {
-                string[] num = new string[18] { "AA", "AB", "AC", "AD", "AE", "AF", "BA", "BB", "BC", "BD", "BE", "BF", "CA", "CB", "CC", "CD", "CE", "CF" };
-                string size = BigSN.Text.Substring(BigSN.Text.Length - 3, 3);
-                switch (size)
+
+                switch (Size.Text)
                 {
-                    case "100":
-                        for (int i = 0; i < 12; i++)
-                        {
-                            ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num[i];
-                            ms_code_KeyDown(sender, e);
-                        }
-                        break;
-                    case "200":
-                        for (int i = 0; i < 10; i++)
+                    case "14寸FHD":
+                        string[] num100_200_300_400_500_600 = new string[16] { "AA", "AB", "AC", "AD", "BA", "BB", "BC", "BD", "CA", "CB", "CC", "CD", "DA", "DB", "DC", "DD" };
+                        string size = BigSN.Text.Substring(BigSN.Text.Length - 3, 3);
+                        switch (size)
                         {
-                            ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num[i];
-                            ms_code_KeyDown(sender, e);
-                        }
-                        break;
-                    case "300":
-                        for (int i = 0; i < 12; i++)
-                        {
-                            ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num[i];
-                            ms_code_KeyDown(sender, e);
+                            case "100":
+                                for (int i = 0; i < 16; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num100_200_300_400_500_600[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+
+                                break;
+                            case "200":
+                                for (int i = 0; i < 16; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num100_200_300_400_500_600[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "300":
+                                for (int i = 0; i < 16; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num100_200_300_400_500_600[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "400":
+                                for (int i = 0; i < 16; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num100_200_300_400_500_600[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "500":
+                                for (int i = 0; i < 16; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num100_200_300_400_500_600[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "600":
+                                for (int i = 0; i < 16; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num100_200_300_400_500_600[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            default:
+                                break;
                         }
                         break;
-                    case "400":
-                        for (int i = 0; i < 10; i++)
+                    case "14寸WU":
+                        string[] num100_300_400_600 = new string[16] { "AA", "AB", "AC", "AD", "BA", "BB", "BC", "BD", "CA", "CB", "CC", "CD", "DA", "DB", "DC", "DD" };
+                        string[] num200_500 = new string[12] { "AA", "AB", "AC", "BA", "BB", "BC", "CA", "CB", "CC", "DA", "DB", "DC" };
+
+                        size = BigSN.Text.Substring(BigSN.Text.Length - 3, 3);
+                        switch (size)
                         {
-                            ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num[i];
-                            ms_code_KeyDown(sender, e);
+                            case "100":
+                                for (int i = 0; i < 16; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num100_300_400_600[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+
+                                break;
+                            case "200":
+                                for (int i = 0; i < 12; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num200_500[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "300":
+                                for (int i = 0; i < 16; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num100_300_400_600[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "400":
+                                for (int i = 0; i < 16; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num100_300_400_600[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "500":
+                                for (int i = 0; i < 12; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num200_500[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "600":
+                                for (int i = 0; i < 16; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num100_300_400_600[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            default:
+                                break;
                         }
                         break;
-                    case "500":
-                        for (int i = 0; i < 18; i++)
+                    case "15.6寸":
+                        string[] num500 = new string[18] { "AA", "AB", "AC", "AD", "AE", "AF", "BA", "BB", "BC", "BD", "BE", "BF", "CA", "CB", "CC", "CD", "CE", "CF" };
+                        string[] num100_300 = new string[12] { "AA", "AB", "AC", "AD", "AE", "AF", "BA", "BB", "BC", "BD", "BE", "BF" };
+                        string[] num200_400 = new string[10] { "AA", "AB", "AC", "AD", "AE", "BA", "BB", "BC", "BD", "BE" };
+                        string[] num600 = new string[15] { "AA", "AB", "AC", "AD", "AE", "BA", "BB", "BC", "BD", "BE", "CA", "CB", "CC", "CD", "CE" };
+
+                        size = BigSN.Text.Substring(BigSN.Text.Length - 3, 3);
+                        switch (size)
                         {
-                            ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num[i];
-                            ms_code_KeyDown(sender, e);
+                            case "100":
+                                for (int i = 0; i < 12; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num100_300[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "200":
+                                for (int i = 0; i < 10; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num200_400[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "300":
+                                for (int i = 0; i < 12; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num100_300[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "400":
+                                for (int i = 0; i < 10; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num200_400[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "500":
+                                for (int i = 0; i < 18; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num500[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "600":
+                                for (int i = 0; i < 15; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num600[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            default:
+                                break;
                         }
                         break;
-                    case "600":
-                        for (int i = 0; i < 15; i++)
+                    case "16寸":
+                        string[] num100_200_300_400 = new string[9] { "AA", "AB", "AC", "BA", "BB", "BC", "CA", "CB", "CC" };
+                        string[] num500_600_700 = new string[10] { "AA", "AB", "BA", "BB", "CA", "CB", "DA", "DB", "EA", "EB" };
+
+                        size = BigSN.Text.Substring(BigSN.Text.Length - 3, 3);
+                        switch (size)
                         {
-                            ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num[i];
-                            ms_code_KeyDown(sender, e);
+                            case "100":
+                                for (int i = 0; i < 9; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num100_200_300_400[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "200":
+                                for (int i = 0; i < 9; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num100_200_300_400[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "300":
+                                for (int i = 0; i < 9; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num100_200_300_400[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "400":
+                                for (int i = 0; i < 9; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num100_200_300_400[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "500":
+                                for (int i = 0; i < 10; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num500_600_700[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "600":
+                                for (int i = 0; i < 10; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num500_600_700[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            case "700":
+                                for (int i = 0; i < 10; i++)
+                                {
+                                    ms_sncode.Text = BigSN.Text.Substring(0, BigSN.Text.Length - 2) + num500_600_700[i];
+                                    ms_code_KeyDown(sender, e);
+                                }
+                                break;
+                            default:
+                                break;
                         }
                         break;
                     default: