修改页面布局

UAS_MES_YD/CustomControl/AccordionMenu/AccordionMenu.Designer.cs

@@ -414,7 +414,7 @@
             this.Name = "AccordionMenu";
             this.Size = new System.Drawing.Size(1741, 452);
             this.Load += new System.EventHandler(this.AccordionMenu_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/AccordionMenu/NavagationBar.Designer.cs

@@ -65,7 +65,7 @@
             this.ShowLinkHint = false;
             this.Text = " ";
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/BaseForm/BaseForm.Designer.cs

@@ -39,7 +39,7 @@
             this.Text = "BaseForm";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.BaseForm_FormClosing);
             this.Load += new System.EventHandler(this.BaseForm_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/ClickPicBox/ClickPicBox.Designer.cs

@@ -34,7 +34,7 @@
             // 
             this.Name = "ClickPicBox";
             this.Size = new System.Drawing.Size(280, 150);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/ComBoxWithFocus/ComboxWithTip.Designer.cs

@@ -35,7 +35,7 @@
             // ComboxWithTip
             // 
             this.TextChanged += new System.EventHandler(this.ComboxWithTip_TextChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/ComBoxWithFocus/PrinterCombox.Designer.cs

@@ -51,7 +51,7 @@
             this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "PrinterCombox";
             this.Size = new System.Drawing.Size(252, 28);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/ComBoxWithFocus/SerialPortCombox.Designer.cs

@@ -49,7 +49,7 @@
             this.Name = "SerialPortCombox";
             this.Size = new System.Drawing.Size(186, 25);
             this.Load += new System.EventHandler(this.SerialPortCombox_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/CustomCheckBox/AutoPrintCheckBox.Designer.cs

@@ -50,7 +50,7 @@
             this.Controls.Add(this.AutoPrint);
             this.Name = "AutoPrintCheckBox";
             this.Size = new System.Drawing.Size(125, 34);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/CustomControl/CustomCheckBox/LockCheckBox.Designer.cs

@@ -34,7 +34,7 @@
             // 
             this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.CheckStateChanged += new System.EventHandler(this.LockCheckBox_CheckStateChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/CustomCheckBox/ReSetCheckBox.Designer.cs

@@ -33,7 +33,7 @@
             // ReSetCheckBox
             // 
             this.Layout += new System.Windows.Forms.LayoutEventHandler(this.ReSetCheckBox_Layout);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/CustomTabControl/CustomTabControl.Designer.cs

@@ -34,7 +34,7 @@
             // 
             this.Name = "CustomTabControl";
             this.Size = new System.Drawing.Size(336, 136);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
         }
 
         #endregion

UAS_MES_YD/CustomControl/DataGrid_View/DataGridViewExpand.Designer.cs

@@ -34,7 +34,7 @@
             // 
             this.RowTemplate.Height = 23;
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
         #endregion

UAS_MES_YD/CustomControl/DataGrid_View/DataGridViewWithCheckBox.Designer.cs

@@ -36,7 +36,7 @@
             this.RowTemplate.Height = 27;
             this.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridViewWithCheckBox_CellContentClick);
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/DataGrid_View/DataGridViewWithFilter.Designer.cs

@@ -36,7 +36,7 @@
             this.RowTemplate.Height = 23;
             this.Size = new System.Drawing.Size(616, 259);
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/DataGrid_View/DataGridViewWithSerialNum.Designer.cs

@@ -40,7 +40,7 @@ namespace UAS_MES_NEW.CustomControl.DataGrid_View
             this.RowTemplate.Height = 27;
             this.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridViewWithSerialNum_CellContentClick);
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/HeadBar/HeadBar.Designer.cs

@@ -133,7 +133,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.MinWindow1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.CloseWindow)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.UpperCollection.Properties)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/CustomControl/Pagination/Pagination.Designer.cs

@@ -284,7 +284,7 @@
             this.Name = "Pagination";
             this.Size = new System.Drawing.Size(724, 40);
             this.Load += new System.EventHandler(this.Pagination_Load);
-            this.panel1.ResumeLayout(false);
+            this.panel1.ResumeLayout(true);
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.UpLoadData)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.DownLoadTemplet)).EndInit();
@@ -295,7 +295,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.LastPage)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.NextPage)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.FirstPage)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/Pagination/PaginationDbFind.Designer.cs

@@ -289,7 +289,7 @@
             this.Name = "PaginationDbFind";
             this.Size = new System.Drawing.Size(724, 40);
             this.Load += new System.EventHandler(this.Pagination_Load);
-            this.panel1.ResumeLayout(false);
+            this.panel1.ResumeLayout(true);
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.UpLoadData)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.DownLoadTemplet)).EndInit();
@@ -300,7 +300,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.LastPage)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.NextPage)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.FirstPage)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/ProcessBar/ProcessBar.Designer.cs

@@ -50,7 +50,7 @@
             this.Name = "ProcessBar";
             this.Size = new System.Drawing.Size(428, 40);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/TextBoxWithIcon/BlurSearch.Designer.cs

@@ -75,7 +75,7 @@
             this.Size = new System.Drawing.Size(154, 120);
             this.Load += new System.EventHandler(this.BlurSearch_Load);
             this.Leave += new System.EventHandler(this.BlurSearch_Leave);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/CustomControl/TextBoxWithIcon/EnterTextBox.Designer.cs

@@ -36,7 +36,7 @@
             this.Enter += new System.EventHandler(this.EnterTextBox_Enter);
             this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.EnterTextBox_KeyPress);
             this.Leave += new System.EventHandler(this.EnterTextBox_Leave);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.Designer.cs

@@ -76,7 +76,7 @@
             this.SizeChanged += new System.EventHandler(this.SearchTextBox_SizeChanged);
             this.Leave += new System.EventHandler(this.MaCodeSearchTextBox_Leave);
             ((System.ComponentModel.ISupportInitialize)(this.Search_Icon)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/CustomControl/TextBoxWithIcon/MaCodeTextBox.Designer.cs

@@ -36,7 +36,7 @@
             this.Enter += new System.EventHandler(this.EnterTextBox_Enter);
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MaCodeTextBox_KeyDown);
             this.Leave += new System.EventHandler(this.EnterTextBox_Leave);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/TextBoxWithIcon/NumOnlyTextBox.Designer.cs

@@ -33,7 +33,7 @@
             // NumOnlyTextBox
             // 
             this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.NumOnlyTextBox_KeyPress);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
         }
 
         #endregion

UAS_MES_YD/CustomControl/TextBoxWithIcon/RoundTextBox.Designer.cs

@@ -39,7 +39,7 @@
             this.Size = new System.Drawing.Size(150, 26);
             this.Paint += new System.Windows.Forms.PaintEventHandler(this.RoundTextBox_Paint);
             this.Resize += new System.EventHandler(this.RoundTextBox_Resize);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/TextBoxWithIcon/SNCodeEnterTextBox.Designer.cs

@@ -35,7 +35,7 @@
             this.Enter += new System.EventHandler(this.SNCodeEnterTextBox_Enter);
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SNCodeEnterTextBox_KeyDown);
             this.Leave += new System.EventHandler(this.SNCodeEnterTextBox_Leave);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/TextBoxWithIcon/SearchTextBox.Designer.cs

@@ -75,7 +75,7 @@
             this.Load += new System.EventHandler(this.SearchTextBox_Load);
             this.SizeChanged += new System.EventHandler(this.SearchTextBox_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.Search_Icon)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/CustomControl/TextBoxWithIcon/SnCollectionBox.Designer.cs

@@ -35,7 +35,7 @@ namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
             // SnCollectionBox
             // 
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SnCollectionBox_KeyDown);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/CustomControl/TextBoxWithIcon/SourceStepCount.Designer.cs

@@ -56,7 +56,7 @@
             this.Name = "SourceStepCount";
             this.Size = new System.Drawing.Size(88, 22);
             this.Load += new System.EventHandler(this.SourceStepCount_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/CustomControl/TextBoxWithIcon/SourceStepCountPre.Designer.cs

@@ -56,7 +56,7 @@
             this.Name = "SourceStepCount";
             this.Size = new System.Drawing.Size(88, 22);
             this.Load += new System.EventHandler(this.SourceStepCount_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/CustomControl/TextBoxWithIcon/TextAreaForm.Designer.cs

@@ -127,7 +127,7 @@
             this.Text = "TextAreaForm";
             this.Load += new System.EventHandler(this.TextAreaForm_Load);
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextAreaForm_KeyDown);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/CustomControl/TextBoxWithIcon/TextBoxGeneratePaCode.Designer.cs

@@ -80,7 +80,7 @@
             this.Load += new System.EventHandler(this.TextBoxGeneratePaCode_Load);
             this.SizeChanged += new System.EventHandler(this.TextBoxGeneratePaCode_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.GeneratePaCode)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/CustomControl/TextBoxWithIcon/TextBoxWithPlaceHolder.Designer.cs

@@ -55,7 +55,7 @@
             this.Controls.Add(this.TextBox);
             this.Name = "TextBoxWithPlaceHolder";
             this.Size = new System.Drawing.Size(241, 28);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/CustomControl/TextBoxWithIcon/TextBoxWithTextArea.Designer.cs

@@ -77,7 +77,7 @@
             this.Load += new System.EventHandler(this.TextBoxWithTextArea_Load);
             this.SizeChanged += new System.EventHandler(this.TextBoxWithTextArea_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.TextAreaIcon)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/CustomControl/TimePickerWithCombo/TimePickerWithCombo.Designer.cs

@@ -96,7 +96,7 @@
             this.Controls.Add(this.comboBox1);
             this.Name = "TimePickerWithCombo";
             this.Size = new System.Drawing.Size(380, 23);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/CustomControl/ValueLabel/ValueLabel.Designer.cs

@@ -35,7 +35,7 @@
             this.AutoSize = true;
             this.MaximumSize = new System.Drawing.Size(200, 0);
             this.Size = new System.Drawing.Size(20, 0);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
         #endregion

UAS_MES_YD/Form1.Designer.cs

@@ -134,7 +134,7 @@
             this.Tag = "123123";
             this.Text = "Form1";
             this.Load += new System.EventHandler(this.Form1_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Employee/Employee_ChooseUserToGroup.Designer.cs

@@ -449,7 +449,7 @@
             this.SizeChanged += new System.EventHandler(this.人员选择_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.OutGroupUser)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.InGroupUser)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Employee/Employee_Data.Designer.cs

@@ -281,7 +281,7 @@
             this.Load += new System.EventHandler(this.人员分组_Load);
             this.SizeChanged += new System.EventHandler(this.人员资料_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.Employee)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Employee/Employee_Group.Designer.cs

@@ -246,7 +246,7 @@
             this.Load += new System.EventHandler(this.人员分组_Load);
             this.SizeChanged += new System.EventHandler(this.人员分组_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.UserGroupDGV)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Employee/Employee_NewGroup.Designer.cs

@@ -148,7 +148,7 @@
             this.Tag = "ShowDialogWindow";
             this.Text = "新增分组";
             this.Load += new System.EventHandler(this.新增分组_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Employee/Employee_Power.Designer.cs

@@ -214,7 +214,7 @@
             this.Load += new System.EventHandler(this.权限控制_Load);
             this.SizeChanged += new System.EventHandler(this.权限控制_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.GroupPowerDGV)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Employee/Employee_PowerSarch.Designer.cs

@@ -254,7 +254,7 @@
             this.Load += new System.EventHandler(this.权限查看_Load);
             this.SizeChanged += new System.EventHandler(this.权限查看_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.PowerSearchDGV)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_CollectBTMAC.Designer.cs

@@ -289,7 +289,7 @@
             this.Activated += new System.EventHandler(this.Make_CollectBTMAC_Activated);
             this.Load += new System.EventHandler(this.Make_CollectBTMAC_Load);
             this.SizeChanged += new System.EventHandler(this.Make_CollectBTMAC_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_CollectElec.Designer.cs

@@ -250,7 +250,7 @@
             this.Activated += new System.EventHandler(this.Make_CollectNetCode_Activated);
             this.Load += new System.EventHandler(this.Make_CollectNetCode_Load);
             this.SizeChanged += new System.EventHandler(this.Make_CollectNetCode_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_CollectNetCode.Designer.cs

@@ -258,7 +258,7 @@
             this.Activated += new System.EventHandler(this.Make_CollectNetCode_Activated);
             this.Load += new System.EventHandler(this.Make_CollectNetCode_Load);
             this.SizeChanged += new System.EventHandler(this.Make_CollectNetCode_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_ColorBoxLabelPrint.Designer.cs

@@ -388,7 +388,7 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_ColorBoxLabelPrint_FormClosing);
             this.Load += new System.EventHandler(this.Make_ColorBoxLabelPrint_Load);
             this.SizeChanged += new System.EventHandler(this.Make_ColorBoxLabelPrint_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_ColorBoxLoadPrint.Designer.cs

@@ -734,7 +734,7 @@
             this.SizeChanged += new System.EventHandler(this.Make_FeedingCollection_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_ColorBoxLoadPrintBZ.Designer.cs

@@ -727,7 +727,7 @@
             this.SizeChanged += new System.EventHandler(this.Make_FeedingCollection_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_ColorBoxLoadPrintPT.Designer.cs

@@ -388,7 +388,7 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_ColorBoxLabelPrint_FormClosing);
             this.Load += new System.EventHandler(this.Make_ColorBoxLabelPrint_Load);
             this.SizeChanged += new System.EventHandler(this.Make_ColorBoxLabelPrint_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_CustomLabelPrint.Designer.cs

@@ -274,7 +274,7 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_CustomLabelPrint_FormClosing);
             this.Load += new System.EventHandler(this.Make_CustomLablePrint_Load);
             this.SizeChanged += new System.EventHandler(this.Make_CustomLabelPrint_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_FeedingCollection.Designer.cs

@@ -804,7 +804,7 @@
             this.SizeChanged += new System.EventHandler(this.Make_FeedingCollection_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_FeedingCollectionCombine.Designer.cs

@@ -751,7 +751,7 @@
             this.SizeChanged += new System.EventHandler(this.Make_FeedingCollection_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_FeedingCollectionCombineFix.Designer.cs

@@ -756,7 +756,7 @@
             this.SizeChanged += new System.EventHandler(this.Make_FeedingCollection_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_FuselageLabelPrint.Designer.cs

@@ -374,7 +374,7 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_FuselageLabelPrint_FormClosing);
             this.Load += new System.EventHandler(this.Make_FuselageLabelPrint_Load);
             this.SizeChanged += new System.EventHandler(this.Make_FuselageLabelPrint_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_GetTestFileData.Designer.cs

@@ -672,7 +672,7 @@ namespace UAS_MES_NEW.Make
             this.Load += new System.EventHandler(this.Make_LabelCheck_Load);
             this.SizeChanged += new System.EventHandler(this.Make_LabelCheck_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.CheckItemDGV)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_ImeiCheck.Designer.cs

@@ -268,7 +268,7 @@
             this.Tag = "Make!ImeiCheck";
             this.Load += new System.EventHandler(this.Make_LabelCheck_Load);
             this.SizeChanged += new System.EventHandler(this.Make_LabelCheck_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_InfoCheck.Designer.cs

@@ -298,7 +298,7 @@
             this.Load += new System.EventHandler(this.Make_LabelCheck_Load);
             this.SizeChanged += new System.EventHandler(this.Make_LabelCheck_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.CheckItemDGV)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_MakeCancelDown.Designer.cs

@@ -451,7 +451,7 @@
             this.Load += new System.EventHandler(this.Make_MakeCancelDown_Load);
             this.SizeChanged += new System.EventHandler(this.Make_MakeCancelDown_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_OutBoxSnCheck.Designer.cs

@@ -173,7 +173,7 @@
             this.Load += new System.EventHandler(this.Make_LabelCheck_Load);
             this.SizeChanged += new System.EventHandler(this.Make_LabelCheck_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.CheckSnDGV)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_PositionStock.Designer.cs

@@ -485,7 +485,7 @@
             this.Load += new System.EventHandler(this.Make_PositionStock_Load);
             this.SizeChanged += new System.EventHandler(this.Make_PositionStock_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.BatchProductDGV)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_PreFeedingCollection.Designer.cs

@@ -633,7 +633,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.ProdNum)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_RePrintLabel.Designer.cs

@@ -354,9 +354,9 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_RePrintLabel_FormClosing);
             this.Load += new System.EventHandler(this.Make_RePrintLabel_Load);
             this.SizeChanged += new System.EventHandler(this.Make_RePrintLabel_SizeChanged);
-            this.groupBoxWithBorder1.ResumeLayout(false);
+            this.groupBoxWithBorder1.ResumeLayout(true);
             this.groupBoxWithBorder1.PerformLayout();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_ReadWriteInfo.Designer.cs

@@ -345,7 +345,7 @@
             this.SizeChanged += new System.EventHandler(this.Make_LabelCheck_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.CheckItemDGV)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.FileWatcher)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_SeqTransformPrint.Designer.cs

@@ -679,7 +679,7 @@
             this.Load += new System.EventHandler(this.Make_SeqTransform_Load);
             this.SizeChanged += new System.EventHandler(this.Make_SeqTransform_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_SplitBoard.Designer.cs

@@ -41,7 +41,7 @@
             this.Tag = "Make!SplitBoard";
             this.Text = "分板作业";
             this.Load += new System.EventHandler(this.分板作业_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/FunctionCode/Make/Make_TestCollectionOnlyBad.Designer.cs

@@ -1087,10 +1087,10 @@ namespace UAS_MES_NEW.Make
             this.Load += new System.EventHandler(this.TestCollection_Load);
             this.SizeChanged += new System.EventHandler(this.测试采集_SizeChanged);
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Make_TestCollection_KeyDown);
-            this.panel1.ResumeLayout(false);
+            this.panel1.ResumeLayout(true);
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.BadInfSource)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Make/Make_UpdateCollectCode.Designer.cs

@@ -291,9 +291,9 @@
             this.Load += new System.EventHandler(this.Make_UpdateCollectCode_Load);
             this.SizeChanged += new System.EventHandler(this.Make_UpdateCollectCode_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.collectCodeRules)).EndInit();
-            this.collects.ResumeLayout(false);
+            this.collects.ResumeLayout(true);
             this.collects.PerformLayout();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/OQC/OQC_BatchResultJudge.Designer.cs

@@ -758,7 +758,7 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OQC_BatchResultJudge_FormClosing);
             this.Load += new System.EventHandler(this.抽检批维护_Load);
             this.SizeChanged += new System.EventHandler(this.抽检批维护_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/OQC/OQC_SamplingDataCollection.Designer.cs

@@ -1000,7 +1000,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.WaitChooseDGV)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.BadInfoSource)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Packing/Packing_BigBoxCollection.Designer.cs

@@ -670,7 +670,7 @@
             this.Load += new System.EventHandler(this.栈板称重_Load);
             this.SizeChanged += new System.EventHandler(this.栈板称重_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.PackageInf)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Packing/Packing_BigBoxWeight.Designer.cs

@@ -510,9 +510,9 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_BigBoxWeight_FormClosing);
             this.Load += new System.EventHandler(this.Make_BigBoxWeight_Load);
             this.SizeChanged += new System.EventHandler(this.Make_BigBoxWeight_SizeChanged);
-            this.panel4.ResumeLayout(false);
+            this.panel4.ResumeLayout(true);
             this.panel4.PerformLayout();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Packing/Packing_CartonBoxSNWeigh.Designer.cs

@@ -671,11 +671,11 @@
             this.Load += new System.EventHandler(this.卡通箱称重_Load);
             this.SizeChanged += new System.EventHandler(this.卡通箱称重_SizeChanged);
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Make_CartonBoxSNWeigh_KeyDown);
-            this.panel6.ResumeLayout(false);
+            this.panel6.ResumeLayout(true);
             this.panel6.PerformLayout();
-            this.panel4.ResumeLayout(false);
+            this.panel4.ResumeLayout(true);
             this.panel4.PerformLayout();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Packing/Packing_CartonBoxWeigh.Designer.cs

@@ -746,12 +746,12 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.卡通箱称重_FormClosing);
             this.Load += new System.EventHandler(this.卡通箱称重_Load);
             this.SizeChanged += new System.EventHandler(this.卡通箱称重_SizeChanged);
-            this.panel6.ResumeLayout(false);
+            this.panel6.ResumeLayout(true);
             this.panel6.PerformLayout();
-            this.panel4.ResumeLayout(false);
+            this.panel4.ResumeLayout(true);
             this.panel4.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fileSystemWatcher1)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Packing/Packing_CartonSplit.Designer.cs

@@ -232,7 +232,7 @@
             this.Text = "Packing_CartonSplit";
             this.Load += new System.EventHandler(this.Packing_CartonSplit_Load);
             this.SizeChanged += new System.EventHandler(this.Packing_CartonSplit_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Packing/Packing_NewBigBox.Designer.cs

@@ -186,7 +186,7 @@
             this.Tag = "ShowDialogWindow";
             this.Text = "新增栈板";
             this.Load += new System.EventHandler(this.新增栈板_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Packing/Packing_NewPallet.Designer.cs

@@ -155,7 +155,7 @@
             this.Tag = "ShowDialogWindow";
             this.Text = "新增栈板";
             this.Load += new System.EventHandler(this.Make_NewPallet_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Packing/Packing_PalletCollection.Designer.cs

@@ -712,7 +712,7 @@
             this.Load += new System.EventHandler(this.Make_PalletCollection_Load);
             this.SizeChanged += new System.EventHandler(this.Make_PalletCollection_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.PackageInf)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Packing/Packing_PalletCollection_OffLine.Designer.cs

@@ -712,7 +712,7 @@
             this.Load += new System.EventHandler(this.Make_PalletCollection_Load);
             this.SizeChanged += new System.EventHandler(this.Make_PalletCollection_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.PackageInf)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Packing/Packing_PalletWeigh.Designer.cs

@@ -542,9 +542,9 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_PalletWeigh_FormClosing);
             this.Load += new System.EventHandler(this.Make_PalletWeigh_Load);
             this.SizeChanged += new System.EventHandler(this.Make_PalletWeigh_SizeChanged);
-            this.panel4.ResumeLayout(false);
+            this.panel4.ResumeLayout(true);
             this.panel4.PerformLayout();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Packing/Packing_PalletWeightRecord.Designer.cs

@@ -303,7 +303,7 @@
             this.Tag = "Packing!PalletWeightRecord";
             this.Text = "Make_PalletWeightRecord";
             this.Load += new System.EventHandler(this.Packing_PalletWeightRecord_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Query/Query_DateRate.Designer.cs

@@ -172,7 +172,7 @@
             this.Tag = "Query!DateRate";
             this.Text = "Query_DateRate";
             this.Load += new System.EventHandler(this.Query_SpecialReport_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Query/Query_ExeProgress.Designer.cs

@@ -391,13 +391,13 @@
             this.Load += new System.EventHandler(this.Query_ExeProgress_Load);
             this.SizeChanged += new System.EventHandler(this.Query_ExeProgress_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.CraftInfDgv)).EndInit();
-            this.groupBoxWithBorder1.ResumeLayout(false);
+            this.groupBoxWithBorder1.ResumeLayout(true);
             this.groupBoxWithBorder1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Query/Query_MakeInf.Designer.cs

@@ -1319,11 +1319,11 @@
             this.SizeChanged += new System.EventHandler(this.Query_MakeInf_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.BOM)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Carft)).EndInit();
-            this.Product.ResumeLayout(false);
+            this.Product.ResumeLayout(true);
             this.Product.PerformLayout();
-            this.MakeInf.ResumeLayout(false);
+            this.MakeInf.ResumeLayout(true);
             this.MakeInf.PerformLayout();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Query/Query_OnlineTraceBack.Designer.cs

@@ -310,7 +310,7 @@
             this.Load += new System.EventHandler(this.Query_OnlineTraceBack_Load);
             this.SizeChanged += new System.EventHandler(this.Query_OnlineTraceBack_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.SnInf)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Query/Query_ProductTraceBack.Designer.cs

@@ -420,7 +420,7 @@
             this.Load += new System.EventHandler(this.产品制程追溯_Load);
             this.SizeChanged += new System.EventHandler(this.产品制程追溯_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridViewWithSerialNum1)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Query/Query_SN.Designer.cs

@@ -47,6 +47,9 @@
             this.ThreeColumn = new System.Windows.Forms.RadioButton();
             this.FourColumn = new System.Windows.Forms.RadioButton();
             this.GenSN = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.ma_count = new System.Windows.Forms.NumericUpDown();
+            this.label1 = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.ma_count)).BeginInit();
             this.SuspendLayout();
             // 
             // ma_salecode_label
@@ -99,7 +102,7 @@
             // 
             this.pr_detail.AutoSize = true;
             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(349, 420);
+            this.pr_detail.Location = new System.Drawing.Point(349, 463);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 41);
@@ -109,7 +112,7 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(171, 420);
+            this.label4.Location = new System.Drawing.Point(171, 463);
             this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(146, 41);
@@ -120,7 +123,7 @@
             // 
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label8.Location = new System.Drawing.Point(171, 343);
+            this.label8.Location = new System.Drawing.Point(171, 386);
             this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(146, 41);
@@ -132,7 +135,7 @@
             this.pr_code.AllPower = null;
             this.pr_code.BackColor = System.Drawing.Color.White;
             this.pr_code.ID = null;
-            this.pr_code.Location = new System.Drawing.Point(356, 352);
+            this.pr_code.Location = new System.Drawing.Point(356, 395);
             this.pr_code.Name = "pr_code";
             this.pr_code.Power = null;
             this.pr_code.Size = new System.Drawing.Size(388, 35);
@@ -169,7 +172,7 @@
             this.Export.DownImage = ((System.Drawing.Image)(resources.GetObject("Export.DownImage")));
             this.Export.Image = null;
             this.Export.IsShowBorder = true;
-            this.Export.Location = new System.Drawing.Point(603, 548);
+            this.Export.Location = new System.Drawing.Point(603, 591);
             this.Export.Margin = new System.Windows.Forms.Padding(6);
             this.Export.MoveImage = ((System.Drawing.Image)(resources.GetObject("Export.MoveImage")));
             this.Export.Name = "Export";
@@ -233,7 +236,7 @@
             // OneColumn
             // 
             this.OneColumn.AutoSize = true;
-            this.OneColumn.Location = new System.Drawing.Point(356, 475);
+            this.OneColumn.Location = new System.Drawing.Point(356, 518);
             this.OneColumn.Name = "OneColumn";
             this.OneColumn.Size = new System.Drawing.Size(89, 28);
             this.OneColumn.TabIndex = 242;
@@ -244,7 +247,7 @@
             // TwoColumn
             // 
             this.TwoColumn.AutoSize = true;
-            this.TwoColumn.Location = new System.Drawing.Point(465, 475);
+            this.TwoColumn.Location = new System.Drawing.Point(465, 518);
             this.TwoColumn.Name = "TwoColumn";
             this.TwoColumn.Size = new System.Drawing.Size(89, 28);
             this.TwoColumn.TabIndex = 243;
@@ -256,7 +259,7 @@
             // 
             this.ThreeColumn.AutoSize = true;
             this.ThreeColumn.Checked = true;
-            this.ThreeColumn.Location = new System.Drawing.Point(583, 475);
+            this.ThreeColumn.Location = new System.Drawing.Point(583, 518);
             this.ThreeColumn.Name = "ThreeColumn";
             this.ThreeColumn.Size = new System.Drawing.Size(89, 28);
             this.ThreeColumn.TabIndex = 244;
@@ -267,7 +270,7 @@
             // FourColumn
             // 
             this.FourColumn.AutoSize = true;
-            this.FourColumn.Location = new System.Drawing.Point(693, 475);
+            this.FourColumn.Location = new System.Drawing.Point(693, 518);
             this.FourColumn.Name = "FourColumn";
             this.FourColumn.Size = new System.Drawing.Size(89, 28);
             this.FourColumn.TabIndex = 245;
@@ -283,7 +286,7 @@
             this.GenSN.DownImage = ((System.Drawing.Image)(resources.GetObject("GenSN.DownImage")));
             this.GenSN.Image = null;
             this.GenSN.IsShowBorder = true;
-            this.GenSN.Location = new System.Drawing.Point(358, 548);
+            this.GenSN.Location = new System.Drawing.Point(358, 591);
             this.GenSN.Margin = new System.Windows.Forms.Padding(6);
             this.GenSN.MoveImage = ((System.Drawing.Image)(resources.GetObject("GenSN.MoveImage")));
             this.GenSN.Name = "GenSN";
@@ -295,11 +298,31 @@
             this.GenSN.UseVisualStyleBackColor = false;
             this.GenSN.Click += new System.EventHandler(this.GenSN_Click);
             // 
+            // ma_count
+            // 
+            this.ma_count.Location = new System.Drawing.Point(356, 335);
+            this.ma_count.Name = "ma_count";
+            this.ma_count.Size = new System.Drawing.Size(120, 35);
+            this.ma_count.TabIndex = 247;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(171, 329);
+            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(146, 41);
+            this.label1.TabIndex = 248;
+            this.label1.Text = "工单数量";
+            // 
             // Query_SN
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(2034, 1118);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.ma_count);
             this.Controls.Add(this.GenSN);
             this.Controls.Add(this.FourColumn);
             this.Controls.Add(this.ThreeColumn);
@@ -324,7 +347,8 @@
             this.Tag = "Query_SN";
             this.Text = "打印机调试";
             this.Load += new System.EventHandler(this.SystemSetting_PrinterTest_Load);
-            this.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.ma_count)).EndInit();
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }
@@ -348,5 +372,7 @@
         private System.Windows.Forms.RadioButton ThreeColumn;
         private System.Windows.Forms.RadioButton FourColumn;
         private CustomControl.ButtonUtil.NormalButton GenSN;
+        private System.Windows.Forms.NumericUpDown ma_count;
+        private System.Windows.Forms.Label label1;
     }
 }

UAS_MES_YD/FunctionCode/Query/Query_SN.cs

@@ -230,6 +230,7 @@ namespace UAS_MES_NEW.Query
                 ma_qty.Text = dt.Rows[0]["ma_qty"].ToString();
                 pr_detail.Text = dt.Rows[0]["pr_detail"].ToString();
             }
+            ma_count.Value = int.Parse(ma_qty.Text);
         }
 
         private void GenSN_Click(object sender, EventArgs e)
@@ -243,11 +244,6 @@ namespace UAS_MES_NEW.Query
                 MessageBox.Show("工单号不存在");
                 return;
             }
-            if (dh.getRowCount("makesnlist", "msl_makecode='" + ma_code.Text + "'") > 0)
-            {
-                MessageBox.Show("工单号" + ma_code.Text + "已存在导入清单");
-                return;
-            }
             DataTable dt = (DataTable)dh.ExecuteSql("select pr_exbarcode,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + ma_code.Text + "'", "select");
             string pr_exbarcode = "";
             string ma_qty = "";
@@ -256,6 +252,11 @@ namespace UAS_MES_NEW.Query
                 pr_exbarcode = dt.Rows[0]["pr_exbarcode"].ToString();
                 ma_qty = dt.Rows[0]["ma_qty"].ToString();
             }
+            if (dh.getRowCount("makesnlist", "msl_makecode='" + ma_code.Text + "'") + ma_count.Value >= int.Parse(ma_qty))
+            {
+                MessageBox.Show("工单号" + ma_code.Text + "生产序列号超出工单数");
+                return;
+            }
             DataTable Nr = (DataTable)dh.ExecuteSql("select nrd_detno,nrd_name,nrd_type,nrd_radix,nrd_sql,nrd_length from NoRuleDetail left join norule on nrd_nrid=nr_id where nr_code='" + pr_exbarcode + "' order by nrd_detno", "select");
             //如果没有则取公共规则
             if (Nr.Rows.Count == 0)
@@ -341,15 +342,15 @@ namespace UAS_MES_NEW.Query
             }
             //遍历整个Grid，勾选的项目全部进行条码生成
             ArrayList<string> custbarcode = new ArrayList<string>();
-            for (int i = 0; i < int.Parse(ma_qty); i++)
+            for (int i = 0; i < ma_count.Value; i++)
             {
                 string data = BarcodeMethod1(PrefixFixed, Suffix, SerialNumIndex, SerialNumLength, Radix);
                 if (!custbarcode.Contains(data))
                     custbarcode.Add(data);
             }
             //插入条码
-            string sql = "insert into makesnlist(MSL_ID, MSL_INDATE, MSL_MAKECODE, MSL_SNCODE, MSL_TYPE)" +
-                "select makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "',:custbarcode,'before' from dual where :custbarcode not in " +
+            string sql = "insert into makesnlist(MSL_ID, MSL_INDATE, MSL_MAKECODE, MSL_SNCODE, MSL_TYPE,msl_status)" +
+                "select makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "',:custbarcode,'before',0 from dual where :custbarcode not in " +
                 "(select msl_sncode from makesnlist)";
             dh.BatchInsert(sql, new string[] { "custbarcode", "custbarcode" }, custbarcode.ToArray(), custbarcode.ToArray());
             //更新最大流水号

UAS_MES_YD/FunctionCode/Query/Query_SOP.Designer.cs

@@ -178,7 +178,7 @@
             this.Tag = "Query!SOP";
             this.Text = "Query_SpecialReport";
             this.Load += new System.EventHandler(this.Query_SpecialReport_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Query/Query_SpecialReport.Designer.cs

@@ -201,7 +201,7 @@
             this.Tag = "Query!SpecialReport";
             this.Text = "Query_SpecialReport";
             this.Load += new System.EventHandler(this.Query_SpecialReport_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/SMT/SMT_ChangeLine.Designer.cs

@@ -38,7 +38,7 @@
             this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "转线";
             this.Text = "转线";
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/FunctionCode/SMT/SMT_Feeding.Designer.cs

@@ -814,12 +814,12 @@
             this.Name = "SMT_Feeding";
             this.Load += new System.EventHandler(this.SMT上料_Load);
             this.SizeChanged += new System.EventHandler(this.SMT上料_SizeChanged);
-            this.panel2.ResumeLayout(false);
+            this.panel2.ResumeLayout(true);
             this.panel2.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.Clearpsl_location)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Clearbar_code)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.SMTInf)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/SMT/SMT_MakeShift.Designer.cs

@@ -225,7 +225,7 @@
             this.Tag = "ShowDialogWindow";
             this.Text = "工单切换";
             this.Load += new System.EventHandler(this.工单切换_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/SMT/SMT_MaterialsWaring.Designer.cs

@@ -273,7 +273,7 @@
             this.Load += new System.EventHandler(this.用料预警_Load);
             this.SizeChanged += new System.EventHandler(this.用料预警_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.SMTMaterialsDGV)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/SMT/SMT_PreMaterials.Designer.cs

@@ -37,7 +37,7 @@
             this.ClientSize = new System.Drawing.Size(1209, 659);
             this.Name = "工单备料";
             this.Text = "工单备料";
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_YD/FunctionCode/SMT/SMT_WaringSetting.Designer.cs

@@ -206,7 +206,7 @@
             this.Tag = "ShowDialogWindow";
             this.Text = "用料预警设置";
             this.Load += new System.EventHandler(this.用料预警设置_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Special/Special_AfterSaleIn.Designer.cs

@@ -358,7 +358,7 @@
             this.Load += new System.EventHandler(this.Special_CancelProdinout_Load);
             this.SizeChanged += new System.EventHandler(this.Special_AfterSaleIn_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.Info)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Special/Special_AfterSaleOut.Designer.cs

@@ -340,7 +340,7 @@
             this.Load += new System.EventHandler(this.Special_CancelProdinout_Load);
             this.SizeChanged += new System.EventHandler(this.Special_AfterSaleIn_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.Info)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Special/Special_CancelCollection.Designer.cs

@@ -156,7 +156,7 @@
             this.Tag = "Special!CancelCollection";
             this.Text = "取消采集";
             this.Load += new System.EventHandler(this.Special_CancelCollection_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YD/FunctionCode/Special/Special_CancelImei.Designer.cs

@@ -151,7 +151,7 @@
             this.Tag = "Special!BoxSplit";
             this.Text = "拆箱处理";
             this.Load += new System.EventHandler(this.Special_BoxSplit_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }