Bladeren bron

设备维修界面修改

callm 2 jaren geleden
bovenliggende
commit
19e16f85d2

+ 422 - 296
UAS_MES_ODLF/FunctionCode/Special/Special_Repair.Designer.cs

@@ -37,8 +37,28 @@ 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_lcdconfirm = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.as_shellconfirm = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.as_duty2 = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.as_changerconfirm = 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();
+            this.label11 = new System.Windows.Forms.Label();
+            this.label10 = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
+            this.label21 = new System.Windows.Forms.Label();
+            this.label18 = new System.Windows.Forms.Label();
+            this.label19 = new System.Windows.Forms.Label();
+            this.label9 = new System.Windows.Forms.Label();
+            this.as_method = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MultBlurSearch();
+            this.as_badpro = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MultBlurSearch();
+            this.as_process = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.as_recheck = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MultBlurSearch();
             this.Save = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.groupBoxWithBorder1 = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.as_outdate = new System.Windows.Forms.Label();
+            this.label15 = new System.Windows.Forms.Label();
             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();
@@ -63,38 +83,27 @@ 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_lcdconfirm = new DevExpress.XtraEditors.CheckedComboBoxEdit();
-            this.as_shellconfirm = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.as_duty2 = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.as_changerconfirm = 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();
-            this.label11 = new System.Windows.Forms.Label();
-            this.label10 = new System.Windows.Forms.Label();
-            this.as_recheck = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MultBlurSearch();
-            this.label8 = new System.Windows.Forms.Label();
-            this.as_method = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MultBlurSearch();
-            this.as_badpro = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MultBlurSearch();
-            this.as_reason = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MultBlurSearch();
-            this.as_process = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
-            this.label21 = new System.Windows.Forms.Label();
+            this.as_location = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MultBlurSearch();
+            this.label16 = new System.Windows.Forms.Label();
+            this.as_type = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MultBlurSearch();
+            this.label17 = new System.Windows.Forms.Label();
+            this.as_image1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MultBlurSearch();
+            this.label22 = new System.Windows.Forms.Label();
+            this.as_location1 = new DevExpress.XtraEditors.CheckedComboBoxEdit();
             this.label20 = new System.Windows.Forms.Label();
-            this.label18 = new System.Windows.Forms.Label();
-            this.label19 = new System.Windows.Forms.Label();
-            this.label9 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.LocationSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.ComponentSource)).BeginInit();
-            this.groupBoxWithBorder1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.as_lcdconfirm.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_shellconfirm.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_duty2.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_changerconfirm.Properties)).BeginInit();
+            this.groupBoxWithBorder1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.as_location1.Properties)).BeginInit();
             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)));
@@ -117,6 +126,227 @@ namespace UAS_MES_NEW.Special
             this.bc_code.TabIndex = 122;
             this.bc_code.Visible = false;
             // 
+            // as_lcdconfirm
+            // 
+            this.as_lcdconfirm.EditValue = "";
+            this.as_lcdconfirm.Location = new System.Drawing.Point(265, 521);
+            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 = 206;
+            // 
+            // as_shellconfirm
+            // 
+            this.as_shellconfirm.Location = new System.Drawing.Point(265, 596);
+            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 = 205;
+            // 
+            // as_duty2
+            // 
+            this.as_duty2.Location = new System.Drawing.Point(863, 987);
+            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 = 204;
+            // 
+            // as_changerconfirm
+            // 
+            this.as_changerconfirm.EditValue = "";
+            this.as_changerconfirm.Location = new System.Drawing.Point(265, 660);
+            this.as_changerconfirm.Name = "as_changerconfirm";
+            this.as_changerconfirm.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.as_changerconfirm.Size = new System.Drawing.Size(306, 36);
+            this.as_changerconfirm.TabIndex = 202;
+            // 
+            // 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(636, 982);
+            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);
+            this.label14.TabIndex = 201;
+            this.label14.Text = "责任归属2";
+            // 
+            // label13
+            // 
+            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(38, 654);
+            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);
+            this.label13.TabIndex = 200;
+            this.label13.Text = "配件确认";
+            // 
+            // label12
+            // 
+            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(38, 591);
+            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);
+            this.label12.TabIndex = 199;
+            this.label12.Text = "壳体外观确认";
+            // 
+            // label11
+            // 
+            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(38, 516);
+            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);
+            this.label11.TabIndex = 198;
+            this.label11.Text = "屏幕外观确认";
+            // 
+            // label10
+            // 
+            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(38, 824);
+            this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(146, 41);
+            this.label10.TabIndex = 197;
+            this.label10.Text = "原因定位";
+            // 
+            // label8
+            // 
+            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(9, 437);
+            this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(210, 41);
+            this.label8.TabIndex = 163;
+            this.label8.Text = "工厂复测信息";
+            // 
+            // label21
+            // 
+            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(38, 977);
+            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);
+            this.label21.TabIndex = 208;
+            this.label21.Text = "分析过程";
+            // 
+            // label18
+            // 
+            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(636, 524);
+            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);
+            this.label18.TabIndex = 211;
+            this.label18.Text = "不良属性";
+            // 
+            // label19
+            // 
+            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(636, 826);
+            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);
+            this.label19.TabIndex = 210;
+            this.label19.Text = "处置动作";
+            // 
+            // 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(9, 741);
+            this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(306, 41);
+            this.label9.TabIndex = 215;
+            this.label9.Text = "工厂翻新及交付信息";
+            // 
+            // as_method
+            // 
+            this.as_method.Condition = null;
+            this.as_method.Field = null;
+            this.as_method.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.as_method.Location = new System.Drawing.Point(863, 826);
+            this.as_method.Margin = new System.Windows.Forms.Padding(4);
+            this.as_method.Name = "as_method";
+            this.as_method.Size = new System.Drawing.Size(306, 39);
+            this.as_method.TabIndex = 214;
+            this.as_method.TableName = null;
+            this.as_method.Value = null;
+            this.as_method.ValueField = null;
+            // 
+            // as_badpro
+            // 
+            this.as_badpro.Condition = null;
+            this.as_badpro.Field = null;
+            this.as_badpro.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.as_badpro.Location = new System.Drawing.Point(863, 524);
+            this.as_badpro.Margin = new System.Windows.Forms.Padding(4);
+            this.as_badpro.Name = "as_badpro";
+            this.as_badpro.Size = new System.Drawing.Size(306, 39);
+            this.as_badpro.TabIndex = 213;
+            this.as_badpro.TableName = null;
+            this.as_badpro.Value = null;
+            this.as_badpro.ValueField = null;
+            this.as_badpro.UserControlTextChanged += new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MultBlurSearch.OnTextChange(this.as_badpro_UserControlTextChanged);
+            // 
+            // as_process
+            // 
+            this.as_process.AllPower = null;
+            this.as_process.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.as_process.BackColor = System.Drawing.Color.White;
+            this.as_process.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.as_process.ID = null;
+            this.as_process.Location = new System.Drawing.Point(265, 982);
+            this.as_process.Margin = new System.Windows.Forms.Padding(6);
+            this.as_process.Name = "as_process";
+            this.as_process.Power = null;
+            this.as_process.Size = new System.Drawing.Size(306, 39);
+            this.as_process.Str = null;
+            this.as_process.Str1 = null;
+            this.as_process.Str2 = null;
+            this.as_process.TabIndex = 207;
+            this.as_process.Tag = "Read";
+            // 
+            // as_recheck
+            // 
+            this.as_recheck.Condition = null;
+            this.as_recheck.Field = null;
+            this.as_recheck.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.as_recheck.Location = new System.Drawing.Point(265, 826);
+            this.as_recheck.Margin = new System.Windows.Forms.Padding(4);
+            this.as_recheck.Name = "as_recheck";
+            this.as_recheck.Size = new System.Drawing.Size(306, 39);
+            this.as_recheck.TabIndex = 203;
+            this.as_recheck.TableName = null;
+            this.as_recheck.Value = null;
+            this.as_recheck.ValueField = null;
+            this.as_recheck.UserControlTextChanged += new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MultBlurSearch.OnTextChange(this.as_recheck_UserControlTextChanged);
+            // 
             // Save
             // 
             this.Save.AllPower = null;
@@ -124,7 +354,7 @@ namespace UAS_MES_NEW.Special
             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.Location = new System.Drawing.Point(598, 1072);
             this.Save.Margin = new System.Windows.Forms.Padding(6);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
@@ -140,6 +370,8 @@ namespace UAS_MES_NEW.Special
             // groupBoxWithBorder1
             // 
             this.groupBoxWithBorder1.BorderColor = System.Drawing.Color.Black;
+            this.groupBoxWithBorder1.Controls.Add(this.as_outdate);
+            this.groupBoxWithBorder1.Controls.Add(this.label15);
             this.groupBoxWithBorder1.Controls.Add(this.AS_BADCODE);
             this.groupBoxWithBorder1.Controls.Add(this.as_sku);
             this.groupBoxWithBorder1.Controls.Add(this.nr_code);
@@ -172,20 +404,43 @@ namespace UAS_MES_NEW.Special
             this.groupBoxWithBorder1.Text = "小度提供信息";
             this.groupBoxWithBorder1.TextColor = System.Drawing.Color.Black;
             // 
+            // as_outdate
+            // 
+            this.as_outdate.AutoSize = true;
+            this.as_outdate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.as_outdate.ForeColor = System.Drawing.Color.Black;
+            this.as_outdate.Location = new System.Drawing.Point(1293, 216);
+            this.as_outdate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.as_outdate.Name = "as_outdate";
+            this.as_outdate.Size = new System.Drawing.Size(0, 41);
+            this.as_outdate.TabIndex = 164;
+            // 
+            // 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.ForeColor = System.Drawing.Color.Black;
+            this.label15.Location = new System.Drawing.Point(1135, 216);
+            this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label15.Name = "label15";
+            this.label15.Size = new System.Drawing.Size(146, 41);
+            this.label15.TabIndex = 163;
+            this.label15.Text = "是否过保";
+            // 
             // 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) 
+            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(1289, 67);
+            this.AS_BADCODE.Location = new System.Drawing.Point(1293, 71);
             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.Size = new System.Drawing.Size(350, 39);
             this.AS_BADCODE.Str = null;
             this.AS_BADCODE.Str1 = null;
             this.AS_BADCODE.Str2 = null;
@@ -195,13 +450,13 @@ namespace UAS_MES_NEW.Special
             // 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(1289, 137);
+            this.as_sku.Location = new System.Drawing.Point(1293, 141);
             this.as_sku.Margin = new System.Windows.Forms.Padding(6);
             this.as_sku.Name = "as_sku";
             this.as_sku.Power = null;
@@ -217,7 +472,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(1692, 456);
+            this.nr_code.Location = new System.Drawing.Point(1696, 460);
             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);
@@ -227,7 +482,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(1131, 131);
+            this.label7.Location = new System.Drawing.Point(1135, 135);
             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);
@@ -248,13 +503,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(1328, 376);
+            this.AS_DUTY.Location = new System.Drawing.Point(1332, 367);
             this.AS_DUTY.Margin = new System.Windows.Forms.Padding(6);
             this.AS_DUTY.Name = "AS_DUTY";
             this.AS_DUTY.Power = null;
@@ -269,7 +524,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(1131, 62);
+            this.AS_BADCODE_label.Location = new System.Drawing.Point(1135, 66);
             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);
@@ -279,13 +534,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(810, 373);
+            this.AS_FACTORY.Location = new System.Drawing.Point(814, 364);
             this.AS_FACTORY.Margin = new System.Windows.Forms.Padding(6);
             this.AS_FACTORY.Name = "AS_FACTORY";
             this.AS_FACTORY.Power = null;
@@ -299,13 +554,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(261, 373);
+            this.AS_WAY.Location = new System.Drawing.Point(265, 364);
             this.AS_WAY.Margin = new System.Windows.Forms.Padding(6);
             this.AS_WAY.Name = "AS_WAY";
             this.AS_WAY.Power = null;
@@ -321,7 +576,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(1622, 347);
+            this.nrg_code.Location = new System.Drawing.Point(1626, 351);
             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);
@@ -331,17 +586,17 @@ 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(1328, 306);
+            this.AS_CHARGER.Location = new System.Drawing.Point(1332, 297);
             this.AS_CHARGER.Margin = new System.Windows.Forms.Padding(6);
             this.AS_CHARGER.Name = "AS_CHARGER";
             this.AS_CHARGER.Power = null;
-            this.AS_CHARGER.Size = new System.Drawing.Size(432, 39);
+            this.AS_CHARGER.Size = new System.Drawing.Size(311, 39);
             this.AS_CHARGER.Str = null;
             this.AS_CHARGER.Str1 = null;
             this.AS_CHARGER.Str2 = null;
@@ -353,7 +608,7 @@ namespace UAS_MES_NEW.Special
             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(1664, 353);
+            this.as_id.Location = new System.Drawing.Point(1668, 357);
             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);
@@ -363,13 +618,13 @@ namespace UAS_MES_NEW.Special
             // 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(810, 306);
+            this.AS_SHELL.Location = new System.Drawing.Point(814, 297);
             this.AS_SHELL.Margin = new System.Windows.Forms.Padding(6);
             this.AS_SHELL.Name = "AS_SHELL";
             this.AS_SHELL.Power = null;
@@ -383,13 +638,13 @@ namespace UAS_MES_NEW.Special
             // 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(261, 306);
+            this.AS_LCD.Location = new System.Drawing.Point(265, 297);
             this.AS_LCD.Margin = new System.Windows.Forms.Padding(6);
             this.AS_LCD.Name = "AS_LCD";
             this.AS_LCD.Power = null;
@@ -405,7 +660,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(39, 60);
+            this.AS_DESCRIPTION_label.Location = new System.Drawing.Point(43, 64);
             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);
@@ -417,7 +672,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(1148, 371);
+            this.label6.Location = new System.Drawing.Point(1152, 362);
             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);
@@ -429,7 +684,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(31, 309);
+            this.label1.Location = new System.Drawing.Point(35, 300);
             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);
@@ -441,7 +696,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(571, 371);
+            this.label5.Location = new System.Drawing.Point(575, 362);
             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);
@@ -453,7 +708,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(571, 309);
+            this.label2.Location = new System.Drawing.Point(575, 300);
             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);
@@ -465,7 +720,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(31, 371);
+            this.label4.Location = new System.Drawing.Point(35, 362);
             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);
@@ -477,7 +732,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(1148, 309);
+            this.label3.Location = new System.Drawing.Point(1152, 300);
             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);
@@ -487,7 +742,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;
@@ -533,263 +788,125 @@ namespace UAS_MES_NEW.Special
             this.Clean.UseVisualStyleBackColor = true;
             this.Clean.Click += new System.EventHandler(this.Clean_Click);
             // 
-            // as_lcdconfirm
-            // 
-            this.as_lcdconfirm.EditValue = "";
-            this.as_lcdconfirm.Location = new System.Drawing.Point(851, 502);
-            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 = 206;
-            // 
-            // as_shellconfirm
-            // 
-            this.as_shellconfirm.Location = new System.Drawing.Point(265, 566);
-            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 = 205;
-            // 
-            // as_duty2
-            // 
-            this.as_duty2.Location = new System.Drawing.Point(265, 641);
-            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 = 204;
-            // 
-            // as_changerconfirm
-            // 
-            this.as_changerconfirm.EditValue = "";
-            this.as_changerconfirm.Location = new System.Drawing.Point(847, 566);
-            this.as_changerconfirm.Name = "as_changerconfirm";
-            this.as_changerconfirm.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.as_changerconfirm.Size = new System.Drawing.Size(306, 36);
-            this.as_changerconfirm.TabIndex = 202;
-            // 
-            // 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(38, 641);
-            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);
-            this.label14.TabIndex = 201;
-            this.label14.Text = "责任归属2";
-            // 
-            // label13
-            // 
-            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(632, 569);
-            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);
-            this.label13.TabIndex = 200;
-            this.label13.Text = "配件确认";
-            // 
-            // label12
-            // 
-            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(38, 570);
-            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);
-            this.label12.TabIndex = 199;
-            this.label12.Text = "壳体外观确认";
-            // 
-            // label11
-            // 
-            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(632, 497);
-            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);
-            this.label11.TabIndex = 198;
-            this.label11.Text = "屏幕外观确认";
-            // 
-            // label10
-            // 
-            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(38, 498);
-            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);
-            this.label10.TabIndex = 197;
-            this.label10.Text = "工厂复测确认";
-            // 
-            // as_recheck
-            // 
-            this.as_recheck.Condition = null;
-            this.as_recheck.Field = null;
-            this.as_recheck.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.as_recheck.Location = new System.Drawing.Point(265, 493);
-            this.as_recheck.Margin = new System.Windows.Forms.Padding(4);
-            this.as_recheck.Name = "as_recheck";
-            this.as_recheck.Size = new System.Drawing.Size(306, 39);
-            this.as_recheck.TabIndex = 203;
-            this.as_recheck.TableName = null;
-            this.as_recheck.Value = null;
-            this.as_recheck.ValueField = null;
-            // 
-            // label8
-            // 
-            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(9, 437);
-            this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(210, 41);
-            this.label8.TabIndex = 163;
-            this.label8.Text = "工厂复测信息";
-            // 
-            // as_method
-            // 
-            this.as_method.Condition = null;
-            this.as_method.Field = null;
-            this.as_method.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.as_method.Location = new System.Drawing.Point(265, 911);
-            this.as_method.Margin = new System.Windows.Forms.Padding(4);
-            this.as_method.Name = "as_method";
-            this.as_method.Size = new System.Drawing.Size(306, 39);
-            this.as_method.TabIndex = 214;
-            this.as_method.TableName = null;
-            this.as_method.Value = null;
-            this.as_method.ValueField = null;
-            // 
-            // as_badpro
-            // 
-            this.as_badpro.Condition = null;
-            this.as_badpro.Field = null;
-            this.as_badpro.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.as_badpro.Location = new System.Drawing.Point(847, 911);
-            this.as_badpro.Margin = new System.Windows.Forms.Padding(4);
-            this.as_badpro.Name = "as_badpro";
-            this.as_badpro.Size = new System.Drawing.Size(306, 39);
-            this.as_badpro.TabIndex = 213;
-            this.as_badpro.TableName = null;
-            this.as_badpro.Value = null;
-            this.as_badpro.ValueField = null;
-            // 
-            // as_reason
-            // 
-            this.as_reason.Condition = null;
-            this.as_reason.Field = null;
-            this.as_reason.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.as_reason.Location = new System.Drawing.Point(847, 828);
-            this.as_reason.Margin = new System.Windows.Forms.Padding(4);
-            this.as_reason.Name = "as_reason";
-            this.as_reason.Size = new System.Drawing.Size(306, 39);
-            this.as_reason.TabIndex = 212;
-            this.as_reason.TableName = null;
-            this.as_reason.Value = null;
-            this.as_reason.ValueField = null;
-            // 
-            // as_process
-            // 
-            this.as_process.AllPower = null;
-            this.as_process.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.as_process.BackColor = System.Drawing.Color.White;
-            this.as_process.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.as_process.ID = null;
-            this.as_process.Location = new System.Drawing.Point(265, 826);
-            this.as_process.Margin = new System.Windows.Forms.Padding(6);
-            this.as_process.Name = "as_process";
-            this.as_process.Power = null;
-            this.as_process.Size = new System.Drawing.Size(306, 39);
-            this.as_process.Str = null;
-            this.as_process.Str1 = null;
-            this.as_process.Str2 = null;
-            this.as_process.TabIndex = 207;
-            this.as_process.Tag = "Read";
-            // 
-            // label21
-            // 
-            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(38, 821);
-            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);
-            this.label21.TabIndex = 208;
-            this.label21.Text = "分析过程";
+            // as_location
+            // 
+            this.as_location.Condition = null;
+            this.as_location.Field = null;
+            this.as_location.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.as_location.Location = new System.Drawing.Point(863, 907);
+            this.as_location.Margin = new System.Windows.Forms.Padding(4);
+            this.as_location.Name = "as_location";
+            this.as_location.Size = new System.Drawing.Size(306, 39);
+            this.as_location.TabIndex = 216;
+            this.as_location.TableName = null;
+            this.as_location.Value = null;
+            this.as_location.ValueField = null;
+            // 
+            // label16
+            // 
+            this.label16.AutoSize = true;
+            this.label16.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label16.ForeColor = System.Drawing.Color.Black;
+            this.label16.Location = new System.Drawing.Point(636, 905);
+            this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label16.Name = "label16";
+            this.label16.Size = new System.Drawing.Size(82, 41);
+            this.label16.TabIndex = 217;
+            this.label16.Text = "位置";
+            // 
+            // as_type
+            // 
+            this.as_type.Condition = null;
+            this.as_type.Field = null;
+            this.as_type.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.as_type.Location = new System.Drawing.Point(863, 593);
+            this.as_type.Margin = new System.Windows.Forms.Padding(4);
+            this.as_type.Name = "as_type";
+            this.as_type.Size = new System.Drawing.Size(306, 39);
+            this.as_type.TabIndex = 219;
+            this.as_type.TableName = null;
+            this.as_type.Value = null;
+            this.as_type.ValueField = null;
+            this.as_type.UserControlTextChanged += new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MultBlurSearch.OnTextChange(this.as_type_UserControlTextChanged);
+            // 
+            // label17
+            // 
+            this.label17.AutoSize = true;
+            this.label17.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label17.ForeColor = System.Drawing.Color.Black;
+            this.label17.Location = new System.Drawing.Point(636, 590);
+            this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label17.Name = "label17";
+            this.label17.Size = new System.Drawing.Size(146, 41);
+            this.label17.TabIndex = 218;
+            this.label17.Text = "不良类别";
+            // 
+            // as_image1
+            // 
+            this.as_image1.Condition = null;
+            this.as_image1.Field = null;
+            this.as_image1.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.as_image1.Location = new System.Drawing.Point(863, 665);
+            this.as_image1.Margin = new System.Windows.Forms.Padding(4);
+            this.as_image1.Name = "as_image1";
+            this.as_image1.Size = new System.Drawing.Size(306, 39);
+            this.as_image1.TabIndex = 221;
+            this.as_image1.TableName = null;
+            this.as_image1.Value = null;
+            this.as_image1.ValueField = null;
+            // 
+            // label22
+            // 
+            this.label22.AutoSize = true;
+            this.label22.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label22.ForeColor = System.Drawing.Color.Black;
+            this.label22.Location = new System.Drawing.Point(636, 663);
+            this.label22.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label22.Name = "label22";
+            this.label22.Size = new System.Drawing.Size(146, 41);
+            this.label22.TabIndex = 220;
+            this.label22.Text = "不良现象";
+            // 
+            // as_location1
+            // 
+            this.as_location1.Location = new System.Drawing.Point(265, 902);
+            this.as_location1.Margin = new System.Windows.Forms.Padding(4);
+            this.as_location1.Name = "as_location1";
+            this.as_location1.Properties.Appearance.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.as_location1.Properties.Appearance.Options.UseFont = true;
+            this.as_location1.Size = new System.Drawing.Size(306, 38);
+            this.as_location1.TabIndex = 223;
             // 
             // label20
             // 
             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(632, 828);
+            this.label20.Location = new System.Drawing.Point(38, 902);
             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);
-            this.label20.TabIndex = 209;
-            this.label20.Text = "原因分析";
-            // 
-            // label18
-            // 
-            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(636, 911);
-            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);
-            this.label18.TabIndex = 211;
-            this.label18.Text = "不良属性";
-            // 
-            // label19
-            // 
-            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(38, 911);
-            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);
-            this.label19.TabIndex = 210;
-            this.label19.Text = "处理方法";
-            // 
-            // 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(9, 741);
-            this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(306, 41);
-            this.label9.TabIndex = 215;
-            this.label9.Text = "工厂翻新及交付信息";
+            this.label20.Size = new System.Drawing.Size(82, 41);
+            this.label20.TabIndex = 222;
+            this.label20.Text = "位置";
             // 
             // 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.as_location1);
+            this.Controls.Add(this.label20);
+            this.Controls.Add(this.as_image1);
+            this.Controls.Add(this.label22);
+            this.Controls.Add(this.as_type);
+            this.Controls.Add(this.label17);
+            this.Controls.Add(this.label16);
+            this.Controls.Add(this.as_location);
             this.Controls.Add(this.label9);
             this.Controls.Add(this.as_method);
             this.Controls.Add(this.as_badpro);
-            this.Controls.Add(this.as_reason);
             this.Controls.Add(this.as_process);
             this.Controls.Add(this.label21);
-            this.Controls.Add(this.label20);
             this.Controls.Add(this.label18);
             this.Controls.Add(this.label19);
             this.Controls.Add(this.label8);
@@ -820,12 +937,13 @@ 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();
-            this.groupBoxWithBorder1.ResumeLayout(true);
-            this.groupBoxWithBorder1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.as_lcdconfirm.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_shellconfirm.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_duty2.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.as_changerconfirm.Properties)).EndInit();
+            this.groupBoxWithBorder1.ResumeLayout(true);
+            this.groupBoxWithBorder1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.as_location1.Properties)).EndInit();
             this.ResumeLayout(true);
             this.PerformLayout();
 
@@ -862,7 +980,7 @@ namespace UAS_MES_NEW.Special
         private CustomControl.TextBoxWithIcon.SnCollectionBox AS_BADCODE;
         private CustomControl.ButtonUtil.NormalButton Save;
         private CustomControl.RichText.RichTextAutoBottom OperatResult;
-        private DevExpress.XtraEditors.CheckedComboBoxEdit as_lcdconfirm;
+        private DevExpress.XtraEditors.ComboBoxEdit as_lcdconfirm;
         private DevExpress.XtraEditors.ComboBoxEdit as_shellconfirm;
         private DevExpress.XtraEditors.ComboBoxEdit as_duty2;
         private DevExpress.XtraEditors.CheckedComboBoxEdit as_changerconfirm;
@@ -875,12 +993,20 @@ namespace UAS_MES_NEW.Special
         private System.Windows.Forms.Label label8;
         private MultBlurSearch as_method;
         private MultBlurSearch as_badpro;
-        private MultBlurSearch as_reason;
         private SnCollectionBox as_process;
         private System.Windows.Forms.Label label21;
-        private System.Windows.Forms.Label label20;
         private System.Windows.Forms.Label label18;
         private System.Windows.Forms.Label label19;
         private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.Label as_outdate;
+        private System.Windows.Forms.Label label15;
+        private MultBlurSearch as_location;
+        private System.Windows.Forms.Label label16;
+        private MultBlurSearch as_type;
+        private System.Windows.Forms.Label label17;
+        private MultBlurSearch as_image1;
+        private System.Windows.Forms.Label label22;
+        private DevExpress.XtraEditors.CheckedComboBoxEdit as_location1;
+        private System.Windows.Forms.Label label20;
     }
 }

+ 111 - 33
UAS_MES_ODLF/FunctionCode/Special/Special_Repair.cs

@@ -32,11 +32,15 @@ namespace UAS_MES_NEW.Special
             GetSNCode.Focus();
             //工厂复测确认
 
-        
             as_recheck.TableName = "aftersaleinf";
             as_recheck.Field = "ASI_VALUES";
             as_recheck.ValueField = "ASI_VALUES";
-            as_recheck.Condition = " asi_type='工厂复测确认' ";
+            as_recheck.Condition = " asi_type='原因定位' ";
+
+            as_location.TableName = "aftersaleinf";
+            as_location.Field = "ASI_VALUES";
+            as_location.ValueField = "ASI_VALUES";
+            as_location.Condition = " asi_type='位置' ";
 
             as_badpro.TableName = "aftersaleinf";
             as_badpro.Field = "ASI_VALUES";
@@ -46,13 +50,19 @@ namespace UAS_MES_NEW.Special
             as_method.TableName = "aftersaleinf";
             as_method.Field = "ASI_VALUES";
             as_method.ValueField = "ASI_VALUES";
-            as_method.Condition = " asi_type='处理方法' ";
+            as_method.Condition = " asi_type='处置动作' ";
+
+            as_type.TableName = "aftersaleinf";
+            as_type.Field = "ASI_VALUES";
+            as_type.ValueField = "ASI_VALUES";
+            as_type.Condition = " asi_type='不良类别' ";
+
+            as_image1.TableName = "aftersaleinf";
+            as_image1.Field = "ASI_VALUES";
+            as_image1.ValueField = "ASI_VALUES";
+            as_image1.Condition = " asi_type='不良现象' ";
+
 
-            as_reason.TableName = "aftersaleinf";
-            as_reason.Field = "ASI_VALUES";
-            as_reason.ValueField = "ASI_VALUES";
-            as_reason.Condition = " asi_type='原因分析' ";
-          
             //屏幕外观确认
             as_lcdconfirm.Properties.Items.Add("有");
             as_lcdconfirm.Properties.Items.Add("无");
@@ -67,13 +77,21 @@ namespace UAS_MES_NEW.Special
                 as_changerconfirm.Properties.Items.Add(dt.Rows[i][0].ToString());
             }
 
+            //位置1
+            dt = (DataTable)dh.ExecuteSql("select ASI_VALUES from aftersaleinf where asi_type='位置1'", "select");
+            for (int i = 0; i < dt.Rows.Count; i++)
+            {
+                as_location1.Properties.Items.Add(dt.Rows[i][0].ToString());
+            }
+
             //责任归属2
             as_duty2.Properties.Items.Add("小度");
             as_duty2.Properties.Items.Add("欧度利方");
             asc.controllInitializeSize(this);
-            as_reason.SendToBack();
-            as_badpro.SendToBack();
             as_method.SendToBack();
+            as_type.SendToBack();
+            as_badpro.SendToBack();
+            as_image1.SendToBack();
             as_recheck.SendToBack();
             as_lcdconfirm.SendToBack();
             as_shellconfirm.SendToBack();
@@ -103,13 +121,14 @@ namespace UAS_MES_NEW.Special
                     BaseUtil.CleanForm(this);
                     return;
                 }
-
+                as_outdate.Text = "否";
                 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);
-                    BaseUtil.CleanForm(this);
-                    return;
+                    as_outdate.Text = "是";
+                    //OperatResult.AppendText(">>序列号:" + GetSNCode.Text + "出货已超过1年半\n", Color.Red);
+                    //BaseUtil.CleanForm(this);
+                    //return;
                 }
 
                 BaseUtil.SetFormValue(this.Controls, dt_);
@@ -165,9 +184,9 @@ namespace UAS_MES_NEW.Special
             {
                 sql.Append("as_process='" + as_process.Text + "',");
             }
-            if (as_reason.Text != "")
+            if (as_type.Text != "")
             {
-                sql.Append("as_reason='" + as_reason.Text + "',");
+                sql.Append("as_type='" + as_type.Text + "',");
             }
             if (as_method.Text != "")
             {
@@ -177,35 +196,94 @@ namespace UAS_MES_NEW.Special
             {
                 sql.Append("as_badpro='" + as_badpro.Text + "',");
             }
-            sql.Append(" AS_RECEIVETIME=sysdate, as_repairman='" + User.UserName + "' where as_id='" + as_id.Text + "'");
+            if (as_location.Text != "")
+            {
+                sql.Append("as_location='" + as_location.Text + "',");
+            }
+            if (as_image1.Text != "")
+            {
+                sql.Append("as_image1='" + as_image1.Text + "',");
+            }
+            if (as_location1.Text != "")
+            {
+                sql.Append("as_location1='" + as_location1.Text + "',");
+            }
+            sql.Append(" as_repairman='" + User.UserName + "' where as_id='" + as_id.Text + "'");
             dh.ExecuteSql(sql.GetString(), "update");
             OperatResult.AppendText(">>序列号【" + GetSNCode.Text + "】保存维修信息成功\n", Color.Green);
 
-            dt = (DataTable)dh.ExecuteSql("select max(ms_id) from makeserial where ms_sncode='" + GetSNCode.Text + "'", "select");
-            if (dt.Rows.Count > 0)
-            {
-                string ms_id = dt.Rows[0][0].ToString();
-                dt = (DataTable)dh.ExecuteSql("select ms_firstsn from makeserial where ms_id='" + ms_id + "'", "select");
-                if (dt.Rows.Count > 0)
-                {
-                    string ms_firstsn = dt.Rows[0][0].ToString();
-                    dh.ExecuteSql("update craftmaterial set cm_status=-1 where cm_firstsn='" + ms_firstsn + "'", "update");
-                    OperatResult.AppendText(">>序列号【" + GetSNCode.Text + "】物料拆解成功\n", Color.Green);
-                }
-            }
+            //dt = (DataTable)dh.ExecuteSql("select max(ms_id) from makeserial where ms_sncode='" + GetSNCode.Text + "'", "select");
+            //if (dt.Rows.Count > 0)
+            //{
+            //    string ms_id = dt.Rows[0][0].ToString();
+            //    dt = (DataTable)dh.ExecuteSql("select ms_firstsn from makeserial where ms_id='" + ms_id + "'", "select");
+            //    if (dt.Rows.Count > 0)
+            //    {
+            //        string ms_firstsn = dt.Rows[0][0].ToString();
+            //        dh.ExecuteSql("update craftmaterial set cm_status=-1 where cm_firstsn='" + ms_firstsn + "'", "update");
+            //        OperatResult.AppendText(">>序列号【" + GetSNCode.Text + "】物料拆解成功\n", Color.Green);
+            //    }
+            //}
             GetSNCode.Clear();
             AS_DESCRIPTION.Clear();
             BaseUtil.CleanForm(this);
         }
 
-        private void as_recheck_ImeModeChanged(object sender, EventArgs e)
+        private void as_badpro_UserControlTextChanged(object sender, EventArgs e)
         {
-            Console.WriteLine(as_recheck.ImeMode.ToString());
+            switch (as_badpro.Text)
+            {
+                case "NTF":
+                    as_duty2.Text = "小度";
+                    break;
+                case "过保":
+                    as_duty2.Text = "小度";
+                    break;
+                case "检测无故障":
+                    as_duty2.Text = "小度";
+                    break;
+                default:
+                    as_duty2.Text = "欧度利方";
+                    break;
+            }
+            Load_as_type();
+        }
+
+        private void as_type_UserControlTextChanged(object sender, EventArgs e)
+        {
+            Load_as_image1();
+        }
+
+        private void as_recheck_UserControlTextChanged(object sender, EventArgs e)
+        {
+            Load_as_recheck();
         }
 
-        private void as_recheck_Modified(object sender, EventArgs e)
+        private void Load_as_type()
         {
-        
+            DataTable dt = (DataTable)dh.ExecuteSql("select asi_code from aftersaleinf where ASI_VALUES='" + as_badpro.Text + "'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                as_type.Condition = "asi_type='不良类别' and asi_toplevelcode='" + dt.Rows[0][0].ToString() + "'";
+            }
+        }
+
+        private void Load_as_image1()
+        {
+            DataTable dt = (DataTable)dh.ExecuteSql("select asi_code from aftersaleinf where ASI_VALUES='" + as_type.Text + "'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                as_image1.Condition = "asi_type='不良现象' and asi_toplevelcode='" + dt.Rows[0][0].ToString() + "'";
+            }
+        }
+
+        private void Load_as_recheck()
+        {
+            DataTable dt = (DataTable)dh.ExecuteSql("select asi_code from aftersaleinf where ASI_VALUES='" + as_type.Text + "'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                as_method.Condition = "asi_type='原因定位' and asi_toplevelcode='" + dt.Rows[0][0].ToString() + "'";
+            }
         }
     }
 }

+ 5 - 5
UAS_MES_ODLF/PublicMethod/BaseUtil.cs

@@ -162,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 || ctl[i] is CheckedComboBoxEdit || ctl[i] is DevExpress.XtraEditors.ComboBoxEdit)
+                    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 MultBlurSearch || ctl[i] is CheckedComboBoxEdit || ctl[i] is DevExpress.XtraEditors.ComboBoxEdit)
                     {
                         for (int j = 0; j < dt.Columns.Count; j++)
                         {
@@ -214,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 || ctl[i].Controls[j] is CheckedComboBoxEdit || ctl[i].Controls[j] is DevExpress.XtraEditors.ComboBoxEdit)
+                            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] is MultBlurSearch || ctl[i].Controls[j] is DevExpress.XtraEditors.ComboBoxEdit)
                             {
                                 for (int k = 0; k < dt.Columns.Count; k++)
                                 {
@@ -233,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 || ctl[i] is CheckedComboBoxEdit || ctl[i] is DevExpress.XtraEditors.ComboBoxEdit)
+                    if (ctl[i] is TextBox || ctl[i] is Label || ctl[i] is SearchTextBox || ctl[i] is CheckedComboBoxEdit || ctl[i] is MultBlurSearch || ctl[i] is DevExpress.XtraEditors.ComboBoxEdit)
                     {
                         for (int j = 0; j < dt.Columns.Count; j++)
                         {
@@ -652,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 || Form.Controls[i] is CheckedComboBoxEdit || Form.Controls[i] is DevExpress.XtraEditors.ComboBoxEdit)
+                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 MultBlurSearch || Form.Controls[i] is DevExpress.XtraEditors.ComboBoxEdit)
                     Form.Controls[i].Text = "";
                 if (Form.Controls[i] is DataGridView)
                     CleanDGVData((DataGridView)Form.Controls[i]);
@@ -665,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 || collection[i] is CheckedComboBoxEdit || collection[i] is DevExpress.XtraEditors.ComboBoxEdit)
+                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 MultBlurSearch || collection[i] is DevExpress.XtraEditors.ComboBoxEdit)
                     collection[i].Text = "";
                 if (collection[i] is DataGridView)
                     CleanDGVData((DataGridView)collection[i]);

+ 1 - 0
UAS_MES_ODLF/UAS_MES_ODLF.csproj

@@ -1615,6 +1615,7 @@
     <EmbeddedResource Include="Main.resx">
       <DependentUpon>Main.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <SubType>Designer</SubType>