优化上料采集和Key冻结功能

UAS_MES_YDCY/FunctionCode/Make/Make_ColorBoxLoadPrintBZ.cs

@@ -6,7 +6,7 @@ using UAS_MES_NEW.CustomControl.TextBoxWithIcon;
 using UAS_MES_NEW.DataOperate;
 using UAS_MES_NEW.Entity;
 using UAS_MES_NEW.PublicMethod;
-using System.Drawing;
+using System.Drawing;   
 using System.Text.RegularExpressions;
 using System.Collections.Generic;
 using UAS_MES_NEW.PublicForm;

UAS_MES_YDCY/FunctionCode/Special/Special_ResetKeyRelease.cs

@@ -81,7 +81,7 @@ namespace UAS_MES_NEW.Special
                     dt = (DataTable)dh.ExecuteSql("select mil_id,nvl(ms_ifqccheck,0)ms_ifqccheck,ms_makecode,ms_firstsn,ms_sncode,ms_prodcode,ms_checkno,ms_craftcode,ms_outboxcode,mil_netcode from makeserial left join makeimeilist on mil_sncode=ms_sncode where ms_id='" + ms_id + "' and instr(ms_paststep,'" + cd_stepcode.Text + "')>0 ", "select");
                     break;
                 default:
-                    dt = (DataTable)dh.ExecuteSql("select mk_id mil_id,nvl(ms_ifqccheck,0)ms_ifqccheck,ms_makecode,ms_firstsn,ms_sncode,ms_prodcode,ms_checkno,ms_craftcode,ms_outboxcode,MK_DPK mil_netcode from makeserial left join "+keytable+" on mk_sncode=ms_sncode where ms_id='" + ms_id + "' and instr(ms_paststep,'" + cd_stepcode.Text + "')>0 ", "select");
+                    dt = (DataTable)dh.ExecuteSql("select mk_id mil_id,nvl(ms_ifqccheck,0)ms_ifqccheck,ms_makecode,ms_firstsn,ms_sncode,ms_prodcode,ms_checkno,ms_craftcode,ms_outboxcode,MK_DPK mil_netcode from makeserial left join " + keytable + " on mk_sncode=ms_sncode where ms_id='" + ms_id + "' and instr(ms_paststep,'" + cd_stepcode.Text + "')>0 ", "select");
                     break;
             }
             string mil_id = dt.Rows[0]["mil_id"].ToString();
@@ -91,13 +91,14 @@ namespace UAS_MES_NEW.Special
                     dh.ExecuteSql("update makeimeilist set mil_sncode='',mil_status=-2,MIL_REMARK='主动冻结' where mil_id='" + mil_id + "'", "update");
                     break;
                 default:
-                    dh.ExecuteSql("update "+keytable+" set mk_sncode='',MK_STATUS=-2,mk_remark='主动冻结' where mk_id='" + mil_id + "'", "update");
+                    dh.ExecuteSql("update " + keytable + " set mk_sncode='',MK_STATUS=-2,mk_remark='主动冻结' where mk_id='" + mil_id + "'", "update");
                     break;
             }
             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_status=1,ms_outboxcode='',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");
             sql.Clear();