添加注销

UAS-MES/FunctionCode/Make/Make_Repair.Designer.cs

@@ -431,6 +431,7 @@
             this.prodcode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.prodcode.Name = "prodcode";
             this.prodcode.Power = null;
+            this.prodcode.ReturnData = null;
             this.prodcode.SelectField = null;
             this.prodcode.SetValueField = null;
             this.prodcode.Size = new System.Drawing.Size(183, 26);
@@ -853,6 +854,7 @@
             this.cd_stepcode.Margin = new System.Windows.Forms.Padding(4);
             this.cd_stepcode.Name = "cd_stepcode";
             this.cd_stepcode.Power = null;
+            this.cd_stepcode.ReturnData = null;
             this.cd_stepcode.SelectField = null;
             this.cd_stepcode.SetValueField = null;
             this.cd_stepcode.Size = new System.Drawing.Size(200, 26);
@@ -874,6 +876,7 @@
             this.cr_code.Margin = new System.Windows.Forms.Padding(4);
             this.cr_code.Name = "cr_code";
             this.cr_code.Power = null;
+            this.cr_code.ReturnData = null;
             this.cr_code.SelectField = null;
             this.cr_code.SetValueField = null;
             this.cr_code.Size = new System.Drawing.Size(200, 26);
@@ -1071,16 +1074,17 @@
             this.Name = "Make_Repair";
             this.Tag = "Make!Repair";
             this.Text = "维修作业";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_Repair_FormClosing);
             this.Load += new System.EventHandler(this.维修作业_Load);
             this.SizeChanged += new System.EventHandler(this.Make_Repair_SizeChanged);
-            this.panel2.ResumeLayout(false);
+            this.panel2.ResumeLayout(true);
             this.panel2.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.LocationSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.ComponentSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.mbp_partdgv)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.mbl_locdgv)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.RefreshTreeView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -618,5 +618,10 @@ namespace UAS_MES.Make
                 BaseUtil.FillDgvWithDataTable(mbp_partdgv, dt);
             }
         }
+
+        private void Make_Repair_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            dh.Dispose();
+        }
     }
 }

UAS-MES/FunctionCode/Make/Make_Repair.resx

@@ -129,18 +129,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>

UAS-MES/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -791,6 +791,7 @@
             this.Name = "Make_TestCollection";
             this.Tag = "Make!TestCollection";
             this.Text = " ";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_TestCollection_FormClosing);
             this.Load += new System.EventHandler(this.TestCollection_Load);
             this.SizeChanged += new System.EventHandler(this.测试采集_SizeChanged);
             this.panel2.ResumeLayout(true);

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -618,5 +618,10 @@ namespace UAS_MES.Make
                 LoadCheckQTY();
             }
         }
+
+        private void Make_TestCollection_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            dh.Dispose();
+        }
     }
 }

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.Designer.cs

@@ -762,6 +762,7 @@
             this.Name = "OQC_BatchResultJudge";
             this.Tag = "OQC!BatchResultJudge";
             this.Text = "抽检批维护";
+            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.panel2.ResumeLayout(false);

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.cs

@@ -378,5 +378,10 @@ namespace UAS_MES.OQC
             if (e.KeyCode == Keys.Enter)
                 GetBatch.PerformClick();
         }
+
+        private void OQC_BatchResultJudge_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            dh.Dispose();
+        }
     }
 }

UAS-MES/FunctionCode/OQC/OQC_Inspection.Designer.cs

@@ -72,8 +72,9 @@
             this.panel2.Controls.Add(this.label1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(915, 28);
+            this.panel2.Size = new System.Drawing.Size(1220, 35);
             this.panel2.TabIndex = 89;
             this.panel2.Tag = "NoAuto";
             // 
@@ -82,9 +83,10 @@
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label1.Location = new System.Drawing.Point(6, 3);
+            this.label1.Location = new System.Drawing.Point(8, 4);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(127, 21);
+            this.label1.Size = new System.Drawing.Size(157, 27);
             this.label1.TabIndex = 0;
             this.label1.Text = "OQC生成送检批";
             // 
@@ -92,9 +94,10 @@
             // 
             this.obd_makecode_label.AutoSize = true;
             this.obd_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.obd_makecode_label.Location = new System.Drawing.Point(24, 139);
+            this.obd_makecode_label.Location = new System.Drawing.Point(32, 174);
+            this.obd_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.obd_makecode_label.Name = "obd_makecode_label";
-            this.obd_makecode_label.Size = new System.Drawing.Size(58, 21);
+            this.obd_makecode_label.Size = new System.Drawing.Size(72, 27);
             this.obd_makecode_label.TabIndex = 144;
             this.obd_makecode_label.Text = "工单号";
             // 
@@ -102,9 +105,10 @@
             // 
             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(24, 102);
+            this.ms_sncode_label.Location = new System.Drawing.Point(32, 128);
+            this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 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(72, 27);
             this.ms_sncode_label.TabIndex = 146;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -112,9 +116,10 @@
             // 
             this.obd_outboxcode_label.AutoSize = true;
             this.obd_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.obd_outboxcode_label.Location = new System.Drawing.Point(26, 68);
+            this.obd_outboxcode_label.Location = new System.Drawing.Point(35, 85);
+            this.obd_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.obd_outboxcode_label.Name = "obd_outboxcode_label";
-            this.obd_outboxcode_label.Size = new System.Drawing.Size(42, 21);
+            this.obd_outboxcode_label.Size = new System.Drawing.Size(52, 27);
             this.obd_outboxcode_label.TabIndex = 148;
             this.obd_outboxcode_label.Text = "箱号";
             // 
@@ -122,9 +127,10 @@
             // 
             this.ob_checkno_label.AutoSize = true;
             this.ob_checkno_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno_label.Location = new System.Drawing.Point(24, 38);
+            this.ob_checkno_label.Location = new System.Drawing.Point(32, 48);
+            this.ob_checkno_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_checkno_label.Name = "ob_checkno_label";
-            this.ob_checkno_label.Size = new System.Drawing.Size(58, 21);
+            this.ob_checkno_label.Size = new System.Drawing.Size(72, 27);
             this.ob_checkno_label.TabIndex = 150;
             this.ob_checkno_label.Text = "抽检批";
             // 
@@ -132,9 +138,10 @@
             // 
             this.ob_prodcode_label.AutoSize = true;
             this.ob_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_prodcode_label.Location = new System.Drawing.Point(263, 139);
+            this.ob_prodcode_label.Location = new System.Drawing.Point(351, 174);
+            this.ob_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_prodcode_label.Name = "ob_prodcode_label";
-            this.ob_prodcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ob_prodcode_label.Size = new System.Drawing.Size(92, 27);
             this.ob_prodcode_label.TabIndex = 152;
             this.ob_prodcode_label.Text = "产品编号";
             // 
@@ -142,9 +149,10 @@
             // 
             this.ob_status_label.AutoSize = true;
             this.ob_status_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_status_label.Location = new System.Drawing.Point(516, 139);
+            this.ob_status_label.Location = new System.Drawing.Point(688, 174);
+            this.ob_status_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_status_label.Name = "ob_status_label";
-            this.ob_status_label.Size = new System.Drawing.Size(74, 21);
+            this.ob_status_label.Size = new System.Drawing.Size(92, 27);
             this.ob_status_label.TabIndex = 154;
             this.ob_status_label.Text = "批次状态";
             // 
@@ -152,9 +160,10 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty_label.Location = new System.Drawing.Point(22, 506);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(29, 632);
+            this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
-            this.ob_batchqty_label.Size = new System.Drawing.Size(58, 21);
+            this.ob_batchqty_label.Size = new System.Drawing.Size(72, 27);
             this.ob_batchqty_label.TabIndex = 160;
             this.ob_batchqty_label.Text = "批数量";
             // 
@@ -162,9 +171,10 @@
             // 
             this.pa_outboxcode_label.AutoSize = true;
             this.pa_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_outboxcode_label.Location = new System.Drawing.Point(22, 541);
+            this.pa_outboxcode_label.Location = new System.Drawing.Point(29, 676);
+            this.pa_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_outboxcode_label.Name = "pa_outboxcode_label";
-            this.pa_outboxcode_label.Size = new System.Drawing.Size(74, 21);
+            this.pa_outboxcode_label.Size = new System.Drawing.Size(92, 27);
             this.pa_outboxcode_label.TabIndex = 162;
             this.pa_outboxcode_label.Text = "输入箱号";
             // 
@@ -172,9 +182,10 @@
             // 
             this.WithDraw.AutoSize = true;
             this.WithDraw.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.WithDraw.Location = new System.Drawing.Point(417, 541);
+            this.WithDraw.Location = new System.Drawing.Point(556, 676);
+            this.WithDraw.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.WithDraw.Name = "WithDraw";
-            this.WithDraw.Size = new System.Drawing.Size(61, 25);
+            this.WithDraw.Size = new System.Drawing.Size(74, 31);
             this.WithDraw.TabIndex = 169;
             this.WithDraw.Text = "撤销";
             this.WithDraw.UseVisualStyleBackColor = true;
@@ -186,12 +197,14 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(102, 140);
+            this.ma_code.Location = new System.Drawing.Point(136, 175);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
+            this.ma_code.ReturnData = null;
             this.ma_code.SelectField = null;
             this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(155, 21);
+            this.ma_code.Size = new System.Drawing.Size(207, 26);
             this.ma_code.TabIndex = 176;
             this.ma_code.TableName = null;
             this.ma_code.TextBoxEnable = false;
@@ -204,12 +217,13 @@
             this.ChooseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ChooseAll.Image = ((System.Drawing.Image)(resources.GetObject("ChooseAll.Image")));
             this.ChooseAll.IsShowBorder = true;
-            this.ChooseAll.Location = new System.Drawing.Point(554, 507);
+            this.ChooseAll.Location = new System.Drawing.Point(739, 634);
+            this.ChooseAll.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ChooseAll.MoveImage = ((System.Drawing.Image)(resources.GetObject("ChooseAll.MoveImage")));
             this.ChooseAll.Name = "ChooseAll";
             this.ChooseAll.NormalImage = ((System.Drawing.Image)(resources.GetObject("ChooseAll.NormalImage")));
             this.ChooseAll.Power = null;
-            this.ChooseAll.Size = new System.Drawing.Size(60, 24);
+            this.ChooseAll.Size = new System.Drawing.Size(80, 30);
             this.ChooseAll.TabIndex = 175;
             this.ChooseAll.Text = "全部勾选";
             this.ChooseAll.UseVisualStyleBackColor = true;
@@ -218,9 +232,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(698, 175);
+            this.OperateResult.Location = new System.Drawing.Point(931, 219);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(211, 319);
+            this.OperateResult.Size = new System.Drawing.Size(280, 398);
             this.OperateResult.TabIndex = 174;
             this.OperateResult.Text = "";
             // 
@@ -232,12 +247,13 @@
             this.Clean.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(772, 506);
+            this.Clean.Location = new System.Drawing.Point(1029, 632);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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(80, 30);
             this.Clean.TabIndex = 173;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -251,12 +267,13 @@
             this.Delete.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Delete.Image = ((System.Drawing.Image)(resources.GetObject("Delete.Image")));
             this.Delete.IsShowBorder = true;
-            this.Delete.Location = new System.Drawing.Point(160, 570);
+            this.Delete.Location = new System.Drawing.Point(213, 712);
+            this.Delete.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Delete.MoveImage = ((System.Drawing.Image)(resources.GetObject("Delete.MoveImage")));
             this.Delete.Name = "Delete";
             this.Delete.NormalImage = ((System.Drawing.Image)(resources.GetObject("Delete.NormalImage")));
             this.Delete.Power = "ifDelete";
-            this.Delete.Size = new System.Drawing.Size(60, 24);
+            this.Delete.Size = new System.Drawing.Size(80, 30);
             this.Delete.TabIndex = 172;
             this.Delete.Text = "删除";
             this.Delete.UseVisualStyleBackColor = true;
@@ -271,12 +288,13 @@
             this.SendOQC.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.SendOQC.Image = ((System.Drawing.Image)(resources.GetObject("SendOQC.Image")));
             this.SendOQC.IsShowBorder = true;
-            this.SendOQC.Location = new System.Drawing.Point(271, 570);
+            this.SendOQC.Location = new System.Drawing.Point(361, 712);
+            this.SendOQC.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.SendOQC.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendOQC.MoveImage")));
             this.SendOQC.Name = "SendOQC";
             this.SendOQC.NormalImage = ((System.Drawing.Image)(resources.GetObject("SendOQC.NormalImage")));
             this.SendOQC.Power = null;
-            this.SendOQC.Size = new System.Drawing.Size(60, 24);
+            this.SendOQC.Size = new System.Drawing.Size(80, 30);
             this.SendOQC.TabIndex = 171;
             this.SendOQC.Text = "送检";
             this.SendOQC.UseVisualStyleBackColor = true;
@@ -290,12 +308,13 @@
             this.GetBatch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.GetBatch.Image = ((System.Drawing.Image)(resources.GetObject("GetBatch.Image")));
             this.GetBatch.IsShowBorder = true;
-            this.GetBatch.Location = new System.Drawing.Point(698, 140);
+            this.GetBatch.Location = new System.Drawing.Point(931, 175);
+            this.GetBatch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.GetBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.MoveImage")));
             this.GetBatch.Name = "GetBatch";
             this.GetBatch.NormalImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.NormalImage")));
             this.GetBatch.Power = "ifRead";
-            this.GetBatch.Size = new System.Drawing.Size(60, 24);
+            this.GetBatch.Size = new System.Drawing.Size(80, 30);
             this.GetBatch.TabIndex = 170;
             this.GetBatch.Text = "获取批";
             this.GetBatch.UseVisualStyleBackColor = true;
@@ -306,10 +325,11 @@
             this.pa_outboxcode.AllPower = null;
             this.pa_outboxcode.BackColor = System.Drawing.Color.White;
             this.pa_outboxcode.ID = null;
-            this.pa_outboxcode.Location = new System.Drawing.Point(117, 542);
+            this.pa_outboxcode.Location = new System.Drawing.Point(156, 678);
+            this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pa_outboxcode.Name = "pa_outboxcode";
             this.pa_outboxcode.Power = null;
-            this.pa_outboxcode.Size = new System.Drawing.Size(292, 21);
+            this.pa_outboxcode.Size = new System.Drawing.Size(388, 25);
             this.pa_outboxcode.Str = null;
             this.pa_outboxcode.Str1 = null;
             this.pa_outboxcode.Str2 = null;
@@ -322,10 +342,11 @@
             this.ob_batchqty.AllPower = null;
             this.ob_batchqty.BackColor = System.Drawing.Color.White;
             this.ob_batchqty.ID = null;
-            this.ob_batchqty.Location = new System.Drawing.Point(117, 507);
+            this.ob_batchqty.Location = new System.Drawing.Point(156, 634);
+            this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_batchqty.Name = "ob_batchqty";
             this.ob_batchqty.Power = null;
-            this.ob_batchqty.Size = new System.Drawing.Size(292, 21);
+            this.ob_batchqty.Size = new System.Drawing.Size(388, 25);
             this.ob_batchqty.Str = null;
             this.ob_batchqty.Str1 = null;
             this.ob_batchqty.Str2 = null;
@@ -340,12 +361,13 @@
             this.RemoveAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.RemoveAll.Image = ((System.Drawing.Image)(resources.GetObject("RemoveAll.Image")));
             this.RemoveAll.IsShowBorder = true;
-            this.RemoveAll.Location = new System.Drawing.Point(632, 507);
+            this.RemoveAll.Location = new System.Drawing.Point(843, 634);
+            this.RemoveAll.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.RemoveAll.MoveImage = ((System.Drawing.Image)(resources.GetObject("RemoveAll.MoveImage")));
             this.RemoveAll.Name = "RemoveAll";
             this.RemoveAll.NormalImage = ((System.Drawing.Image)(resources.GetObject("RemoveAll.NormalImage")));
             this.RemoveAll.Power = "ifDelete";
-            this.RemoveAll.Size = new System.Drawing.Size(60, 24);
+            this.RemoveAll.Size = new System.Drawing.Size(80, 30);
             this.RemoveAll.TabIndex = 159;
             this.RemoveAll.Text = "全部移除";
             this.RemoveAll.UseVisualStyleBackColor = true;
@@ -359,12 +381,13 @@
             this.NewBatch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.NewBatch.Image = ((System.Drawing.Image)(resources.GetObject("NewBatch.Image")));
             this.NewBatch.IsShowBorder = true;
-            this.NewBatch.Location = new System.Drawing.Point(698, 102);
+            this.NewBatch.Location = new System.Drawing.Point(931, 128);
+            this.NewBatch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.NewBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewBatch.MoveImage")));
             this.NewBatch.Name = "NewBatch";
             this.NewBatch.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewBatch.NormalImage")));
             this.NewBatch.Power = "ifWrite";
-            this.NewBatch.Size = new System.Drawing.Size(60, 24);
+            this.NewBatch.Size = new System.Drawing.Size(80, 30);
             this.NewBatch.TabIndex = 156;
             this.NewBatch.Tag = "OQC!Inspection";
             this.NewBatch.Text = "生成新批";
@@ -377,10 +400,11 @@
             this.ob_status.BackColor = System.Drawing.Color.White;
             this.ob_status.Enabled = false;
             this.ob_status.ID = null;
-            this.ob_status.Location = new System.Drawing.Point(613, 140);
+            this.ob_status.Location = new System.Drawing.Point(817, 175);
+            this.ob_status.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_status.Name = "ob_status";
             this.ob_status.Power = null;
-            this.ob_status.Size = new System.Drawing.Size(78, 21);
+            this.ob_status.Size = new System.Drawing.Size(103, 25);
             this.ob_status.Str = null;
             this.ob_status.Str1 = null;
             this.ob_status.Str2 = null;
@@ -393,10 +417,11 @@
             this.ma_prodcode.BackColor = System.Drawing.Color.White;
             this.ma_prodcode.Enabled = false;
             this.ma_prodcode.ID = null;
-            this.ma_prodcode.Location = new System.Drawing.Point(359, 140);
+            this.ma_prodcode.Location = new System.Drawing.Point(479, 175);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Power = null;
-            this.ma_prodcode.Size = new System.Drawing.Size(141, 21);
+            this.ma_prodcode.Size = new System.Drawing.Size(187, 25);
             this.ma_prodcode.Str = null;
             this.ma_prodcode.Str1 = null;
             this.ma_prodcode.Str2 = null;
@@ -408,10 +433,11 @@
             this.ob_checkno.AllPower = null;
             this.ob_checkno.BackColor = System.Drawing.Color.White;
             this.ob_checkno.ID = null;
-            this.ob_checkno.Location = new System.Drawing.Point(103, 42);
+            this.ob_checkno.Location = new System.Drawing.Point(137, 52);
+            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Power = null;
-            this.ob_checkno.Size = new System.Drawing.Size(319, 21);
+            this.ob_checkno.Size = new System.Drawing.Size(424, 25);
             this.ob_checkno.Str = null;
             this.ob_checkno.Str1 = null;
             this.ob_checkno.Str2 = null;
@@ -425,10 +451,11 @@
             this.obd_outboxcode.AllPower = null;
             this.obd_outboxcode.BackColor = System.Drawing.Color.White;
             this.obd_outboxcode.ID = null;
-            this.obd_outboxcode.Location = new System.Drawing.Point(103, 73);
+            this.obd_outboxcode.Location = new System.Drawing.Point(137, 91);
+            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.obd_outboxcode.Name = "obd_outboxcode";
             this.obd_outboxcode.Power = null;
-            this.obd_outboxcode.Size = new System.Drawing.Size(319, 21);
+            this.obd_outboxcode.Size = new System.Drawing.Size(424, 25);
             this.obd_outboxcode.Str = null;
             this.obd_outboxcode.Str1 = null;
             this.obd_outboxcode.Str2 = null;
@@ -441,10 +468,11 @@
             this.ms_sncode.AllPower = null;
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(103, 106);
+            this.ms_sncode.Location = new System.Drawing.Point(137, 132);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
-            this.ms_sncode.Size = new System.Drawing.Size(319, 21);
+            this.ms_sncode.Size = new System.Drawing.Size(424, 25);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -462,11 +490,12 @@
             this.obd_outboxcode_dgv,
             this.obd_id,
             this.obd_makecode});
-            this.CheckBatchDGV.Location = new System.Drawing.Point(27, 174);
+            this.CheckBatchDGV.Location = new System.Drawing.Point(36, 218);
+            this.CheckBatchDGV.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.CheckBatchDGV.Name = "CheckBatchDGV";
             this.CheckBatchDGV.RowHeadersWidth = 20;
             this.CheckBatchDGV.RowTemplate.Height = 23;
-            this.CheckBatchDGV.Size = new System.Drawing.Size(665, 318);
+            this.CheckBatchDGV.Size = new System.Drawing.Size(887, 398);
             this.CheckBatchDGV.TabIndex = 90;
             this.CheckBatchDGV.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.CheckBatchDGV_CellContentClick);
             this.CheckBatchDGV.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dataGridViewExpand1_DataError);
@@ -510,9 +539,9 @@
             // 
             // OQC_Inspection
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(915, 600);
+            this.ClientSize = new System.Drawing.Size(1220, 750);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.ChooseAll);
             this.Controls.Add(this.OperateResult);
@@ -541,9 +570,11 @@
             this.Controls.Add(this.CheckBatchDGV);
             this.Controls.Add(this.panel2);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "OQC_Inspection";
             this.Tag = "OQC!Inspection";
             this.Text = "生成送检批";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OQC_Inspection_FormClosing);
             this.Load += new System.EventHandler(this.生成送检批_Load);
             this.SizeChanged += new System.EventHandler(this.生成送检批_SizeChanged);
             this.panel2.ResumeLayout(false);

UAS-MES/FunctionCode/OQC/OQC_Inspection.cs

@@ -348,5 +348,10 @@ namespace UAS_MES.OQC
             if (e.KeyCode == Keys.Enter)
                 GetBatch.PerformClick();
         }
+
+        private void OQC_Inspection_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            dh.Dispose();
+        }
     }
 }

UAS-MES/FunctionCode/OQC/OQC_Inspection.resx

@@ -1050,19 +1050,4 @@
   <metadata name="obd_makecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="勾选.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ob_batchqty_dgv.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="obd_outboxcode_dgv.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="obd_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="obd_makecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.cs

@@ -270,5 +270,10 @@ namespace UAS_MES.OQC
             DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             BaseUtil.FillDgvWithDataTable(CheckTypeDGV, dt);
         }
+
+        private void OQC_PlanMaintain_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            dh.Dispose();
+        }
     }
 }

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.designer.cs

@@ -286,6 +286,7 @@
             this.al_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.al_code.Name = "al_code";
             this.al_code.Power = null;
+            this.al_code.ReturnData = null;
             this.al_code.SelectField = null;
             this.al_code.SetValueField = null;
             this.al_code.Size = new System.Drawing.Size(226, 26);
@@ -324,6 +325,7 @@
             this.pr_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.pr_code.Name = "pr_code";
             this.pr_code.Power = null;
+            this.pr_code.ReturnData = null;
             this.pr_code.SelectField = null;
             this.pr_code.SetValueField = null;
             this.pr_code.Size = new System.Drawing.Size(212, 26);
@@ -613,6 +615,7 @@
             this.Name = "OQC_PlanMaintain";
             this.Tag = "OQC!PlanMaintain";
             this.Text = "抽样计划维护";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OQC_PlanMaintain_FormClosing);
             this.Load += new System.EventHandler(this.抽样计划维护_Load);
             this.SizeChanged += new System.EventHandler(this.抽样计划维护_SizeChanged);
             this.panel2.ResumeLayout(true);

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.Designer.cs

@@ -55,6 +55,10 @@
             this.ob_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_makecode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ChoosedDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewExpand();
+            this.or_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bg_code1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bc_code1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bc_name1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.WaitChooseDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithCheckBox();
             this.ChooseAll = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.bg_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -91,10 +95,6 @@
             this.ob_makecode_dgv = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.obd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.BadGroupCode = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
-            this.or_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bg_code1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bc_code1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bc_name1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.ChoosedDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.WaitChooseDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).BeginInit();
@@ -446,6 +446,37 @@
             this.ChoosedDGV.Size = new System.Drawing.Size(325, 321);
             this.ChoosedDGV.TabIndex = 205;
             // 
+            // or_id
+            // 
+            this.or_id.DataPropertyName = "or_id";
+            this.or_id.HeaderText = "or_id";
+            this.or_id.Name = "or_id";
+            this.or_id.Visible = false;
+            // 
+            // bg_code1
+            // 
+            this.bg_code1.DataPropertyName = "bg_code";
+            this.bg_code1.HeaderText = "不良组别编号";
+            this.bg_code1.Name = "bg_code1";
+            this.bg_code1.Visible = false;
+            // 
+            // bc_code1
+            // 
+            this.bc_code1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.bc_code1.DataPropertyName = "bc_code";
+            this.bc_code1.HeaderText = "不良代码";
+            this.bc_code1.Name = "bc_code1";
+            this.bc_code1.ReadOnly = true;
+            this.bc_code1.Width = 140;
+            // 
+            // bc_name1
+            // 
+            this.bc_name1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.bc_name1.DataPropertyName = "bc_name";
+            this.bc_name1.HeaderText = "不良名称 ";
+            this.bc_name1.Name = "bc_name1";
+            this.bc_name1.ReadOnly = true;
+            // 
             // WaitChooseDGV
             // 
             this.WaitChooseDGV.AllowUserToAddRows = false;
@@ -893,37 +924,6 @@
             this.BadGroupCode.TabIndex = 219;
             this.BadGroupCode.SelectedIndexChanged += new System.EventHandler(this.BadGroupCode_SelectedIndexChanged);
             // 
-            // or_id
-            // 
-            this.or_id.DataPropertyName = "or_id";
-            this.or_id.HeaderText = "or_id";
-            this.or_id.Name = "or_id";
-            this.or_id.Visible = false;
-            // 
-            // bg_code1
-            // 
-            this.bg_code1.DataPropertyName = "bg_code";
-            this.bg_code1.HeaderText = "不良组别编号";
-            this.bg_code1.Name = "bg_code1";
-            this.bg_code1.Visible = false;
-            // 
-            // bc_code1
-            // 
-            this.bc_code1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.bc_code1.DataPropertyName = "bc_code";
-            this.bc_code1.HeaderText = "不良代码";
-            this.bc_code1.Name = "bc_code1";
-            this.bc_code1.ReadOnly = true;
-            this.bc_code1.Width = 140;
-            // 
-            // bc_name1
-            // 
-            this.bc_name1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.bc_name1.DataPropertyName = "bc_name";
-            this.bc_name1.HeaderText = "不良名称 ";
-            this.bc_name1.Name = "bc_name1";
-            this.bc_name1.ReadOnly = true;
-            // 
             // OQC_SamplingDataCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
@@ -977,6 +977,7 @@
             this.Name = "OQC_SamplingDataCollection";
             this.Tag = "OQC!SamplingDataCollection";
             this.Text = " ";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OQC_SamplingDataCollection_FormClosing);
             this.Load += new System.EventHandler(this.抽样数据采集_Load);
             this.SizeChanged += new System.EventHandler(this.抽样数据采集_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.ChoosedDGV)).EndInit();

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -482,5 +482,10 @@ namespace UAS_MES.OQC
             DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             BaseUtil.FillDgvWithDataTable(WaitChooseDGV, dt);
         }
+
+        private void OQC_SamplingDataCollection_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            dh.Dispose();
+        }
     }
 }