章政 8 年 前
コミット
319cfe3a2d

+ 92 - 72
UAS-MES/FunctionCode/OQC/OQC_CheckNoSplit.Designer.cs

@@ -36,7 +36,7 @@
             this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ms_sncode_label = new System.Windows.Forms.Label();
             this.ob_prodcode_label = new System.Windows.Forms.Label();
-            this.pr_spec_label = new System.Windows.Forms.Label();
+            this.pr_detail_label = new System.Windows.Forms.Label();
             this.ob_prodcode = new System.Windows.Forms.Label();
             this.GetBatch = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.OutBoxDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
@@ -55,8 +55,8 @@
             this.new_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.new_checkno_lable = new System.Windows.Forms.Label();
             this.groupBoxWithBorder2 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.pr_detail = new System.Windows.Forms.Label();
             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,10 +67,11 @@
             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(115, 30);
+            this.ob_checkno.Location = new System.Drawing.Point(153, 38);
+            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Power = "";
-            this.ob_checkno.Size = new System.Drawing.Size(411, 23);
+            this.ob_checkno.Size = new System.Drawing.Size(547, 27);
             this.ob_checkno.Str = null;
             this.ob_checkno.Str1 = null;
             this.ob_checkno.Str2 = null;
@@ -82,9 +83,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(35, 28);
+            this.ob_checkno_label.Location = new System.Drawing.Point(45, 33);
+            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 = 216;
             this.ob_checkno_label.Text = "抽检批";
             // 
@@ -94,10 +96,11 @@
             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(115, 70);
+            this.obd_outboxcode.Location = new System.Drawing.Point(153, 88);
+            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4);
             this.obd_outboxcode.Name = "obd_outboxcode";
             this.obd_outboxcode.Power = null;
-            this.obd_outboxcode.Size = new System.Drawing.Size(411, 23);
+            this.obd_outboxcode.Size = new System.Drawing.Size(547, 27);
             this.obd_outboxcode.Str = null;
             this.obd_outboxcode.Str1 = null;
             this.obd_outboxcode.Str2 = null;
@@ -109,9 +112,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(35, 67);
+            this.obd_outboxcode_label.Location = new System.Drawing.Point(45, 81);
+            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 = 220;
             this.obd_outboxcode_label.Text = "箱号";
             // 
@@ -121,10 +125,11 @@
             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(115, 103);
+            this.ms_sncode.Location = new System.Drawing.Point(153, 129);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = "";
-            this.ms_sncode.Size = new System.Drawing.Size(411, 23);
+            this.ms_sncode.Size = new System.Drawing.Size(547, 27);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -136,9 +141,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(35, 102);
+            this.ms_sncode_label.Location = new System.Drawing.Point(45, 125);
+            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 = 218;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -146,29 +152,32 @@
             // 
             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(35, 138);
+            this.ob_prodcode_label.Location = new System.Drawing.Point(45, 170);
+            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 = 222;
             this.ob_prodcode_label.Text = "产品编号";
             // 
-            // pr_spec_label
+            // pr_detail_label
             // 
-            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(289, 138);
-            this.pr_spec_label.Name = "pr_spec_label";
-            this.pr_spec_label.Size = new System.Drawing.Size(74, 21);
-            this.pr_spec_label.TabIndex = 224;
-            this.pr_spec_label.Text = "名称规格";
+            this.pr_detail_label.AutoSize = true;
+            this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_detail_label.Location = new System.Drawing.Point(384, 170);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail_label.Name = "pr_detail_label";
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
+            this.pr_detail_label.TabIndex = 224;
+            this.pr_detail_label.Text = "产品名称";
             // 
             // ob_prodcode
             // 
             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(116, 138);
+            this.ob_prodcode.Location = new System.Drawing.Point(153, 170);
+            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_prodcode.Name = "ob_prodcode";
-            this.ob_prodcode.Size = new System.Drawing.Size(0, 21);
+            this.ob_prodcode.Size = new System.Drawing.Size(0, 27);
             this.ob_prodcode.TabIndex = 225;
             // 
             // GetBatch
@@ -179,12 +188,13 @@
             this.GetBatch.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.GetBatch.Image = null;
             this.GetBatch.IsShowBorder = true;
-            this.GetBatch.Location = new System.Drawing.Point(561, 102);
+            this.GetBatch.Location = new System.Drawing.Point(748, 128);
+            this.GetBatch.Margin = new System.Windows.Forms.Padding(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 = "";
-            this.GetBatch.Size = new System.Drawing.Size(60, 24);
+            this.GetBatch.Size = new System.Drawing.Size(80, 30);
             this.GetBatch.TabIndex = 227;
             this.GetBatch.Text = "获取批";
             this.GetBatch.UseVisualStyleBackColor = true;
@@ -201,11 +211,11 @@
             this.obd_sncode,
             this.obd_builddate});
             this.OutBoxDGV.EnableContentClick = false;
-            this.OutBoxDGV.Location = new System.Drawing.Point(29, 225);
-            this.OutBoxDGV.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.OutBoxDGV.Location = new System.Drawing.Point(39, 281);
+            this.OutBoxDGV.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OutBoxDGV.Name = "OutBoxDGV";
             this.OutBoxDGV.RowTemplate.Height = 27;
-            this.OutBoxDGV.Size = new System.Drawing.Size(582, 279);
+            this.OutBoxDGV.Size = new System.Drawing.Size(776, 349);
             this.OutBoxDGV.TabIndex = 228;
             this.OutBoxDGV.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.OutBoxDGV_CellContentClick);
             // 
@@ -248,9 +258,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(622, 225);
+            this.OperateResult.Location = new System.Drawing.Point(829, 281);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(236, 282);
+            this.OperateResult.Size = new System.Drawing.Size(313, 352);
             this.OperateResult.TabIndex = 229;
             this.OperateResult.Text = "";
             // 
@@ -259,10 +270,11 @@
             this.sncode.AllPower = "";
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(105, 522);
+            this.sncode.Location = new System.Drawing.Point(140, 652);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4);
             this.sncode.Name = "sncode";
             this.sncode.Power = "";
-            this.sncode.Size = new System.Drawing.Size(154, 21);
+            this.sncode.Size = new System.Drawing.Size(204, 25);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -274,9 +286,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.Location = new System.Drawing.Point(26, 520);
+            this.label1.Location = new System.Drawing.Point(35, 650);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(58, 21);
+            this.label1.Size = new System.Drawing.Size(72, 27);
             this.label1.TabIndex = 230;
             this.label1.Text = "序列号";
             // 
@@ -284,9 +297,10 @@
             // 
             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(418, 522);
+            this.choosedsn_label.Location = new System.Drawing.Point(557, 652);
+            this.choosedsn_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.choosedsn_label.Name = "choosedsn_label";
-            this.choosedsn_label.Size = new System.Drawing.Size(42, 21);
+            this.choosedsn_label.Size = new System.Drawing.Size(52, 27);
             this.choosedsn_label.TabIndex = 232;
             this.choosedsn_label.Text = "已选";
             // 
@@ -294,9 +308,10 @@
             // 
             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(466, 522);
+            this.choosedsn.Location = new System.Drawing.Point(621, 652);
+            this.choosedsn.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.choosedsn.Name = "choosedsn";
-            this.choosedsn.Size = new System.Drawing.Size(19, 21);
+            this.choosedsn.Size = new System.Drawing.Size(24, 27);
             this.choosedsn.TabIndex = 233;
             this.choosedsn.Text = "0";
             // 
@@ -304,9 +319,10 @@
             // 
             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(560, 522);
+            this.totalsn.Location = new System.Drawing.Point(747, 652);
+            this.totalsn.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.totalsn.Name = "totalsn";
-            this.totalsn.Size = new System.Drawing.Size(19, 21);
+            this.totalsn.Size = new System.Drawing.Size(24, 27);
             this.totalsn.TabIndex = 235;
             this.totalsn.Text = "0";
             // 
@@ -314,9 +330,10 @@
             // 
             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(515, 522);
+            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.Name = "totalsn_label";
-            this.totalsn_label.Size = new System.Drawing.Size(42, 21);
+            this.totalsn_label.Size = new System.Drawing.Size(52, 27);
             this.totalsn_label.TabIndex = 234;
             this.totalsn_label.Text = "总数";
             // 
@@ -325,10 +342,11 @@
             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(144, 191);
+            this.new_checkno.Location = new System.Drawing.Point(192, 239);
+            this.new_checkno.Margin = new System.Windows.Forms.Padding(4);
             this.new_checkno.Name = "new_checkno";
             this.new_checkno.Power = "";
-            this.new_checkno.Size = new System.Drawing.Size(411, 21);
+            this.new_checkno.Size = new System.Drawing.Size(547, 25);
             this.new_checkno.Str = null;
             this.new_checkno.Str1 = null;
             this.new_checkno.Str2 = null;
@@ -339,16 +357,17 @@
             // 
             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(64, 190);
+            this.new_checkno_lable.Location = new System.Drawing.Point(85, 238);
+            this.new_checkno_lable.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.new_checkno_lable.Name = "new_checkno_lable";
-            this.new_checkno_lable.Size = new System.Drawing.Size(74, 21);
+            this.new_checkno_lable.Size = new System.Drawing.Size(92, 27);
             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.pr_detail);
             this.groupBoxWithBorder2.Controls.Add(this.obd_outboxcode);
             this.groupBoxWithBorder2.Controls.Add(this.ob_checkno_label);
             this.groupBoxWithBorder2.Controls.Add(this.ob_checkno);
@@ -356,20 +375,30 @@
             this.groupBoxWithBorder2.Controls.Add(this.ms_sncode);
             this.groupBoxWithBorder2.Controls.Add(this.obd_outboxcode_label);
             this.groupBoxWithBorder2.Controls.Add(this.ob_prodcode_label);
-            this.groupBoxWithBorder2.Controls.Add(this.pr_spec_label);
+            this.groupBoxWithBorder2.Controls.Add(this.pr_detail_label);
             this.groupBoxWithBorder2.Controls.Add(this.ob_prodcode);
             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(29, 6);
-            this.groupBoxWithBorder2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBoxWithBorder2.Location = new System.Drawing.Point(39, 8);
+            this.groupBoxWithBorder2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBoxWithBorder2.Name = "groupBoxWithBorder2";
-            this.groupBoxWithBorder2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.groupBoxWithBorder2.Size = new System.Drawing.Size(828, 168);
+            this.groupBoxWithBorder2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBoxWithBorder2.Size = new System.Drawing.Size(1104, 210);
             this.groupBoxWithBorder2.TabIndex = 238;
             this.groupBoxWithBorder2.TabStop = false;
             this.groupBoxWithBorder2.Text = "抽检信息";
             this.groupBoxWithBorder2.TextColor = System.Drawing.Color.Black;
             // 
+            // pr_detail
+            // 
+            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(484, 170);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail.Name = "pr_detail";
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
+            this.pr_detail.TabIndex = 228;
+            // 
             // SplitCheckNo
             // 
             this.SplitCheckNo.AllPower = "";
@@ -378,32 +407,23 @@
             this.SplitCheckNo.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.SplitCheckNo.Image = null;
             this.SplitCheckNo.IsShowBorder = true;
-            this.SplitCheckNo.Location = new System.Drawing.Point(277, 520);
+            this.SplitCheckNo.Location = new System.Drawing.Point(369, 650);
+            this.SplitCheckNo.Margin = new System.Windows.Forms.Padding(4);
             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(60, 24);
+            this.SplitCheckNo.Size = new System.Drawing.Size(80, 30);
             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(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(883, 557);
+            this.ClientSize = new System.Drawing.Size(1177, 696);
             this.Controls.Add(this.SplitCheckNo);
             this.Controls.Add(this.groupBoxWithBorder2);
             this.Controls.Add(this.new_checkno);
@@ -417,7 +437,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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "OQC_CheckNoSplit";
             this.Tag = "OQC!CheckNoSplit";
             this.Text = "OQC_CheckNoSplit";
@@ -440,7 +460,7 @@
         private CustomControl.TextBoxWithIcon.EnterTextBox ms_sncode;
         private System.Windows.Forms.Label ms_sncode_label;
         private System.Windows.Forms.Label ob_prodcode_label;
-        private System.Windows.Forms.Label pr_spec_label;
+        private System.Windows.Forms.Label pr_detail_label;
         private System.Windows.Forms.Label ob_prodcode;
         private CustomControl.ButtonUtil.NormalButton GetBatch;
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum OutBoxDGV;
@@ -460,6 +480,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;
+        private System.Windows.Forms.Label pr_detail;
     }
 }

+ 1 - 1
UAS-MES/PublicMethod/LogicHandler.cs

@@ -498,7 +498,7 @@ namespace UAS_MES.PublicMethod
                     break;
                 case "OQCCHECKNOSPLIT":
                     sql.Clear();
-                    sql.Append("select ob_checkno,ob_makecode,ob_prodcode,ob_nowcheckqty,pr_spec||'|'||pr_detail pr_spec,ob_ngqty,ob_okqty,");
+                    sql.Append("select ob_checkno,ob_makecode,ob_prodcode,ob_nowcheckqty,pr_detail,ob_ngqty,ob_okqty,");
                     sql.Append("ob_remark,ob_makecode,ob_status,ob_projectcode,ob_aqlcode,ob_maxngacceptqty from OQCBatch left join product on ");
                     sql.Append("pr_code=ob_prodcode left join oqcitems on oi_checkno =ob_checkno and oi_projectcode =ob_projectcode where ob_checkno='" + iCheckNo + "' and ob_status='UNCHECK'");
                     Form = (DataTable)dh.ExecuteSql(sql.ToString(), "select");