良品如完工则删除steppassed和完工数-1

UAS-MES/PublicMethod/LogicHandler.cs

@@ -953,11 +953,17 @@ namespace UAS_MES.PublicMethod
                 dh.ExecuteSql("update oqcbatch set ob_nowcheckqty=ob_nowcheckqty-1 where ob_checkno='" + checkno + "'", "update");
             }
             //之前保存的不良就不再调用
-            DataTable dt = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_stepcode", "nvl(ms_ifrework,0)ms_ifrework" }, "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
+            DataTable dt = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_stepcode", "nvl(ms_ifrework,0)ms_ifrework", "ms_status" }, "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
             if (dt.Rows.Count > 0)
             {
                 string ifrework = dt.Rows[0]["ms_ifrework"].ToString();
                 string ms_stepcode = dt.Rows[0]["ms_stepcode"].ToString();
+                string ms_status = dt.Rows[0]["ms_status"].ToString();
+                if (ms_status == "2")
+                {
+                    dh.ExecuteSql("delete from steppassed where sp_sncode='" + iSnCode + "' and sp_makecode='" + iMakeCode + "' and sp_stepcode='" + StepCode + "'", "delete");
+                    dh.UpdateByCondition("make", "ma_madeqty=nvl(ma_madeqty,0)-1", "ma_code='" + iMakeCode + "'");
+                }
                 if (ms_stepcode == StepCode)
                 {
                     if (ifrework == "0")