老化修改

UAS_MES_ZT/FunctionCode/Make/Make_Aging.cs

@@ -186,7 +186,7 @@ namespace UAS_MES_NEW.Make
                         {
                             dh.ExecuteSql("insert into ageing(ag_id,ag_code,ag_indate,ag_status) values(ageing_seq.nextval,'" + agcode.Text + "',sysdate,0)", "insert");
                         }
-                        if (dh.CheckExist("ageingdetail", "agd_sncode='" + sncode.Text + "' agd_makecode='" + ms_makecode.Text + "'"))
+                        if (dh.CheckExist("ageingdetail", "agd_sncode='" + sncode.Text + "' and agd_makecode='" + ms_makecode.Text + "'"))
                         {
                             OperateResult.AppendText(">>" + sncode.Text + "已经进入老化，不允许重复采集\n", Color.Red, sncode);
                             return;

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_STEPCODE = '',MS_CHECKNO = '', ms_status=1,ms_outboxcode='',ms_nextstepcode= '"+ stepcode + "' where ms_sncode='" + sncode + "' and ms_nextmacode is null", "update");
+            dh.ExecuteSql("update makeserial set MS_STEPCODE = '',MS_CHECKNO = '', ms_status=1,ms_outboxcode='',ms_nextstepcode= '"+ stepcode + "',ms_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");