更新返工需求单回批次号主表

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.cs

@@ -98,7 +98,7 @@ namespace UAS_MES.OQC
                             break;
                         default:
                             break;
-                    }             
+                    }
                 }
                 else
                 {
@@ -111,7 +111,7 @@ namespace UAS_MES.OQC
                     WithdrawRejection.Enabled = false;
                     OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                 }
-              
+
             }
             else
             {
@@ -146,6 +146,11 @@ namespace UAS_MES.OQC
                 if (LogicHandler.OQCBatchJudge(ob_checkno.Text, User.UserSourceCode, "NG", ReworkRequire.Checked ? "Y" : "N", User.UserCode, Remark.Text, out ReworkCode, out ErrorMessage))
                 {
                     OperateResult.AppendText(">>判退批成功\n", Color.Green);
+                    if (ReworkRequire.Checked)
+                    {
+                        dh.UpdateByCondition("oqcbatch", "ob_reworkcode='"+ReworkCode+"'", "ob_checkno='"+ob_checkno.Text+"'");
+                        OperateResult.AppendText(">>生成返工需求单"+ReworkCode+"\n", Color.Green);
+                    }
                     GetBatch.PerformClick();
                 }
                 else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
@@ -173,7 +178,12 @@ namespace UAS_MES.OQC
             {
                 if (LogicHandler.OQCBatchJudge(ob_checkno.Text, User.UserSourceCode, "FNG", ReworkRequire.Checked ? "Y" : "N", User.UserCode, Remark.Text, out ReworkCode, out ErrorMessage))
                 {
-                    OperateResult.AppendText(">>强制撤销批" + ob_checkno.Text + "成功\n", Color.Green);
+                    OperateResult.AppendText(">>强制退批" + ob_checkno.Text + "成功\n", Color.Green);
+                    if (ReworkRequire.Checked)
+                    {
+                        dh.UpdateByCondition("oqcbatch", "ob_reworkcode='" + ReworkCode + "'", "ob_checkno='" + ob_checkno.Text + "'");
+                        OperateResult.AppendText(">>生成返工需求单" + ReworkCode + "\n", Color.Green);
+                    }
                     GetBatch.PerformClick();
                 }
                 else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
@@ -229,7 +239,8 @@ namespace UAS_MES.OQC
                             else return;
                         }
                     }
-                    else {
+                    else
+                    {
                         if (LogicHandler.OQCBatchJudge(ob_checkno.Text, User.UserSourceCode, "RENG", "", User.UserCode, Remark.Text, out ReworkCode, out ErrorMessage))
                         {
                             OperateResult.AppendText(">>撤销判退成功\n", Color.Green);