绑定界面添加CellID 查询界面优化

UAS_MES_ZT/FunctionCode/Query/Query_ExeProgress.Designer.cs

@@ -75,6 +75,10 @@
             this.label3 = new System.Windows.Forms.Label();
             this.ms_endremark = new System.Windows.Forms.TextBox();
             this.label10 = new System.Windows.Forms.Label();
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.label11 = new System.Windows.Forms.Label();
+            this.ms_othcode1 = new System.Windows.Forms.TextBox();
+            this.label12 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.CraftmaterialData)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.CraftInfDgv)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
@@ -87,10 +91,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(18, 12);
-            this.sn_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sn_code_label.Location = new System.Drawing.Point(24, 16);
+            this.sn_code_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.sn_code_label.Name = "sn_code_label";
-            this.sn_code_label.Size = new System.Drawing.Size(86, 31);
+            this.sn_code_label.Size = new System.Drawing.Size(114, 41);
             this.sn_code_label.TabIndex = 183;
             this.sn_code_label.Text = "序列号";
             // 
@@ -100,9 +104,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.SerialPanel.AutoScroll = true;
             this.SerialPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.SerialPanel.Location = new System.Drawing.Point(18, 138);
+            this.SerialPanel.Location = new System.Drawing.Point(24, 184);
+            this.SerialPanel.Margin = new System.Windows.Forms.Padding(4);
             this.SerialPanel.Name = "SerialPanel";
-            this.SerialPanel.Size = new System.Drawing.Size(1418, 186);
+            this.SerialPanel.Size = new System.Drawing.Size(1889, 247);
             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);
@@ -111,89 +116,89 @@
             // 
             this.ma_code_label.AutoSize = true;
             this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code_label.Location = new System.Drawing.Point(363, 12);
-            this.ma_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_code_label.Location = new System.Drawing.Point(484, 16);
+            this.ma_code_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.ma_code_label.Name = "ma_code_label";
-            this.ma_code_label.Size = new System.Drawing.Size(86, 31);
+            this.ma_code_label.Size = new System.Drawing.Size(114, 41);
             this.ma_code_label.TabIndex = 195;
             this.ma_code_label.Text = "工单号";
             // 
             // ma_code
             // 
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code.Location = new System.Drawing.Point(459, 8);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
+            this.ma_code.Location = new System.Drawing.Point(612, 11);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(5);
             this.ma_code.Name = "ma_code";
-            this.ma_code.Size = new System.Drawing.Size(249, 39);
+            this.ma_code.Size = new System.Drawing.Size(331, 50);
             this.ma_code.TabIndex = 196;
             // 
             // label5
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label5.Location = new System.Drawing.Point(1167, 12);
-            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label5.Location = new System.Drawing.Point(1556, 16);
+            this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(86, 31);
+            this.label5.Size = new System.Drawing.Size(114, 41);
             this.label5.TabIndex = 197;
             this.label5.Text = "栈板号";
             // 
             // pallet
             // 
             this.pallet.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pallet.Location = new System.Drawing.Point(1248, 8);
-            this.pallet.Margin = new System.Windows.Forms.Padding(4);
+            this.pallet.Location = new System.Drawing.Point(1664, 11);
+            this.pallet.Margin = new System.Windows.Forms.Padding(5);
             this.pallet.Name = "pallet";
-            this.pallet.Size = new System.Drawing.Size(188, 39);
+            this.pallet.Size = new System.Drawing.Size(249, 50);
             this.pallet.TabIndex = 198;
             // 
             // label6
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label6.Location = new System.Drawing.Point(716, 12);
-            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label6.Location = new System.Drawing.Point(955, 16);
+            this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(110, 31);
+            this.label6.Size = new System.Drawing.Size(146, 41);
             this.label6.TabIndex = 199;
             this.label6.Text = "卡通箱号";
             // 
             // ms_outboxcode
             // 
             this.ms_outboxcode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ms_outboxcode.Location = new System.Drawing.Point(822, 8);
-            this.ms_outboxcode.Margin = new System.Windows.Forms.Padding(4);
+            this.ms_outboxcode.Location = new System.Drawing.Point(1096, 11);
+            this.ms_outboxcode.Margin = new System.Windows.Forms.Padding(5);
             this.ms_outboxcode.Name = "ms_outboxcode";
-            this.ms_outboxcode.Size = new System.Drawing.Size(325, 39);
+            this.ms_outboxcode.Size = new System.Drawing.Size(432, 50);
             this.ms_outboxcode.TabIndex = 200;
             // 
             // ms_checkno
             // 
             this.ms_checkno.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ms_checkno.Location = new System.Drawing.Point(138, 54);
-            this.ms_checkno.Margin = new System.Windows.Forms.Padding(4);
+            this.ms_checkno.Location = new System.Drawing.Point(184, 72);
+            this.ms_checkno.Margin = new System.Windows.Forms.Padding(5);
             this.ms_checkno.Name = "ms_checkno";
-            this.ms_checkno.Size = new System.Drawing.Size(216, 39);
+            this.ms_checkno.Size = new System.Drawing.Size(287, 50);
             this.ms_checkno.TabIndex = 203;
             // 
             // label7
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label7.Location = new System.Drawing.Point(18, 58);
-            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label7.Location = new System.Drawing.Point(24, 77);
+            this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(110, 31);
+            this.label7.Size = new System.Drawing.Size(146, 41);
             this.label7.TabIndex = 202;
             this.label7.Text = "抽检批号";
             // 
             // barcode
             // 
             this.barcode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.barcode.Location = new System.Drawing.Point(1248, 56);
-            this.barcode.Margin = new System.Windows.Forms.Padding(4);
+            this.barcode.Location = new System.Drawing.Point(1664, 75);
+            this.barcode.Margin = new System.Windows.Forms.Padding(5);
             this.barcode.Name = "barcode";
-            this.barcode.Size = new System.Drawing.Size(188, 39);
+            this.barcode.Size = new System.Drawing.Size(249, 50);
             this.barcode.TabIndex = 207;
             this.barcode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.barcode_KeyDown);
             // 
@@ -201,50 +206,50 @@
             // 
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label9.Location = new System.Drawing.Point(1167, 60);
-            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label9.Location = new System.Drawing.Point(1556, 80);
+            this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(86, 31);
+            this.label9.Size = new System.Drawing.Size(114, 41);
             this.label9.TabIndex = 206;
             this.label9.Text = "部件号";
             // 
             // pr_orispeccode
             // 
             this.pr_orispeccode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_orispeccode.Location = new System.Drawing.Point(822, 56);
-            this.pr_orispeccode.Margin = new System.Windows.Forms.Padding(4);
+            this.pr_orispeccode.Location = new System.Drawing.Point(1096, 75);
+            this.pr_orispeccode.Margin = new System.Windows.Forms.Padding(5);
             this.pr_orispeccode.Name = "pr_orispeccode";
-            this.pr_orispeccode.Size = new System.Drawing.Size(325, 39);
+            this.pr_orispeccode.Size = new System.Drawing.Size(432, 50);
             this.pr_orispeccode.TabIndex = 211;
             // 
             // label8
             // 
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label8.Location = new System.Drawing.Point(721, 60);
-            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label8.Location = new System.Drawing.Point(961, 80);
+            this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(62, 31);
+            this.label8.Size = new System.Drawing.Size(82, 41);
             this.label8.TabIndex = 210;
             this.label8.Text = "型号";
             // 
             // pr_code
             // 
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(459, 55);
-            this.pr_code.Margin = new System.Windows.Forms.Padding(4);
+            this.pr_code.Location = new System.Drawing.Point(612, 73);
+            this.pr_code.Margin = new System.Windows.Forms.Padding(5);
             this.pr_code.Name = "pr_code";
-            this.pr_code.Size = new System.Drawing.Size(249, 39);
+            this.pr_code.Size = new System.Drawing.Size(331, 50);
             this.pr_code.TabIndex = 209;
             // 
             // liaohao
             // 
             this.liaohao.AutoSize = true;
             this.liaohao.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.liaohao.Location = new System.Drawing.Point(363, 63);
-            this.liaohao.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.liaohao.Location = new System.Drawing.Point(484, 84);
+            this.liaohao.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.liaohao.Name = "liaohao";
-            this.liaohao.Size = new System.Drawing.Size(62, 31);
+            this.liaohao.Size = new System.Drawing.Size(82, 41);
             this.liaohao.TabIndex = 208;
             this.liaohao.Text = "料号";
             // 
@@ -263,11 +268,12 @@
             this.dataGridViewTextBoxColumn7,
             this.dataGridViewTextBoxColumn8});
             this.CraftmaterialData.EnableContentClick = true;
-            this.CraftmaterialData.Location = new System.Drawing.Point(18, 330);
+            this.CraftmaterialData.Location = new System.Drawing.Point(24, 440);
+            this.CraftmaterialData.Margin = new System.Windows.Forms.Padding(4);
             this.CraftmaterialData.Name = "CraftmaterialData";
             this.CraftmaterialData.RowHeadersWidth = 62;
             this.CraftmaterialData.RowTemplate.Height = 27;
-            this.CraftmaterialData.Size = new System.Drawing.Size(1422, 167);
+            this.CraftmaterialData.Size = new System.Drawing.Size(1896, 223);
             this.CraftmaterialData.TabIndex = 201;
             // 
             // dataGridViewTextBoxColumn1
@@ -351,11 +357,12 @@
             this.mp_inman,
             this.em_name});
             this.CraftInfDgv.EnableContentClick = true;
-            this.CraftInfDgv.Location = new System.Drawing.Point(18, 503);
+            this.CraftInfDgv.Location = new System.Drawing.Point(24, 671);
+            this.CraftInfDgv.Margin = new System.Windows.Forms.Padding(4);
             this.CraftInfDgv.Name = "CraftInfDgv";
             this.CraftInfDgv.RowHeadersWidth = 62;
             this.CraftInfDgv.RowTemplate.Height = 27;
-            this.CraftInfDgv.Size = new System.Drawing.Size(1436, 234);
+            this.CraftInfDgv.Size = new System.Drawing.Size(1915, 312);
             this.CraftInfDgv.TabIndex = 193;
             // 
             // mp_sncode
@@ -443,11 +450,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(135, 15);
-            this.sn_code.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.sn_code.Location = new System.Drawing.Point(180, 20);
+            this.sn_code.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
             this.sn_code.Name = "sn_code";
             this.sn_code.Power = null;
-            this.sn_code.Size = new System.Drawing.Size(216, 28);
+            this.sn_code.Size = new System.Drawing.Size(287, 35);
             this.sn_code.Str = null;
             this.sn_code.Str1 = null;
             this.sn_code.Str2 = null;
@@ -459,30 +466,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(1017, 104);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(1012, 136);
+            this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(110, 31);
+            this.label1.Size = new System.Drawing.Size(146, 41);
             this.label1.TabIndex = 219;
             this.label1.Text = "尚未执行";
             // 
             // pictureBox4
             // 
             this.pictureBox4.BackColor = System.Drawing.Color.White;
-            this.pictureBox4.Location = new System.Drawing.Point(906, 101);
-            this.pictureBox4.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.pictureBox4.Location = new System.Drawing.Point(930, 138);
+            this.pictureBox4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
             this.pictureBox4.Name = "pictureBox4";
-            this.pictureBox4.Size = new System.Drawing.Size(90, 30);
+            this.pictureBox4.Size = new System.Drawing.Size(81, 40);
             this.pictureBox4.TabIndex = 218;
             this.pictureBox4.TabStop = false;
             // 
             // pictureBox2
             // 
             this.pictureBox2.BackColor = System.Drawing.Color.Green;
-            this.pictureBox2.Location = new System.Drawing.Point(45, 101);
-            this.pictureBox2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.pictureBox2.Location = new System.Drawing.Point(24, 136);
+            this.pictureBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
             this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(90, 30);
+            this.pictureBox2.Size = new System.Drawing.Size(86, 40);
             this.pictureBox2.TabIndex = 213;
             this.pictureBox2.TabStop = false;
             // 
@@ -490,30 +497,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(812, 107);
-            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label4.Location = new System.Drawing.Point(812, 138);
+            this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(86, 31);
+            this.label4.Size = new System.Drawing.Size(114, 41);
             this.label4.TabIndex = 217;
             this.label4.Text = "已报废";
             // 
             // pictureBox1
             // 
             this.pictureBox1.BackColor = System.Drawing.Color.Red;
-            this.pictureBox1.Location = new System.Drawing.Point(359, 102);
-            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.pictureBox1.Location = new System.Drawing.Point(351, 136);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(90, 30);
+            this.pictureBox1.Size = new System.Drawing.Size(82, 40);
             this.pictureBox1.TabIndex = 212;
             this.pictureBox1.TabStop = false;
             // 
             // pictureBox3
             // 
             this.pictureBox3.BackColor = System.Drawing.Color.Black;
-            this.pictureBox3.Location = new System.Drawing.Point(702, 104);
-            this.pictureBox3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.pictureBox3.Location = new System.Drawing.Point(714, 139);
+            this.pictureBox3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
             this.pictureBox3.Name = "pictureBox3";
-            this.pictureBox3.Size = new System.Drawing.Size(90, 30);
+            this.pictureBox3.Size = new System.Drawing.Size(92, 40);
             this.pictureBox3.TabIndex = 216;
             this.pictureBox3.TabStop = false;
             // 
@@ -521,10 +528,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(155, 104);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Location = new System.Drawing.Point(113, 134);
+            this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(182, 31);
+            this.label2.Size = new System.Drawing.Size(242, 41);
             this.label2.TabIndex = 214;
             this.label2.Text = "已执行且为良品";
             // 
@@ -532,38 +539,82 @@
             // 
             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(470, 105);
-            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label3.Location = new System.Drawing.Point(434, 136);
+            this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(206, 31);
+            this.label3.Size = new System.Drawing.Size(274, 41);
             this.label3.TabIndex = 215;
             this.label3.Text = "已执行且为不良品";
             // 
             // ms_endremark
             // 
             this.ms_endremark.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ms_endremark.Location = new System.Drawing.Point(1248, 98);
-            this.ms_endremark.Margin = new System.Windows.Forms.Padding(4);
+            this.ms_endremark.Location = new System.Drawing.Point(1664, 131);
+            this.ms_endremark.Margin = new System.Windows.Forms.Padding(5);
             this.ms_endremark.Name = "ms_endremark";
-            this.ms_endremark.Size = new System.Drawing.Size(183, 39);
+            this.ms_endremark.Size = new System.Drawing.Size(243, 50);
             this.ms_endremark.TabIndex = 221;
             // 
             // label10
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label10.Location = new System.Drawing.Point(1135, 101);
-            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label10.Location = new System.Drawing.Point(1513, 135);
+            this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(110, 31);
+            this.label10.Size = new System.Drawing.Size(146, 41);
             this.label10.TabIndex = 220;
             this.label10.Text = "客户编码";
             // 
+            // textBox1
+            // 
+            this.textBox1.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.textBox1.Location = new System.Drawing.Point(926, 493);
+            this.textBox1.Margin = new System.Windows.Forms.Padding(5);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(243, 50);
+            this.textBox1.TabIndex = 223;
+            // 
+            // label11
+            // 
+            this.label11.AutoSize = true;
+            this.label11.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label11.Location = new System.Drawing.Point(775, 497);
+            this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label11.Name = "label11";
+            this.label11.Size = new System.Drawing.Size(146, 41);
+            this.label11.TabIndex = 222;
+            this.label11.Text = "客户编码";
+            // 
+            // ms_othcode1
+            // 
+            this.ms_othcode1.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.ms_othcode1.Location = new System.Drawing.Point(1270, 131);
+            this.ms_othcode1.Margin = new System.Windows.Forms.Padding(5);
+            this.ms_othcode1.Name = "ms_othcode1";
+            this.ms_othcode1.Size = new System.Drawing.Size(249, 50);
+            this.ms_othcode1.TabIndex = 225;
+            // 
+            // label12
+            // 
+            this.label12.AutoSize = true;
+            this.label12.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label12.Location = new System.Drawing.Point(1157, 136);
+            this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label12.Name = "label12";
+            this.label12.Size = new System.Drawing.Size(108, 41);
+            this.label12.TabIndex = 224;
+            this.label12.Text = "CellID";
+            // 
             // Query_ExeProgress
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1458, 778);
+            this.ClientSize = new System.Drawing.Size(1944, 1037);
+            this.Controls.Add(this.ms_othcode1);
+            this.Controls.Add(this.label12);
+            this.Controls.Add(this.textBox1);
+            this.Controls.Add(this.label11);
             this.Controls.Add(this.ms_endremark);
             this.Controls.Add(this.label10);
             this.Controls.Add(this.label1);
@@ -594,7 +645,7 @@
             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, 3, 4, 3);
+            this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
             this.Name = "Query_ExeProgress";
             this.Tag = "Query!ExeProgress";
             this.Text = "工单执行进度";
@@ -659,5 +710,9 @@
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.TextBox ms_endremark;
         private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.TextBox ms_othcode1;
+        private System.Windows.Forms.Label label12;
     }
 }

UAS_MES_ZT/FunctionCode/Query/Query_ExeProgress.cs

@@ -73,7 +73,7 @@ namespace UAS_MES_NEW.Query
                 else
                 {
                     //没有过转号
-                    ms_id = (DataTable)dh.ExecuteSql("select ms_id,ms_makecode,ms_checkno,ms_outboxcode,pr_code,pr_orispeccode,ms_endremark from makeserial left join product on ms_prodcode = pr_code where ms_sncode='" + sn_code.Text + "' order by ms_id", "select");
+                    ms_id = (DataTable)dh.ExecuteSql("select ms_id,ms_makecode,ms_checkno,ms_outboxcode,ms_othcode1,pr_code,pr_orispeccode,ms_endremark from makeserial left join product on ms_prodcode = pr_code where ms_sncode='" + sn_code.Text + "' order by ms_id", "select");
                 }
                 if (ms_id.Rows.Count == 0)
                 {
@@ -87,6 +87,7 @@ namespace UAS_MES_NEW.Query
                 pr_code.Text = ms_id.Rows[ms_id.Rows.Count - 1]["pr_code"].ToString();
                 pr_orispeccode.Text = ms_id.Rows[ms_id.Rows.Count - 1]["pr_orispeccode"].ToString();
                 ms_endremark.Text = ms_id.Rows[ms_id.Rows.Count - 1]["ms_endremark"].ToString();
+                ms_othcode1.Text = ms_id.Rows[ms_id.Rows.Count - 1]["ms_othcode1"].ToString();
                 ms_checkno.Text = ms_id.Rows[ms_id.Rows.Count - 1]["ms_checkno"].ToString();
                 pallet.Text = dh.getFieldDataByCondition("mes_package_view", "v_outboxcode", "v_barcode = '"+sn_code.Text+"' and v_type = 3").ToString();
                 ms_outboxcode.Text = ms_id.Rows[ms_id.Rows.Count - 1]["ms_outboxcode"].ToString();

UAS_MES_ZT/FunctionCode/Query/Query_ExeProgress.resx

@@ -141,6 +141,60 @@
   <metadata name="dataGridViewTextBoxColumn8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="mp_sncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="mp_makecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ma_prodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="mp_sourcecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="mp_stepname.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="mp_indate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ma_craftcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="sc_linecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="mp_inman.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="em_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="mp_sncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

UAS_MES_ZT/FunctionCode/Special/Special_ReSNBD.cs

@@ -54,6 +54,7 @@ namespace UAS_MES_NEW.Special
         string makecode;
         string prodcode;
         string orispeccode;
+        string othcode1;
 
         private void sncode_KeyDown(object sender, KeyEventArgs e)
         {
@@ -86,6 +87,7 @@ namespace UAS_MES_NEW.Special
                                 makecode = dt.Rows[0]["ms_makecode"].ToString();
                                 prodcode = dt.Rows[0]["ms_prodcode"].ToString();
                                 orispeccode = dt.Rows[0]["pr_orispeccode"].ToString();
+                                othcode1 = dt.Rows[0]["ms_othcode1"].ToString();
                             }
 
                             if (dh.CheckExist("returnsnbd", "rsb_oldsn = '" + sncode.Text + "'"))
@@ -132,6 +134,7 @@ namespace UAS_MES_NEW.Special
                                 return;
                             }
                             dh.ExecuteSql("insert into returnsnbd (rsb_id,rsb_newsn,rsb_oldsn,RSB_MAKECODE,RSB_PRODCODE,RSB_ORISPECCODE) values (returnsnbd_seq.nextval,'" + sncode.Text + "','"+ show_sncode.Text + "','"+makecode+"','"+prodcode+"','"+orispeccode+"') ", "insert");
+                            dh.ExecuteSql("update makeserial set ms_othcode1='" + othcode1 + "' where ms_sncode='" + sncode.Text + "'","update");
                             bsncode = "";
                             ChangeResult.Enabled = true;
                             OperateResult.AppendText(">>返修SN:" + show_sncode.Text + "与新SN:"+ sncode.Text + "关联成功\n", Color.LawnGreen, sncode, show_sncode);