Browse Source

Merge repos.ubtob.net:usoft/mes-client

callm 2 months ago
parent
commit
ec0d20788a
1 changed files with 20 additions and 0 deletions
  1. 20 0
      UAS_MES_JWS/FunctionCode/SystemSetting/SystemSetting_PrinterTest.cs

+ 20 - 0
UAS_MES_JWS/FunctionCode/SystemSetting/SystemSetting_PrinterTest.cs

@@ -256,26 +256,46 @@ namespace UAS_MES_NEW.SystemSetting
                         {
                             case "SN":
                                 format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp).ToString()));
+                                if (dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_printstatus='-1'"))
+                                {
+                                    return;
+                                }
                                 if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_makecode='" + ma_code.Text + "'"))
                                     dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type,msl_printstatus)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before',-1)", "insert");
                                 break;
                             case "SN2":
                                 format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp + 1).ToString()));
+                                if (dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_printstatus='-1'"))
+                                {
+                                    return;
+                                }
                                 if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_makecode='" + ma_code.Text + "'"))
                                     dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type,msl_printstatus)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before',-1)", "insert");
                                 break;
                             case "SN3":
                                 format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp + 2).ToString()));
+                                if (dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_printstatus='-1'"))
+                                {
+                                    return;
+                                }
                                 if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_makecode='" + ma_code.Text + "'"))
                                     dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type,msl_printstatus)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before',-1)", "insert");
                                 break;
                             case "SN4":
                                 format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp + 3).ToString()));
+                                if (dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_printstatus='-1'"))
+                                {
+                                    return;
+                                }
                                 if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_makecode='" + ma_code.Text + "'"))
                                     dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type,msl_printstatus)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before',-1)", "insert");
                                 break;
                             case "SN5":
                                 format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp + 4).ToString()));
+                                if (dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_printstatus='-1'"))
+                                {
+                                    return;
+                                }
                                 if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_makecode='" + ma_code.Text + "'"))
                                     dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type,msl_printstatus)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before',-1)", "insert");
                                 break;