优化功能

UAS_MES_YDCY/FunctionCode/Special/Special_ResetKeyRelease.cs

@@ -69,9 +69,9 @@ namespace UAS_MES_NEW.Special
                 OperatResult.AppendText(">>序列号" + sncode + "已出货不允许回流\n", Color.Red);
                 return false;
             }
-            if (dt.Rows[0]["MS_ISACTIVE"].ToString() == "0")
+            if (dt.Rows[0]["MS_ISACTIVE"].ToString() == "-1")
             {
-                OperatResult.AppendText(">>序列号" + sncode + "未激活不允许冻结\n", Color.Red);
+                OperatResult.AppendText(">>序列号" + sncode + "已激活不允许解绑\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")
@@ -103,7 +103,7 @@ namespace UAS_MES_NEW.Special
             string makecode = dt.Rows[0]["ms_makecode"].ToString();
             string stname = dh.getFieldDataByCondition("step", "st_name", "st_code = '" + stepcode + "'").ToString();
 
-            dh.ExecuteSql("update makeserial set MS_ISACTIVE=0,ms_status=1,ms_outboxcode='',ms_keyid='',ms_printcount = 0,ms_stepcode='', ms_nextstepcode= '" + stepcode + "' where ms_sncode='" + sncode + "' and ms_makecode='" + makecode + "'", "update");
+            dh.ExecuteSql("update makeserial set ms_status=1,ms_outboxcode='',ms_keyid='',ms_printcount = 0,ms_stepcode='', ms_nextstepcode= '" + stepcode + "' where ms_sncode='" + sncode + "' and ms_makecode='" + makecode + "'", "update");
             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");

UAS_MES_ZT/FunctionCode/Special/Special_Reset.cs

@@ -52,7 +52,7 @@ namespace UAS_MES_NEW.Special
         private void ReSN(string sncode, string stepcode)
         {   
             string stname = dh.getFieldDataByCondition("step", "st_name", "st_code = '" + stepcode +  "'").ToString();
-            dh.ExecuteSql("update makeserial set MS_CHECKNO = '', ms_status=1,ms_outboxcode='',ms_nextstepcode= '"+ stepcode + "',ms_stepcode='' where ms_sncode='" + sncode + "' and ms_nextmacode is null", "update");
+            dh.ExecuteSql("update makeserial set MS_CHECKNO = '', ms_status=1,ms_outboxcode='',ms_nextstepcode= '"+ stepcode + "',ms_stepcode='"+ stepcode + "' where ms_sncode='" + sncode + "' and ms_nextmacode is null", "update");
             //if (checkBox1.Checked)
             //{
             //    dh.ExecuteSql("update makeserial set ms_bs = '',ms_key='',ms_keyid='',MS_HARDWREID='',MS_KEYSTATEID='',MS_BIOS='',ms_ec='',ms_uuid='',MS_KEYPARTNUMBER='',ms_bt='',ms_mac='',ms_imei='' where ms_sncode = '" + sncode + "' and ms_makecode = '" + ms_makecode.Text + "'", "update");