判定采用存储过程

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.Designer.cs

@@ -45,7 +45,7 @@
             this.label1 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.ob_maxngacceptqty_label = new System.Windows.Forms.Label();
-            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+            this.Remark = new System.Windows.Forms.RichTextBox();
             this.label5 = new System.Windows.Forms.Label();
             this.ob_status_label = new System.Windows.Forms.Label();
             this.ob_status = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
@@ -255,14 +255,14 @@
             this.ob_maxngacceptqty_label.TabIndex = 223;
             this.ob_maxngacceptqty_label.Text = "最大不合格允许通过数";
             // 
-            // richTextBox1
+            // Remark
             // 
-            this.richTextBox1.Location = new System.Drawing.Point(117, 239);
-            this.richTextBox1.Margin = new System.Windows.Forms.Padding(4);
-            this.richTextBox1.Name = "richTextBox1";
-            this.richTextBox1.Size = new System.Drawing.Size(547, 280);
-            this.richTextBox1.TabIndex = 225;
-            this.richTextBox1.Text = "";
+            this.Remark.Location = new System.Drawing.Point(117, 239);
+            this.Remark.Margin = new System.Windows.Forms.Padding(4);
+            this.Remark.Name = "Remark";
+            this.Remark.Size = new System.Drawing.Size(547, 280);
+            this.Remark.TabIndex = 225;
+            this.Remark.Text = "";
             // 
             // label5
             // 
@@ -715,7 +715,7 @@
             this.Controls.Add(this.ob_id);
             this.Controls.Add(this.OperateResult);
             this.Controls.Add(this.label5);
-            this.Controls.Add(this.richTextBox1);
+            this.Controls.Add(this.Remark);
             this.Controls.Add(this.ob_maxngacceptqty_label);
             this.Controls.Add(this.label3);
             this.Controls.Add(this.GetBatch);
@@ -800,7 +800,7 @@
         private CustomControl.ButtonUtil.NormalButton GetBatch;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Label ob_maxngacceptqty_label;
-        private System.Windows.Forms.RichTextBox richTextBox1;
+        private System.Windows.Forms.RichTextBox Remark;
         private System.Windows.Forms.Label label5;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private CustomControl.TextBoxWithIcon.EnterTextBox ob_id;

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.cs

@@ -112,14 +112,17 @@ namespace UAS_MES.OQC
 
         private void BatchPass_Click(object sender, EventArgs e)
         {
+            string ReworkCode = "";
             if (CheckBefore() && PassCheckStep)
             {
                 if (int.Parse(ob_ngqty.Text == "" ? "0" : ob_ngqty.Text) <= int.Parse(ob_maxngacceptqty.Text == "" ? ob_maxngacceptqty.Text : ob_maxngacceptqty.Text))
                 {
-                    dh.ExecuteSql("update OQCBatch set ob_status='OK',ob_result='OK' where ob_checkno='" + ob_checkno.Text + "'", "select");
-                    DoLog("批次通过", "批次通过成功", "通过");
-                    GetBatch.PerformClick();
-                    OperateResult.AppendText(">>通过批成功\n", Color.Green);
+                    if (LogicHandler.OQCBatchJudge(ob_checkno.Text, User.UserSourceCode, "OK", "", User.UserCode, Remark.Text, out ReworkCode, out ErrorMessage))
+                    {
+                        OperateResult.AppendText(">>通过批成功\n", Color.Green);
+                        GetBatch.PerformClick();
+                    }
+                    else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                 }
                 else
                     OperateResult.AppendText(">>当前批次不合格数为" + ob_ngqty.Text + ",大于最大不合格允通过数" + ob_maxngacceptqty.Text + "\n", Color.Red);
@@ -128,79 +131,67 @@ namespace UAS_MES.OQC
 
         private void BatchRejection_Click(object sender, EventArgs e)
         {
+            string ReworkCode = "";
             if (CheckBefore() && PassCheckStep)
             {
-                dh.ExecuteSql("update makeserial set ms_status=3 where ms_checkno='" + ob_checkno.Text + "'", "update");
-                dh.ExecuteSql("update OQCBatch set ob_status='NG',ob_result='NG' where ob_checkno='" + ob_checkno.Text + "'", "select");
-                //如果勾选了发起反攻需求则新增记录
-                if (ReworkRequire.Checked)
+                if (LogicHandler.OQCBatchJudge(ob_checkno.Text, User.UserSourceCode, "NG", ReworkRequire.Checked ? "Y" : "N", User.UserCode, Remark.Text, out ReworkCode, out ErrorMessage))
                 {
-                    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 + ",'" + 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();
-                    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");
-                    //将工单信息写回到OQC主表
-                    dh.ExecuteSql("update oqcbatch set ob_rmcode='" + re_code + "' where ob_checkno='" + ob_checkno.Text + "'", "update");
+                    OperateResult.AppendText(">>判退批成功\n", Color.Green);
+                    GetBatch.PerformClick();
                 }
-                DoLog("判退通过", "批次判退成功", "通过");
-                OperateResult.AppendText(">>判退批成功\n", Color.Green);
-                GetBatch.PerformClick();
+                else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
             }
         }
 
         private void ForcePass_Click(object sender, EventArgs e)
         {
+            string ReworkCode = "";
             if (PassCheckStep)
             {
-                dh.ExecuteSql("update OQCBatch set ob_status='OK' ,ob_result='FOK' where ob_checkno='" + ob_checkno.Text + "'", "select");
-                DoLog("强制通过", "强制通过成功", "通过");
-                GetBatch.PerformClick();
-                OperateResult.AppendText(">>强制通过批" + ob_checkno.Text + "成功\n", Color.Green);
+                if (LogicHandler.OQCBatchJudge(ob_checkno.Text, User.UserSourceCode, "FOK", "", User.UserCode, Remark.Text, out ReworkCode, out ErrorMessage))
+                {
+                    OperateResult.AppendText(">>强制通过批" + ob_checkno.Text + "成功\n", Color.Green);
+                    GetBatch.PerformClick();
+                }
+                else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
             }
         }
 
         private void ForceRejection_Click(object sender, EventArgs e)
         {
+            string ReworkCode = "";
             if (PassCheckStep)
             {
-                dh.ExecuteSql("update makeserial set ms_status=3 where ms_checkno='" + ob_checkno.Text + "'", "update");
-                dh.ExecuteSql("update OQCBatch set ob_status='NG' ,ob_result='FNG' where ob_checkno='" + ob_checkno.Text + "'", "select");
-                DoLog("强制判退通过", "强制判退通过成功", "判退");
-                GetBatch.PerformClick();
-                OperateResult.AppendText(">>强制撤销批" + ob_checkno.Text + "成功\n", Color.Green);
+                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);
+                    GetBatch.PerformClick();
+                }
+                else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
             }
         }
 
         private void WithdrawPass_Click(object sender, EventArgs e)
         {
+            string ReworkCode = "";
             if (PassCheckStep)
             {
                 if (ob_result.Text == "OK" || ob_result.Text == "FOK")
                 {
-                    dh.ExecuteSql("update OQCBatch set ob_status='CHECKING' ,ob_result='' where ob_checkno='" + ob_checkno.Text + "'", "select");
-                    ob_result.Text = "";
-                    DoLog("撤销通过", "撤销通过成功", "撤销");
-                    OperateResult.AppendText(">>撤销通过批" + ob_checkno.Text + "成功\n", Color.Green);
-                    GetBatch.PerformClick();
-                }
-                else
-                {
-                    OperateResult.AppendText(">>该抽检批次未通过,无需撤销通过\n", Color.Red);
+                    if (LogicHandler.OQCBatchJudge(ob_checkno.Text, User.UserSourceCode, "REOK", "", User.UserCode, Remark.Text, out ReworkCode, out ErrorMessage))
+                    {
+                        OperateResult.AppendText(">>撤销通过批" + ob_checkno.Text + "成功\n", Color.Green);
+                        GetBatch.PerformClick();
+                    }
+                    else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                 }
+                else OperateResult.AppendText(">>该抽检批次未通过,无需撤销通过\n", Color.Red);
             }
         }
 
         private void WithdrawRejection_Click(object sender, EventArgs e)
         {
+            string ReworkCode = "";
             if (PassCheckStep)
             {
                 if (ob_result.Text == "NG" || ob_result.Text == "FNG")
@@ -218,17 +209,26 @@ namespace UAS_MES.OQC
                             string logout_confirm = MessageBox.Show("已存在返修工单,撤销会删除该工单，是否继续", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
                             if (logout_confirm == "Yes")
                             {
-                                dh.ExecuteSql("delete from reworkdetail where rd_checkno='" + ob_checkno.Text + "' ", "delete");
-                                dh.ExecuteSql("delete from rework where re_checkno='" + ob_checkno.Text + "' ", "delete");
+                                if (LogicHandler.OQCBatchJudge(ob_checkno.Text, User.UserSourceCode, "RENG", "", User.UserCode, Remark.Text, out ReworkCode, out ErrorMessage))
+                                {
+                                    OperateResult.AppendText(">>撤销判退成功\n", Color.Green);
+                                    ob_result.Text = "";
+                                    GetBatch.PerformClick();
+                                }
+                                else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                             }
                             else return;
                         }
                     }
-                    dh.ExecuteSql("update OQCBatch set ob_status='CHECKING' ,ob_result='' where ob_checkno='" + ob_checkno.Text + "'", "select");
-                    ob_result.Text = "";
-                    DoLog("撤销判退", "撤销判退成功", "撤销");
-                    OperateResult.AppendText(">>撤销判退成功\n", Color.Green);
-                    GetBatch.PerformClick();
+                    else {
+                        if (LogicHandler.OQCBatchJudge(ob_checkno.Text, User.UserSourceCode, "RENG", "", User.UserCode, Remark.Text, out ReworkCode, out ErrorMessage))
+                        {
+                            OperateResult.AppendText(">>撤销判退成功\n", Color.Green);
+                            ob_result.Text = "";
+                            GetBatch.PerformClick();
+                        }
+                        else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
+                    }
                 }
                 else OperateResult.AppendText(">>该抽检批次未判退,无需撤销判退\n", Color.Red);
             }

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -291,11 +291,11 @@ namespace UAS_MES.OQC
                         sql.Append("nvl(ois_ifng,0)=0 then 0 else 1 end),0) ,count(1) from OQCItemSamples where ois_checkno=oi_checkno ");
                         sql.Append("and ois_itemcode=oi_itemcode)where oi_checkno ='" + ob_checkno.Text + "' and oi_projectcode ='" + ob_projectcode.Text + "'");
                         dh.ExecuteSql(sql.GetString(), "update");
-                        //含有不良的将序列号更新为不良
-                        if (IfContainNG)
-                            dh.ExecuteSql("update makeserial set ms_status=3 where ms_sncode='" + sncode.Text + "'", "update");
-                        else
-                            dh.ExecuteSql("update makeserial set ms_status=1 where ms_sncode='" + sncode.Text + "'", "update");
+                        ////含有不良的将序列号更新为不良
+                        //if (IfContainNG)
+                        //    dh.ExecuteSql("update makeserial set ms_status=3 where ms_sncode='" + sncode.Text + "'", "update");
+                        //else
+                        //    dh.ExecuteSql("update makeserial set ms_status=1 where ms_sncode='" + sncode.Text + "'", "update");
                         //更新检验状态，如果是待检验的更新为检验中
                         if (ob_status.Text == "待检验")
                         {