彩盒称重去掉弹窗提示

UAS_MES_PW/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -181,9 +181,9 @@ namespace UAS_MES_NEW.Make
                                     OperateResult.AppendText(">>彩盒" + sncode.Text + "重量检测未通过\n", Color.Red);
                                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒称重:" + weight.Text, "称量不合格", sncode.Text, "");
                                     LogicHandler.RecordProdWeight(sncode.Text, "SN", float.Parse(ActualWeight.ToString()), "kg", User.UserLineCode, pr_code.Text, User.UserSourceCode, User.UserName);
-                                    SetCheck set = new SetCheck("NG", Color.Red);
-                                    BaseUtil.SetFormCenter(set);
-                                    set.ShowDialog();
+                                    //SetCheck set = new SetCheck("NG", Color.Red);
+                                    //BaseUtil.SetFormCenter(set);
+                                    //set.ShowDialog();
                                     return;
                                 }
                             }

UAS_MES_PW/FunctionCode/Make/Make_Repair.Designer.cs

@@ -250,7 +250,7 @@
             // 
             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(22, 288);
-            this.BadCodeTree.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.BadCodeTree.Margin = new System.Windows.Forms.Padding(4);
             this.BadCodeTree.Name = "BadCodeTree";
             this.BadCodeTree.Size = new System.Drawing.Size(284, 848);
             this.BadCodeTree.TabIndex = 118;
@@ -328,9 +328,12 @@
             "喇叭",
             "摄像头",
             "MIC板",
+            "底壳",
+            "FPC排线",
+            "电池",
             "其他"});
             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.Margin = new System.Windows.Forms.Padding(6);
             this.mbc_component.Name = "mbc_component";
             this.mbc_component.Size = new System.Drawing.Size(238, 32);
             this.mbc_component.TabIndex = 139;
@@ -342,7 +345,7 @@
             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(242, 70);
+            this.mbr_dutyname.Size = new System.Drawing.Size(242, 35);
             this.mbr_dutyname.TabIndex = 135;
             this.mbr_dutyname.TableName = null;
             this.mbr_dutyname.Value = null;
@@ -356,7 +359,7 @@
             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(242, 70);
+            this.so_name.Size = new System.Drawing.Size(242, 35);
             this.so_name.TabIndex = 133;
             this.so_name.TableName = null;
             this.so_name.Value = null;
@@ -370,7 +373,7 @@
             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(242, 70);
+            this.nr_name.Size = new System.Drawing.Size(242, 35);
             this.nr_name.TabIndex = 132;
             this.nr_name.TableName = null;
             this.nr_name.Value = null;
@@ -384,7 +387,7 @@
             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(242, 70);
+            this.nrg_name.Size = new System.Drawing.Size(242, 35);
             this.nrg_name.TabIndex = 131;
             this.nrg_name.TableName = null;
             this.nrg_name.Value = null;
@@ -413,9 +416,9 @@
             this.groupBoxWithBorder1.Controls.Add(this.ms_makecode);
             this.groupBoxWithBorder1.Font = new System.Drawing.Font("微软雅黑", 12F);
             this.groupBoxWithBorder1.Location = new System.Drawing.Point(18, 16);
-            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(4);
             this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
-            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(4);
             this.groupBoxWithBorder1.Size = new System.Drawing.Size(1760, 204);
             this.groupBoxWithBorder1.TabIndex = 130;
             this.groupBoxWithBorder1.TabStop = false;
@@ -431,7 +434,7 @@
             this.cd_stepcode.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.cd_stepcode.FormName = null;
             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.Margin = new System.Windows.Forms.Padding(6);
             this.cd_stepcode.Name = "cd_stepcode";
             this.cd_stepcode.Power = "ifspecial";
             this.cd_stepcode.ReturnData = null;
@@ -449,7 +452,7 @@
             | 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(1580, 114);
+            this.ms_reworkcheckno.Location = new System.Drawing.Point(1581, 115);
             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(146, 41);
@@ -463,7 +466,7 @@
             | 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(402, 50);
+            this.ms_makecode_label.Location = new System.Drawing.Point(403, 51);
             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(114, 41);
@@ -476,7 +479,7 @@
             | 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(26, 48);
+            this.ms_sncode_label.Location = new System.Drawing.Point(27, 49);
             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(114, 41);
@@ -489,7 +492,7 @@
             | 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(1576, 50);
+            this.ms_checkno.Location = new System.Drawing.Point(1577, 51);
             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(146, 41);
@@ -506,7 +509,7 @@
             this.RepairComplete.Image = null;
             this.RepairComplete.IsShowBorder = true;
             this.RepairComplete.Location = new System.Drawing.Point(1072, 132);
-            this.RepairComplete.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.RepairComplete.Margin = new System.Windows.Forms.Padding(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")));
@@ -525,7 +528,7 @@
             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(176, 50);
+            this.ms_sncode.Location = new System.Drawing.Point(177, 51);
             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";
@@ -541,7 +544,7 @@
             this.Scrap.Image = null;
             this.Scrap.IsShowBorder = true;
             this.Scrap.Location = new System.Drawing.Point(1262, 132);
-            this.Scrap.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.Scrap.Margin = new System.Windows.Forms.Padding(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")));
@@ -558,7 +561,7 @@
             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(1676, 440);
+            this.nr_code.Location = new System.Drawing.Point(1677, 441);
             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);
@@ -570,7 +573,7 @@
             | 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(526, 126);
+            this.st_rstepcode_label.Location = new System.Drawing.Point(527, 127);
             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(146, 41);
@@ -583,7 +586,7 @@
             | 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(26, 126);
+            this.ma_craftcode_label.Location = new System.Drawing.Point(27, 127);
             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(146, 41);
@@ -599,7 +602,7 @@
             this.cr_code.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.cr_code.FormName = null;
             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.Margin = new System.Windows.Forms.Padding(6);
             this.cr_code.Name = "cr_code";
             this.cr_code.Power = "ifspecial";
             this.cr_code.ReturnData = null;
@@ -618,7 +621,7 @@
             | 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(1270, 50);
+            this.pr_detail_label.Location = new System.Drawing.Point(1271, 51);
             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(146, 41);
@@ -631,7 +634,7 @@
             | 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(812, 50);
+            this.ms_prodcode_label.Location = new System.Drawing.Point(813, 51);
             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(146, 41);
@@ -645,7 +648,7 @@
             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(1462, 50);
+            this.pr_detail.Location = new System.Drawing.Point(1463, 51);
             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";
@@ -659,7 +662,7 @@
             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(1004, 50);
+            this.ms_prodcode.Location = new System.Drawing.Point(1005, 51);
             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";
@@ -674,7 +677,7 @@
             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(562, 50);
+            this.ms_makecode.Location = new System.Drawing.Point(563, 51);
             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";
@@ -684,7 +687,7 @@
             // mb_badremark
             // 
             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.Margin = new System.Windows.Forms.Padding(8);
             this.mb_badremark.Name = "mb_badremark";
             this.mb_badremark.Size = new System.Drawing.Size(280, 42);
             this.mb_badremark.TabIndex = 127;
@@ -699,7 +702,7 @@
             this.bd_soncode.DBTitle = null;
             this.bd_soncode.FormName = null;
             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.Margin = new System.Windows.Forms.Padding(4);
             this.bd_soncode.Name = "bd_soncode";
             this.bd_soncode.Power = null;
             this.bd_soncode.ReturnData = null;
@@ -720,7 +723,7 @@
             this.DeleteCom,
             this.mbp_id});
             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.Margin = new System.Windows.Forms.Padding(4);
             this.mbp_partdgv.Name = "mbp_partdgv";
             this.mbp_partdgv.RowTemplate.Height = 27;
             this.mbp_partdgv.Size = new System.Drawing.Size(524, 304);
@@ -761,7 +764,7 @@
             this.DeletePos,
             this.mbl_id});
             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.Margin = new System.Windows.Forms.Padding(4);
             this.mbl_locdgv.Name = "mbl_locdgv";
             this.mbl_locdgv.RowTemplate.Height = 27;
             this.mbl_locdgv.Size = new System.Drawing.Size(524, 304);
@@ -797,7 +800,7 @@
             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(170, 236);
-            this.RefreshTreeView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.RefreshTreeView.Margin = new System.Windows.Forms.Padding(4);
             this.RefreshTreeView.Name = "RefreshTreeView";
             this.RefreshTreeView.Power = null;
             this.RefreshTreeView.Size = new System.Drawing.Size(40, 40);
@@ -814,7 +817,7 @@
             this.GetSNCode.BackColor = System.Drawing.Color.White;
             this.GetSNCode.ID = null;
             this.GetSNCode.Location = new System.Drawing.Point(488, 1068);
-            this.GetSNCode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.GetSNCode.Margin = new System.Windows.Forms.Padding(6);
             this.GetSNCode.Name = "GetSNCode";
             this.GetSNCode.Power = null;
             this.GetSNCode.Size = new System.Drawing.Size(372, 35);
@@ -833,7 +836,7 @@
             this.NewRepairInf.Image = null;
             this.NewRepairInf.IsShowBorder = true;
             this.NewRepairInf.Location = new System.Drawing.Point(584, 986);
-            this.NewRepairInf.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.NewRepairInf.Margin = new System.Windows.Forms.Padding(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")));
@@ -853,7 +856,7 @@
             this.SaveRepairInf.Image = null;
             this.SaveRepairInf.IsShowBorder = true;
             this.SaveRepairInf.Location = new System.Drawing.Point(1312, 454);
-            this.SaveRepairInf.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.SaveRepairInf.Margin = new System.Windows.Forms.Padding(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")));
@@ -873,7 +876,7 @@
             this.DeleteRepairInf.Image = null;
             this.DeleteRepairInf.IsShowBorder = true;
             this.DeleteRepairInf.Location = new System.Drawing.Point(842, 986);
-            this.DeleteRepairInf.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.DeleteRepairInf.Margin = new System.Windows.Forms.Padding(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")));
@@ -893,7 +896,7 @@
             this.mbl_loc.BackColor = System.Drawing.Color.White;
             this.mbl_loc.ID = null;
             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.Margin = new System.Windows.Forms.Padding(6);
             this.mbl_loc.Name = "mbl_loc";
             this.mbl_loc.Power = null;
             this.mbl_loc.Size = new System.Drawing.Size(240, 35);
@@ -913,7 +916,7 @@
             this.bc_name.Enabled = false;
             this.bc_name.ID = null;
             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.Margin = new System.Windows.Forms.Padding(6);
             this.bc_name.Name = "bc_name";
             this.bc_name.Power = null;
             this.bc_name.Size = new System.Drawing.Size(238, 35);
@@ -933,7 +936,7 @@
             this.bg_name.ForeColor = System.Drawing.Color.Red;
             this.bg_name.ID = null;
             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.Margin = new System.Windows.Forms.Padding(6);
             this.bg_name.Name = "bg_name";
             this.bg_name.Power = null;
             this.bg_name.Size = new System.Drawing.Size(238, 35);
@@ -947,7 +950,7 @@
             // 
             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(1466, 574);
-            this.OperatResult.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.OperatResult.Margin = new System.Windows.Forms.Padding(6);
             this.OperatResult.Name = "OperatResult";
             this.OperatResult.Size = new System.Drawing.Size(310, 496);
             this.OperatResult.TabIndex = 87;
@@ -961,7 +964,7 @@
             this.Clean.Image = null;
             this.Clean.IsShowBorder = true;
             this.Clean.Location = new System.Drawing.Point(1564, 1084);
-            this.Clean.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.Clean.Margin = new System.Windows.Forms.Padding(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")));
@@ -981,7 +984,7 @@
             this.NewBadCode.Image = null;
             this.NewBadCode.IsShowBorder = true;
             this.NewBadCode.Location = new System.Drawing.Point(328, 986);
-            this.NewBadCode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.NewBadCode.Margin = new System.Windows.Forms.Padding(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")));
@@ -1002,7 +1005,7 @@
             this.SaveBadLocation.Image = null;
             this.SaveBadLocation.IsShowBorder = true;
             this.SaveBadLocation.Location = new System.Drawing.Point(770, 574);
-            this.SaveBadLocation.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.SaveBadLocation.Margin = new System.Windows.Forms.Padding(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")));
@@ -1060,7 +1063,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.Margin = new System.Windows.Forms.Padding(6);
             this.Name = "Make_Repair";
             this.Tag = "Make!Repair";
             this.Text = "维修作业";

UAS_MES_PW/FunctionCode/Make/Make_Repair.cs

@@ -696,6 +696,8 @@ namespace UAS_MES_NEW.Make
                 ErrorMessage += " 不良原因 ";
             if (mbr_dutyname.Text == "")
                 ErrorMessage += " 责任别 ";
+            if (mbr_dutyname.Text == "物料问题" && mbc_component.Text == "")
+                ErrorMessage += "责任别为物料问题时必须选择不良零件";
             if (ErrorMessage != "")
             {
                 ErrorMessage += "不能为空";

UAS_MES_PW/FunctionCode/Make/Make_SeqTransform.cs

@@ -177,6 +177,7 @@ namespace UAS_MES_NEW.Make
                                             }
                                             else
                                             {
+                                                nextstepcode = dh.getFieldDataByCondition("step", "st_name", "st_code='" + nextstepcode + "'").ToString();
                                                 OperateResult.AppendText("<<序列号:" + sncode.Text + "下一工序是" + nextstepcode + ",不是当前岗位的工序\n", Color.Red, sncode);
                                                 OperateResult.AppendText(">>请重新输入TSN号\n", Color.Black);
                                             }
@@ -277,8 +278,7 @@ namespace UAS_MES_NEW.Make
                                         }
                                     }
                                 }
-
-                                if (!ChangeResult.Checked && !onlyPass || bsncode != sncode.Text)
+                                if (/*!ChangeResult.Checked && */!onlyPass)
                                 {
                                     string firstsn = "";
                                     string updateSql = "";

UAS_MES_PW/PublicMethod/LogicHandler.cs

@@ -185,9 +185,11 @@ namespace UAS_MES_NEW.PublicMethod
             }
             else
             {
-                SetCheck set = new SetCheck("NG", Color.Red);
-                BaseUtil.SetFormCenter(set);
-                set.ShowDialog();
+                if (User.CurrentStepCode != "B_WEIGH") {
+                    SetCheck set = new SetCheck("NG", Color.Red);
+                    BaseUtil.SetFormCenter(set);
+                    set.ShowDialog();
+                }
                 return false;
             }
         }