添加售后返修模块录入

UAS_MES_ODLF/FunctionCode/Special/Special_Repair.Designer.cs

@@ -36,22 +36,23 @@ namespace UAS_MES_NEW.Special
             this.LocationSource = new System.Windows.Forms.BindingSource(this.components);
             this.ComponentSource = new System.Windows.Forms.BindingSource(this.components);
             this.bc_code = new System.Windows.Forms.Label();
-            this.as_reason = new DevExpress.XtraEditors.CheckedComboBoxEdit();
+            this.Save = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.groupBoxWithBorder3 = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.as_badpro = new DevExpress.XtraEditors.ComboBoxEdit();
             this.as_process = new DevExpress.XtraEditors.CheckedComboBoxEdit();
             this.as_method = new DevExpress.XtraEditors.CheckedComboBoxEdit();
-            this.as_badpro = new DevExpress.XtraEditors.CheckedComboBoxEdit();
+            this.as_reason = new DevExpress.XtraEditors.CheckedComboBoxEdit();
             this.label9 = new System.Windows.Forms.Label();
             this.label21 = new System.Windows.Forms.Label();
             this.label20 = new System.Windows.Forms.Label();
             this.label18 = new System.Windows.Forms.Label();
             this.label19 = new System.Windows.Forms.Label();
             this.groupBoxWithBorder2 = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.as_lcdconfirm = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.as_shellconfirm = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.as_duty2 = new DevExpress.XtraEditors.ComboBoxEdit();
             this.as_recheck = new DevExpress.XtraEditors.CheckedComboBoxEdit();
-            this.as_lcdconfirm = new DevExpress.XtraEditors.CheckedComboBoxEdit();
-            this.as_shellconfirm = new DevExpress.XtraEditors.CheckedComboBoxEdit();
             this.as_changerconfirm = new DevExpress.XtraEditors.CheckedComboBoxEdit();
-            this.as_duty2 = new DevExpress.XtraEditors.CheckedComboBoxEdit();
             this.label14 = new System.Windows.Forms.Label();
             this.label13 = new System.Windows.Forms.Label();
             this.label12 = new System.Windows.Forms.Label();
@@ -59,6 +60,7 @@ namespace UAS_MES_NEW.Special
             this.label8 = new System.Windows.Forms.Label();
             this.label10 = new System.Windows.Forms.Label();
             this.groupBoxWithBorder1 = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.AS_BADCODE = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.as_sku = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.nr_code = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
@@ -69,9 +71,8 @@ namespace UAS_MES_NEW.Special
             this.AS_WAY = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.nrg_code = new System.Windows.Forms.Label();
             this.AS_CHARGER = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
-            this.so_code = new System.Windows.Forms.Label();
+            this.as_id = new System.Windows.Forms.Label();
             this.AS_SHELL = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
-            this.mbr_dutycode = new System.Windows.Forms.Label();
             this.AS_LCD = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.AS_DESCRIPTION_label = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
@@ -83,26 +84,25 @@ namespace UAS_MES_NEW.Special
             this.GetSNCode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperatResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             this.Clean = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            this.AS_BADCODE = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             ((System.ComponentModel.ISupportInitialize)(this.LocationSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.ComponentSource)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.as_reason.Properties)).BeginInit();
             this.groupBoxWithBorder3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.as_badpro.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_process.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_method.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.as_badpro.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.as_reason.Properties)).BeginInit();
             this.groupBoxWithBorder2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.as_recheck.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_lcdconfirm.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_shellconfirm.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.as_changerconfirm.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_duty2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.as_recheck.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.as_changerconfirm.Properties)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
             this.SuspendLayout();
             // 
             // GetSNCode_Label
             // 
-            this.GetSNCode_Label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.GetSNCode_Label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.GetSNCode_Label.AutoSize = true;
             this.GetSNCode_Label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -125,22 +125,32 @@ namespace UAS_MES_NEW.Special
             this.bc_code.TabIndex = 122;
             this.bc_code.Visible = false;
             // 
-            // as_reason
-            // 
-            this.as_reason.EditValue = "";
-            this.as_reason.Location = new System.Drawing.Point(805, 95);
-            this.as_reason.Name = "as_reason";
-            this.as_reason.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.as_reason.Size = new System.Drawing.Size(306, 36);
-            this.as_reason.TabIndex = 164;
+            // Save
+            // 
+            this.Save.AllPower = null;
+            this.Save.BackColor = System.Drawing.Color.Transparent;
+            this.Save.DownImage = ((System.Drawing.Image)(resources.GetObject("Save.DownImage")));
+            this.Save.Image = null;
+            this.Save.IsShowBorder = true;
+            this.Save.Location = new System.Drawing.Point(610, 1078);
+            this.Save.Margin = new System.Windows.Forms.Padding(6);
+            this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
+            this.Save.Name = "Save";
+            this.Save.NormalImage = ((System.Drawing.Image)(resources.GetObject("Save.NormalImage")));
+            this.Save.Power = null;
+            this.Save.Size = new System.Drawing.Size(120, 48);
+            this.Save.TabIndex = 164;
+            this.Save.Tag = "IfRead";
+            this.Save.Text = "保存";
+            this.Save.UseVisualStyleBackColor = true;
+            this.Save.Click += new System.EventHandler(this.Save_Click);
             // 
             // groupBoxWithBorder3
             // 
             this.groupBoxWithBorder3.BorderColor = System.Drawing.Color.Black;
+            this.groupBoxWithBorder3.Controls.Add(this.as_badpro);
             this.groupBoxWithBorder3.Controls.Add(this.as_process);
             this.groupBoxWithBorder3.Controls.Add(this.as_method);
-            this.groupBoxWithBorder3.Controls.Add(this.as_badpro);
             this.groupBoxWithBorder3.Controls.Add(this.as_reason);
             this.groupBoxWithBorder3.Controls.Add(this.label9);
             this.groupBoxWithBorder3.Controls.Add(this.label21);
@@ -158,6 +168,15 @@ namespace UAS_MES_NEW.Special
             this.groupBoxWithBorder3.Text = "工厂翻新及交付信息";
             this.groupBoxWithBorder3.TextColor = System.Drawing.Color.Black;
             // 
+            // as_badpro
+            // 
+            this.as_badpro.Location = new System.Drawing.Point(805, 182);
+            this.as_badpro.Name = "as_badpro";
+            this.as_badpro.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.as_badpro.Size = new System.Drawing.Size(306, 36);
+            this.as_badpro.TabIndex = 192;
+            // 
             // as_process
             // 
             this.as_process.EditValue = "";
@@ -178,22 +197,22 @@ namespace UAS_MES_NEW.Special
             this.as_method.Size = new System.Drawing.Size(306, 36);
             this.as_method.TabIndex = 184;
             // 
-            // as_badpro
+            // as_reason
             // 
-            this.as_badpro.EditValue = "";
-            this.as_badpro.Location = new System.Drawing.Point(805, 182);
-            this.as_badpro.Name = "as_badpro";
-            this.as_badpro.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.as_reason.EditValue = "";
+            this.as_reason.Location = new System.Drawing.Point(805, 95);
+            this.as_reason.Name = "as_reason";
+            this.as_reason.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.as_badpro.Size = new System.Drawing.Size(306, 36);
-            this.as_badpro.TabIndex = 183;
+            this.as_reason.Size = new System.Drawing.Size(306, 36);
+            this.as_reason.TabIndex = 164;
             // 
             // label9
             // 
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label9.ForeColor = System.Drawing.Color.Black;
-            this.label9.Location = new System.Drawing.Point(1683, 447);
+            this.label9.Location = new System.Drawing.Point(1687, 451);
             this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(0, 41);
@@ -204,7 +223,7 @@ namespace UAS_MES_NEW.Special
             this.label21.AutoSize = true;
             this.label21.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label21.ForeColor = System.Drawing.Color.Black;
-            this.label21.Location = new System.Drawing.Point(14, 95);
+            this.label21.Location = new System.Drawing.Point(18, 99);
             this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label21.Name = "label21";
             this.label21.Size = new System.Drawing.Size(146, 41);
@@ -216,7 +235,7 @@ namespace UAS_MES_NEW.Special
             this.label20.AutoSize = true;
             this.label20.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label20.ForeColor = System.Drawing.Color.Black;
-            this.label20.Location = new System.Drawing.Point(586, 95);
+            this.label20.Location = new System.Drawing.Point(590, 99);
             this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label20.Name = "label20";
             this.label20.Size = new System.Drawing.Size(146, 41);
@@ -228,7 +247,7 @@ namespace UAS_MES_NEW.Special
             this.label18.AutoSize = true;
             this.label18.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label18.ForeColor = System.Drawing.Color.Black;
-            this.label18.Location = new System.Drawing.Point(586, 182);
+            this.label18.Location = new System.Drawing.Point(590, 186);
             this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(146, 41);
@@ -240,7 +259,7 @@ namespace UAS_MES_NEW.Special
             this.label19.AutoSize = true;
             this.label19.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label19.ForeColor = System.Drawing.Color.Black;
-            this.label19.Location = new System.Drawing.Point(14, 182);
+            this.label19.Location = new System.Drawing.Point(18, 186);
             this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label19.Name = "label19";
             this.label19.Size = new System.Drawing.Size(146, 41);
@@ -250,11 +269,11 @@ namespace UAS_MES_NEW.Special
             // groupBoxWithBorder2
             // 
             this.groupBoxWithBorder2.BorderColor = System.Drawing.Color.Black;
-            this.groupBoxWithBorder2.Controls.Add(this.as_recheck);
             this.groupBoxWithBorder2.Controls.Add(this.as_lcdconfirm);
             this.groupBoxWithBorder2.Controls.Add(this.as_shellconfirm);
-            this.groupBoxWithBorder2.Controls.Add(this.as_changerconfirm);
             this.groupBoxWithBorder2.Controls.Add(this.as_duty2);
+            this.groupBoxWithBorder2.Controls.Add(this.as_recheck);
+            this.groupBoxWithBorder2.Controls.Add(this.as_changerconfirm);
             this.groupBoxWithBorder2.Controls.Add(this.label14);
             this.groupBoxWithBorder2.Controls.Add(this.label13);
             this.groupBoxWithBorder2.Controls.Add(this.label12);
@@ -272,35 +291,43 @@ namespace UAS_MES_NEW.Special
             this.groupBoxWithBorder2.Text = "工厂复测确认信息";
             this.groupBoxWithBorder2.TextColor = System.Drawing.Color.Black;
             // 
-            // as_recheck
-            // 
-            this.as_recheck.EditValue = "";
-            this.as_recheck.Location = new System.Drawing.Point(249, 75);
-            this.as_recheck.Name = "as_recheck";
-            this.as_recheck.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.as_recheck.Size = new System.Drawing.Size(306, 36);
-            this.as_recheck.TabIndex = 190;
-            // 
             // as_lcdconfirm
             // 
-            this.as_lcdconfirm.EditValue = "";
-            this.as_lcdconfirm.Location = new System.Drawing.Point(806, 76);
+            this.as_lcdconfirm.AllowHtmlTextInToolTip = DevExpress.Utils.DefaultBoolean.False;
+            this.as_lcdconfirm.Location = new System.Drawing.Point(808, 72);
             this.as_lcdconfirm.Name = "as_lcdconfirm";
             this.as_lcdconfirm.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.as_lcdconfirm.Size = new System.Drawing.Size(306, 36);
-            this.as_lcdconfirm.TabIndex = 189;
+            this.as_lcdconfirm.TabIndex = 193;
             // 
             // as_shellconfirm
             // 
-            this.as_shellconfirm.EditValue = "";
             this.as_shellconfirm.Location = new System.Drawing.Point(249, 148);
             this.as_shellconfirm.Name = "as_shellconfirm";
             this.as_shellconfirm.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.as_shellconfirm.Size = new System.Drawing.Size(306, 36);
-            this.as_shellconfirm.TabIndex = 188;
+            this.as_shellconfirm.TabIndex = 192;
+            // 
+            // as_duty2
+            // 
+            this.as_duty2.Location = new System.Drawing.Point(249, 223);
+            this.as_duty2.Name = "as_duty2";
+            this.as_duty2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.as_duty2.Size = new System.Drawing.Size(306, 36);
+            this.as_duty2.TabIndex = 191;
+            // 
+            // as_recheck
+            // 
+            this.as_recheck.EditValue = "";
+            this.as_recheck.Location = new System.Drawing.Point(249, 75);
+            this.as_recheck.Name = "as_recheck";
+            this.as_recheck.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.as_recheck.Size = new System.Drawing.Size(306, 36);
+            this.as_recheck.TabIndex = 190;
             // 
             // as_changerconfirm
             // 
@@ -312,22 +339,12 @@ namespace UAS_MES_NEW.Special
             this.as_changerconfirm.Size = new System.Drawing.Size(306, 36);
             this.as_changerconfirm.TabIndex = 187;
             // 
-            // as_duty2
-            // 
-            this.as_duty2.EditValue = "";
-            this.as_duty2.Location = new System.Drawing.Point(249, 219);
-            this.as_duty2.Name = "as_duty2";
-            this.as_duty2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.as_duty2.Size = new System.Drawing.Size(306, 36);
-            this.as_duty2.TabIndex = 186;
-            // 
             // label14
             // 
             this.label14.AutoSize = true;
             this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label14.ForeColor = System.Drawing.Color.Black;
-            this.label14.Location = new System.Drawing.Point(14, 215);
+            this.label14.Location = new System.Drawing.Point(18, 219);
             this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(165, 41);
@@ -339,7 +356,7 @@ namespace UAS_MES_NEW.Special
             this.label13.AutoSize = true;
             this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label13.ForeColor = System.Drawing.Color.Black;
-            this.label13.Location = new System.Drawing.Point(586, 144);
+            this.label13.Location = new System.Drawing.Point(590, 148);
             this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(146, 41);
@@ -351,7 +368,7 @@ namespace UAS_MES_NEW.Special
             this.label12.AutoSize = true;
             this.label12.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label12.ForeColor = System.Drawing.Color.Black;
-            this.label12.Location = new System.Drawing.Point(14, 144);
+            this.label12.Location = new System.Drawing.Point(18, 148);
             this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(210, 41);
@@ -363,7 +380,7 @@ namespace UAS_MES_NEW.Special
             this.label11.AutoSize = true;
             this.label11.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label11.ForeColor = System.Drawing.Color.Black;
-            this.label11.Location = new System.Drawing.Point(586, 72);
+            this.label11.Location = new System.Drawing.Point(590, 76);
             this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label11.Name = "label11";
             this.label11.Size = new System.Drawing.Size(210, 41);
@@ -375,7 +392,7 @@ namespace UAS_MES_NEW.Special
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label8.ForeColor = System.Drawing.Color.Black;
-            this.label8.Location = new System.Drawing.Point(1683, 447);
+            this.label8.Location = new System.Drawing.Point(1687, 451);
             this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(0, 41);
@@ -386,7 +403,7 @@ namespace UAS_MES_NEW.Special
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label10.ForeColor = System.Drawing.Color.Black;
-            this.label10.Location = new System.Drawing.Point(14, 72);
+            this.label10.Location = new System.Drawing.Point(18, 76);
             this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(210, 41);
@@ -407,9 +424,8 @@ namespace UAS_MES_NEW.Special
             this.groupBoxWithBorder1.Controls.Add(this.AS_WAY);
             this.groupBoxWithBorder1.Controls.Add(this.nrg_code);
             this.groupBoxWithBorder1.Controls.Add(this.AS_CHARGER);
-            this.groupBoxWithBorder1.Controls.Add(this.so_code);
+            this.groupBoxWithBorder1.Controls.Add(this.as_id);
             this.groupBoxWithBorder1.Controls.Add(this.AS_SHELL);
-            this.groupBoxWithBorder1.Controls.Add(this.mbr_dutycode);
             this.groupBoxWithBorder1.Controls.Add(this.AS_LCD);
             this.groupBoxWithBorder1.Controls.Add(this.AS_DESCRIPTION_label);
             this.groupBoxWithBorder1.Controls.Add(this.label6);
@@ -429,16 +445,36 @@ namespace UAS_MES_NEW.Special
             this.groupBoxWithBorder1.Text = "小度提供信息";
             this.groupBoxWithBorder1.TextColor = System.Drawing.Color.Black;
             // 
+            // AS_BADCODE
+            // 
+            this.AS_BADCODE.AllPower = null;
+            this.AS_BADCODE.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.AS_BADCODE.BackColor = System.Drawing.Color.White;
+            this.AS_BADCODE.Enabled = false;
+            this.AS_BADCODE.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.AS_BADCODE.ID = null;
+            this.AS_BADCODE.Location = new System.Drawing.Point(1284, 62);
+            this.AS_BADCODE.Margin = new System.Windows.Forms.Padding(6);
+            this.AS_BADCODE.Name = "AS_BADCODE";
+            this.AS_BADCODE.Power = null;
+            this.AS_BADCODE.Size = new System.Drawing.Size(432, 39);
+            this.AS_BADCODE.Str = null;
+            this.AS_BADCODE.Str1 = null;
+            this.AS_BADCODE.Str2 = null;
+            this.AS_BADCODE.TabIndex = 162;
+            this.AS_BADCODE.Tag = "Read";
+            // 
             // as_sku
             // 
             this.as_sku.AllPower = null;
-            this.as_sku.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.as_sku.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.as_sku.BackColor = System.Drawing.Color.White;
             this.as_sku.Enabled = false;
             this.as_sku.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.as_sku.ID = null;
-            this.as_sku.Location = new System.Drawing.Point(1280, 128);
+            this.as_sku.Location = new System.Drawing.Point(1284, 132);
             this.as_sku.Margin = new System.Windows.Forms.Padding(6);
             this.as_sku.Name = "as_sku";
             this.as_sku.Power = null;
@@ -454,7 +490,7 @@ namespace UAS_MES_NEW.Special
             this.nr_code.AutoSize = true;
             this.nr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.nr_code.ForeColor = System.Drawing.Color.Black;
-            this.nr_code.Location = new System.Drawing.Point(1683, 447);
+            this.nr_code.Location = new System.Drawing.Point(1687, 451);
             this.nr_code.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.nr_code.Name = "nr_code";
             this.nr_code.Size = new System.Drawing.Size(0, 41);
@@ -464,7 +500,7 @@ namespace UAS_MES_NEW.Special
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(1122, 122);
+            this.label7.Location = new System.Drawing.Point(1126, 126);
             this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(80, 41);
@@ -485,13 +521,13 @@ namespace UAS_MES_NEW.Special
             // AS_DUTY
             // 
             this.AS_DUTY.AllPower = null;
-            this.AS_DUTY.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.AS_DUTY.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.AS_DUTY.BackColor = System.Drawing.Color.White;
             this.AS_DUTY.Enabled = false;
             this.AS_DUTY.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.AS_DUTY.ID = null;
-            this.AS_DUTY.Location = new System.Drawing.Point(1319, 367);
+            this.AS_DUTY.Location = new System.Drawing.Point(1323, 371);
             this.AS_DUTY.Margin = new System.Windows.Forms.Padding(6);
             this.AS_DUTY.Name = "AS_DUTY";
             this.AS_DUTY.Power = null;
@@ -506,7 +542,7 @@ namespace UAS_MES_NEW.Special
             // 
             this.AS_BADCODE_label.AutoSize = true;
             this.AS_BADCODE_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AS_BADCODE_label.Location = new System.Drawing.Point(1122, 53);
+            this.AS_BADCODE_label.Location = new System.Drawing.Point(1126, 57);
             this.AS_BADCODE_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.AS_BADCODE_label.Name = "AS_BADCODE_label";
             this.AS_BADCODE_label.Size = new System.Drawing.Size(146, 41);
@@ -516,13 +552,13 @@ namespace UAS_MES_NEW.Special
             // AS_FACTORY
             // 
             this.AS_FACTORY.AllPower = null;
-            this.AS_FACTORY.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.AS_FACTORY.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.AS_FACTORY.BackColor = System.Drawing.Color.White;
             this.AS_FACTORY.Enabled = false;
             this.AS_FACTORY.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.AS_FACTORY.ID = null;
-            this.AS_FACTORY.Location = new System.Drawing.Point(801, 364);
+            this.AS_FACTORY.Location = new System.Drawing.Point(805, 368);
             this.AS_FACTORY.Margin = new System.Windows.Forms.Padding(6);
             this.AS_FACTORY.Name = "AS_FACTORY";
             this.AS_FACTORY.Power = null;
@@ -536,13 +572,13 @@ namespace UAS_MES_NEW.Special
             // AS_WAY
             // 
             this.AS_WAY.AllPower = null;
-            this.AS_WAY.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.AS_WAY.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.AS_WAY.BackColor = System.Drawing.Color.White;
             this.AS_WAY.Enabled = false;
             this.AS_WAY.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.AS_WAY.ID = null;
-            this.AS_WAY.Location = new System.Drawing.Point(252, 364);
+            this.AS_WAY.Location = new System.Drawing.Point(256, 368);
             this.AS_WAY.Margin = new System.Windows.Forms.Padding(6);
             this.AS_WAY.Name = "AS_WAY";
             this.AS_WAY.Power = null;
@@ -558,7 +594,7 @@ namespace UAS_MES_NEW.Special
             this.nrg_code.AutoSize = true;
             this.nrg_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.nrg_code.ForeColor = System.Drawing.Color.Black;
-            this.nrg_code.Location = new System.Drawing.Point(1613, 338);
+            this.nrg_code.Location = new System.Drawing.Point(1617, 342);
             this.nrg_code.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.nrg_code.Name = "nrg_code";
             this.nrg_code.Size = new System.Drawing.Size(0, 41);
@@ -568,13 +604,13 @@ namespace UAS_MES_NEW.Special
             // AS_CHARGER
             // 
             this.AS_CHARGER.AllPower = null;
-            this.AS_CHARGER.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.AS_CHARGER.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.AS_CHARGER.BackColor = System.Drawing.Color.White;
             this.AS_CHARGER.Enabled = false;
             this.AS_CHARGER.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.AS_CHARGER.ID = null;
-            this.AS_CHARGER.Location = new System.Drawing.Point(1319, 297);
+            this.AS_CHARGER.Location = new System.Drawing.Point(1323, 301);
             this.AS_CHARGER.Margin = new System.Windows.Forms.Padding(6);
             this.AS_CHARGER.Name = "AS_CHARGER";
             this.AS_CHARGER.Power = null;
@@ -585,28 +621,28 @@ namespace UAS_MES_NEW.Special
             this.AS_CHARGER.TabIndex = 156;
             this.AS_CHARGER.Tag = "Read";
             // 
-            // so_code
+            // as_id
             // 
-            this.so_code.AutoSize = true;
-            this.so_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.so_code.ForeColor = System.Drawing.Color.Black;
-            this.so_code.Location = new System.Drawing.Point(1655, 344);
-            this.so_code.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.so_code.Name = "so_code";
-            this.so_code.Size = new System.Drawing.Size(0, 41);
-            this.so_code.TabIndex = 137;
-            this.so_code.Visible = false;
+            this.as_id.AutoSize = true;
+            this.as_id.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.as_id.ForeColor = System.Drawing.Color.Black;
+            this.as_id.Location = new System.Drawing.Point(1659, 348);
+            this.as_id.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.as_id.Name = "as_id";
+            this.as_id.Size = new System.Drawing.Size(0, 41);
+            this.as_id.TabIndex = 137;
+            this.as_id.Visible = false;
             // 
             // AS_SHELL
             // 
             this.AS_SHELL.AllPower = null;
-            this.AS_SHELL.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.AS_SHELL.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.AS_SHELL.BackColor = System.Drawing.Color.White;
             this.AS_SHELL.Enabled = false;
             this.AS_SHELL.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.AS_SHELL.ID = null;
-            this.AS_SHELL.Location = new System.Drawing.Point(801, 297);
+            this.AS_SHELL.Location = new System.Drawing.Point(805, 301);
             this.AS_SHELL.Margin = new System.Windows.Forms.Padding(6);
             this.AS_SHELL.Name = "AS_SHELL";
             this.AS_SHELL.Power = null;
@@ -617,28 +653,16 @@ namespace UAS_MES_NEW.Special
             this.AS_SHELL.TabIndex = 155;
             this.AS_SHELL.Tag = "Read";
             // 
-            // mbr_dutycode
-            // 
-            this.mbr_dutycode.AutoSize = true;
-            this.mbr_dutycode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mbr_dutycode.ForeColor = System.Drawing.Color.Black;
-            this.mbr_dutycode.Location = new System.Drawing.Point(1571, 344);
-            this.mbr_dutycode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.mbr_dutycode.Name = "mbr_dutycode";
-            this.mbr_dutycode.Size = new System.Drawing.Size(0, 41);
-            this.mbr_dutycode.TabIndex = 138;
-            this.mbr_dutycode.Visible = false;
-            // 
             // AS_LCD
             // 
             this.AS_LCD.AllPower = null;
-            this.AS_LCD.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.AS_LCD.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.AS_LCD.BackColor = System.Drawing.Color.White;
             this.AS_LCD.Enabled = false;
             this.AS_LCD.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.AS_LCD.ID = null;
-            this.AS_LCD.Location = new System.Drawing.Point(252, 297);
+            this.AS_LCD.Location = new System.Drawing.Point(256, 301);
             this.AS_LCD.Margin = new System.Windows.Forms.Padding(6);
             this.AS_LCD.Name = "AS_LCD";
             this.AS_LCD.Power = null;
@@ -654,7 +678,7 @@ namespace UAS_MES_NEW.Special
             this.AS_DESCRIPTION_label.AutoSize = true;
             this.AS_DESCRIPTION_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.AS_DESCRIPTION_label.ForeColor = System.Drawing.Color.Black;
-            this.AS_DESCRIPTION_label.Location = new System.Drawing.Point(30, 51);
+            this.AS_DESCRIPTION_label.Location = new System.Drawing.Point(34, 55);
             this.AS_DESCRIPTION_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.AS_DESCRIPTION_label.Name = "AS_DESCRIPTION_label";
             this.AS_DESCRIPTION_label.Size = new System.Drawing.Size(210, 41);
@@ -666,7 +690,7 @@ namespace UAS_MES_NEW.Special
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label6.ForeColor = System.Drawing.Color.Black;
-            this.label6.Location = new System.Drawing.Point(1139, 362);
+            this.label6.Location = new System.Drawing.Point(1143, 366);
             this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(165, 41);
@@ -678,7 +702,7 @@ namespace UAS_MES_NEW.Special
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label1.ForeColor = System.Drawing.Color.Black;
-            this.label1.Location = new System.Drawing.Point(22, 300);
+            this.label1.Location = new System.Drawing.Point(26, 304);
             this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(232, 41);
@@ -690,7 +714,7 @@ namespace UAS_MES_NEW.Special
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label5.ForeColor = System.Drawing.Color.Black;
-            this.label5.Location = new System.Drawing.Point(562, 362);
+            this.label5.Location = new System.Drawing.Point(566, 366);
             this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(82, 41);
@@ -702,7 +726,7 @@ namespace UAS_MES_NEW.Special
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.Color.Black;
-            this.label2.Location = new System.Drawing.Point(562, 300);
+            this.label2.Location = new System.Drawing.Point(566, 304);
             this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(232, 41);
@@ -714,7 +738,7 @@ namespace UAS_MES_NEW.Special
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label4.ForeColor = System.Drawing.Color.Black;
-            this.label4.Location = new System.Drawing.Point(22, 362);
+            this.label4.Location = new System.Drawing.Point(26, 366);
             this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(82, 41);
@@ -726,7 +750,7 @@ namespace UAS_MES_NEW.Special
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label3.ForeColor = System.Drawing.Color.Black;
-            this.label3.Location = new System.Drawing.Point(1139, 300);
+            this.label3.Location = new System.Drawing.Point(1143, 304);
             this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(168, 41);
@@ -736,7 +760,7 @@ namespace UAS_MES_NEW.Special
             // GetSNCode
             // 
             this.GetSNCode.AllPower = null;
-            this.GetSNCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.GetSNCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)));
             this.GetSNCode.BackColor = System.Drawing.Color.White;
             this.GetSNCode.ID = null;
@@ -782,31 +806,12 @@ namespace UAS_MES_NEW.Special
             this.Clean.UseVisualStyleBackColor = true;
             this.Clean.Click += new System.EventHandler(this.Clean_Click);
             // 
-            // AS_BADCODE
-            // 
-            this.AS_BADCODE.AllPower = null;
-            this.AS_BADCODE.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.AS_BADCODE.BackColor = System.Drawing.Color.White;
-            this.AS_BADCODE.Enabled = false;
-            this.AS_BADCODE.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.AS_BADCODE.ID = null;
-            this.AS_BADCODE.Location = new System.Drawing.Point(1280, 58);
-            this.AS_BADCODE.Margin = new System.Windows.Forms.Padding(6);
-            this.AS_BADCODE.Name = "AS_BADCODE";
-            this.AS_BADCODE.Power = null;
-            this.AS_BADCODE.Size = new System.Drawing.Size(432, 39);
-            this.AS_BADCODE.Str = null;
-            this.AS_BADCODE.Str1 = null;
-            this.AS_BADCODE.Str2 = null;
-            this.AS_BADCODE.TabIndex = 162;
-            this.AS_BADCODE.Tag = "Read";
-            // 
             // Special_Repair
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1800, 1158);
+            this.Controls.Add(this.Save);
             this.Controls.Add(this.groupBoxWithBorder3);
             this.Controls.Add(this.groupBoxWithBorder2);
             this.Controls.Add(this.groupBoxWithBorder1);
@@ -825,19 +830,19 @@ namespace UAS_MES_NEW.Special
             this.SizeChanged += new System.EventHandler(this.Make_Repair_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.LocationSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.ComponentSource)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.as_reason.Properties)).EndInit();
             this.groupBoxWithBorder3.ResumeLayout(true);
             this.groupBoxWithBorder3.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.as_badpro.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_process.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_method.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.as_badpro.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.as_reason.Properties)).EndInit();
             this.groupBoxWithBorder2.ResumeLayout(true);
             this.groupBoxWithBorder2.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.as_recheck.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_lcdconfirm.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_shellconfirm.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.as_changerconfirm.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_duty2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.as_recheck.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.as_changerconfirm.Properties)).EndInit();
             this.groupBoxWithBorder1.ResumeLayout(true);
             this.groupBoxWithBorder1.PerformLayout();
             this.ResumeLayout(true);
@@ -856,8 +861,7 @@ namespace UAS_MES_NEW.Special
         private System.Windows.Forms.Label nr_code;
         private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder groupBoxWithBorder1;
         private System.Windows.Forms.Label nrg_code;
-        private System.Windows.Forms.Label so_code;
-        private System.Windows.Forms.Label mbr_dutycode;
+        private System.Windows.Forms.Label as_id;
         private CustomControl.RichText.RichTextAutoBottom AS_DESCRIPTION;
         private System.Windows.Forms.Label AS_DESCRIPTION_label;
         private System.Windows.Forms.Label label1;
@@ -876,7 +880,6 @@ namespace UAS_MES_NEW.Special
         private CustomControl.TextBoxWithIcon.SnCollectionBox as_sku;
         private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder groupBoxWithBorder2;
         private System.Windows.Forms.Label label8;
-        private CustomControl.RichText.RichTextAutoBottom OperatResult;
         private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder groupBoxWithBorder3;
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.Label label10;
@@ -889,14 +892,16 @@ namespace UAS_MES_NEW.Special
         private System.Windows.Forms.Label label18;
         private System.Windows.Forms.Label label19;
         private DevExpress.XtraEditors.CheckedComboBoxEdit as_reason;
-        private DevExpress.XtraEditors.CheckedComboBoxEdit as_badpro;
         private DevExpress.XtraEditors.CheckedComboBoxEdit as_process;
         private DevExpress.XtraEditors.CheckedComboBoxEdit as_method;
         private DevExpress.XtraEditors.CheckedComboBoxEdit as_recheck;
-        private DevExpress.XtraEditors.CheckedComboBoxEdit as_lcdconfirm;
-        private DevExpress.XtraEditors.CheckedComboBoxEdit as_shellconfirm;
         private DevExpress.XtraEditors.CheckedComboBoxEdit as_changerconfirm;
-        private DevExpress.XtraEditors.CheckedComboBoxEdit as_duty2;
         private CustomControl.TextBoxWithIcon.SnCollectionBox AS_BADCODE;
+        private CustomControl.ButtonUtil.NormalButton Save;
+        private CustomControl.RichText.RichTextAutoBottom OperatResult;
+        private DevExpress.XtraEditors.ComboBoxEdit as_duty2;
+        private DevExpress.XtraEditors.ComboBoxEdit as_badpro;
+        private DevExpress.XtraEditors.ComboBoxEdit as_lcdconfirm;
+        private DevExpress.XtraEditors.ComboBoxEdit as_shellconfirm;
     }
 }

UAS_MES_ODLF/FunctionCode/Special/Special_Repair.cs

@@ -1,12 +1,8 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using UAS_MES_NEW.CustomControl.DataGrid_View;
-using UAS_MES_NEW.CustomControl.TextBoxWithIcon;
 using UAS_MES_NEW.DataOperate;
 using UAS_MES_NEW.Entity;
 using UAS_MES_NEW.PublicMethod;
@@ -34,24 +30,65 @@ namespace UAS_MES_NEW.Special
         {
             dh = SystemInf.dh;
             GetSNCode.Focus();
-
-            dt = (DataTable)dh.ExecuteSql("select distinct NR_NAME from qua_ngreason", "select");
-            for (int i = 0; i < dt.Rows.Count; i++)
+            //工厂复测确认
+            string[] str = new string[] { "检测无故障","缝隙段差","破屏","不充电","不开机","花屏","NTF","黑屏","白斑","气泡","摄像头故障","触摸失灵","自动重启"
+                                ,"进液","私拆","不进系统","自动关机","扬声器故障","联网故障","触屏不良","暗点","待机时间短","前摄像头无法打开","人为私拆","喇叭杂音","尾插坏","无法进入主界面","侧键故障"
+                                ,"麦克风故障","按键故障","闪屏","开裂","红斑","无发唤醒","语音无法唤醒","WIFI故障","偏色","无法进入系统","色斑","充电故障","后摄像头无法打开","机体发热","距离感应无用"
+                                ,"摄像头模糊","有异响","摄像头有异物","黑斑","拍照模糊","杂音","白屏","机体分离","摄像头脱落","气泡","死机","无前摄像头"
+                                ,"电源接口损坏","蓝斑","跳屏","无显示","充电慢","漏光","智能眼故障","亮点","充电发烫","烧机","无后摄像头","电池鼓包"};
+            for (int i = 0; i < str.Length; i++)
             {
-                as_reason.Properties.Items.Add(dt.Rows[i][0].ToString());
+                as_recheck.Properties.Items.Add(str[i]);
             }
 
-            dt = (DataTable)dh.ExecuteSql("select distinct so_name from solution", "select");
-            for (int i = 0; i < dt.Rows.Count; i++)
+            //屏幕外观确认
+            as_lcdconfirm.Properties.Items.Add("有");
+            as_lcdconfirm.Properties.Items.Add("无");
+            //壳体外观确认
+            as_shellconfirm.Properties.Items.Add("有");
+            as_shellconfirm.Properties.Items.Add("无");
+
+            //配件确认
+            string[] str3 = new string[] { "无支架", "无皮套", "无数据线", "无包装", "有适配器", "无适配器", "有支架", "有皮套" };
+            for (int i = 0; i < str3.Length; i++)
+            {
+                as_changerconfirm.Properties.Items.Add(str3[i]);
+            }
+            //责任归属2
+            as_duty2.Properties.Items.Add("小度");
+            as_duty2.Properties.Items.Add("欧度利方");
+            //原因分析
+            string[] str4 = new string[] { "检测无故障闪屏","人为损坏", "屏失灵", "副板不良", "重装OK", "屏端排线没扣",
+                "屏气泡", "前摄不良", "进液少主排线", "进液", "重装副板OK","副板端排线没扣","花屏","黑屏","屏斑点",
+                "充电插口损坏","刷机","主板端排线没扣","NTF","不充电","电池故障","尾插坏","充电插口烧坏","主板升压烧坏",
+                "主板私修","充CPU虚焊电OK","DDP虚焊","私拆","后摄镜片划伤","充电IC不良","换膜OK","按键排线不良","电池松动",
+                "送话器排线不良","喇叭不良","电池耗电","底壳故障","屏线条","副板无触摸","重扣排线OK","后摄不良","屏亮点"
+                 ,"屏黑点","开机键排线不良","触摸失灵","屏显暗","破屏","侧键不良","WIFI故障","摄像头故障","暗点","灯控升压二极管坏",
+                "进液主板屏坏","前摄扣座松动","刷机OK","电池扣座松动","CPU不良"};
+            for (int i = 0; i < str4.Length; i++)
+            {
+                as_reason.Properties.Items.Add(str4[i]);
+            }
+            //处理方法
+            string[] str1 = new string[] { "换屏", "换底壳", "换主板", "换喇叭", "换前摄像头", "换后摄像头", "刷机翻新", "换电池"
+                                , "换FPC排线","换副板" ,"换后摄镜片" ,"换后摄镜片" ,"换天线" ,"换麦克" ,"重装OK" };
+            for (int i = 0; i < str1.Length; i++)
             {
-                as_method.Properties.Items.Add(dt.Rows[i][0].ToString());
+                as_method.Properties.Items.Add(str1[i]);
             }
 
-            dt = (DataTable)dh.ExecuteSql("select distinct bc_name from badcode", "select");
-            for (int i = 0; i < dt.Rows.Count; i++)
+            //不良属性
+            string[] str2 = new string[] { "外观", "七天", "过保", "NTF", "功能", "人为损坏" };
+            for (int i = 0; i < str2.Length; i++)
             {
-                as_badpro.Properties.Items.Add(dt.Rows[i][0].ToString());
+                as_badpro.Properties.Items.Add(str2[i]);
             }
+
+            //dt = (DataTable)dh.ExecuteSql("select distinct so_name from solution", "select");
+            //for (int i = 0; i < dt.Rows.Count; i++)
+            //{
+            //    as_method.Properties.Items.Add(dt.Rows[i][0].ToString());
+            //}
         }
 
         private void Prodcode_DbChange(object sender, EventArgs e)
@@ -61,10 +98,12 @@ namespace UAS_MES_NEW.Special
 
         private void Cd_stepcode_DbChange(object sender, EventArgs e)
         {
+
         }
 
         private void Cr_code_DbChange(object sender, EventArgs e)
         {
+
         }
 
         private void GetSNCode_KeyDown(object sender, KeyEventArgs e)
@@ -79,7 +118,7 @@ namespace UAS_MES_NEW.Special
                 }
                 sql.Clear();
                 sql.Append("select * from aftersale left join makeserial on as_sn=ms_sncode left join make ");
-                sql.Append("on ms_makecode=ma_code where as_sn = '" + GetSNCode.Text + "' order by ms_id desc");
+                sql.Append("on ms_makecode=ma_code where as_sn = '" + GetSNCode.Text + "' order by as_id desc");
                 DataTable dt_ = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 if (dt_.Rows.Count == 0)
                 {
@@ -88,7 +127,7 @@ namespace UAS_MES_NEW.Special
                     return;
                 }
 
-                dt = (DataTable)dh.ExecuteSql("select * from prodiomac where pim_mac='" + GetSNCode.Text + "' and PIM_INOROUT='OUT' and sysdate-180<PIM_INDATE ", "select");
+                dt = (DataTable)dh.ExecuteSql("select * from prodiomac where pim_mac='" + GetSNCode.Text + "' and PIM_INOROUT='OUT' and sysdate-547<PIM_INDATE ", "select");
                 if (dt.Rows.Count == 0)
                 {
                     OperatResult.AppendText(">>序列号:" + GetSNCode.Text + "出货已超过180天\n", Color.Red);
@@ -103,25 +142,9 @@ namespace UAS_MES_NEW.Special
 
         private void Make_Repair_SizeChanged(object sender, EventArgs e)
         {
-
-
             asc.controlAutoSize(this);
         }
 
-        private void RepairComplete_Click(object sender, EventArgs e)
-        {
-            if (GetSNCode.Text == "")
-            {
-                OperatResult.AppendText(">>序列号不允许为空\n", Color.Red);
-                return;
-            }
-        }
-
-        private void SaveRepairInf_Click(object sender, EventArgs e)
-        {
-
-        }
-
         private void Clean_Click(object sender, EventArgs e)
         {
             OperatResult.Clear();
@@ -132,14 +155,57 @@ namespace UAS_MES_NEW.Special
             dh.Dispose();
         }
 
-        private void ms_prodcode_TextChanged(object sender, EventArgs e)
+        public void RefreshData()
         {
-
+            GetSNCode_KeyDown(new object(), new KeyEventArgs(Keys.Enter));
         }
 
-        public void RefreshData()
+        private void Save_Click(object sender, EventArgs e)
         {
-            GetSNCode_KeyDown(new object(), new KeyEventArgs(Keys.Enter));
+            sql.Clear();
+            sql.Append("update aftersale set ");
+            if (as_recheck.Text != "")
+            {
+                sql.Append("as_recheck='" + as_recheck.Text + "',");
+            }
+            if (as_lcdconfirm.Text != "")
+            {
+                sql.Append("as_lcdconfirm='" + as_lcdconfirm.Text + "',");
+            }
+            if (as_shellconfirm.Text != "")
+            {
+                sql.Append("as_shellconfirm='" + as_shellconfirm.Text + "',");
+            }
+            if (as_changerconfirm.Text != "")
+            {
+                sql.Append("as_changerconfirm='" + as_changerconfirm.Text + "',");
+            }
+            if (as_duty2.Text != "")
+            {
+                sql.Append("as_duty2='" + as_duty2.Text + "',");
+            }
+            if (as_process.Text != "")
+            {
+                sql.Append("as_process='" + as_process.Text + "',");
+            }
+            if (as_reason.Text != "")
+            {
+                sql.Append("as_reason='" + as_reason.Text + "',");
+            }
+            if (as_method.Text != "")
+            {
+                sql.Append("as_method='" + as_method.Text + "',");
+            }
+            if (as_badpro.Text != "")
+            {
+                sql.Append("as_badpro='" + as_badpro.Text + "',");
+            }
+            sql.Append(" AS_RECEIVETIME=sysdate, as_repairman='" + User.UserName + "' where as_id='" + as_id.Text + "'");
+            dh.ExecuteSql(sql.GetString(), "update");
+            OperatResult.AppendText(">>序列号【" + GetSNCode.Text + "】保存维修信息成功\n", Color.Green);
+            GetSNCode.Clear();
+            AS_DESCRIPTION.Clear();
+            BaseUtil.CleanForm(this);
         }
     }
 }

UAS_MES_ODLF/FunctionCode/Special/Special_Repair.resx

@@ -124,6 +124,44 @@
     <value>190, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="Save.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="Save.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="Save.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
   <data name="Clean.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m

UAS_MES_ODLF/PublicMethod/BaseUtil.cs

@@ -1,4 +1,5 @@
-using LabelManager2;
+using DevExpress.XtraEditors;
+using LabelManager2;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -161,7 +162,7 @@ namespace UAS_MES_NEW.PublicMethod
                     string controlName = ctl[i].Name;
                     string controlsTag = ctl[i].Tag == null ? "" : ctl[i].Tag.ToString();
                     //默认给TextBox和Label赋值
-                    if (ctl[i] is TextBox || ctl[i] is Label || ctl[i] is SearchTextBox || ctl[i] is MaCodeSearchTextBox || ctl[i] is EnterTextBox || ctl[i] is TextBoxGeneratePaCode || ctl[i] is NumericUpDown || ctl[i] is TextBoxWithTextArea ||ctl[i] is RichTextBox)
+                    if (ctl[i] is TextBox || ctl[i] is Label || ctl[i] is SearchTextBox || ctl[i] is MaCodeSearchTextBox || ctl[i] is EnterTextBox || ctl[i] is TextBoxGeneratePaCode || ctl[i] is NumericUpDown || ctl[i] is TextBoxWithTextArea || ctl[i] is RichTextBox || ctl[i] is CheckedComboBoxEdit || ctl[i] is DevExpress.XtraEditors.ComboBoxEdit)
                     {
                         for (int j = 0; j < dt.Columns.Count; j++)
                         {
@@ -213,7 +214,7 @@ namespace UAS_MES_NEW.PublicMethod
                         for (int j = 0; j < ctl[i].Controls.Count; j++)
                         {
                             controlName = ctl[i].Controls[j].Name;
-                            if (ctl[i].Controls[j] is TextBox || ctl[i].Controls[j] is Label || ctl[i].Controls[j] is SearchTextBox || ctl[i].Controls[j] is MaCodeSearchTextBox)
+                            if (ctl[i].Controls[j] is TextBox || ctl[i].Controls[j] is Label || ctl[i].Controls[j] is SearchTextBox || ctl[i].Controls[j] is MaCodeSearchTextBox || ctl[i].Controls[j] is CheckedComboBoxEdit || ctl[i].Controls[j] is DevExpress.XtraEditors.ComboBoxEdit)
                             {
                                 for (int k = 0; k < dt.Columns.Count; k++)
                                 {
@@ -232,7 +233,7 @@ namespace UAS_MES_NEW.PublicMethod
             {
                 for (int i = 0; i < ctl.Count; i++)
                 {
-                    if (ctl[i] is TextBox || ctl[i] is Label || ctl[i] is SearchTextBox)
+                    if (ctl[i] is TextBox || ctl[i] is Label || ctl[i] is SearchTextBox || ctl[i] is CheckedComboBoxEdit || ctl[i] is DevExpress.XtraEditors.ComboBoxEdit)
                     {
                         for (int j = 0; j < dt.Columns.Count; j++)
                         {
@@ -651,7 +652,7 @@ namespace UAS_MES_NEW.PublicMethod
                 {
                     CleanControls(Form.Controls[i].Controls);
                 }
-                if (Form.Controls[i] is EnterTextBox || Form.Controls[i] is TextBox || Form.Controls[i] is ValueLabel || Form.Controls[i] is SearchTextBox || Form.Controls[i] is ValueNumLabel || Form.Controls[i] is MaCodeSearchTextBox)
+                if (Form.Controls[i] is EnterTextBox || Form.Controls[i] is TextBox || Form.Controls[i] is ValueLabel || Form.Controls[i] is SearchTextBox || Form.Controls[i] is ValueNumLabel || Form.Controls[i] is MaCodeSearchTextBox || Form.Controls[i] is CheckedComboBoxEdit || Form.Controls[i] is DevExpress.XtraEditors.ComboBoxEdit)
                     Form.Controls[i].Text = "";
                 if (Form.Controls[i] is DataGridView)
                     CleanDGVData((DataGridView)Form.Controls[i]);
@@ -664,7 +665,7 @@ namespace UAS_MES_NEW.PublicMethod
             {
                 if (collection[i].Controls.Count > 0)
                     CleanControls(collection[i].Controls);
-                if (collection[i] is EnterTextBox || collection[i] is TextBox || collection[i] is ValueLabel || collection[i] is SearchTextBox || collection[i] is ValueNumLabel || collection[i] is MaCodeSearchTextBox)
+                if (collection[i] is EnterTextBox || collection[i] is TextBox || collection[i] is ValueLabel || collection[i] is SearchTextBox || collection[i] is ValueNumLabel || collection[i] is MaCodeSearchTextBox || collection[i] is CheckedComboBoxEdit || collection[i] is DevExpress.XtraEditors.ComboBoxEdit)
                     collection[i].Text = "";
                 if (collection[i] is DataGridView)
                     CleanDGVData((DataGridView)collection[i]);
@@ -790,9 +791,9 @@ namespace UAS_MES_NEW.PublicMethod
                 //如果Text不为空再进行条件的拼接
                 if (Condition[i].Text != "")
                 {
-                    if (Condition[i] is ComboBox)
+                    if (Condition[i] is System.Windows.Forms.ComboBox)
                     {
-                        condition += "(" + Condition[i].Tag + " like " + "'%" + (Condition[i] as ComboBox).SelectedValue + "%' )";
+                        condition += "(" + Condition[i].Tag + " like " + "'%" + (Condition[i] as System.Windows.Forms.ComboBox).SelectedValue + "%' )";
                     }
                     else
                     {