去除批判退条件

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.cs

@@ -135,31 +135,27 @@ namespace UAS_MES.OQC
                 sql.Append("and al_statuscode='AUDITED'  and al_code ='" + ob_aqlcode.Text + "' and " + (ob_nowcheckqty.Text != "" ? ob_nowcheckqty.Text : "0") + " >= ad_minqty ");
                 sql.Append("and " + (ob_nowcheckqty.Text != "" ? ob_nowcheckqty.Text : "0") + "<=ad_maxqty ");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                if (int.Parse(ob_ngqty.Text == "" ? "0" : ob_ngqty.Text) <= int.Parse(dt.Rows[0]["maxngacceptqty"].ToString() == "" ? ob_maxngacceptqty.Text : dt.Rows[0]["maxngacceptqty"].ToString()))
+
+                dh.ExecuteSql("update OQCBatch set ob_status='NG',ob_result='NG' where ob_checkno='" + ob_checkno.Text + "'", "select");
+                //如果勾选了发起反攻需求则新增记录
+                if (ReworkRequire.Checked)
                 {
-                    dh.ExecuteSql("update OQCBatch set ob_status='NG',ob_result='NG' where ob_checkno='" + ob_checkno.Text + "'", "select");
-                    //如果勾选了发起反攻需求则新增记录
-                    if (ReworkRequire.Checked)
-                    {
-                        string re_id = dh.GetSEQ("rework_seq");
-                        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("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();
-                        sql.Append("insert into ReworkDetail (rd_id,rd_reid,rd_detno,rd_sncode,rd_prodcode,rd_checkno,rd_indate,rd_inman,rd_rwstatus) ");
-                        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");
-                    }
-                    DoLog("判退通过", "批次判退成功", "通过");
-                    OperateResult.AppendText(">>判退批成功\n", Color.Green);
-                    GetBatch.PerformClick();
+                    string re_id = dh.GetSEQ("rework_seq");
+                    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("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();
+                    sql.Append("insert into ReworkDetail (rd_id,rd_reid,rd_detno,rd_sncode,rd_prodcode,rd_checkno,rd_indate,rd_inman,rd_rwstatus) ");
+                    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");
                 }
-                else
-                    OperateResult.AppendText(">>当前批次不合格数为" + ob_ngqty.Text + ",大于最大不合格允通过数" + ob_maxngacceptqty.Text + "\n", Color.Red);
+                DoLog("判退通过", "批次判退成功", "通过");
+                OperateResult.AppendText(">>判退批成功\n", Color.Green);
+                GetBatch.PerformClick();
             }
         }