QC抽检状态修改

UAS_MES_YDCY/PublicMethod/LogicHandler.cs

@@ -865,6 +865,15 @@ namespace UAS_MES_NEW.PublicMethod
             {
                 AutoPassJudge(iSnCode, iMakeCode, iSourceCode, "", LineCode, "", "-1");
             }
+            DataTable dt = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_stepcode", "nvl(ms_ifrework,0)ms_ifrework", "ms_status", "nvl(ms_ifqccheck,0)ms_ifqccheck" }, "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
+            if (dt.Rows.Count > 0) {
+                string ms_ifqccheck = dt.Rows[0]["ms_ifqccheck"].ToString();
+                if (ms_ifqccheck != "0")
+                {
+                    oErrorMessage = iSnCode + "QC抽检状态，不允许采集";
+                    return false;
+                }
+            }
             sql.Clear();
             sql.Append("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,mb_indate,mb_stepcode");
             sql.Append(",mb_sourcecode,mb_badcode,mb_bgcode,mb_badtable,mb_status,mb_badremark,mb_bgname,mb_badname,mb_type)");
@@ -889,7 +898,6 @@ namespace UAS_MES_NEW.PublicMethod
                 dh.ExecuteSql("delete from oqcbatchdetail where obd_sncode='" + iSnCode + "'", "delete");
             }
             //之前保存的不良就不再调用
-            DataTable dt = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_stepcode", "nvl(ms_ifrework,0)ms_ifrework", "ms_status", "nvl(ms_ifqccheck,0)ms_ifqccheck" }, "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
             if (dt.Rows.Count > 0)
             {
                 string ifrework = dt.Rows[0]["ms_ifrework"].ToString();
@@ -903,14 +911,16 @@ namespace UAS_MES_NEW.PublicMethod
                 }
                 if (ms_stepcode == StepCode)
                 {
-                    if (ms_ifqccheck == "-1")
+                    if (ms_ifqccheck != "0")
                     {
                         oErrorMessage = iSnCode + "QC抽检状态，不允许采集";
                     }
-                    if (ifrework == "0")
-                        dh.UpdateByCondition("makeserial", "ms_status=3,ms_nextstepcode=''", "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
-                    else
-                        dh.UpdateByCondition("makeserial", "ms_reworkstatus=3,ms_nextstepcode=''", "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
+                    else {
+                        if (ifrework == "0")
+                            dh.UpdateByCondition("makeserial", "ms_status=3,ms_nextstepcode=''", "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
+                        else
+                            dh.UpdateByCondition("makeserial", "ms_reworkstatus=3,ms_nextstepcode=''", "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
+                    }
                 }
                 else
                 {