修改维修内容和拆解物料名称

UAS_MES_ODLF/FunctionCode/Make/Make_Decompose.cs

@@ -128,7 +128,7 @@ namespace UAS_MES_NEW.Make
                         pr_name += "'" + item + "',";
                     }
                     pr_name = pr_name.TrimEnd(',');
-                    LabelDataGridView.Rows[i].Cells["pr_detail_"].Value = dh.getFieldDataByCondition("product", "wm_concat(pr_detail)", "pr_code in (" + pr_name + ")");
+                    LabelDataGridView.Rows[i].Cells["pr_detail_"].Value = dh.getFieldDataByCondition("product", "wm_concat(substr(pr_spec,0,20))", "pr_code in (" + pr_name + ")");
                     LabelDataGridView.Rows[i].Cells["cm_status_1"].Value = (LabelDataGridView.Rows[i].Cells["cm_status"].Value.ToString() == "-1") ? "已拆解" : "上线";
                 }
             }
@@ -262,7 +262,7 @@ namespace UAS_MES_NEW.Make
                             sql.Append("select max(sp_id)sp_id,max(sp_detno)sp_detno,min(sp_ifrepeat)sp_ifrepeat,sp_fsoncode,max(sp_barcoderule)");
                             sql.Append("sp_barcoderule, min(sp_checksalecode)sp_checksalecode,sp_tracekind,wm_concat(sp_soncode) sp_soncode,max(sp_ifuseregex)sp_ifuseregex,max(sp_ifforsn)");
                             sql.Append("sp_ifforsn,max(sp_length)sp_length,max(sp_type)sp_type,replace(wm_concat(sp_prefix),',','|')sp_prefix,max(sp_regex)");
-                            sql.Append("sp_regex,max(pr_detail)pr_detail from stepproduct left join product on pr_code=sp_fsoncode where ");
+                            sql.Append("sp_regex,max(substr(pr_spec,0,20))pr_detail from stepproduct left join product on pr_code=sp_fsoncode where ");
                             sql.Append("sp_bomversion='" + ma_bomversion + "' and  sp_craftcode='" + LabelDataGridView.Rows[i].Cells["cm_craftcode"].Value + "'and sp_mothercode ='" + LabelDataGridView.Rows[i].Cells["cm_maprodcode"].Value + "'");
                             sql.Append(" group by sp_fsoncode,sp_tracekind  order by SP_DETNO asc");
                             dtbar = (DataTable)dh.ExecuteSql(sql.GetString(), "select");

UAS_MES_ODLF/FunctionCode/Make/Make_Repair.Designer.cs

@@ -107,9 +107,10 @@
             // 
             this.label14.AutoSize = true;
             this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label14.Location = new System.Drawing.Point(654, 144);
+            this.label14.Location = new System.Drawing.Point(1308, 288);
+            this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(74, 21);
+            this.label14.Size = new System.Drawing.Size(146, 41);
             this.label14.TabIndex = 46;
             this.label14.Text = "不良备注";
             // 
@@ -118,9 +119,10 @@
             this.bc_name_label.AutoSize = true;
             this.bc_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_name_label.ForeColor = System.Drawing.Color.Black;
-            this.bc_name_label.Location = new System.Drawing.Point(406, 142);
+            this.bc_name_label.Location = new System.Drawing.Point(812, 284);
+            this.bc_name_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.bc_name_label.Name = "bc_name_label";
-            this.bc_name_label.Size = new System.Drawing.Size(74, 21);
+            this.bc_name_label.Size = new System.Drawing.Size(146, 41);
             this.bc_name_label.TabIndex = 44;
             this.bc_name_label.Text = "不良代码";
             // 
@@ -128,9 +130,10 @@
             // 
             this.bg_name_label.AutoSize = true;
             this.bg_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bg_name_label.Location = new System.Drawing.Point(163, 142);
+            this.bg_name_label.Location = new System.Drawing.Point(326, 284);
+            this.bg_name_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.bg_name_label.Name = "bg_name_label";
-            this.bg_name_label.Size = new System.Drawing.Size(90, 21);
+            this.bg_name_label.Size = new System.Drawing.Size(178, 41);
             this.bg_name_label.TabIndex = 40;
             this.bg_name_label.Text = "不良代码组";
             // 
@@ -139,9 +142,10 @@
             this.mbr_brgcode_label.AutoSize = true;
             this.mbr_brgcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbr_brgcode_label.ForeColor = System.Drawing.Color.Black;
-            this.mbr_brgcode_label.Location = new System.Drawing.Point(163, 187);
+            this.mbr_brgcode_label.Location = new System.Drawing.Point(326, 374);
+            this.mbr_brgcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.mbr_brgcode_label.Name = "mbr_brgcode_label";
-            this.mbr_brgcode_label.Size = new System.Drawing.Size(90, 21);
+            this.mbr_brgcode_label.Size = new System.Drawing.Size(178, 41);
             this.mbr_brgcode_label.TabIndex = 93;
             this.mbr_brgcode_label.Text = "不良原因组";
             // 
@@ -150,9 +154,10 @@
             this.nr_name_label.AutoSize = true;
             this.nr_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.nr_name_label.ForeColor = System.Drawing.Color.Black;
-            this.nr_name_label.Location = new System.Drawing.Point(406, 187);
+            this.nr_name_label.Location = new System.Drawing.Point(812, 374);
+            this.nr_name_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.nr_name_label.Name = "nr_name_label";
-            this.nr_name_label.Size = new System.Drawing.Size(74, 21);
+            this.nr_name_label.Size = new System.Drawing.Size(146, 41);
             this.nr_name_label.TabIndex = 95;
             this.nr_name_label.Text = "不良原因";
             // 
@@ -161,9 +166,10 @@
             this.mbr_dutycode_label.AutoSize = true;
             this.mbr_dutycode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbr_dutycode_label.ForeColor = System.Drawing.Color.Black;
-            this.mbr_dutycode_label.Location = new System.Drawing.Point(654, 187);
+            this.mbr_dutycode_label.Location = new System.Drawing.Point(1308, 374);
+            this.mbr_dutycode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.mbr_dutycode_label.Name = "mbr_dutycode_label";
-            this.mbr_dutycode_label.Size = new System.Drawing.Size(58, 21);
+            this.mbr_dutycode_label.Size = new System.Drawing.Size(114, 41);
             this.mbr_dutycode_label.TabIndex = 97;
             this.mbr_dutycode_label.Text = "责任别";
             // 
@@ -172,9 +178,10 @@
             this.mbc_component_label.AutoSize = true;
             this.mbc_component_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbc_component_label.ForeColor = System.Drawing.Color.Black;
-            this.mbc_component_label.Location = new System.Drawing.Point(163, 229);
+            this.mbc_component_label.Location = new System.Drawing.Point(326, 458);
+            this.mbc_component_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.mbc_component_label.Name = "mbc_component_label";
-            this.mbc_component_label.Size = new System.Drawing.Size(74, 21);
+            this.mbc_component_label.Size = new System.Drawing.Size(146, 41);
             this.mbc_component_label.TabIndex = 99;
             this.mbc_component_label.Text = "不良组件";
             // 
@@ -183,9 +190,10 @@
             this.mbr_solution_label.AutoSize = true;
             this.mbr_solution_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbr_solution_label.ForeColor = System.Drawing.Color.Black;
-            this.mbr_solution_label.Location = new System.Drawing.Point(406, 228);
+            this.mbr_solution_label.Location = new System.Drawing.Point(812, 456);
+            this.mbr_solution_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.mbr_solution_label.Name = "mbr_solution_label";
-            this.mbr_solution_label.Size = new System.Drawing.Size(74, 21);
+            this.mbr_solution_label.Size = new System.Drawing.Size(146, 41);
             this.mbr_solution_label.TabIndex = 101;
             this.mbr_solution_label.Text = "解决方案";
             // 
@@ -194,9 +202,10 @@
             this.mbl_loc_label.AutoSize = true;
             this.mbl_loc_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbl_loc_label.ForeColor = System.Drawing.Color.Black;
-            this.mbl_loc_label.Location = new System.Drawing.Point(163, 287);
+            this.mbl_loc_label.Location = new System.Drawing.Point(326, 574);
+            this.mbl_loc_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.mbl_loc_label.Name = "mbl_loc_label";
-            this.mbl_loc_label.Size = new System.Drawing.Size(74, 21);
+            this.mbl_loc_label.Size = new System.Drawing.Size(146, 41);
             this.mbl_loc_label.TabIndex = 103;
             this.mbl_loc_label.Text = "不良位置";
             // 
@@ -205,9 +214,10 @@
             this.mbp_part_label.AutoSize = true;
             this.mbp_part_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbp_part_label.ForeColor = System.Drawing.Color.Black;
-            this.mbp_part_label.Location = new System.Drawing.Point(454, 287);
+            this.mbp_part_label.Location = new System.Drawing.Point(908, 574);
+            this.mbp_part_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.mbp_part_label.Name = "mbp_part_label";
-            this.mbp_part_label.Size = new System.Drawing.Size(74, 21);
+            this.mbp_part_label.Size = new System.Drawing.Size(146, 41);
             this.mbp_part_label.TabIndex = 105;
             this.mbp_part_label.Text = "不良零件";
             // 
@@ -217,9 +227,10 @@
             | 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)));
-            this.GetSNCode_Label.Location = new System.Drawing.Point(163, 533);
+            this.GetSNCode_Label.Location = new System.Drawing.Point(326, 1066);
+            this.GetSNCode_Label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.GetSNCode_Label.Name = "GetSNCode_Label";
-            this.GetSNCode_Label.Size = new System.Drawing.Size(58, 21);
+            this.GetSNCode_Label.Size = new System.Drawing.Size(114, 41);
             this.GetSNCode_Label.TabIndex = 113;
             this.GetSNCode_Label.Text = "序列号";
             // 
@@ -228,19 +239,20 @@
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.Color.Black;
-            this.label2.Location = new System.Drawing.Point(8, 118);
+            this.label2.Location = new System.Drawing.Point(16, 236);
+            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(74, 22);
+            this.label2.Size = new System.Drawing.Size(146, 42);
             this.label2.TabIndex = 117;
             this.label2.Text = "不良信息";
             // 
             // BadCodeTree
             // 
             this.BadCodeTree.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.BadCodeTree.Location = new System.Drawing.Point(11, 144);
-            this.BadCodeTree.Margin = new System.Windows.Forms.Padding(2);
+            this.BadCodeTree.Location = new System.Drawing.Point(22, 288);
+            this.BadCodeTree.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.BadCodeTree.Name = "BadCodeTree";
-            this.BadCodeTree.Size = new System.Drawing.Size(144, 426);
+            this.BadCodeTree.Size = new System.Drawing.Size(284, 848);
             this.BadCodeTree.TabIndex = 118;
             this.BadCodeTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.BadCodeTree_NodeMouseClick);
             // 
@@ -249,9 +261,10 @@
             this.bc_code.AutoSize = true;
             this.bc_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_code.ForeColor = System.Drawing.Color.Black;
-            this.bc_code.Location = new System.Drawing.Point(862, 225);
+            this.bc_code.Location = new System.Drawing.Point(1724, 450);
+            this.bc_code.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.bc_code.Name = "bc_code";
-            this.bc_code.Size = new System.Drawing.Size(0, 21);
+            this.bc_code.Size = new System.Drawing.Size(0, 41);
             this.bc_code.TabIndex = 122;
             this.bc_code.Visible = false;
             // 
@@ -260,9 +273,10 @@
             this.bg_code.AutoSize = true;
             this.bg_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bg_code.ForeColor = System.Drawing.Color.Black;
-            this.bg_code.Location = new System.Drawing.Point(827, 225);
+            this.bg_code.Location = new System.Drawing.Point(1654, 450);
+            this.bg_code.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.bg_code.Name = "bg_code";
-            this.bg_code.Size = new System.Drawing.Size(0, 21);
+            this.bg_code.Size = new System.Drawing.Size(0, 41);
             this.bg_code.TabIndex = 123;
             this.bg_code.Visible = false;
             // 
@@ -271,9 +285,10 @@
             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(799, 260);
+            this.nrg_code.Location = new System.Drawing.Point(1598, 520);
+            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, 21);
+            this.nrg_code.Size = new System.Drawing.Size(0, 41);
             this.nrg_code.TabIndex = 136;
             this.nrg_code.Visible = false;
             // 
@@ -282,9 +297,10 @@
             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(820, 263);
+            this.so_code.Location = new System.Drawing.Point(1640, 526);
+            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, 21);
+            this.so_code.Size = new System.Drawing.Size(0, 41);
             this.so_code.TabIndex = 137;
             this.so_code.Visible = false;
             // 
@@ -293,9 +309,10 @@
             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(778, 263);
+            this.mbr_dutycode.Location = new System.Drawing.Point(1556, 526);
+            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, 21);
+            this.mbr_dutycode.Size = new System.Drawing.Size(0, 41);
             this.mbr_dutycode.TabIndex = 138;
             this.mbr_dutycode.Visible = false;
             // 
@@ -308,20 +325,24 @@
             "主板",
             "液晶屏",
             "电路板",
+            "喇叭",
+            "摄像头",
+            "MIC板",
             "其他"});
-            this.mbc_component.Location = new System.Drawing.Point(262, 229);
+            this.mbc_component.Location = new System.Drawing.Point(524, 458);
+            this.mbc_component.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.mbc_component.Name = "mbc_component";
-            this.mbc_component.Size = new System.Drawing.Size(121, 20);
+            this.mbc_component.Size = new System.Drawing.Size(238, 32);
             this.mbc_component.TabIndex = 139;
             // 
             // mbr_dutyname
             // 
             this.mbr_dutyname.Condition = null;
             this.mbr_dutyname.Field = null;
-            this.mbr_dutyname.Location = new System.Drawing.Point(733, 189);
-            this.mbr_dutyname.Margin = new System.Windows.Forms.Padding(2);
+            this.mbr_dutyname.Location = new System.Drawing.Point(1466, 378);
+            this.mbr_dutyname.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.mbr_dutyname.Name = "mbr_dutyname";
-            this.mbr_dutyname.Size = new System.Drawing.Size(121, 21);
+            this.mbr_dutyname.Size = new System.Drawing.Size(242, 70);
             this.mbr_dutyname.TabIndex = 135;
             this.mbr_dutyname.TableName = null;
             this.mbr_dutyname.Value = null;
@@ -332,10 +353,10 @@
             // 
             this.so_name.Condition = null;
             this.so_name.Field = null;
-            this.so_name.Location = new System.Drawing.Point(502, 229);
-            this.so_name.Margin = new System.Windows.Forms.Padding(2);
+            this.so_name.Location = new System.Drawing.Point(1004, 458);
+            this.so_name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.so_name.Name = "so_name";
-            this.so_name.Size = new System.Drawing.Size(121, 21);
+            this.so_name.Size = new System.Drawing.Size(242, 70);
             this.so_name.TabIndex = 133;
             this.so_name.TableName = null;
             this.so_name.Value = null;
@@ -346,10 +367,10 @@
             // 
             this.nr_name.Condition = null;
             this.nr_name.Field = null;
-            this.nr_name.Location = new System.Drawing.Point(502, 189);
-            this.nr_name.Margin = new System.Windows.Forms.Padding(2);
+            this.nr_name.Location = new System.Drawing.Point(1004, 378);
+            this.nr_name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.nr_name.Name = "nr_name";
-            this.nr_name.Size = new System.Drawing.Size(121, 21);
+            this.nr_name.Size = new System.Drawing.Size(242, 70);
             this.nr_name.TabIndex = 132;
             this.nr_name.TableName = null;
             this.nr_name.Value = null;
@@ -360,10 +381,10 @@
             // 
             this.nrg_name.Condition = null;
             this.nrg_name.Field = null;
-            this.nrg_name.Location = new System.Drawing.Point(262, 189);
-            this.nrg_name.Margin = new System.Windows.Forms.Padding(2);
+            this.nrg_name.Location = new System.Drawing.Point(524, 378);
+            this.nrg_name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.nrg_name.Name = "nrg_name";
-            this.nrg_name.Size = new System.Drawing.Size(121, 21);
+            this.nrg_name.Size = new System.Drawing.Size(242, 70);
             this.nrg_name.TabIndex = 131;
             this.nrg_name.TableName = null;
             this.nrg_name.Value = null;
@@ -391,11 +412,11 @@
             this.groupBoxWithBorder1.Controls.Add(this.ms_prodcode);
             this.groupBoxWithBorder1.Controls.Add(this.ms_makecode);
             this.groupBoxWithBorder1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.groupBoxWithBorder1.Location = new System.Drawing.Point(9, 8);
-            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(2);
+            this.groupBoxWithBorder1.Location = new System.Drawing.Point(18, 16);
+            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
-            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBoxWithBorder1.Size = new System.Drawing.Size(880, 102);
+            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.groupBoxWithBorder1.Size = new System.Drawing.Size(1760, 204);
             this.groupBoxWithBorder1.TabIndex = 130;
             this.groupBoxWithBorder1.TabStop = false;
             this.groupBoxWithBorder1.Text = "工单信息";
@@ -409,13 +430,14 @@
             this.cd_stepcode.DBTitle = "回流工序";
             this.cd_stepcode.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.cd_stepcode.FormName = null;
-            this.cd_stepcode.Location = new System.Drawing.Point(356, 69);
+            this.cd_stepcode.Location = new System.Drawing.Point(712, 138);
+            this.cd_stepcode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.cd_stepcode.Name = "cd_stepcode";
             this.cd_stepcode.Power = "ifspecial";
             this.cd_stepcode.ReturnData = null;
             this.cd_stepcode.SelectField = null;
             this.cd_stepcode.SetValueField = null;
-            this.cd_stepcode.Size = new System.Drawing.Size(150, 22);
+            this.cd_stepcode.Size = new System.Drawing.Size(300, 44);
             this.cd_stepcode.TabIndex = 68;
             this.cd_stepcode.TableName = null;
             this.cd_stepcode.Tag = "";
@@ -427,9 +449,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_reworkcheckno.AutoSize = true;
             this.ms_reworkcheckno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_reworkcheckno.Location = new System.Drawing.Point(791, 58);
+            this.ms_reworkcheckno.Location = new System.Drawing.Point(1580, 114);
+            this.ms_reworkcheckno.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_reworkcheckno.Name = "ms_reworkcheckno";
-            this.ms_reworkcheckno.Size = new System.Drawing.Size(74, 21);
+            this.ms_reworkcheckno.Size = new System.Drawing.Size(146, 41);
             this.ms_reworkcheckno.TabIndex = 129;
             this.ms_reworkcheckno.Text = "返修批号";
             this.ms_reworkcheckno.Visible = false;
@@ -440,9 +463,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(202, 26);
+            this.ms_makecode_label.Location = new System.Drawing.Point(402, 50);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(58, 21);
+            this.ms_makecode_label.Size = new System.Drawing.Size(114, 41);
             this.ms_makecode_label.TabIndex = 37;
             this.ms_makecode_label.Text = "工单号";
             // 
@@ -452,9 +476,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_sncode_label.AutoSize = true;
             this.ms_sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_sncode_label.Location = new System.Drawing.Point(14, 25);
+            this.ms_sncode_label.Location = new System.Drawing.Point(26, 48);
+            this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_sncode_label.Name = "ms_sncode_label";
-            this.ms_sncode_label.Size = new System.Drawing.Size(58, 21);
+            this.ms_sncode_label.Size = new System.Drawing.Size(114, 41);
             this.ms_sncode_label.TabIndex = 38;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -464,9 +489,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_checkno.AutoSize = true;
             this.ms_checkno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_checkno.Location = new System.Drawing.Point(789, 26);
+            this.ms_checkno.Location = new System.Drawing.Point(1576, 50);
+            this.ms_checkno.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_checkno.Name = "ms_checkno";
-            this.ms_checkno.Size = new System.Drawing.Size(74, 21);
+            this.ms_checkno.Size = new System.Drawing.Size(146, 41);
             this.ms_checkno.TabIndex = 128;
             this.ms_checkno.Text = "送检批号";
             this.ms_checkno.Visible = false;
@@ -479,12 +505,13 @@
             this.RepairComplete.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.RepairComplete.Image = null;
             this.RepairComplete.IsShowBorder = true;
-            this.RepairComplete.Location = new System.Drawing.Point(536, 66);
+            this.RepairComplete.Location = new System.Drawing.Point(1072, 132);
+            this.RepairComplete.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.RepairComplete.MoveImage = ((System.Drawing.Image)(resources.GetObject("RepairComplete.MoveImage")));
             this.RepairComplete.Name = "RepairComplete";
             this.RepairComplete.NormalImage = ((System.Drawing.Image)(resources.GetObject("RepairComplete.NormalImage")));
             this.RepairComplete.Power = null;
-            this.RepairComplete.Size = new System.Drawing.Size(68, 24);
+            this.RepairComplete.Size = new System.Drawing.Size(136, 48);
             this.RepairComplete.TabIndex = 55;
             this.RepairComplete.Tag = "IfRead";
             this.RepairComplete.Text = "完成维修";
@@ -498,10 +525,11 @@
             this.ms_sncode.AutoSize = true;
             this.ms_sncode.CutLength = null;
             this.ms_sncode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_sncode.Location = new System.Drawing.Point(89, 26);
-            this.ms_sncode.MaximumSize = new System.Drawing.Size(150, 0);
+            this.ms_sncode.Location = new System.Drawing.Point(176, 50);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ms_sncode.MaximumSize = new System.Drawing.Size(300, 0);
             this.ms_sncode.Name = "ms_sncode";
-            this.ms_sncode.Size = new System.Drawing.Size(0, 21);
+            this.ms_sncode.Size = new System.Drawing.Size(0, 41);
             this.ms_sncode.TabIndex = 126;
             // 
             // Scrap
@@ -512,12 +540,13 @@
             this.Scrap.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.Scrap.Image = null;
             this.Scrap.IsShowBorder = true;
-            this.Scrap.Location = new System.Drawing.Point(631, 66);
+            this.Scrap.Location = new System.Drawing.Point(1262, 132);
+            this.Scrap.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Scrap.MoveImage = ((System.Drawing.Image)(resources.GetObject("Scrap.MoveImage")));
             this.Scrap.Name = "Scrap";
             this.Scrap.NormalImage = ((System.Drawing.Image)(resources.GetObject("Scrap.NormalImage")));
             this.Scrap.Power = null;
-            this.Scrap.Size = new System.Drawing.Size(68, 24);
+            this.Scrap.Size = new System.Drawing.Size(136, 48);
             this.Scrap.TabIndex = 56;
             this.Scrap.Tag = "IfRead";
             this.Scrap.Text = "报废";
@@ -529,9 +558,10 @@
             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(839, 221);
+            this.nr_code.Location = new System.Drawing.Point(1676, 440);
+            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, 21);
+            this.nr_code.Size = new System.Drawing.Size(0, 41);
             this.nr_code.TabIndex = 125;
             // 
             // st_rstepcode_label
@@ -540,9 +570,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.st_rstepcode_label.AutoSize = true;
             this.st_rstepcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.st_rstepcode_label.Location = new System.Drawing.Point(264, 64);
+            this.st_rstepcode_label.Location = new System.Drawing.Point(526, 126);
+            this.st_rstepcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.st_rstepcode_label.Name = "st_rstepcode_label";
-            this.st_rstepcode_label.Size = new System.Drawing.Size(74, 21);
+            this.st_rstepcode_label.Size = new System.Drawing.Size(146, 41);
             this.st_rstepcode_label.TabIndex = 65;
             this.st_rstepcode_label.Text = "回流工序";
             // 
@@ -552,9 +583,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ma_craftcode_label.AutoSize = true;
             this.ma_craftcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_craftcode_label.Location = new System.Drawing.Point(14, 64);
+            this.ma_craftcode_label.Location = new System.Drawing.Point(26, 126);
+            this.ma_craftcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ma_craftcode_label.Name = "ma_craftcode_label";
-            this.ma_craftcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_craftcode_label.Size = new System.Drawing.Size(146, 41);
             this.ma_craftcode_label.TabIndex = 66;
             this.ma_craftcode_label.Text = "回流途程";
             // 
@@ -566,13 +598,14 @@
             this.cr_code.DBTitle = "回流途程";
             this.cr_code.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.cr_code.FormName = null;
-            this.cr_code.Location = new System.Drawing.Point(91, 69);
+            this.cr_code.Location = new System.Drawing.Point(182, 138);
+            this.cr_code.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.cr_code.Name = "cr_code";
             this.cr_code.Power = "ifspecial";
             this.cr_code.ReturnData = null;
             this.cr_code.SelectField = null;
             this.cr_code.SetValueField = null;
-            this.cr_code.Size = new System.Drawing.Size(150, 23);
+            this.cr_code.Size = new System.Drawing.Size(300, 46);
             this.cr_code.TabIndex = 67;
             this.cr_code.TableName = null;
             this.cr_code.Tag = "ma_craftcode";
@@ -585,9 +618,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(636, 26);
+            this.pr_detail_label.Location = new System.Drawing.Point(1270, 50);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_detail_label.Size = new System.Drawing.Size(146, 41);
             this.pr_detail_label.TabIndex = 61;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -597,9 +631,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_prodcode_label.AutoSize = true;
             this.ms_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_prodcode_label.Location = new System.Drawing.Point(407, 26);
+            this.ms_prodcode_label.Location = new System.Drawing.Point(812, 50);
+            this.ms_prodcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_prodcode_label.Name = "ms_prodcode_label";
-            this.ms_prodcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ms_prodcode_label.Size = new System.Drawing.Size(146, 41);
             this.ms_prodcode_label.TabIndex = 62;
             this.ms_prodcode_label.Text = "产品编号";
             // 
@@ -610,10 +645,11 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(732, 26);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pr_detail.Location = new System.Drawing.Point(1462, 50);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(300, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 21);
+            this.pr_detail.Size = new System.Drawing.Size(0, 41);
             this.pr_detail.TabIndex = 82;
             // 
             // ms_prodcode
@@ -623,10 +659,11 @@
             this.ms_prodcode.AutoSize = true;
             this.ms_prodcode.CutLength = null;
             this.ms_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_prodcode.Location = new System.Drawing.Point(503, 26);
-            this.ms_prodcode.MaximumSize = new System.Drawing.Size(150, 0);
+            this.ms_prodcode.Location = new System.Drawing.Point(1004, 50);
+            this.ms_prodcode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ms_prodcode.MaximumSize = new System.Drawing.Size(300, 0);
             this.ms_prodcode.Name = "ms_prodcode";
-            this.ms_prodcode.Size = new System.Drawing.Size(0, 21);
+            this.ms_prodcode.Size = new System.Drawing.Size(0, 41);
             this.ms_prodcode.TabIndex = 20;
             this.ms_prodcode.TextChanged += new System.EventHandler(this.ms_prodcode_TextChanged);
             // 
@@ -637,18 +674,19 @@
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.CutLength = null;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(282, 26);
-            this.ms_makecode.MaximumSize = new System.Drawing.Size(150, 0);
+            this.ms_makecode.Location = new System.Drawing.Point(562, 50);
+            this.ms_makecode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ms_makecode.MaximumSize = new System.Drawing.Size(300, 0);
             this.ms_makecode.Name = "ms_makecode";
-            this.ms_makecode.Size = new System.Drawing.Size(0, 21);
+            this.ms_makecode.Size = new System.Drawing.Size(0, 41);
             this.ms_makecode.TabIndex = 85;
             // 
             // mb_badremark
             // 
-            this.mb_badremark.Location = new System.Drawing.Point(733, 143);
-            this.mb_badremark.Margin = new System.Windows.Forms.Padding(4);
+            this.mb_badremark.Location = new System.Drawing.Point(1466, 286);
+            this.mb_badremark.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
             this.mb_badremark.Name = "mb_badremark";
-            this.mb_badremark.Size = new System.Drawing.Size(140, 21);
+            this.mb_badremark.Size = new System.Drawing.Size(280, 42);
             this.mb_badremark.TabIndex = 127;
             this.mb_badremark.TextAreaEnable = true;
             this.mb_badremark.TextBoxEnable = true;
@@ -660,14 +698,14 @@
             this.bd_soncode.Condition = null;
             this.bd_soncode.DBTitle = null;
             this.bd_soncode.FormName = null;
-            this.bd_soncode.Location = new System.Drawing.Point(528, 288);
-            this.bd_soncode.Margin = new System.Windows.Forms.Padding(2);
+            this.bd_soncode.Location = new System.Drawing.Point(1056, 576);
+            this.bd_soncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.bd_soncode.Name = "bd_soncode";
             this.bd_soncode.Power = null;
             this.bd_soncode.ReturnData = null;
             this.bd_soncode.SelectField = null;
             this.bd_soncode.SetValueField = null;
-            this.bd_soncode.Size = new System.Drawing.Size(137, 21);
+            this.bd_soncode.Size = new System.Drawing.Size(274, 42);
             this.bd_soncode.TabIndex = 124;
             this.bd_soncode.TableName = null;
             this.bd_soncode.Tag = "bd_soncode";
@@ -681,11 +719,11 @@
             this.mbp_part1,
             this.DeleteCom,
             this.mbp_id});
-            this.mbp_partdgv.Location = new System.Drawing.Point(458, 325);
-            this.mbp_partdgv.Margin = new System.Windows.Forms.Padding(2);
+            this.mbp_partdgv.Location = new System.Drawing.Point(916, 650);
+            this.mbp_partdgv.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.mbp_partdgv.Name = "mbp_partdgv";
             this.mbp_partdgv.RowTemplate.Height = 27;
-            this.mbp_partdgv.Size = new System.Drawing.Size(262, 152);
+            this.mbp_partdgv.Size = new System.Drawing.Size(524, 304);
             this.mbp_partdgv.TabIndex = 121;
             this.mbp_partdgv.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.mbp_partdgv_CellContentClick);
             // 
@@ -722,11 +760,11 @@
             this.mbl_loc1,
             this.DeletePos,
             this.mbl_id});
-            this.mbl_locdgv.Location = new System.Drawing.Point(166, 325);
-            this.mbl_locdgv.Margin = new System.Windows.Forms.Padding(2);
+            this.mbl_locdgv.Location = new System.Drawing.Point(332, 650);
+            this.mbl_locdgv.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.mbl_locdgv.Name = "mbl_locdgv";
             this.mbl_locdgv.RowTemplate.Height = 27;
-            this.mbl_locdgv.Size = new System.Drawing.Size(262, 152);
+            this.mbl_locdgv.Size = new System.Drawing.Size(524, 304);
             this.mbl_locdgv.TabIndex = 120;
             this.mbl_locdgv.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.mbl_locdgv_CellContentClick);
             // 
@@ -758,11 +796,11 @@
             this.RefreshTreeView.AllPower = null;
             this.RefreshTreeView.Cursor = System.Windows.Forms.Cursors.Hand;
             this.RefreshTreeView.Image = global::UAS_MES_NEW.Properties.Resources.refresh;
-            this.RefreshTreeView.Location = new System.Drawing.Point(85, 118);
-            this.RefreshTreeView.Margin = new System.Windows.Forms.Padding(2);
+            this.RefreshTreeView.Location = new System.Drawing.Point(170, 236);
+            this.RefreshTreeView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.RefreshTreeView.Name = "RefreshTreeView";
             this.RefreshTreeView.Power = null;
-            this.RefreshTreeView.Size = new System.Drawing.Size(20, 20);
+            this.RefreshTreeView.Size = new System.Drawing.Size(40, 40);
             this.RefreshTreeView.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.RefreshTreeView.TabIndex = 119;
             this.RefreshTreeView.TabStop = false;
@@ -775,10 +813,11 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.GetSNCode.BackColor = System.Drawing.Color.White;
             this.GetSNCode.ID = null;
-            this.GetSNCode.Location = new System.Drawing.Point(244, 534);
+            this.GetSNCode.Location = new System.Drawing.Point(488, 1068);
+            this.GetSNCode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.GetSNCode.Name = "GetSNCode";
             this.GetSNCode.Power = null;
-            this.GetSNCode.Size = new System.Drawing.Size(188, 21);
+            this.GetSNCode.Size = new System.Drawing.Size(372, 35);
             this.GetSNCode.Str = null;
             this.GetSNCode.Str1 = null;
             this.GetSNCode.Str2 = null;
@@ -793,12 +832,13 @@
             this.NewRepairInf.DownImage = ((System.Drawing.Image)(resources.GetObject("NewRepairInf.DownImage")));
             this.NewRepairInf.Image = null;
             this.NewRepairInf.IsShowBorder = true;
-            this.NewRepairInf.Location = new System.Drawing.Point(292, 493);
+            this.NewRepairInf.Location = new System.Drawing.Point(584, 986);
+            this.NewRepairInf.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.NewRepairInf.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewRepairInf.MoveImage")));
             this.NewRepairInf.Name = "NewRepairInf";
             this.NewRepairInf.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewRepairInf.NormalImage")));
             this.NewRepairInf.Power = null;
-            this.NewRepairInf.Size = new System.Drawing.Size(86, 24);
+            this.NewRepairInf.Size = new System.Drawing.Size(172, 48);
             this.NewRepairInf.TabIndex = 112;
             this.NewRepairInf.Tag = "IfRead";
             this.NewRepairInf.Text = "新增维修信息";
@@ -812,12 +852,13 @@
             this.SaveRepairInf.DownImage = ((System.Drawing.Image)(resources.GetObject("SaveRepairInf.DownImage")));
             this.SaveRepairInf.Image = null;
             this.SaveRepairInf.IsShowBorder = true;
-            this.SaveRepairInf.Location = new System.Drawing.Point(656, 227);
+            this.SaveRepairInf.Location = new System.Drawing.Point(1312, 454);
+            this.SaveRepairInf.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.SaveRepairInf.MoveImage = ((System.Drawing.Image)(resources.GetObject("SaveRepairInf.MoveImage")));
             this.SaveRepairInf.Name = "SaveRepairInf";
             this.SaveRepairInf.NormalImage = ((System.Drawing.Image)(resources.GetObject("SaveRepairInf.NormalImage")));
             this.SaveRepairInf.Power = null;
-            this.SaveRepairInf.Size = new System.Drawing.Size(86, 24);
+            this.SaveRepairInf.Size = new System.Drawing.Size(172, 48);
             this.SaveRepairInf.TabIndex = 111;
             this.SaveRepairInf.Tag = "IfRead";
             this.SaveRepairInf.Text = "保存维修信息";
@@ -831,12 +872,13 @@
             this.DeleteRepairInf.DownImage = ((System.Drawing.Image)(resources.GetObject("DeleteRepairInf.DownImage")));
             this.DeleteRepairInf.Image = null;
             this.DeleteRepairInf.IsShowBorder = true;
-            this.DeleteRepairInf.Location = new System.Drawing.Point(421, 493);
+            this.DeleteRepairInf.Location = new System.Drawing.Point(842, 986);
+            this.DeleteRepairInf.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.DeleteRepairInf.MoveImage = ((System.Drawing.Image)(resources.GetObject("DeleteRepairInf.MoveImage")));
             this.DeleteRepairInf.Name = "DeleteRepairInf";
             this.DeleteRepairInf.NormalImage = ((System.Drawing.Image)(resources.GetObject("DeleteRepairInf.NormalImage")));
             this.DeleteRepairInf.Power = null;
-            this.DeleteRepairInf.Size = new System.Drawing.Size(57, 24);
+            this.DeleteRepairInf.Size = new System.Drawing.Size(114, 48);
             this.DeleteRepairInf.TabIndex = 110;
             this.DeleteRepairInf.Tag = "IfRead";
             this.DeleteRepairInf.Text = "删除";
@@ -850,10 +892,11 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.mbl_loc.BackColor = System.Drawing.Color.White;
             this.mbl_loc.ID = null;
-            this.mbl_loc.Location = new System.Drawing.Point(262, 289);
+            this.mbl_loc.Location = new System.Drawing.Point(524, 578);
+            this.mbl_loc.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.mbl_loc.Name = "mbl_loc";
             this.mbl_loc.Power = null;
-            this.mbl_loc.Size = new System.Drawing.Size(122, 21);
+            this.mbl_loc.Size = new System.Drawing.Size(240, 35);
             this.mbl_loc.Str = null;
             this.mbl_loc.Str1 = null;
             this.mbl_loc.Str2 = null;
@@ -869,10 +912,11 @@
             this.bc_name.BackColor = System.Drawing.Color.White;
             this.bc_name.Enabled = false;
             this.bc_name.ID = null;
-            this.bc_name.Location = new System.Drawing.Point(502, 143);
+            this.bc_name.Location = new System.Drawing.Point(1004, 286);
+            this.bc_name.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.bc_name.Name = "bc_name";
             this.bc_name.Power = null;
-            this.bc_name.Size = new System.Drawing.Size(121, 21);
+            this.bc_name.Size = new System.Drawing.Size(238, 35);
             this.bc_name.Str = null;
             this.bc_name.Str1 = null;
             this.bc_name.Str2 = null;
@@ -888,10 +932,11 @@
             this.bg_name.Enabled = false;
             this.bg_name.ForeColor = System.Drawing.Color.Red;
             this.bg_name.ID = null;
-            this.bg_name.Location = new System.Drawing.Point(262, 144);
+            this.bg_name.Location = new System.Drawing.Point(524, 288);
+            this.bg_name.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.bg_name.Name = "bg_name";
             this.bg_name.Power = null;
-            this.bg_name.Size = new System.Drawing.Size(121, 21);
+            this.bg_name.Size = new System.Drawing.Size(238, 35);
             this.bg_name.Str = null;
             this.bg_name.Str1 = null;
             this.bg_name.Str2 = null;
@@ -901,9 +946,10 @@
             // OperatResult
             // 
             this.OperatResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperatResult.Location = new System.Drawing.Point(733, 287);
+            this.OperatResult.Location = new System.Drawing.Point(1466, 574);
+            this.OperatResult.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.OperatResult.Name = "OperatResult";
-            this.OperatResult.Size = new System.Drawing.Size(157, 250);
+            this.OperatResult.Size = new System.Drawing.Size(310, 496);
             this.OperatResult.TabIndex = 87;
             this.OperatResult.Text = "";
             // 
@@ -914,12 +960,13 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = null;
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(782, 542);
+            this.Clean.Location = new System.Drawing.Point(1564, 1084);
+            this.Clean.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(60, 24);
+            this.Clean.Size = new System.Drawing.Size(120, 48);
             this.Clean.TabIndex = 81;
             this.Clean.Tag = "IfRead";
             this.Clean.Text = "清除";
@@ -933,12 +980,13 @@
             this.NewBadCode.DownImage = ((System.Drawing.Image)(resources.GetObject("NewBadCode.DownImage")));
             this.NewBadCode.Image = null;
             this.NewBadCode.IsShowBorder = true;
-            this.NewBadCode.Location = new System.Drawing.Point(164, 493);
+            this.NewBadCode.Location = new System.Drawing.Point(328, 986);
+            this.NewBadCode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.NewBadCode.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewBadCode.MoveImage")));
             this.NewBadCode.Name = "NewBadCode";
             this.NewBadCode.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewBadCode.NormalImage")));
             this.NewBadCode.Power = null;
-            this.NewBadCode.Size = new System.Drawing.Size(86, 24);
+            this.NewBadCode.Size = new System.Drawing.Size(172, 48);
             this.NewBadCode.TabIndex = 60;
             this.NewBadCode.Tag = "IfRead";
             this.NewBadCode.Text = "新增不良代码";
@@ -953,12 +1001,13 @@
             this.SaveBadLocation.Enabled = false;
             this.SaveBadLocation.Image = null;
             this.SaveBadLocation.IsShowBorder = true;
-            this.SaveBadLocation.Location = new System.Drawing.Point(385, 287);
+            this.SaveBadLocation.Location = new System.Drawing.Point(770, 574);
+            this.SaveBadLocation.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.SaveBadLocation.MoveImage = ((System.Drawing.Image)(resources.GetObject("SaveBadLocation.MoveImage")));
             this.SaveBadLocation.Name = "SaveBadLocation";
             this.SaveBadLocation.NormalImage = ((System.Drawing.Image)(resources.GetObject("SaveBadLocation.NormalImage")));
             this.SaveBadLocation.Power = null;
-            this.SaveBadLocation.Size = new System.Drawing.Size(46, 24);
+            this.SaveBadLocation.Size = new System.Drawing.Size(92, 48);
             this.SaveBadLocation.TabIndex = 59;
             this.SaveBadLocation.Tag = "IfRead";
             this.SaveBadLocation.Text = "保存";
@@ -967,9 +1016,9 @@
             // 
             // Make_Repair
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(900, 579);
+            this.ClientSize = new System.Drawing.Size(1800, 1158);
             this.Controls.Add(this.mbc_component);
             this.Controls.Add(this.mbr_dutycode);
             this.Controls.Add(this.so_code);
@@ -1011,6 +1060,7 @@
             this.Controls.Add(this.bc_name_label);
             this.Controls.Add(this.bg_name_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Name = "Make_Repair";
             this.Tag = "Make!Repair";
             this.Text = "维修作业";

UAS_MES_ODLF/FunctionCode/Make/Make_Repair.cs

@@ -80,21 +80,24 @@ namespace UAS_MES_NEW.Make
             bd_soncode.DbChange += Prodcode_DbChange;
 
             //nrg_name.BringToFront();
-            nrg_name.TableName = "QUA_NGREASONGROUP";
+            nrg_name.TableName = "(select nrg_name,nrg_code from QUA_NGREASONGROUP left join DATAINPUTRECORD ON NRG_NAME = DIR_COMMENT AND DIR_GROUP = '不良原因组' and DIR_SOURCECODE = '" + User.UserSourceCode + "' ORDER BY NVL(DIR_NUMBER,0) DESC)";
             nrg_name.Field = "nrg_name";
             nrg_name.ValueField = "nrg_code";
+            nrg_name.Condition = " 1=1 ORDER BY ROWNUM asc";
 
-            nr_name.TableName = "QUA_NGREASONGROUPDET left join QUA_NGREASONGROUP on nrgd_nrgid=nrg_id left join QUA_NGReason on nrgd_nrcode=nr_code ";
+            nr_name.TableName = "QUA_NGREASONGROUPDET left join QUA_NGREASONGROUP on nrgd_nrgid=nrg_id left join QUA_NGReason on nrgd_nrcode=nr_code left join DATAINPUTRECORD ON nr_name = DIR_COMMENT AND DIR_GROUP = '不良原因' and  DIR_SOURCECODE = '" + User.UserSourceCode + "' ";
             nr_name.Field = "nr_name";
             nr_name.ValueField = "nr_code";
 
-            mbr_dutyname.TableName = "ngduty";
+            mbr_dutyname.TableName = "(select nd_name,nd_code from  ngduty left join DATAINPUTRECORD ON nd_name = DIR_COMMENT  AND DIR_GROUP = '责任别' and DIR_SOURCECODE = '" + User.UserSourceCode + "' ORDER BY NVL(DIR_NUMBER,0) DESC) ";
             mbr_dutyname.Field = "nd_name";
             mbr_dutyname.ValueField = "nd_code";
+            mbr_dutyname.Condition = " 1=1 ORDER BY ROWNUM asc";
 
-            so_name.TableName = "solution";
+            so_name.TableName = "(select so_name,so_code from solution left join DATAINPUTRECORD ON so_name = DIR_COMMENT AND DIR_GROUP = '解决方案' and DIR_SOURCECODE = '" + User.UserSourceCode + "' ORDER BY NVL(DIR_NUMBER,0) DESC)";
             so_name.Field = "so_name";
             so_name.ValueField = "so_code";
+            so_name.Condition = " 1=1 ORDER BY ROWNUM asc";
 
             asc.controllInitializeSize(this);
             mbc_component.SendToBack();
@@ -708,6 +711,15 @@ namespace UAS_MES_NEW.Make
                 OperatResult.AppendText(">>解决方案不存在\n", Color.Red);
                 return;
             }
+
+            //保存选择记录至后台，根据岗位资源代码记录
+
+            dh.ExecuteSql("merge into DATAINPUTRECORD using (select NRG_NAME  from QUA_NGREASONGROUP where NRG_NAME = '" + nrg_name.Text + "') ON (NRG_NAME = DIR_COMMENT AND DIR_GROUP = '不良原因组' and DIR_SOURCECODE = '" + User.UserSourceCode + "') when matched then update set DIR_NUMBER = DIR_NUMBER +1 when not matched then insert (DIR_COMMENT,DIR_NUMBER,DIR_SOURCECODE,DIR_GROUP) VALUES (NRG_NAME,1,'" + User.UserSourceCode + "','不良原因组')", "select");
+            dh.ExecuteSql("merge into DATAINPUTRECORD using (select nr_name  from QUA_NGReason left join QUA_NGREASONGROUPDET on nrgd_nrcode=nr_code left join QUA_NGREASONGROUP on nrgd_nrgid=nrg_id where nr_name = '" + nr_name.Text + "' and NRG_NAME = '" + nrg_name.Text + "') ON (nr_name = DIR_COMMENT AND DIR_GROUP = '不良原因' and DIR_SOURCECODE = '" + User.UserSourceCode + "') when matched then update set DIR_NUMBER = DIR_NUMBER +1 when not matched then insert (DIR_COMMENT,DIR_NUMBER,DIR_SOURCECODE,DIR_GROUP) VALUES (nr_name,1,'" + User.UserSourceCode + "','不良原因')", "select");
+            dh.ExecuteSql("merge into DATAINPUTRECORD using (select nd_name  from ngduty where nd_name = '" + mbr_dutyname.Text + "') ON (nd_name = DIR_COMMENT AND DIR_GROUP = '责任别' and DIR_SOURCECODE = '" + User.UserSourceCode + "') when matched then update set DIR_NUMBER = DIR_NUMBER +1 when not matched then insert (DIR_COMMENT,DIR_NUMBER,DIR_SOURCECODE,DIR_GROUP) VALUES (nd_name,1,'" + User.UserSourceCode + "','责任别')", "select");
+            dh.ExecuteSql("merge into DATAINPUTRECORD using (select so_name  from solution where so_name = '" + so_name.Text + "') ON (so_name = DIR_COMMENT AND DIR_GROUP = '解决方案' and DIR_SOURCECODE = '" + User.UserSourceCode + "') when matched then update set DIR_NUMBER = DIR_NUMBER +1 when not matched then insert (DIR_COMMENT,DIR_NUMBER,DIR_SOURCECODE,DIR_GROUP) VALUES (so_name,1,'" + User.UserSourceCode + "','解决方案')", "select");
+
+
             //保存不良原因
             sql.Clear();
             sql.Append("insert into makebadreason (mbr_mbid,mbr_id,mbr_brcode,mbr_solutioncode,");

UAS_MES_ODLF/FunctionCode/Make/Make_Repair.resx

@@ -206,18 +206,6 @@
   <metadata name="DeleteCom.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="mbp_part1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="DeleteCom.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="mbl_loc1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="DeletePos.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="mbl_loc1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>