回流功能修改

UAS_MES_YDCY/FunctionCode/Special/Special_NeedCheck.cs

@@ -47,7 +47,7 @@ namespace UAS_MES_NEW.Special
             if (cd_stepcode.Text == "") { OperateResult.AppendText(">>请选择回流工序\n"); return; }
             DataTable dt = (DataTable)dh.ExecuteSql("select ms_makecode,nvl(ms_qctest,0)ms_qctest,ms_firstsn,ms_sncode,ms_prodcode,ms_checkno,ms_craftcode,ms_outboxcode from makeserial where ms_id='" + ms_id + "' and instr(ms_paststep,'" + cd_stepcode.Text + "')>0 ", "select");
             string ms_qctest = dt.Rows[0]["ms_qctest"].ToString();
-            if (ms_qctest == "1") { OperateResult.AppendText(">>" + SN.Text + "未抽检或者不需要回流，不允许回流\n", System.Drawing.Color.Red, SN); return; }
+            if (ms_qctest != "1") { OperateResult.AppendText(">>" + SN.Text + "未抽检或者不需要回流，不允许回流\n", System.Drawing.Color.Red, SN); return; }
 
             if (dt.Rows.Count == 0) { OperateResult.AppendText(">>" + SN.Text + "不存在或未执行过" + cd_stepcode.Text + "工序\n"); return; }
 
@@ -93,7 +93,7 @@ namespace UAS_MES_NEW.Special
                 ms_id = dt.Rows[0]["ms_id"].ToString();
                 string ms_checkno = dt.Rows[0]["ms_checkno"].ToString();
 
-                if (ms_checkno == "") { OperateResult.AppendText(">>" + SN.Text + "不存在抽检批次中\n", System.Drawing.Color.Red, SN); return; }
+                //if (ms_checkno == "") { OperateResult.AppendText(">>" + SN.Text + "不存在抽检批次中\n", System.Drawing.Color.Red, SN); return; }
 
                 cr_code.Text = dt.Rows[0]["ms_craftcode"].ToString();
                 string ms_prodcode = dt.Rows[0]["ms_prodcode"].ToString();

UAS_MES_YDCY/FunctionCode/SystemSetting/SystemSetting_PrinterTest.cs

@@ -68,14 +68,14 @@ namespace UAS_MES_NEW.SystemSetting
                         switch (format.SubStrings[j].Name)
                         {
                             case "SN":
-                                format.SubStrings[j].Value = (ma_code.Text.Replace("XX-", "") + lpad(4, (temp).ToString()));
+                                format.SubStrings[j].Value = (ma_code.Text.Replace("XX-", "") + lpad(5, (temp).ToString()));
                                 if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "'"))
                                 {
                                     dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before')", "insert");
                                 };
                                 break;
                             case "SN2":
-                                format.SubStrings[j].Value = (ma_code.Text.Replace("XX-", "") + lpad(4, (temp + 1).ToString()));
+                                format.SubStrings[j].Value = (ma_code.Text.Replace("XX-", "") + lpad(5, (temp + 1).ToString()));
                                 if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "'"))
                                 {
                                     dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before')", "insert");