如未勾选不良可整批返工则需要全部序列号完成返修途程

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.cs

@@ -115,7 +115,7 @@ namespace UAS_MES.OQC
             {
                 if (ob_source.Text == "返工" && ob_reworkcode.Text != "")
                 {
-                    dt = (DataTable)dh.ExecuteSql("select re_id from rework where re_code='" + ob_reworkcode.Text + "' and nvl(re_nullngfinsh,0)<>0", "select");
+                    dt = (DataTable)dh.ExecuteSql("select re_id from rework where re_code='" + ob_reworkcode.Text + "' and nvl(re_nullngfinsh,0)=0", "select");
                     if (dt.Rows.Count > 0)
                     {
                         sql.Clear();
@@ -125,7 +125,7 @@ namespace UAS_MES.OQC
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (dt.Rows[0]["sn"].ToString() != "")
                         {
-                            OperateResult.AppendText(">>序列号" + dt.Rows[0]["sn"].ToString() + "下一道不是OQC工序", Color.Red);
+                            OperateResult.AppendText(">>序列号" + dt.Rows[0]["sn"].ToString() + "下一道不是OQC工序\n", Color.Red);
                             return;
                         }
                     }