diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/AddPortraitTubeJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/AddPortraitTubeJob.java index 0a818e584..e85bd1936 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/AddPortraitTubeJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/AddPortraitTubeJob.java @@ -44,7 +44,7 @@ public class AddPortraitTubeJob implements Job { // TODO 2024-08-28 To delete when no longer in use private static final String TUBE_50_SKU_MULTIPLE = "PJ95530040-WIA"; -// private static final String TUBE_NEW_40_SKU_SINGLE = "PJ349400032-JCH"; + private static final String TUBE_NEW_40_SKU_SINGLE = "PJ349400032-JCH"; private static final String TUBE_NEW_40_SKU_MULTIPLE = "PJ349400045-JCH"; // private static final String TUBE_NEW_50_SKU_SINGLE = "PJ349500032-JCH"; private static final String TUBE_NEW_50_SKU_MULTIPLE = "PJ349500045-JCH"; @@ -53,7 +53,7 @@ public class AddPortraitTubeJob implements Job { private static final List TUBE_SKUS = Arrays.asList(TUBE_30_SKU_SINGLE_DOUBLE, TUBE_50_SKU_SINGLE, TUBE_40_SKU_SINGLE, TUBE_NEW_40_SKU_MULTIPLE, TUBE_NEW_50_SKU_MULTIPLE, TUBE_NEW_60_SKU_SINGLE, - TUBE_NEW_60_SKU_MULTIPLE, TUBE_40_SKU_MULTIPLE, TUBE_50_SKU_MULTIPLE); + TUBE_NEW_60_SKU_MULTIPLE, TUBE_40_SKU_MULTIPLE, TUBE_50_SKU_MULTIPLE, TUBE_NEW_40_SKU_SINGLE); private static final String PREFIX_50_CANVAS = "JJ2501"; private static final String PREFIX_50_CANVAS_CHROME = "JJ2001"; private static final String PREFIX_40_CANVAS = "JJ2500"; @@ -317,7 +317,7 @@ public class AddPortraitTubeJob implements Job { adequateTubes.add(Pair.of(TUBE_NEW_60_SKU_MULTIPLE, tubeNew60MultipleCount)); } if (tube40SingleCount > 0) { - adequateTubes.add(Pair.of(TUBE_40_SKU_SINGLE, tube40SingleCount)); + adequateTubes.add(Pair.of(TUBE_NEW_40_SKU_SINGLE, tube40SingleCount)); } if (tubeNew50MultipleCount > 0) { adequateTubes.add(Pair.of(TUBE_NEW_50_SKU_MULTIPLE, tubeNew50MultipleCount)); diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt index 3af11bb12..08b8af872 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt @@ -8,7 +8,7 @@ ${AnsiColor.BRIGHT_BLUE} ${AnsiColor.BRIGHT_GREEN} -WIA APP Version: 2.8.0 +WIA APP Version: 2.9.0 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version} Website: www.wia-sourcing.com ${AnsiColor.BLACK} diff --git a/pom.xml b/pom.xml index 749926375..1f6360fac 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.jeecgframework.boot jeecg-boot-parent - 2.8.0 + 2.9.0 pom WIA APP ${project.version}