Merge remote-tracking branch 'refs/remotes/origin/master'

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -83,7 +83,7 @@ namespace UAS_MES.OQC
                 GetBatch.PerformClick();
                 if (CheckSnCode())
                 {
-                    dt = (DataTable)dh.ExecuteSql("select or_id,or_badcode bc_code, or_description bc_name from OQCNGReason where or_checkno='" + ob_checkno.Text + "' and or_sncode='" + sncode.Text + "'", "select");
+                    dt = (DataTable)dh.ExecuteSql("select or_id,or_badcode bc_code,or_description bc_name,or_bgcode bg_code from OQCNGReason where or_checkno='" + ob_checkno.Text + "' and or_sncode='" + sncode.Text + "'", "select");
                     BaseUtil.FillDgvWithDataTable(ChoosedDGV, dt);
                     GetBatchTypeGridData();
                 }
@@ -270,7 +270,7 @@ namespace UAS_MES.OQC
                             sql.Clear();
                             sql.Append("insert into OQCNGReason(or_id, or_checkno, or_makecode, or_sncode, or_badcode, or_description, or_remark,or_bgcode)");
                             sql.Append("values (OQCNGReason_seq.nextval,'" + ob_checkno.Text + "','" + ob_makecode.Text + "','" + sncode.Text + "',:a,:b,'" + ob_remark.Text + "',:c)");
-                            dh.BatchInsert(sql.GetString(), new string[] { "a", "b","c" }, bc_code.ToArray(), bc_name.ToArray(), bg_code.ToArray());
+                            dh.BatchInsert(sql.GetString(), new string[] { "a", "b", "c" }, bc_code.ToArray(), bc_name.ToArray(), bg_code.ToArray());
                         }
                         //更新项目编号中的抽检数、不合格数，根据采样项目记录
                         sql.Clear();
@@ -378,12 +378,26 @@ namespace UAS_MES.OQC
 
         private void ChooseedReject_Click(object sender, EventArgs e)
         {
-            DataTable dt = (DataTable)WaitChooseDGV.DataSource;
-            dt = BaseUtil.filterDataTable(dt, "ChooseAll<>0");
-            if (dt.Rows.Count > 0)
+            DataTable wait = BaseUtil.filterDataTable((DataTable)WaitChooseDGV.DataSource, "ChooseAll<>0");
+            DataTable choose = (ChoosedDGV.DataSource as DataTable);
+            List<string> Chooseed = new List<string>();
+            for (int i = 0; i < choose.Rows.Count; i++)
             {
-                (ChoosedDGV.DataSource as DataTable).Merge(dt);
-                //BaseUtil.FillDgvWithDataTable(ChoosedDGV, dt);
+                Chooseed.Add(choose.Rows[i]["bc_code"].ToString());
+            }
+            if (wait.Rows.Count > 0)
+            {
+                for (int i = 0; i < wait.Rows.Count; i++)
+                {
+                    if (!Chooseed.Contains( wait.Rows[i]["bc_code"].ToString()))
+                    {
+                        DataRow dr1 = choose.NewRow();
+                        dr1["bc_code"] = wait.Rows[i]["bc_code"];
+                        dr1["bc_name"] = wait.Rows[i]["bc_name"];
+                        dr1["bg_code"] = wait.Rows[i]["bg_code"];
+                        choose.Rows.Add(dr1);
+                    }
+                }
             }
             else OperateResult.AppendText(">>请勾选不良明细\n", Color.Red);
         }