Merge branch 'master' of ssh://10.10.101.21/source/mes-client

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

@@ -36,15 +36,17 @@
             this.SaveWeight = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.weight = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.pa_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.label2 = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
             // outboxcode_label
             // 
             this.outboxcode_label.AutoSize = true;
             this.outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.outboxcode_label.Location = new System.Drawing.Point(107, 97);
+            this.outboxcode_label.Location = new System.Drawing.Point(119, 121);
+            this.outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.outboxcode_label.Name = "outboxcode_label";
-            this.outboxcode_label.Size = new System.Drawing.Size(58, 21);
+            this.outboxcode_label.Size = new System.Drawing.Size(72, 27);
             this.outboxcode_label.TabIndex = 168;
             this.outboxcode_label.Text = "栈板号";
             // 
@@ -52,9 +54,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(107, 153);
+            this.label1.Location = new System.Drawing.Point(119, 191);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(74, 21);
+            this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 170;
             this.label1.Text = "栈板重量";
             // 
@@ -65,12 +68,13 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = null;
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(502, 320);
+            this.Clean.Location = new System.Drawing.Point(635, 400);
+            this.Clean.Margin = new System.Windows.Forms.Padding(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(75, 28);
+            this.Clean.Size = new System.Drawing.Size(100, 35);
             this.Clean.TabIndex = 173;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = false;
@@ -79,9 +83,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(425, 12);
+            this.OperateResult.Location = new System.Drawing.Point(511, 16);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(226, 302);
+            this.OperateResult.Size = new System.Drawing.Size(346, 376);
             this.OperateResult.TabIndex = 172;
             this.OperateResult.Text = "";
             // 
@@ -92,12 +97,13 @@
             this.SaveWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("SaveWeight.DownImage")));
             this.SaveWeight.Image = null;
             this.SaveWeight.IsShowBorder = true;
-            this.SaveWeight.Location = new System.Drawing.Point(201, 216);
+            this.SaveWeight.Location = new System.Drawing.Point(244, 270);
+            this.SaveWeight.Margin = new System.Windows.Forms.Padding(4);
             this.SaveWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("SaveWeight.MoveImage")));
             this.SaveWeight.Name = "SaveWeight";
             this.SaveWeight.NormalImage = ((System.Drawing.Image)(resources.GetObject("SaveWeight.NormalImage")));
             this.SaveWeight.Power = null;
-            this.SaveWeight.Size = new System.Drawing.Size(75, 28);
+            this.SaveWeight.Size = new System.Drawing.Size(100, 35);
             this.SaveWeight.TabIndex = 171;
             this.SaveWeight.Text = "保存";
             this.SaveWeight.UseVisualStyleBackColor = false;
@@ -108,10 +114,11 @@
             this.weight.AllPower = "ifall";
             this.weight.BackColor = System.Drawing.Color.White;
             this.weight.ID = null;
-            this.weight.Location = new System.Drawing.Point(201, 153);
+            this.weight.Location = new System.Drawing.Point(244, 191);
+            this.weight.Margin = new System.Windows.Forms.Padding(4);
             this.weight.Name = "weight";
             this.weight.Power = "ifwrite";
-            this.weight.Size = new System.Drawing.Size(147, 21);
+            this.weight.Size = new System.Drawing.Size(195, 25);
             this.weight.Str = null;
             this.weight.Str1 = null;
             this.weight.Str2 = null;
@@ -123,21 +130,34 @@
             this.pa_outboxcode.AllPower = "ifall";
             this.pa_outboxcode.BackColor = System.Drawing.Color.White;
             this.pa_outboxcode.ID = null;
-            this.pa_outboxcode.Location = new System.Drawing.Point(201, 97);
+            this.pa_outboxcode.Location = new System.Drawing.Point(244, 121);
+            this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(4);
             this.pa_outboxcode.Name = "pa_outboxcode";
             this.pa_outboxcode.Power = "ifwrite";
-            this.pa_outboxcode.Size = new System.Drawing.Size(147, 21);
+            this.pa_outboxcode.Size = new System.Drawing.Size(195, 25);
             this.pa_outboxcode.Str = null;
             this.pa_outboxcode.Str1 = null;
             this.pa_outboxcode.Str2 = null;
             this.pa_outboxcode.TabIndex = 167;
             this.pa_outboxcode.Tag = "NoAuto";
             // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.Location = new System.Drawing.Point(443, 189);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(36, 27);
+            this.label2.TabIndex = 174;
+            this.label2.Text = "kg";
+            // 
             // Make_PalletWeightRecord
             // 
-            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(662, 376);
+            this.ClientSize = new System.Drawing.Size(883, 470);
+            this.Controls.Add(this.label2);
             this.Controls.Add(this.Clean);
             this.Controls.Add(this.OperateResult);
             this.Controls.Add(this.SaveWeight);
@@ -146,6 +166,7 @@
             this.Controls.Add(this.outboxcode_label);
             this.Controls.Add(this.pa_outboxcode);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_PalletWeightRecord";
             this.Tag = "Make!PalletWeightRecord";
             this.Text = "Make_PalletWeightRecord";
@@ -163,5 +184,6 @@
         private CustomControl.ButtonUtil.NormalButton SaveWeight;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private CustomControl.ButtonUtil.NormalButton Clean;
+        private System.Windows.Forms.Label label2;
     }
 }

UAS-MES/FunctionCode/Make/Make_PalletWeightRecord.cs

@@ -35,11 +35,10 @@ namespace UAS_MES.Make
                     return;
                 }
                 dh.UpdateByCondition("package", "PA_WEIGHT='" + PalletWeight + "'", "pa_outboxcode='" + pa_outboxcode.Text + "'");
-                pa_outboxcode.Clear();
+                OperateResult.AppendText(">>栈板号" + pa_outboxcode.Text + "记录重量" + weight.Text + "kg成功\n", Color.Green, pa_outboxcode);
                 weight.Clear();
-                OperateResult.AppendText(">>栈板号" + pa_outboxcode.Text + "记录重量成功\n");
             }
-            else OperateResult.AppendText(">>栈板号" + pa_outboxcode.Text + "不存在\n");
+            else OperateResult.AppendText(">>栈板号" + pa_outboxcode.Text + "不存在\n", Color.Red, pa_outboxcode);
         }
 
         private void Clean_Click(object sender, EventArgs e)

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;
     }
 }

UAS-MES/FunctionCode/Query/Query_ExeProgress.Designer.cs

@@ -31,6 +31,15 @@
             this.sn_code_label = new System.Windows.Forms.Label();
             this.SerialPanel = new System.Windows.Forms.Panel();
             this.CraftInfDgv = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
+            this.mp_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mp_makecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ma_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mp_sourcecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mp_indate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ma_craftcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.sc_linecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mp_inman = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.em_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.groupBoxWithBorder1 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.label1 = new System.Windows.Forms.Label();
             this.pictureBox4 = new System.Windows.Forms.PictureBox();
@@ -41,15 +50,6 @@
             this.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.mp_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.mp_makecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ma_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.mp_sourcecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.mp_indate = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ma_craftcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.sc_linecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.mp_inman = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.em_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.CraftInfDgv)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
@@ -62,9 +62,10 @@
             // 
             this.sn_code_label.AutoSize = true;
             this.sn_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sn_code_label.Location = new System.Drawing.Point(10, 11);
+            this.sn_code_label.Location = new System.Drawing.Point(15, 16);
+            this.sn_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sn_code_label.Name = "sn_code_label";
-            this.sn_code_label.Size = new System.Drawing.Size(58, 21);
+            this.sn_code_label.Size = new System.Drawing.Size(86, 31);
             this.sn_code_label.TabIndex = 183;
             this.sn_code_label.Text = "序列号";
             // 
@@ -72,12 +73,13 @@
             // 
             this.SerialPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.SerialPanel.AutoScroll = true;
             this.SerialPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.SerialPanel.Location = new System.Drawing.Point(14, 107);
-            this.SerialPanel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.SerialPanel.Location = new System.Drawing.Point(21, 160);
             this.SerialPanel.Name = "SerialPanel";
-            this.SerialPanel.Size = new System.Drawing.Size(950, 254);
+            this.SerialPanel.Size = new System.Drawing.Size(1423, 379);
             this.SerialPanel.TabIndex = 194;
+            this.SerialPanel.Scroll += new System.Windows.Forms.ScrollEventHandler(this.SerialPanel_Scroll);
             this.SerialPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.SerialPanel_Paint);
             // 
             // CraftInfDgv
@@ -95,13 +97,74 @@
             this.sc_linecode,
             this.mp_inman,
             this.em_name});
-            this.CraftInfDgv.Location = new System.Drawing.Point(0, 388);
-            this.CraftInfDgv.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.CraftInfDgv.EnableContentClick = true;
+            this.CraftInfDgv.Location = new System.Drawing.Point(0, 582);
             this.CraftInfDgv.Name = "CraftInfDgv";
             this.CraftInfDgv.RowTemplate.Height = 27;
-            this.CraftInfDgv.Size = new System.Drawing.Size(975, 190);
+            this.CraftInfDgv.Size = new System.Drawing.Size(1462, 285);
             this.CraftInfDgv.TabIndex = 193;
             // 
+            // mp_sncode
+            // 
+            this.mp_sncode.DataPropertyName = "mp_sncode";
+            this.mp_sncode.HeaderText = "序列号";
+            this.mp_sncode.Name = "mp_sncode";
+            this.mp_sncode.Width = 120;
+            // 
+            // mp_makecode
+            // 
+            this.mp_makecode.DataPropertyName = "mp_makecode";
+            this.mp_makecode.HeaderText = "工单代码";
+            this.mp_makecode.Name = "mp_makecode";
+            this.mp_makecode.Width = 120;
+            // 
+            // ma_prodcode
+            // 
+            this.ma_prodcode.DataPropertyName = "ma_prodcode";
+            this.ma_prodcode.HeaderText = "产品代码";
+            this.ma_prodcode.Name = "ma_prodcode";
+            this.ma_prodcode.Width = 120;
+            // 
+            // mp_sourcecode
+            // 
+            this.mp_sourcecode.DataPropertyName = "mp_sourcecode";
+            this.mp_sourcecode.HeaderText = "资源编号";
+            this.mp_sourcecode.Name = "mp_sourcecode";
+            this.mp_sourcecode.Width = 120;
+            // 
+            // mp_indate
+            // 
+            this.mp_indate.DataPropertyName = "mp_indate";
+            this.mp_indate.HeaderText = "过站时间";
+            this.mp_indate.Name = "mp_indate";
+            this.mp_indate.Width = 120;
+            // 
+            // ma_craftcode
+            // 
+            this.ma_craftcode.DataPropertyName = "ma_craftcode";
+            this.ma_craftcode.HeaderText = "途程代码";
+            this.ma_craftcode.Name = "ma_craftcode";
+            this.ma_craftcode.Width = 120;
+            // 
+            // sc_linecode
+            // 
+            this.sc_linecode.DataPropertyName = "sc_linecode";
+            this.sc_linecode.HeaderText = "产线";
+            this.sc_linecode.Name = "sc_linecode";
+            this.sc_linecode.Width = 120;
+            // 
+            // mp_inman
+            // 
+            this.mp_inman.DataPropertyName = "mp_inman";
+            this.mp_inman.HeaderText = "人员工号";
+            this.mp_inman.Name = "mp_inman";
+            // 
+            // em_name
+            // 
+            this.em_name.DataPropertyName = "em_name";
+            this.em_name.HeaderText = "人员姓名";
+            this.em_name.Name = "em_name";
+            // 
             // groupBoxWithBorder1
             // 
             this.groupBoxWithBorder1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
@@ -116,9 +179,11 @@
             this.groupBoxWithBorder1.Controls.Add(this.label2);
             this.groupBoxWithBorder1.Controls.Add(this.label3);
             this.groupBoxWithBorder1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder1.Location = new System.Drawing.Point(12, 40);
+            this.groupBoxWithBorder1.Location = new System.Drawing.Point(18, 60);
+            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(4);
             this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
-            this.groupBoxWithBorder1.Size = new System.Drawing.Size(953, 40);
+            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(4);
+            this.groupBoxWithBorder1.Size = new System.Drawing.Size(1430, 60);
             this.groupBoxWithBorder1.TabIndex = 192;
             this.groupBoxWithBorder1.TabStop = false;
             this.groupBoxWithBorder1.Text = "颜色说明";
@@ -128,27 +193,30 @@
             // 
             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(848, 14);
+            this.label1.Location = new System.Drawing.Point(1272, 21);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(74, 21);
+            this.label1.Size = new System.Drawing.Size(110, 31);
             this.label1.TabIndex = 193;
             this.label1.Text = "尚未执行";
             // 
             // pictureBox4
             // 
             this.pictureBox4.BackColor = System.Drawing.Color.White;
-            this.pictureBox4.Location = new System.Drawing.Point(776, 12);
+            this.pictureBox4.Location = new System.Drawing.Point(1164, 18);
+            this.pictureBox4.Margin = new System.Windows.Forms.Padding(4);
             this.pictureBox4.Name = "pictureBox4";
-            this.pictureBox4.Size = new System.Drawing.Size(60, 20);
+            this.pictureBox4.Size = new System.Drawing.Size(90, 30);
             this.pictureBox4.TabIndex = 192;
             this.pictureBox4.TabStop = false;
             // 
             // pictureBox2
             // 
             this.pictureBox2.BackColor = System.Drawing.Color.Green;
-            this.pictureBox2.Location = new System.Drawing.Point(99, 12);
+            this.pictureBox2.Location = new System.Drawing.Point(148, 18);
+            this.pictureBox2.Margin = new System.Windows.Forms.Padding(4);
             this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(60, 20);
+            this.pictureBox2.Size = new System.Drawing.Size(90, 30);
             this.pictureBox2.TabIndex = 187;
             this.pictureBox2.TabStop = false;
             // 
@@ -156,27 +224,30 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(653, 14);
+            this.label4.Location = new System.Drawing.Point(980, 21);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(58, 21);
+            this.label4.Size = new System.Drawing.Size(86, 31);
             this.label4.TabIndex = 191;
             this.label4.Text = "已报废";
             // 
             // pictureBox1
             // 
             this.pictureBox1.BackColor = System.Drawing.Color.Red;
-            this.pictureBox1.Location = new System.Drawing.Point(338, 12);
+            this.pictureBox1.Location = new System.Drawing.Point(507, 18);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(60, 20);
+            this.pictureBox1.Size = new System.Drawing.Size(90, 30);
             this.pictureBox1.TabIndex = 186;
             this.pictureBox1.TabStop = false;
             // 
             // pictureBox3
             // 
             this.pictureBox3.BackColor = System.Drawing.Color.Black;
-            this.pictureBox3.Location = new System.Drawing.Point(581, 12);
+            this.pictureBox3.Location = new System.Drawing.Point(872, 18);
+            this.pictureBox3.Margin = new System.Windows.Forms.Padding(4);
             this.pictureBox3.Name = "pictureBox3";
-            this.pictureBox3.Size = new System.Drawing.Size(60, 20);
+            this.pictureBox3.Size = new System.Drawing.Size(90, 30);
             this.pictureBox3.TabIndex = 190;
             this.pictureBox3.TabStop = false;
             // 
@@ -184,9 +255,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(171, 14);
+            this.label2.Location = new System.Drawing.Point(256, 21);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(122, 21);
+            this.label2.Size = new System.Drawing.Size(182, 31);
             this.label2.TabIndex = 188;
             this.label2.Text = "已执行且为良品";
             // 
@@ -194,9 +266,10 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(410, 14);
+            this.label3.Location = new System.Drawing.Point(615, 21);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(138, 21);
+            this.label3.Size = new System.Drawing.Size(206, 31);
             this.label3.TabIndex = 189;
             this.label3.Text = "已执行且为不良品";
             // 
@@ -205,10 +278,11 @@
             this.sn_code.AllPower = null;
             this.sn_code.BackColor = System.Drawing.Color.White;
             this.sn_code.ID = null;
-            this.sn_code.Location = new System.Drawing.Point(92, 13);
+            this.sn_code.Location = new System.Drawing.Point(138, 20);
+            this.sn_code.Margin = new System.Windows.Forms.Padding(4);
             this.sn_code.Name = "sn_code";
             this.sn_code.Power = null;
-            this.sn_code.Size = new System.Drawing.Size(145, 21);
+            this.sn_code.Size = new System.Drawing.Size(216, 28);
             this.sn_code.Str = null;
             this.sn_code.Str1 = null;
             this.sn_code.Str2 = null;
@@ -216,91 +290,31 @@
             this.sn_code.Tag = "NoAuto";
             this.sn_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sn_code_KeyDown);
             // 
-            // mp_sncode
-            // 
-            this.mp_sncode.DataPropertyName = "mp_sncode";
-            this.mp_sncode.HeaderText = "序列号";
-            this.mp_sncode.Name = "mp_sncode";
-            this.mp_sncode.Width = 120;
-            // 
-            // mp_makecode
-            // 
-            this.mp_makecode.DataPropertyName = "mp_makecode";
-            this.mp_makecode.HeaderText = "工单代码";
-            this.mp_makecode.Name = "mp_makecode";
-            this.mp_makecode.Width = 120;
-            // 
-            // ma_prodcode
-            // 
-            this.ma_prodcode.DataPropertyName = "ma_prodcode";
-            this.ma_prodcode.HeaderText = "产品代码";
-            this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Width = 120;
-            // 
-            // mp_sourcecode
-            // 
-            this.mp_sourcecode.DataPropertyName = "mp_sourcecode";
-            this.mp_sourcecode.HeaderText = "资源编号";
-            this.mp_sourcecode.Name = "mp_sourcecode";
-            this.mp_sourcecode.Width = 120;
-            // 
-            // mp_indate
-            // 
-            this.mp_indate.DataPropertyName = "mp_indate";
-            this.mp_indate.HeaderText = "过站时间";
-            this.mp_indate.Name = "mp_indate";
-            this.mp_indate.Width = 120;
-            // 
-            // ma_craftcode
-            // 
-            this.ma_craftcode.DataPropertyName = "ma_craftcode";
-            this.ma_craftcode.HeaderText = "途程代码";
-            this.ma_craftcode.Name = "ma_craftcode";
-            this.ma_craftcode.Width = 120;
-            // 
-            // sc_linecode
-            // 
-            this.sc_linecode.DataPropertyName = "sc_linecode";
-            this.sc_linecode.HeaderText = "产线";
-            this.sc_linecode.Name = "sc_linecode";
-            this.sc_linecode.Width = 120;
-            // 
-            // mp_inman
-            // 
-            this.mp_inman.DataPropertyName = "mp_inman";
-            this.mp_inman.HeaderText = "人员工号";
-            this.mp_inman.Name = "mp_inman";
-            // 
-            // em_name
-            // 
-            this.em_name.DataPropertyName = "em_name";
-            this.em_name.HeaderText = "人员姓名";
-            this.em_name.Name = "em_name";
-            // 
             // Query_ExeProgress
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(975, 578);
+            this.ClientSize = new System.Drawing.Size(1462, 867);
             this.Controls.Add(this.SerialPanel);
             this.Controls.Add(this.CraftInfDgv);
             this.Controls.Add(this.groupBoxWithBorder1);
             this.Controls.Add(this.sn_code);
             this.Controls.Add(this.sn_code_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Query_ExeProgress";
             this.Tag = "Query!ExeProgress";
             this.Text = "工单执行进度";
             this.Load += new System.EventHandler(this.工单执行进度_Load);
             this.SizeChanged += new System.EventHandler(this.工单执行进度_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.CraftInfDgv)).EndInit();
-            this.groupBoxWithBorder1.ResumeLayout(false);
+            this.groupBoxWithBorder1.ResumeLayout(true);
             this.groupBoxWithBorder1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-MES/FunctionCode/Query/Query_ExeProgress.cs

@@ -118,6 +118,7 @@ namespace UAS_MES.Query
                         }
                     }
                     currentStep = dt.Rows[idCount - 1]["ms_stepcode"].ToString();
+                    bool flag = false;//记录返工单开始就是不良的情况
                     //如果只有一个单
                     if (idCount == 1)
                     {
@@ -134,6 +135,11 @@ namespace UAS_MES.Query
                     else//有至少两个工单，之前的工单肯定是已经完工的
                     {
                         PaintColor.Add(Brushes.Green);
+                        if (BadStep == "" && ((dt.Rows[idCount - 1]["ms_status"].ToString() == "3" && ifRework == "0") || (dt.Rows[idCount - 1]["ms_reworkstatus"].ToString() == "3" && ifRework == "-1")))
+                        {
+                            //单独记录返工前oqc判不良
+                            flag = true;
+                        }
                     }
                     //查询执行过的步骤
                     sql.Clear();
@@ -224,8 +230,15 @@ namespace UAS_MES.Query
                         }
                         else
                         {
-                            //就是之前生产的途程，为绿色
-                            PaintColor.Add(Brushes.Green);
+                            //就是之前生产的途程，为绿色，除了返工
+                            if (flag && (dt.Rows[i + 1]["ms_id"].ToString() == ms_id.Rows[ms_id.Rows.Count - 1]["ms_id"].ToString()))
+                            {
+                                PaintColor.Add(Brushes.Red);
+                            }
+                            else
+                            {
+                                PaintColor.Add(Brushes.Green);
+                            }
                         }
                     }
                     if (ifRework != "0")
@@ -313,12 +326,12 @@ namespace UAS_MES.Query
 
                         //设定param文本框的位置
                         //Param.Location = new Point(x + r.Width / 14 * RectangleCountEachRow, y + r.Height / 10 * 4);
-                        Param.Location = new Point(x + (int)(r.Width - size.Width) / 2, y + (int)(r.Height - size.Height) / 2);
+                        Param.Location = new Point(SerialPanel.AutoScrollPosition.X + x + (int)(r.Width - size.Width) / 2, SerialPanel.AutoScrollPosition.Y + y + (int)(r.Height - size.Height) / 2);
                         graphics.Dispose();
                         //如果在奇数行
                         if (i % 2 != 0)
                         {
-                            r.Location = new Point(x, y);
+                            r.Location = new Point(SerialPanel.AutoScrollPosition.X + x, SerialPanel.AutoScrollPosition.Y + y);
                             g.FillRectangle(PaintColor[j], r);
                             //填充方块内的信息
                             if (SerialPanel.Controls[Param.Name] == null)
@@ -329,13 +342,13 @@ namespace UAS_MES.Query
                             //如果是一行中的箭头
                             if (j + 1 < RectangleCountEachRow * i)
                             {
-                                g.DrawLine(p, x + r.Width + 10, y + r.Height / 2, x + ScreenWidth / (RectangleCountEachRow), y + r.Height / 2);
+                                g.DrawLine(p, SerialPanel.AutoScrollPosition.X+ x + r.Width + 10, SerialPanel.AutoScrollPosition.Y + y + r.Height / 2, SerialPanel.AutoScrollPosition.X + x + ScreenWidth / (RectangleCountEachRow), SerialPanel.AutoScrollPosition.Y + y + r.Height / 2);
                                 x += ScreenWidth / RectangleCountEachRow;
                             }
                             //如果是行的最后一个的箭头
                             else if (j + 1 == RectangleCountEachRow * i)
                             {
-                                g.DrawLine(p, x + r.Width / 2, y + r.Height + 10, x + r.Width / 2, y + r.Height + r.Height);
+                                g.DrawLine(p, SerialPanel.AutoScrollPosition.X + x + r.Width / 2, SerialPanel.AutoScrollPosition.Y + y + r.Height + 10, SerialPanel.AutoScrollPosition.X + x + r.Width / 2, SerialPanel.AutoScrollPosition.Y + y + r.Height + r.Height);
                                 y = y + r.Height + r.Height;
                             }
 
@@ -343,7 +356,7 @@ namespace UAS_MES.Query
                         //如果在偶数行
                         else
                         {
-                            r.Location = new Point(x, y);
+                            r.Location = new Point(SerialPanel.AutoScrollPosition.X + x, SerialPanel.AutoScrollPosition.Y + y);
                             g.FillRectangle(PaintColor[j], r);
                             //填充文字信息
                             //存在这个名称的则不进行添加
@@ -359,13 +372,13 @@ namespace UAS_MES.Query
                             //如果不是本行的最后一个画横向的箭头
                             if (j + 1 < RectangleCountEachRow * i)
                             {
-                                g.DrawLine(p, (x - 10), (y + r.Height / 2), (x - ScreenWidth / RectangleCountEachRow + r.Width), (y + r.Height / 2));
+                                g.DrawLine(p, SerialPanel.AutoScrollPosition.X + (x - 10), SerialPanel.AutoScrollPosition.Y + (y + r.Height / 2), SerialPanel.AutoScrollPosition.X + (x - ScreenWidth / RectangleCountEachRow + r.Width), SerialPanel.AutoScrollPosition.Y + (y + r.Height / 2));
                                 x -= ScreenWidth / RectangleCountEachRow;
                             }
                             //如果是最后一个画纵向的箭头
                             else if (j + 1 == RectangleCountEachRow * i)
                             {
-                                g.DrawLine(p, (x + r.Width / 2), (y + r.Height + 10), (x + r.Width / 2), (y + r.Height + r.Height));
+                                g.DrawLine(p, SerialPanel.AutoScrollPosition.X + (x + r.Width / 2), SerialPanel.AutoScrollPosition.Y + (y + r.Height + 10), SerialPanel.AutoScrollPosition.X + (x + r.Width / 2), SerialPanel.AutoScrollPosition.Y + (y + r.Height + r.Height));
                                 y = y + r.Height + r.Height;
                             }
                         }
@@ -374,5 +387,12 @@ namespace UAS_MES.Query
                 }
             }
         }
+
+        private void SerialPanel_Scroll(object sender, ScrollEventArgs e)
+        {
+            Graphics g = this.SerialPanel.CreateGraphics();
+            g.Clear(this.BackColor);
+            SerialPanel.Refresh();
+        }
     }
 }

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");