添加测试结果字段

UAS_MES_YTDZ/FunctionCode/Query/Query_ExeProgress.Designer.cs

@@ -54,25 +54,26 @@
             this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.CraftInfDgv = new UAS_MES_NEW.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
+            this.sn_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.pictureBox4 = new System.Windows.Forms.PictureBox();
+            this.pictureBox2 = new System.Windows.Forms.PictureBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.pictureBox3 = new System.Windows.Forms.PictureBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
             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_stepname = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mp_result = 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.sn_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.pictureBox4 = new System.Windows.Forms.PictureBox();
-            this.pictureBox2 = new System.Windows.Forms.PictureBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();
-            this.pictureBox3 = new System.Windows.Forms.PictureBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.CraftmaterialData)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.CraftInfDgv)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
@@ -263,6 +264,7 @@
             this.CraftmaterialData.EnableContentClick = true;
             this.CraftmaterialData.Location = new System.Drawing.Point(18, 330);
             this.CraftmaterialData.Name = "CraftmaterialData";
+            this.CraftmaterialData.RowHeadersWidth = 62;
             this.CraftmaterialData.RowTemplate.Height = 27;
             this.CraftmaterialData.Size = new System.Drawing.Size(1422, 167);
             this.CraftmaterialData.TabIndex = 201;
@@ -271,6 +273,7 @@
             // 
             this.dataGridViewTextBoxColumn1.DataPropertyName = "cm_makecode";
             this.dataGridViewTextBoxColumn1.HeaderText = "工单号";
+            this.dataGridViewTextBoxColumn1.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
             this.dataGridViewTextBoxColumn1.Width = 120;
             // 
@@ -278,6 +281,7 @@
             // 
             this.dataGridViewTextBoxColumn2.DataPropertyName = "cm_soncode";
             this.dataGridViewTextBoxColumn2.HeaderText = "子件编号";
+            this.dataGridViewTextBoxColumn2.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
             this.dataGridViewTextBoxColumn2.Width = 120;
             // 
@@ -285,6 +289,7 @@
             // 
             this.dataGridViewTextBoxColumn3.DataPropertyName = "pr_detail";
             this.dataGridViewTextBoxColumn3.HeaderText = "子件名称";
+            this.dataGridViewTextBoxColumn3.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
             this.dataGridViewTextBoxColumn3.Width = 120;
             // 
@@ -292,6 +297,7 @@
             // 
             this.dataGridViewTextBoxColumn4.DataPropertyName = "cm_barcode";
             this.dataGridViewTextBoxColumn4.HeaderText = "子件批次号";
+            this.dataGridViewTextBoxColumn4.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
             this.dataGridViewTextBoxColumn4.Width = 120;
             // 
@@ -299,6 +305,7 @@
             // 
             this.dataGridViewTextBoxColumn5.DataPropertyName = "cm_stepcode";
             this.dataGridViewTextBoxColumn5.HeaderText = "工序编号";
+            this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
             this.dataGridViewTextBoxColumn5.Width = 130;
             // 
@@ -306,6 +313,7 @@
             // 
             this.dataGridViewTextBoxColumn6.DataPropertyName = "cm_stepname";
             this.dataGridViewTextBoxColumn6.HeaderText = "工序名称";
+            this.dataGridViewTextBoxColumn6.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
             this.dataGridViewTextBoxColumn6.Width = 120;
             // 
@@ -313,6 +321,7 @@
             // 
             this.dataGridViewTextBoxColumn7.DataPropertyName = "cm_status";
             this.dataGridViewTextBoxColumn7.HeaderText = "上料状态";
+            this.dataGridViewTextBoxColumn7.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
             this.dataGridViewTextBoxColumn7.Width = 120;
             // 
@@ -320,6 +329,7 @@
             // 
             this.dataGridViewTextBoxColumn8.DataPropertyName = "cm_indate";
             this.dataGridViewTextBoxColumn8.HeaderText = "上料时间";
+            this.dataGridViewTextBoxColumn8.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
             this.dataGridViewTextBoxColumn8.Width = 120;
             // 
@@ -334,6 +344,7 @@
             this.ma_prodcode,
             this.mp_sourcecode,
             this.mp_stepname,
+            this.mp_result,
             this.mp_indate,
             this.ma_craftcode,
             this.sc_linecode,
@@ -342,78 +353,11 @@
             this.CraftInfDgv.EnableContentClick = true;
             this.CraftInfDgv.Location = new System.Drawing.Point(18, 503);
             this.CraftInfDgv.Name = "CraftInfDgv";
+            this.CraftInfDgv.RowHeadersWidth = 62;
             this.CraftInfDgv.RowTemplate.Height = 27;
             this.CraftInfDgv.Size = new System.Drawing.Size(1436, 234);
             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 = 80;
-            // 
-            // mp_sourcecode
-            // 
-            this.mp_sourcecode.DataPropertyName = "mp_sourcecode";
-            this.mp_sourcecode.HeaderText = "资源编号";
-            this.mp_sourcecode.Name = "mp_sourcecode";
-            this.mp_sourcecode.Width = 120;
-            // 
-            // mp_stepname
-            // 
-            this.mp_stepname.DataPropertyName = "mp_stepname";
-            this.mp_stepname.HeaderText = "工序名称";
-            this.mp_stepname.Name = "mp_stepname";
-            this.mp_stepname.Width = 130;
-            // 
-            // 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 = 80;
-            // 
-            // 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";
-            // 
             // sn_code
             // 
             this.sn_code.AllPower = null;
@@ -515,6 +459,94 @@
             this.label3.TabIndex = 215;
             this.label3.Text = "已执行且为不良品";
             // 
+            // mp_sncode
+            // 
+            this.mp_sncode.DataPropertyName = "mp_sncode";
+            this.mp_sncode.HeaderText = "序列号";
+            this.mp_sncode.MinimumWidth = 8;
+            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.MinimumWidth = 8;
+            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.MinimumWidth = 8;
+            this.ma_prodcode.Name = "ma_prodcode";
+            this.ma_prodcode.Width = 80;
+            // 
+            // mp_sourcecode
+            // 
+            this.mp_sourcecode.DataPropertyName = "mp_sourcecode";
+            this.mp_sourcecode.HeaderText = "资源编号";
+            this.mp_sourcecode.MinimumWidth = 8;
+            this.mp_sourcecode.Name = "mp_sourcecode";
+            this.mp_sourcecode.Width = 120;
+            // 
+            // mp_stepname
+            // 
+            this.mp_stepname.DataPropertyName = "mp_stepname";
+            this.mp_stepname.HeaderText = "工序名称";
+            this.mp_stepname.MinimumWidth = 8;
+            this.mp_stepname.Name = "mp_stepname";
+            this.mp_stepname.Width = 130;
+            // 
+            // mp_result
+            // 
+            this.mp_result.DataPropertyName = "mp_result";
+            this.mp_result.HeaderText = "测试结果";
+            this.mp_result.MinimumWidth = 8;
+            this.mp_result.Name = "mp_result";
+            this.mp_result.Width = 150;
+            // 
+            // mp_indate
+            // 
+            this.mp_indate.DataPropertyName = "mp_indate";
+            this.mp_indate.HeaderText = "过站时间";
+            this.mp_indate.MinimumWidth = 8;
+            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.MinimumWidth = 8;
+            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.MinimumWidth = 8;
+            this.sc_linecode.Name = "sc_linecode";
+            this.sc_linecode.Width = 80;
+            // 
+            // mp_inman
+            // 
+            this.mp_inman.DataPropertyName = "mp_inman";
+            this.mp_inman.HeaderText = "人员工号";
+            this.mp_inman.MinimumWidth = 8;
+            this.mp_inman.Name = "mp_inman";
+            this.mp_inman.Width = 150;
+            // 
+            // em_name
+            // 
+            this.em_name.DataPropertyName = "em_name";
+            this.em_name.HeaderText = "人员姓名";
+            this.em_name.MinimumWidth = 8;
+            this.em_name.Name = "em_name";
+            this.em_name.Width = 150;
+            // 
             // Query_ExeProgress
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
@@ -589,16 +621,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
-        private System.Windows.Forms.DataGridViewTextBoxColumn mp_sncode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn mp_makecode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn ma_prodcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn mp_sourcecode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn mp_stepname;
-        private System.Windows.Forms.DataGridViewTextBoxColumn mp_indate;
-        private System.Windows.Forms.DataGridViewTextBoxColumn ma_craftcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn sc_linecode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn mp_inman;
-        private System.Windows.Forms.DataGridViewTextBoxColumn em_name;
         private System.Windows.Forms.TextBox pr_orispeccode;
         private System.Windows.Forms.Label label8;
         private System.Windows.Forms.TextBox pr_code;
@@ -611,5 +633,16 @@
         private System.Windows.Forms.PictureBox pictureBox3;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn mp_sncode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn mp_makecode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ma_prodcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn mp_sourcecode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn mp_stepname;
+        private System.Windows.Forms.DataGridViewTextBoxColumn mp_result;
+        private System.Windows.Forms.DataGridViewTextBoxColumn mp_indate;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ma_craftcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn sc_linecode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn mp_inman;
+        private System.Windows.Forms.DataGridViewTextBoxColumn em_name;
     }
 }

UAS_MES_YTDZ/FunctionCode/Query/Query_ExeProgress.cs

@@ -307,7 +307,7 @@ namespace UAS_MES_NEW.Query
                     }
                     sql.Clear();
                     sql.Append("select mp_makecode,ma_prodcode,sc_linecode,ma_craftcode,mp_sourcecode,mp_sncode,mp_stepname,");
-                    sql.Append("mp_indate,mp_inman,em_name from makeprocess left join make on mp_makecode=ma_code left join employee on mp_inman = em_code left join source on ");
+                    sql.Append("mp_indate,mp_inman,em_name,mp_result from makeprocess left join make on mp_makecode=ma_code left join employee on mp_inman = em_code left join source on ");
                     sql.Append("mp_sourcecode=sc_code where mp_sncode in (" + mp_sncodes.ToString().Substring(0, mp_sncodes.ToString().Length - 1) + ") and ma_code in (" + makecodes.ToString().Substring(0, makecodes.ToString().Length - 1) + ") order by mp_indate");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     BaseUtil.FillDgvWithDataTable(CraftInfDgv, dt);

UAS_MES_YTDZ/FunctionCode/Query/Query_ExeProgress.resx

@@ -156,6 +156,9 @@
   <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_result.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>