不良采集为不良不再重复刷新数量

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -276,7 +276,7 @@ namespace UAS_MES.Make
                 if (AutoBadCode.Checked)
                     Save_Click(new object(), new EventArgs());
             }
-            if (GoodProduct.Checked)
+            else if (GoodProduct.Checked)
                 SetTestPass();
             dt = (DataTable)dh.ExecuteSql("select mcd_inqty,ma_qty-mcd_inqty mcd_remainqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
             BaseUtil.SetFormValue(Controls, dt);
@@ -326,7 +326,7 @@ namespace UAS_MES.Make
                 }
                 else
                 {
-                    if (ChoosedRejectList.Items.Count == 0 && bc_code.Text == "")
+                    if (ChoosedRejectList.Items.Count == 0)
                     {
                         OperateResult.AppendText(">>不良品必须选择不良原因和不良代码!\n", Color.Red);
                         return;

UAS-MES/PublicMethod/LogicHandler.cs

@@ -1082,6 +1082,7 @@ namespace UAS_MES.PublicMethod
             if (iResult == "" || iResult == null)
                 iResult = "检查未通过";
             GetStepCodeAndNameBySource(iSourceCode, ref StepCode, ref StepName);
+            string ms_status = dh.getFieldDataByCondition("makeserial", "ms_status", "ms_sncode='" + iSnCode + "'").ToString();
             sql.Clear();
             sql.Append("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,");
             sql.Append("mb_indate,mb_stepcode,mb_sourcecode,mb_badcode,mb_bgcode,mb_badtable,mb_soncode,mb_status,mb_badremark)");
@@ -1102,7 +1103,9 @@ namespace UAS_MES.PublicMethod
             //记录操作日志
             InsertMakeProcess(iSnCode, iMakeCode, "不良采集", iResult, iUserName);
             //判断当前采集点是否为扣料工序cd_ifreduce =-1 则为扣料工序
-            SetStepFinish(iMakeCode, iSourceCode, iSnCode, iUserName, out oErrorMessage);
+            //之前保存的不良就不再调用
+            if (ms_status != "3")
+                SetStepFinish(iMakeCode, iSourceCode, iSnCode, iUserName, out oErrorMessage);
             //SetCollectionFinish(iSnCode, iMakeCode, iUserName, iSourceCode, out oErrorMessage);
             return true;
         }