diff --git a/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml b/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml index 2eb5f90c..9670ac6d 100644 --- a/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml +++ b/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml @@ -208,7 +208,7 @@ - SELECT ISNULL(MAX(id), 100000) + 1 + SELECT ISNULL(MAX(CASE WHEN id >= 100000 THEN id END), 100000) + 1 FROM plm_project_info_tracking WITH (TABLOCKX, HOLDLOCK) INSERT INTO plm_project_info_tracking @@ -229,7 +229,7 @@ - SELECT ISNULL(MAX(id), 100000) + 1 + SELECT ISNULL(MAX(CASE WHEN id >= 100000 THEN id END), 100000) + 1 FROM plm_project_part_tracking WITH (TABLOCKX, HOLDLOCK) INSERT INTO plm_project_part_tracking @@ -248,7 +248,7 @@ - SELECT ISNULL(MAX(id), 100000) + 1 + SELECT ISNULL(MAX(CASE WHEN id >= 100000 THEN id END), 100000) + 1 FROM plm_proofing_information_tracking WITH (TABLOCKX, HOLDLOCK) INSERT INTO plm_proofing_information_tracking @@ -653,7 +653,7 @@ - SELECT ISNULL(MAX(id), 100000) + 1 + SELECT ISNULL(MAX(CASE WHEN id >= 100000 THEN id END), 100000) + 1 FROM plm_proofing_information_tracking WITH (TABLOCKX, HOLDLOCK) INSERT INTO plm_proofing_information_tracking diff --git a/src/main/resources/mapper/sampletracking/SampleTrackingMapper.xml b/src/main/resources/mapper/sampletracking/SampleTrackingMapper.xml index 5f951ac4..aaf8ffb3 100644 --- a/src/main/resources/mapper/sampletracking/SampleTrackingMapper.xml +++ b/src/main/resources/mapper/sampletracking/SampleTrackingMapper.xml @@ -78,7 +78,7 @@ - SELECT ISNULL(MAX(id), 10000) + 1 + SELECT ISNULL(MAX(CASE WHEN id >= 100000 THEN id END), 100000) + 1 FROM plm_project_info_tracking WITH (TABLOCKX, HOLDLOCK) INSERT INTO plm_project_info_tracking @@ -255,7 +255,7 @@ - SELECT ISNULL(MAX(id), 10000) + 1 + SELECT ISNULL(MAX(CASE WHEN id >= 100000 THEN id END), 100000) + 1 FROM plm_project_part_tracking WITH (TABLOCKX, HOLDLOCK) INSERT INTO plm_project_part_tracking @@ -411,7 +411,7 @@ @@ -528,7 +528,7 @@ @@ -655,7 +655,7 @@ diff --git a/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx b/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx index c888e188..5ae1f0fe 100644 Binary files a/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx and b/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx differ