修改界面样式

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

@@ -86,7 +86,7 @@
             this.BadGroupCode = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.oi_itemcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.oi_checkkind = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ci_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.oi_sampleqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.oi_checkqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.oi_ng = new System.Windows.Forms.DataGridViewCheckBoxColumn();
@@ -452,19 +452,20 @@
             // 
             // bc_code1
             // 
-            this.bc_code1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.bc_code1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.bc_code1.DataPropertyName = "bc_code";
             this.bc_code1.HeaderText = "不良代码";
             this.bc_code1.Name = "bc_code1";
             this.bc_code1.ReadOnly = true;
+            this.bc_code1.Width = 130;
             // 
             // bc_name1
             // 
-            this.bc_name1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.bc_name1.DataPropertyName = "bc_name";
             this.bc_name1.HeaderText = "不良名称 ";
             this.bc_name1.Name = "bc_name1";
             this.bc_name1.ReadOnly = true;
+            this.bc_name1.Width = 151;
             // 
             // WaitChooseDGV
             // 
@@ -495,10 +496,12 @@
             // 
             // bc_code
             // 
+            this.bc_code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.bc_code.DataPropertyName = "bc_code";
             this.bc_code.HeaderText = "不良代码";
             this.bc_code.Name = "bc_code";
             this.bc_code.ReadOnly = true;
+            this.bc_code.Width = 130;
             // 
             // bc_name
             // 
@@ -547,7 +550,7 @@
             this.CheckTypeDGV.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.choose,
             this.oi_itemcode,
-            this.oi_checkkind,
+            this.ci_name,
             this.oi_sampleqty,
             this.oi_checkqty,
             this.oi_ng,
@@ -840,21 +843,19 @@
             // 
             // oi_itemcode
             // 
-            this.oi_itemcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.oi_itemcode.DataPropertyName = "oi_itemcode";
             this.oi_itemcode.HeaderText = "项目编号";
             this.oi_itemcode.Name = "oi_itemcode";
             this.oi_itemcode.Visible = false;
             // 
-            // oi_checkkind
+            // ci_name
             // 
-            this.oi_checkkind.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.oi_checkkind.DataPropertyName = "oi_checkkind";
+            this.ci_name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.ci_name.DataPropertyName = "ci_name";
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.oi_checkkind.DefaultCellStyle = dataGridViewCellStyle1;
-            this.oi_checkkind.HeaderText = "项目名称";
-            this.oi_checkkind.Name = "oi_checkkind";
-            this.oi_checkkind.Width = 96;
+            this.ci_name.DefaultCellStyle = dataGridViewCellStyle1;
+            this.ci_name.HeaderText = "项目名称";
+            this.ci_name.Name = "ci_name";
             // 
             // oi_sampleqty
             // 
@@ -874,7 +875,7 @@
             // 
             // oi_ng
             // 
-            this.oi_ng.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.oi_ng.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.oi_ng.DataPropertyName = "oi_ng";
             this.oi_ng.HeaderText = "是否通过";
             this.oi_ng.Name = "oi_ng";
@@ -889,7 +890,6 @@
             this.oi_leveldefect.Name = "oi_leveldefect";
             this.oi_leveldefect.Resizable = System.Windows.Forms.DataGridViewTriState.True;
             this.oi_leveldefect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.oi_leveldefect.Width = 80;
             // 
             // ois_remark
             // 
@@ -1018,15 +1018,15 @@
         private System.Windows.Forms.Label ob_maxngacceptqty_label;
         private System.Windows.Forms.Label ob_projectcode_label;
         private CustomControl.ComBoxWithFocus.ComBoxWithFocus BadGroupCode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn or_id;
-        private System.Windows.Forms.DataGridViewTextBoxColumn bc_code1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn bc_name1;
         private System.Windows.Forms.DataGridViewCheckBoxColumn ChooseAll;
         private System.Windows.Forms.DataGridViewTextBoxColumn bc_code;
         private System.Windows.Forms.DataGridViewTextBoxColumn bc_name;
+        private System.Windows.Forms.DataGridViewTextBoxColumn or_id;
+        private System.Windows.Forms.DataGridViewTextBoxColumn bc_code1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn bc_name1;
         private System.Windows.Forms.DataGridViewCheckBoxColumn choose;
         private System.Windows.Forms.DataGridViewTextBoxColumn oi_itemcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn oi_checkkind;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ci_name;
         private System.Windows.Forms.DataGridViewTextBoxColumn oi_sampleqty;
         private System.Windows.Forms.DataGridViewTextBoxColumn oi_checkqty;
         private System.Windows.Forms.DataGridViewCheckBoxColumn oi_ng;

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -154,10 +154,10 @@ namespace UAS_MES.OQC
                 checkkind += ("'" + dt.Rows[i]["oi_checkkind"].ToString() + "',");
             }
             sql.Clear();
-            sql.Append("select 1 choose,oi_itemcode,oi_checkkind,oi_sampleqty,nvl((oi_checkqty),0) oi_checkqty, ");
+            sql.Append("select 1 choose,ci_name,oi_itemcode,oi_checkkind,oi_sampleqty,nvl((oi_checkqty),0) oi_checkqty, ");
             sql.Append("nvl(ois_id,0) ois_id,nvl(ois_ifng,0) oi_ng,nvl(ois_defectlevel,'-1') oi_leveldefect, ");
             sql.Append("ois_remark,case nvl(ois_id,0) when 0 then '未检验' else '已检验' end ois_status ");
-            sql.Append("from OQCItems left join OQCItemSamples on  ois_sncode='" + sncode.Text + "' and ois_checkno=oi_checkno and ");
+            sql.Append("from OQCItems left join  QUA_CHECKITEM on oi_itemcode=ci_code left join OQCItemSamples on  ois_sncode='" + sncode.Text + "' and ois_checkno=oi_checkno and ");
             sql.Append("ois_itemcode=oi_itemcode and ois_projectcode = oi_projectcode where oi_checkno ='" + ob_checkno.Text + "' ");
             sql.Append("and oi_checkkind in (" + checkkind.Substring(0, checkkind.Length - 1) + ")");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.resx

@@ -273,7 +273,7 @@
   <metadata name="oi_itemcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="oi_checkkind.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="ci_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="oi_sampleqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">