diff --git a/modules/i3plus-ext-mes-api/pom.xml b/modules/i3plus-ext-mes-api/pom.xml index 4b24fca..9cecd56 100644 --- a/modules/i3plus-ext-mes-api/pom.xml +++ b/modules/i3plus-ext-mes-api/pom.xml @@ -19,14 +19,6 @@ i3plus.pojo i3plus-pojo-mes - 1.0.0-yfai - - - - i3plus.platform - i3plus-platform-common - 1.0.0.1-patch - pom i3plus.ext.mes diff --git a/modules/i3plus-ext-mes-apiservice/pom.xml b/modules/i3plus-ext-mes-apiservice/pom.xml index c5054bb..6b2e26e 100644 --- a/modules/i3plus-ext-mes-apiservice/pom.xml +++ b/modules/i3plus-ext-mes-apiservice/pom.xml @@ -78,20 +78,22 @@ i3plus.pojo + i3plus-pojo-model + + + + i3plus.pojo i3plus-pojo-mes i3plus.platform i3plus-platform-common - 1.0.0.1-patch i3plus.platform i3plus-platform-plugin - 1.0.0.1-patch - diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/TestBusiController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/TestBusiController.java deleted file mode 100644 index 6820723..0000000 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/TestBusiController.java +++ /dev/null @@ -1,8 +0,0 @@ -package cn.estsh.i3plus.ext.mes.apiservice.controller.busi; - -import cn.estsh.impp.framework.base.controller.MesBaseController; - -public class TestBusiController extends MesBaseController { - - -} diff --git a/modules/i3plus-ext-mes-icloud/pom.xml b/modules/i3plus-ext-mes-icloud/pom.xml index 8bf9f97..1485500 100644 --- a/modules/i3plus-ext-mes-icloud/pom.xml +++ b/modules/i3plus-ext-mes-icloud/pom.xml @@ -28,7 +28,6 @@ i3plus.platform i3plus-platform-common - 1.0.0.1-patch diff --git a/modules/i3plus-ext-mes-pojo/pom.xml b/modules/i3plus-ext-mes-pojo/pom.xml index 4b29488..08d8df4 100644 --- a/modules/i3plus-ext-mes-pojo/pom.xml +++ b/modules/i3plus-ext-mes-pojo/pom.xml @@ -16,8 +16,6 @@ i3plus.pojo i3plus-pojo-mes - 1.0.0-yfai - org.quartz-scheduler diff --git a/pom.xml b/pom.xml index 052d8fb..6d52f5c 100644 --- a/pom.xml +++ b/pom.xml @@ -30,14 +30,12 @@ true UTF-8 - 1.0.0.3 - + 1.0.1-YZ 1.0.0-yfai 1.0.0.1-patch 1.0.0.1-patch 1.0.0-yfai 2.17.1 - @@ -61,13 +59,9 @@ i3plus-icloud ${i3plus.icloud.version} pom + import - - i3plus.icloud - i3plus-icloud-wms - ${i3plus.icloud.version} - i3plus.pojo i3plus-pojo @@ -89,9 +83,15 @@ i3plus-mes ${i3plus.mes.version} pom + import + i3plus.icloud + i3plus-icloud-wms + ${i3plus.icloud.version} + + i3plus.mes i3plus-mes-apiservice ${i3plus.mes.version} @@ -125,7 +125,6 @@ impp.framework impp-framework-boot ${impp.framework.version} - @@ -152,25 +151,33 @@ i3plus.pojo i3plus-pojo-mes - 1.0.0-yfai + ${i3plus.pojo.version} - i3plus.pojo - i3plus-pojo-andon - 1.0.0-yfai + i3plus-pojo-base + ${i3plus.pojo.version} + + + i3plus.pojo + i3plus-pojo-model + ${i3plus.pojo.version} i3plus.platform i3plus-platform-common - 1.0.0.1-patch + ${i3plus.platform.version} + + + i3plus.platform + i3plus-platform-plugin + ${i3plus.platform.version} i3plus.icloud i3plus-icloud-core ${i3plus.icloud.version} - i3plus.icloud i3plus-icloud-andon