返修工单更新回抽检批次主表

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.cs

@@ -140,10 +140,11 @@ namespace UAS_MES.OQC
                 if (ReworkRequire.Checked)
                 {
                     string re_id = dh.GetSEQ("rework_seq");
+                    string re_code = dh.GetSerialNumberByCaller("Rework");
                     sql.Clear();
                     sql.Append("insert into rework (re_id ,re_code,re_indate,re_inman,re_status,re_statuscode,");
                     sql.Append("re_rwstatus,re_prodcode,re_qty, re_description,re_source,re_sourcemo,re_checkno) ");
-                    sql.Append(" select " + re_id + ",'" + dh.GetSerialNumberByCaller("Rework") + "',sysdate,'" + User.UserName + "','在录入','ENTERING','未返工',");
+                    sql.Append(" select " + re_id + ",'" + re_code + "',sysdate,'" + User.UserName + "','在录入','ENTERING','未返工',");
                     sql.Append("OQCBatch.ob_prodcode,OQCBatch.ob_batchqty,OQCBatch.ob_description,'批判退发起返工',OQCBatch.ob_makecode,OQCBatch.ob_checkno from oqcbatch where ob_checkno='" + ob_checkno.Text + "'");
                     dh.ExecuteSql(sql.GetString(), "insert");
                     sql.Clear();
@@ -151,6 +152,7 @@ namespace UAS_MES.OQC
                     sql.Append("select ReworkDetail_seq.nextval," + re_id + ",rownum,OQCBatchDetail.obd_sncode,ob_prodcode,ob_checkno,sysdate,'" + User.UserName + "','未返工' ");
                     sql.Append("from OQCBatch  left join OQCBatchDetail on obd_obid=ob_id where ob_checkno='" + ob_checkno.Text + "'");
                     dh.ExecuteSql(sql.GetString(), "insert");
+                    dh.ExecuteSql("update oqcbatch set ob_rmcode='"+re_code+"' where ob_checkno='"+ob_checkno.Text+"'", "update");
                 }
                 DoLog("判退通过", "批次判退成功", "通过");
                 OperateResult.AppendText(">>判退批成功\n", Color.Green);

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -203,7 +203,6 @@ namespace UAS_MES.OQC
                         //将布尔值转换为0,-1
                         if (TempForCheckType.Rows[i]["ois_id"].ToString() != "" && TempForCheckType.Rows[i]["ois_id"].ToString() != "0")
                         {
-
                             ois_ifng_update.Add(TempForCheckType.Rows[i]["oi_ng"].ToString());
                             ois_defectlevel_update.Add(TempForCheckType.Rows[i]["oi_leveldefect"].ToString());
                             ois_remark_update.Add(TempForCheckType.Rows[i]["ois_remark"].ToString());