优化KEY释放

UAS_MES_YDCY/FunctionCode/Special/Special_Reset.cs

@@ -50,7 +50,7 @@ namespace UAS_MES_NEW.Special
 
         private bool ReSN(string sncode, string stepcode)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select ms_paststep,nvl(ms_qccheck,0)ms_qccheck,nvl(ms_ifqccheck,0)ms_ifqccheck,ms_makecode,nvl(ms_outstatus,0)ms_outstatus,nvl(pr_ifrepaircheck,0)pr_ifrepaircheck from makeserial left join product on pr_code=ms_prodcode where ms_sncode ='" + sncode + "' order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_paststep,nvl(MS_ISACTIVE,0)MS_ISACTIVE,nvl(ms_qccheck,0)ms_qccheck,nvl(ms_ifqccheck,0)ms_ifqccheck,ms_makecode,nvl(ms_outstatus,0)ms_outstatus,nvl(pr_ifrepaircheck,0)pr_ifrepaircheck from makeserial left join product on pr_code=ms_prodcode where ms_sncode ='" + sncode + "' order by ms_id desc", "select");
             if (!dt.Rows[0]["ms_paststep"].ToString().Contains(cd_stepcode.Text))
             {
                 OperatResult.AppendText(">>序列号" + sncode + "不允许回流到未执行工序\n", Color.Red);
@@ -61,6 +61,11 @@ namespace UAS_MES_NEW.Special
                 OperatResult.AppendText(">>序列号" + sncode + "已出货不允许回流\n", Color.Red);
                 return false;
             }
+            if (dt.Rows[0]["MS_ISACTIVE"].ToString() == "-1")
+            {
+                OperatResult.AppendText(">>序列号" + sncode + "Key已激活不允许回流\n", Color.Red);
+                return false;
+            }
             if ((dt.Rows[0]["ms_qccheck"].ToString() == "-1"&& dt.Rows[0]["pr_ifrepaircheck"].ToString() == "-1") || dt.Rows[0]["ms_ifqccheck"].ToString() == "-1")
             {
                 OperatResult.AppendText(">>序列号" + sncode + "处于抽检状态，不允许重置站点\n", Color.Red);

UAS_MES_YDCY/FunctionCode/Special/Special_ResetKeyFreeze.cs

@@ -107,6 +107,7 @@ namespace UAS_MES_NEW.Special
             dh.ExecuteSql("update sninfo set si_keyid='' where si_sn='" + sncode + "'", "update");
             dh.ExecuteSql("delete makebad where mb_sncode = '" + sncode + "' and mb_makecode='" + makecode + "' and mb_status = 0", "delete");
             dh.ExecuteSql("delete labelprintlog where lpl_value = '" + sncode + "'  ", "delete");
+            dh.ExecuteSql("update MACRELEASE set MR_STATUS=-1 where mr_sncode = '" + sncode + "'  ", "update");
             sql.Clear();
             sql.Append("update craftmaterial set cm_status=-1,cm_lastdeco=-1,cm_dropman='" + User.UserCode + "',");
             sql.Append("cm_dropdate =sysdate,CM_REMARK = '重置站点拆解',cm_dropstep='" + User.CurrentStepCode + "',");

UAS_MES_YDCY/FunctionCode/Special/Special_ResetKeyRelease.cs

@@ -107,6 +107,7 @@ namespace UAS_MES_NEW.Special
             dh.ExecuteSql("update sninfo set si_keyid='' where si_sn='" + sncode + "'", "update");
             dh.ExecuteSql("delete makebad where mb_sncode = '" + sncode + "' and mb_makecode='" + makecode + "' and mb_status = 0", "delete");
             dh.ExecuteSql("delete labelprintlog where lpl_value = '" + sncode + "'  ", "delete");
+            dh.ExecuteSql("update MACRELEASE set MR_STATUS=-1 where mr_sncode = '" + sncode + "'  ", "update");
             sql.Clear();
             sql.Append("update craftmaterial set cm_status=-1,cm_lastdeco=-1,cm_dropman='" + User.UserCode + "',");
             sql.Append("cm_dropdate =sysdate,CM_REMARK = '重置站点拆解',cm_dropstep='" + User.CurrentStepCode + "',");