From 4c199ce8bad46531ba0edc3ef6e930bf6e63d3f1 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 20 Mar 2020 09:39:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BB=BB=E5=8A=A11470=E3=80=90=201470=2050?= =?UTF-8?q?4=20=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3-=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E6=94=B6=E8=B4=A7--=E6=96=B0=E5=A2=9E=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=BB=84=E4=BB=B6=E3=80=91?= =?UTF-8?q?=20=E4=BB=BB=E5=8A=A11467=E3=80=901467=20506=20=E5=8C=97?= =?UTF-8?q?=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3-=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=85=A5=E5=BA=93-=E6=96=B0=E5=A2=9E=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=BA=93=E4=BD=8D=E7=BB=84=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 10 ++++++++++ .../estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index ee6babb..a69e24b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; @@ -47,6 +48,7 @@ public class WmsLocate extends BaseBean { */ @Column(name = "LOCATE_TYPE") @ApiParam(value = "库位类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.LOCATE_TYPE.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "LOCATE_TYPE") private Integer locateType; @@ -192,6 +194,14 @@ public class WmsLocate extends BaseBean { this.destBoxQty = destBoxQty; } + public WmsLocate(String locateNo,Integer destBoxQty, Integer y, Integer x, Integer z) { + this.locateNo = locateNo; + this.destBoxQty = destBoxQty; + this.y = y; + this.x = x; + this.z = z; + } + public WmsLocate(Integer boxQty , Double partQty,String locateNo){ this.boxQty=boxQty; this.partQty=partQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java index 480fb35..c9fcfd4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java @@ -48,4 +48,11 @@ public class GenerateLocateRule { * 物料名称 */ private String partNo; + + /** + * 按照坐标排序 + */ + private boolean orderByAxle; + + } From 98787953ec9e951fe8b60e497a31c5a5bfd95cf2 Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 25 Mar 2020 14:25:45 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90MesPcnEnum=20=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 371e3aa..3e0e184 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -202,7 +202,7 @@ public class MesPcnEnumUtil { PCN_MENU(170, "PCN_MENU", ""), PCN_MODULE(180, "PCN_MODULE", ""), PCN_LOGOUT(190, "PCN_LOGOUT", ""), - UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"), + UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"), PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"), PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"); From 56c1bf8c443a29b649ff5c810c6eff920280354d Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 25 Mar 2020 18:33:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=907648=20=E5=9C=A8=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=89=93?= =?UTF-8?q?=E5=BC=80=E5=8D=95=E6=8D=AE=E6=8C=89=E9=92=AE=E3=80=82=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 8b79c72..10e116b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -105,7 +105,7 @@ public class WmsDocMovementDetails extends BaseBean { */ @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; /** From 3a7d7a79248e646326239ebfdc4e9a4287a17202 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 25 Mar 2020 18:36:08 +0800 Subject: [PATCH 4/5] =?UTF-8?q?bug7754=E3=80=907754=20=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=8E=A5=E6=94=B6=E5=AF=B9=E6=96=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=9C=A8=E6=88=91=E4=BB=AC=E7=B3=BB=E7=BB=9F=E4=B8=AD?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E6=8A=A5=E5=B7=A5=E7=9A=84=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E5=BD=93=E6=8E=A5=E6=94=B6=E5=88=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E5=9C=A8=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=AD=E7=94=9F=E6=88=90=E4=B8=80=E4=B8=AA=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=EF=BC=8C=E7=84=B6=E5=90=8E=E8=87=AA=E5=8A=A8=E5=AF=B9=E8=AF=A5?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=BF=9B=E8=A1=8C=E6=8A=A5=E5=B7=A5=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=EF=BC=8C=E6=8E=A5=E5=8F=A3=E4=B8=AD=E5=8C=85=E5=90=AB?= =?UTF-8?q?=E4=BA=86=E6=9D=A1=E7=A0=81=EF=BC=8C=E9=9B=B6=E4=BB=B6=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=82=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 60 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++ .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 5 ++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 ++ 4 files changed, 72 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 44f3039..d7b4c19 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -139,6 +139,15 @@ public class WmsEnumUtil { } return tmp; } + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } } @@ -2977,6 +2986,16 @@ public class WmsEnumUtil { } return tmp; } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } } /** @@ -5150,4 +5169,45 @@ public class WmsEnumUtil { return tmp; } } + + + /** + * 推送类型单位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QAD_DOC_TYPE { + TYPE_S(10, "s","s"), TYPE_D(20, "d","d"); + + private int value; + private String code; + private String description; + + public String getCode() { + return code; + } + + QAD_DOC_TYPE(int value,String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 74d1911..b807a04 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -170,6 +170,10 @@ public class WmsDocMovementMaster extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.STEP.class, refForeignKey = "value", value = "description") private Integer isSingleStep; + @Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''") + @ApiParam(value = "QAD发运单据类型") + private String erpSrcType; + @Transient @ApiParam(value = "发运单号") private String shipOrderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 741493d..2833b2f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -183,6 +183,11 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("是否预收货") public Integer priorRC = 2; + + @Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''") + @ApiParam(value = "QAD发运单据类型") + private String erpSrcType; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 793e485..68b8086 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1908,6 +1908,9 @@ public class WmsHqlPack { if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) { DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", packBean); } + if (wmsTransModule.getId() != null) { + DdlPreparedPack.getNumEqualPack(wmsTransModule.getId(), "id", packBean); + } if (StringUtils.isNotBlank(wmsTransModule.orderBy())) { packBean.setOrderByStr(wmsTransModule.orderBy()); } From 048419d82365e6ded93f3bd4b589138e60b6b13c Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Wed, 25 Mar 2020 19:21:51 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=97=B6=E7=89=88=E6=9C=AC=E5=8F=B7=E7=9A=84=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=EF=BC=8C=E5=90=8E=E7=BB=AD=E5=8F=AF=E4=BB=A5=E9=80=9A=E8=BF=87?= =?UTF-8?q?mvn=20clean=20install=20Pdev=20=E5=91=BD=E4=BB=A4=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=89=93=E5=8C=85,=E6=9C=80=E5=90=8Edev=E8=BF=98?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=9B=B4=E6=8D=A2=E4=B8=BAtest=E3=80=81prod?= =?UTF-8?q?=E3=80=81docker=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 34 ++++++++++++++++++++++++++++++++- modules/i3plus-pojo-aps/pom.xml | 34 ++++++++++++++++++++++++++++++++- modules/i3plus-pojo-base/pom.xml | 35 ++++++++++++++++++++++++++++++++-- modules/i3plus-pojo-form/pom.xml | 34 ++++++++++++++++++++++++++++++++- modules/i3plus-pojo-hardswitch/pom.xml | 35 ++++++++++++++++++++++++++++++++-- modules/i3plus-pojo-jobflow/pom.xml | 35 ++++++++++++++++++++++++++++++++-- modules/i3plus-pojo-lac/pom.xml | 34 ++++++++++++++++++++++++++++++++- modules/i3plus-pojo-mes-pcn/pom.xml | 35 ++++++++++++++++++++++++++++++++-- modules/i3plus-pojo-mes/pom.xml | 35 ++++++++++++++++++++++++++++++++-- modules/i3plus-pojo-model/pom.xml | 35 ++++++++++++++++++++++++++++++++-- modules/i3plus-pojo-platform/pom.xml | 35 ++++++++++++++++++++++++++++++++-- modules/i3plus-pojo-ptl/pom.xml | 34 ++++++++++++++++++++++++++++++++- modules/i3plus-pojo-report/pom.xml | 34 ++++++++++++++++++++++++++++++++- modules/i3plus-pojo-softswitch/pom.xml | 34 ++++++++++++++++++++++++++++++++- modules/i3plus-pojo-sweb/pom.xml | 35 ++++++++++++++++++++++++++++++++-- modules/i3plus-pojo-wms/pom.xml | 35 ++++++++++++++++++++++++++++++++-- modules/i3plus-pojo-workflow/pom.xml | 35 ++++++++++++++++++++++++++++++++-- pom.xml | 35 ++++++++++++++++++++++++++++++++-- 18 files changed, 594 insertions(+), 29 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..2bb8b09 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -19,5 +19,37 @@ i3plus-pojo-base + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4fa7c5a..4591fe3 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -23,5 +23,37 @@ hibernate-validator + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e97c0bb..0e3621b 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -41,7 +41,38 @@ - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 90e744d..4d0a808 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -20,4 +20,36 @@ i3plus-pojo-base + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0ba3645..ecf48ed 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,13 +5,44 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-hardswitch jar - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6706323..2241e93 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,13 +5,44 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-jobflow jar - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index ffcac19..c9fd4ee 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -19,5 +19,37 @@ i3plus-pojo-base + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e388a1d..27731be 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -19,6 +19,37 @@ i3plus-pojo-base - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 62ebe64..2ba9ddd 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -19,6 +19,37 @@ i3plus-pojo-base - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39d9423..3fd87ac 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -60,6 +60,37 @@ - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index e310bfd..c0524de 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -19,6 +19,37 @@ i3plus-pojo-base - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 92de049..4b73b1a 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -19,4 +19,36 @@ i3plus-pojo-base + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index e36fcf7..4ebc2f7 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -20,4 +20,36 @@ i3plus-pojo-base + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 81fb02b..b3c4fc8 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -20,4 +20,36 @@ i3plus-pojo-base + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1f622d9..b601666 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -19,6 +19,37 @@ i3plus-pojo-base - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index bc41914..2d56516 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -23,6 +23,37 @@ - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 93f9732..4395f3c 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,13 +5,44 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-workflow jar - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2ffb2ae..96a06e4 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform @@ -222,5 +222,36 @@ - + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file