Merge remote-tracking branch 'refs/remotes/origin/master'

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -413,7 +413,10 @@ namespace UAS_MES.Make
                 {
                     string status = dt.Rows[0]["ms_status"].ToString();
                     if (status == "1" || status == "2")
+                    {
                         dh.UpdateByCondition("makecraftdetail", "mcd_okqty=mcd_okqty-1", "mcd_macode='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
+                        dh.UpdateByCondition("makeserial", "ms_nextstepcode=''", "ms_sncode='" + ms_sncode.Text + "'");
+                    }
                     string checkno = dt.Rows[0]["ms_checkno"].ToString();
                     //存在抽检批次更新为空
                     if (checkno != "")
@@ -542,7 +545,7 @@ namespace UAS_MES.Make
             ob_nowcheckqty.Text = "";
             ob_batchqty.Text = "";
             SendCheck.Enabled = false;
-            OperateResult.AppendText(">>批次"+ob_checkno.Text+"送检成功\n", Color.Red);
+            OperateResult.AppendText(">>批次" + ob_checkno.Text + "送检成功\n", Color.Red);
             ms_sncode.Focus();
             LogicHandler.InsertMakeProcess(LastSncode, ma_code.Text, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
         }

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -47,7 +47,7 @@ namespace UAS_MES.OQC
         {
             if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
             {
-                DataTable[] dt = LogicHandler.GetOQCBatch(ms_sncode.Text, obd_outboxcode.Text, ob_checkno.Text, "OQCDataCollection", out ErrorMessage);
+                DataTable[] dt = LogicHandler.GetOQCBatch(ms_sncode.Text == "" ? sncode.Text : ms_sncode.Text, obd_outboxcode.Text, ob_checkno.Text, "OQCDataCollection", out ErrorMessage);
                 if (ErrorMessage == "")
                 {
                     BaseUtil.SetFormValue(Controls, dt[0]);
@@ -80,6 +80,7 @@ namespace UAS_MES.OQC
         {
             if (e.KeyCode == Keys.Enter)
             {
+                GetBatch.PerformClick();
                 if (CheckSnCode())
                 {
                     dt = (DataTable)dh.ExecuteSql("select or_id,or_reasoncode bc_code, oi_description bc_name from OQCNGReason where or_checkno='" + ob_checkno.Text + "' and or_sncode='" + sncode.Text + "'", "select");
@@ -97,7 +98,7 @@ namespace UAS_MES.OQC
                 //判断当前的检验状态
                 if (ob_status.Text == "待检验" || ob_status.Text == "检验中")
                 {
-                    dt = (DataTable)dh.ExecuteSql("select obd_sncode,ob_source,ob_makecode from OQCBatchDetail left join OQCBatch  on ob_id=obd_obid where obd_sncode='" + sncode.Text + "'", "select");
+                    dt = (DataTable)dh.ExecuteSql("select obd_sncode,ob_source,ob_makecode from OQCBatchDetail left join OQCBatch  on ob_id=obd_obid where obd_sncode='" + sncode.Text + "' and ob_checkno='" + ob_checkno.Text + "'", "select");
                     if (dt.Rows.Count > 0)
                     {
                         if (dt.Rows[0]["ob_source"].ToString() != "工序")

UAS-MES/PublicMethod/LogicHandler.cs

@@ -750,7 +750,7 @@ namespace UAS_MES.PublicMethod
                             if (Form.Rows[0]["pr_qualmethod"].ToString() == "")
                             {
                                 //判读第二原则送检方案为空
-                                string pr_qualmethod = dh.getFieldDataByCondition("product left join productkind on pr_kind=pk_name", "pk_qualmethod", "pr_code='" + Form.Rows[0]["ob_prodcode"] + "'").ToString();
+                                qualmethod = dh.getFieldDataByCondition("product left join productkind on pr_kind=pk_name", "pk_qualmethod", "pr_code='" + Form.Rows[0]["ob_prodcode"] + "'").ToString();
                             }
                             //第一原则送检方案不为空
                             else