修改OQC显示规格过长的问题，

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

@@ -38,7 +38,6 @@
             this.ob_prodcode_label = new System.Windows.Forms.Label();
             this.pr_spec_label = new System.Windows.Forms.Label();
             this.ob_prodcode = new System.Windows.Forms.Label();
-            this.pr_spec = new System.Windows.Forms.Label();
             this.GetBatch = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.OutBoxDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
             this.choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
@@ -57,6 +56,7 @@
             this.new_checkno_lable = new System.Windows.Forms.Label();
             this.groupBoxWithBorder2 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.SplitCheckNo = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.pr_spec = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxWithTextArea();
             ((System.ComponentModel.ISupportInitialize)(this.OutBoxDGV)).BeginInit();
             this.groupBoxWithBorder2.SuspendLayout();
             this.SuspendLayout();
@@ -67,11 +67,10 @@
             this.ob_checkno.BackColor = System.Drawing.Color.White;
             this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.ob_checkno.ID = null;
-            this.ob_checkno.Location = new System.Drawing.Point(153, 38);
-            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_checkno.Location = new System.Drawing.Point(115, 30);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Power = "";
-            this.ob_checkno.Size = new System.Drawing.Size(547, 27);
+            this.ob_checkno.Size = new System.Drawing.Size(411, 23);
             this.ob_checkno.Str = null;
             this.ob_checkno.Str1 = null;
             this.ob_checkno.Str2 = null;
@@ -83,10 +82,9 @@
             // 
             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(47, 35);
-            this.ob_checkno_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_checkno_label.Location = new System.Drawing.Point(35, 28);
             this.ob_checkno_label.Name = "ob_checkno_label";
-            this.ob_checkno_label.Size = new System.Drawing.Size(72, 27);
+            this.ob_checkno_label.Size = new System.Drawing.Size(58, 21);
             this.ob_checkno_label.TabIndex = 216;
             this.ob_checkno_label.Text = "抽检批";
             // 
@@ -96,11 +94,10 @@
             this.obd_outboxcode.BackColor = System.Drawing.Color.White;
             this.obd_outboxcode.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.obd_outboxcode.ID = null;
-            this.obd_outboxcode.Location = new System.Drawing.Point(153, 87);
-            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4);
+            this.obd_outboxcode.Location = new System.Drawing.Point(115, 70);
             this.obd_outboxcode.Name = "obd_outboxcode";
             this.obd_outboxcode.Power = null;
-            this.obd_outboxcode.Size = new System.Drawing.Size(547, 27);
+            this.obd_outboxcode.Size = new System.Drawing.Size(411, 23);
             this.obd_outboxcode.Str = null;
             this.obd_outboxcode.Str1 = null;
             this.obd_outboxcode.Str2 = null;
@@ -112,10 +109,9 @@
             // 
             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(47, 84);
-            this.obd_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.obd_outboxcode_label.Location = new System.Drawing.Point(35, 67);
             this.obd_outboxcode_label.Name = "obd_outboxcode_label";
-            this.obd_outboxcode_label.Size = new System.Drawing.Size(52, 27);
+            this.obd_outboxcode_label.Size = new System.Drawing.Size(42, 21);
             this.obd_outboxcode_label.TabIndex = 220;
             this.obd_outboxcode_label.Text = "箱号";
             // 
@@ -125,11 +121,10 @@
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(153, 129);
-            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
+            this.ms_sncode.Location = new System.Drawing.Point(115, 103);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = "";
-            this.ms_sncode.Size = new System.Drawing.Size(547, 27);
+            this.ms_sncode.Size = new System.Drawing.Size(411, 23);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -141,10 +136,9 @@
             // 
             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(47, 127);
-            this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_sncode_label.Location = new System.Drawing.Point(35, 102);
             this.ms_sncode_label.Name = "ms_sncode_label";
-            this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
+            this.ms_sncode_label.Size = new System.Drawing.Size(58, 21);
             this.ms_sncode_label.TabIndex = 218;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -152,10 +146,9 @@
             // 
             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(47, 172);
-            this.ob_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_prodcode_label.Location = new System.Drawing.Point(35, 138);
             this.ob_prodcode_label.Name = "ob_prodcode_label";
-            this.ob_prodcode_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_prodcode_label.Size = new System.Drawing.Size(74, 21);
             this.ob_prodcode_label.TabIndex = 222;
             this.ob_prodcode_label.Text = "产品编号";
             // 
@@ -163,10 +156,9 @@
             // 
             this.pr_spec_label.AutoSize = true;
             this.pr_spec_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_spec_label.Location = new System.Drawing.Point(392, 172);
-            this.pr_spec_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_spec_label.Location = new System.Drawing.Point(289, 138);
             this.pr_spec_label.Name = "pr_spec_label";
-            this.pr_spec_label.Size = new System.Drawing.Size(92, 27);
+            this.pr_spec_label.Size = new System.Drawing.Size(74, 21);
             this.pr_spec_label.TabIndex = 224;
             this.pr_spec_label.Text = "名称规格";
             // 
@@ -174,22 +166,11 @@
             // 
             this.ob_prodcode.AutoSize = true;
             this.ob_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_prodcode.Location = new System.Drawing.Point(155, 172);
-            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_prodcode.Location = new System.Drawing.Point(116, 138);
             this.ob_prodcode.Name = "ob_prodcode";
-            this.ob_prodcode.Size = new System.Drawing.Size(0, 27);
+            this.ob_prodcode.Size = new System.Drawing.Size(0, 21);
             this.ob_prodcode.TabIndex = 225;
             // 
-            // pr_spec
-            // 
-            this.pr_spec.AutoSize = true;
-            this.pr_spec.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_spec.Location = new System.Drawing.Point(492, 172);
-            this.pr_spec.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_spec.Name = "pr_spec";
-            this.pr_spec.Size = new System.Drawing.Size(0, 27);
-            this.pr_spec.TabIndex = 226;
-            // 
             // GetBatch
             // 
             this.GetBatch.AllPower = "";
@@ -198,13 +179,12 @@
             this.GetBatch.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.GetBatch.Image = null;
             this.GetBatch.IsShowBorder = true;
-            this.GetBatch.Location = new System.Drawing.Point(748, 127);
-            this.GetBatch.Margin = new System.Windows.Forms.Padding(4);
+            this.GetBatch.Location = new System.Drawing.Point(561, 102);
             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 = "";
-            this.GetBatch.Size = new System.Drawing.Size(80, 30);
+            this.GetBatch.Size = new System.Drawing.Size(60, 24);
             this.GetBatch.TabIndex = 227;
             this.GetBatch.Text = "获取批";
             this.GetBatch.UseVisualStyleBackColor = true;
@@ -221,10 +201,11 @@
             this.obd_sncode,
             this.obd_builddate});
             this.OutBoxDGV.EnableContentClick = false;
-            this.OutBoxDGV.Location = new System.Drawing.Point(39, 281);
+            this.OutBoxDGV.Location = new System.Drawing.Point(29, 225);
+            this.OutBoxDGV.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.OutBoxDGV.Name = "OutBoxDGV";
             this.OutBoxDGV.RowTemplate.Height = 27;
-            this.OutBoxDGV.Size = new System.Drawing.Size(776, 349);
+            this.OutBoxDGV.Size = new System.Drawing.Size(582, 279);
             this.OutBoxDGV.TabIndex = 228;
             this.OutBoxDGV.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.OutBoxDGV_CellContentClick);
             // 
@@ -267,10 +248,9 @@
             // 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(830, 281);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Location = new System.Drawing.Point(622, 225);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(313, 352);
+            this.OperateResult.Size = new System.Drawing.Size(236, 282);
             this.OperateResult.TabIndex = 229;
             this.OperateResult.Text = "";
             // 
@@ -279,11 +259,10 @@
             this.sncode.AllPower = "";
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(140, 652);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4);
+            this.sncode.Location = new System.Drawing.Point(105, 522);
             this.sncode.Name = "sncode";
             this.sncode.Power = "";
-            this.sncode.Size = new System.Drawing.Size(204, 25);
+            this.sncode.Size = new System.Drawing.Size(154, 21);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -295,10 +274,9 @@
             // 
             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(34, 650);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(26, 520);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(72, 27);
+            this.label1.Size = new System.Drawing.Size(58, 21);
             this.label1.TabIndex = 230;
             this.label1.Text = "序列号";
             // 
@@ -306,10 +284,9 @@
             // 
             this.choosedsn_label.AutoSize = true;
             this.choosedsn_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.choosedsn_label.Location = new System.Drawing.Point(558, 652);
-            this.choosedsn_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.choosedsn_label.Location = new System.Drawing.Point(418, 522);
             this.choosedsn_label.Name = "choosedsn_label";
-            this.choosedsn_label.Size = new System.Drawing.Size(52, 27);
+            this.choosedsn_label.Size = new System.Drawing.Size(42, 21);
             this.choosedsn_label.TabIndex = 232;
             this.choosedsn_label.Text = "已选";
             // 
@@ -317,10 +294,9 @@
             // 
             this.choosedsn.AutoSize = true;
             this.choosedsn.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.choosedsn.Location = new System.Drawing.Point(621, 652);
-            this.choosedsn.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.choosedsn.Location = new System.Drawing.Point(466, 522);
             this.choosedsn.Name = "choosedsn";
-            this.choosedsn.Size = new System.Drawing.Size(24, 27);
+            this.choosedsn.Size = new System.Drawing.Size(19, 21);
             this.choosedsn.TabIndex = 233;
             this.choosedsn.Text = "0";
             // 
@@ -328,10 +304,9 @@
             // 
             this.totalsn.AutoSize = true;
             this.totalsn.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.totalsn.Location = new System.Drawing.Point(747, 652);
-            this.totalsn.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.totalsn.Location = new System.Drawing.Point(560, 522);
             this.totalsn.Name = "totalsn";
-            this.totalsn.Size = new System.Drawing.Size(24, 27);
+            this.totalsn.Size = new System.Drawing.Size(19, 21);
             this.totalsn.TabIndex = 235;
             this.totalsn.Text = "0";
             // 
@@ -339,10 +314,9 @@
             // 
             this.totalsn_label.AutoSize = true;
             this.totalsn_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.totalsn_label.Location = new System.Drawing.Point(687, 652);
-            this.totalsn_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.totalsn_label.Location = new System.Drawing.Point(515, 522);
             this.totalsn_label.Name = "totalsn_label";
-            this.totalsn_label.Size = new System.Drawing.Size(52, 27);
+            this.totalsn_label.Size = new System.Drawing.Size(42, 21);
             this.totalsn_label.TabIndex = 234;
             this.totalsn_label.Text = "总数";
             // 
@@ -351,11 +325,10 @@
             this.new_checkno.AllPower = "";
             this.new_checkno.BackColor = System.Drawing.Color.White;
             this.new_checkno.ID = null;
-            this.new_checkno.Location = new System.Drawing.Point(192, 239);
-            this.new_checkno.Margin = new System.Windows.Forms.Padding(4);
+            this.new_checkno.Location = new System.Drawing.Point(144, 191);
             this.new_checkno.Name = "new_checkno";
             this.new_checkno.Power = "";
-            this.new_checkno.Size = new System.Drawing.Size(547, 25);
+            this.new_checkno.Size = new System.Drawing.Size(411, 21);
             this.new_checkno.Str = null;
             this.new_checkno.Str1 = null;
             this.new_checkno.Str2 = null;
@@ -366,16 +339,16 @@
             // 
             this.new_checkno_lable.AutoSize = true;
             this.new_checkno_lable.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.new_checkno_lable.Location = new System.Drawing.Point(86, 237);
-            this.new_checkno_lable.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.new_checkno_lable.Location = new System.Drawing.Point(64, 190);
             this.new_checkno_lable.Name = "new_checkno_lable";
-            this.new_checkno_lable.Size = new System.Drawing.Size(92, 27);
+            this.new_checkno_lable.Size = new System.Drawing.Size(74, 21);
             this.new_checkno_lable.TabIndex = 236;
             this.new_checkno_lable.Text = "新批次号";
             // 
             // groupBoxWithBorder2
             // 
             this.groupBoxWithBorder2.BorderColor = System.Drawing.Color.Black;
+            this.groupBoxWithBorder2.Controls.Add(this.pr_spec);
             this.groupBoxWithBorder2.Controls.Add(this.obd_outboxcode);
             this.groupBoxWithBorder2.Controls.Add(this.ob_checkno_label);
             this.groupBoxWithBorder2.Controls.Add(this.ob_checkno);
@@ -385,12 +358,13 @@
             this.groupBoxWithBorder2.Controls.Add(this.ob_prodcode_label);
             this.groupBoxWithBorder2.Controls.Add(this.pr_spec_label);
             this.groupBoxWithBorder2.Controls.Add(this.ob_prodcode);
-            this.groupBoxWithBorder2.Controls.Add(this.pr_spec);
             this.groupBoxWithBorder2.Controls.Add(this.GetBatch);
             this.groupBoxWithBorder2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder2.Location = new System.Drawing.Point(39, 8);
+            this.groupBoxWithBorder2.Location = new System.Drawing.Point(29, 6);
+            this.groupBoxWithBorder2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.groupBoxWithBorder2.Name = "groupBoxWithBorder2";
-            this.groupBoxWithBorder2.Size = new System.Drawing.Size(1104, 210);
+            this.groupBoxWithBorder2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBoxWithBorder2.Size = new System.Drawing.Size(828, 168);
             this.groupBoxWithBorder2.TabIndex = 238;
             this.groupBoxWithBorder2.TabStop = false;
             this.groupBoxWithBorder2.Text = "抽检信息";
@@ -404,23 +378,32 @@
             this.SplitCheckNo.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.SplitCheckNo.Image = null;
             this.SplitCheckNo.IsShowBorder = true;
-            this.SplitCheckNo.Location = new System.Drawing.Point(369, 650);
-            this.SplitCheckNo.Margin = new System.Windows.Forms.Padding(4);
+            this.SplitCheckNo.Location = new System.Drawing.Point(277, 520);
             this.SplitCheckNo.MoveImage = ((System.Drawing.Image)(resources.GetObject("SplitCheckNo.MoveImage")));
             this.SplitCheckNo.Name = "SplitCheckNo";
             this.SplitCheckNo.NormalImage = ((System.Drawing.Image)(resources.GetObject("SplitCheckNo.NormalImage")));
             this.SplitCheckNo.Power = "";
-            this.SplitCheckNo.Size = new System.Drawing.Size(80, 30);
+            this.SplitCheckNo.Size = new System.Drawing.Size(60, 24);
             this.SplitCheckNo.TabIndex = 228;
             this.SplitCheckNo.Text = "拆批";
             this.SplitCheckNo.UseVisualStyleBackColor = true;
             this.SplitCheckNo.Click += new System.EventHandler(this.SplitCheckNo_Click);
             // 
+            // pr_spec
+            // 
+            this.pr_spec.Location = new System.Drawing.Point(371, 136);
+            this.pr_spec.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.pr_spec.Name = "pr_spec";
+            this.pr_spec.Size = new System.Drawing.Size(193, 25);
+            this.pr_spec.TabIndex = 228;
+            this.pr_spec.TextAreaEnable = false;
+            this.pr_spec.TextBoxEnable = false;
+            // 
             // OQC_CheckNoSplit
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1177, 696);
+            this.ClientSize = new System.Drawing.Size(883, 557);
             this.Controls.Add(this.SplitCheckNo);
             this.Controls.Add(this.groupBoxWithBorder2);
             this.Controls.Add(this.new_checkno);
@@ -434,6 +417,7 @@
             this.Controls.Add(this.OperateResult);
             this.Controls.Add(this.OutBoxDGV);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Name = "OQC_CheckNoSplit";
             this.Tag = "OQC!CheckNoSplit";
             this.Text = "OQC_CheckNoSplit";
@@ -458,7 +442,6 @@
         private System.Windows.Forms.Label ob_prodcode_label;
         private System.Windows.Forms.Label pr_spec_label;
         private System.Windows.Forms.Label ob_prodcode;
-        private System.Windows.Forms.Label pr_spec;
         private CustomControl.ButtonUtil.NormalButton GetBatch;
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum OutBoxDGV;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
@@ -477,5 +460,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn obd_makecode;
         private System.Windows.Forms.DataGridViewTextBoxColumn obd_sncode;
         private System.Windows.Forms.DataGridViewTextBoxColumn obd_builddate;
+        private CustomControl.TextBoxWithIcon.TextBoxWithTextArea pr_spec;
     }
 }

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

@@ -475,7 +475,6 @@
             // 勾选
             // 
             this.勾选.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.勾选.Frozen = true;
             this.勾选.HeaderText = "勾选";
             this.勾选.MinimumWidth = 60;
             this.勾选.Name = "勾选";
@@ -485,16 +484,16 @@
             // obd_sncode
             // 
             this.obd_sncode.DataPropertyName = "obd_sncode";
-            this.obd_sncode.Frozen = true;
             this.obd_sncode.HeaderText = "序列号";
             this.obd_sncode.Name = "obd_sncode";
+            this.obd_sncode.ReadOnly = true;
             // 
             // obd_outboxcode_dgv
             // 
             this.obd_outboxcode_dgv.DataPropertyName = "obd_outboxcode";
-            this.obd_outboxcode_dgv.Frozen = true;
             this.obd_outboxcode_dgv.HeaderText = "箱号";
             this.obd_outboxcode_dgv.Name = "obd_outboxcode_dgv";
+            this.obd_outboxcode_dgv.ReadOnly = true;
             this.obd_outboxcode_dgv.Width = 190;
             // 
             // obd_id
@@ -507,10 +506,10 @@
             // obd_makecode
             // 
             this.obd_makecode.DataPropertyName = "obd_makecode";
-            this.obd_makecode.Frozen = true;
             this.obd_makecode.HeaderText = "工单号";
             this.obd_makecode.MinimumWidth = 120;
             this.obd_makecode.Name = "obd_makecode";
+            this.obd_makecode.ReadOnly = true;
             this.obd_makecode.Width = 215;
             // 
             // OQC_Inspection

UAS-MES/FunctionCode/OQC/OQC_Inspection.cs

@@ -49,7 +49,7 @@ namespace UAS_MES.OQC
             {
                 string ob_id = dh.GetSEQ("OQCBatch_SEQ");
                 string checkno = "";
-                LogicHandler.GetSerialNumByCaller("Make!CheckQC",out checkno);
+                LogicHandler.GetSerialNumByCaller("Make!CheckQC", out checkno);
                 sql.Clear();
                 sql.Append("insert into OQCBatch (ob_id, ob_checkno ,ob_status, ob_source,ob_indate,ob_checkman) ");
                 sql.Append("values( '" + ob_id + "','" + checkno + "', 'ENTERING', '新增', sysdate, '" + User.UserName + "')");
@@ -111,16 +111,13 @@ namespace UAS_MES.OQC
                                     dh.ExecuteSql(sql.GetString(), "insert");
                                     string obd_id = dh.getFieldDataByCondition("OQCBatchDetail", "obd_id", "obd_outboxcode='" + pa_outboxcode.Text + "'").ToString();
                                     dh.UpdateByCondition("OQCBatch", "ob_batchqty =(select count(1) from OQCBatchDetail where obd_obid=" + obd_id + ")", "ob_id=" + obd_id);
-                                    dh.UpdateByCondition("makeserial", "ms_checkno='" + ob_checkno.Text + "'", "exists (select 1 from OQCBatchDetail where obd_obid ='" + obd_id + "' and obd_makecode = ms_makecode and  ms_sncode = obd_sncode)");
+                                    dh.UpdateByCondition("makeserial", "ms_checkno='" + ob_checkno.Text + "'", "ms_outboxcode='" + pa_outboxcode.Text + "'");
                                     GetBatch.PerformClick();
-                                    OperateResult.AppendText(">>箱号成功维护到送检批\n", Color.Green, pa_outboxcode);
+                                    OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "成功维护到送检批\n", Color.Green, pa_outboxcode);
                                 }
                                 //存在则进行提示
                                 else OperateResult.AppendText(">>箱号已存在送检批" + dt.Rows[0]["obd_checkno"] + "中\n", Color.Red, pa_outboxcode);
                             }
-                            else if (ma_prodcode.Text == "")
-                            {
-                            }
                             else OperateResult.AppendText(">>箱内产品与抽检批次产品不一致\n", Color.Red, pa_outboxcode);
                         }
                         else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "不存在\n", Color.Red, pa_outboxcode);

UAS-MES/PublicMethod/LogicHandler.cs

@@ -388,7 +388,7 @@ namespace UAS_MES.PublicMethod
             {
                 case "OQCSENDCHECK":
                     sql.Clear();
-                    sql.Append("select obd_outboxcode,obd_id,obd_makecode,obd_sncode from OQCBatchdetail where obd_checkno = '" + iCheckNo + "'");
+                    sql.Append("select obd_outboxcode,obd_id,obd_makecode,obd_sncode from OQCBatchdetail where obd_checkno = '" + iCheckNo + "' order by obd_sncode");
                     Grid = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                     Form = (DataTable)dh.ExecuteSql("select ob_id,ob_status,ob_prodcode,ob_batchqty,ob_source,ob_checkno from OQCBatch where ob_checkno='" + iCheckNo + "'", "select");
                     if (Form.Rows.Count > 0)