From ab688957606f2a88352e0c080752feeed6f8895d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 20 Dec 2019 10:39:42 +0800 Subject: [PATCH 01/10] =?UTF-8?q?test=E5=88=86=E6=94=AF=E4=BF=AE=E6=94=B9p?= =?UTF-8?q?om?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..f8fa98e 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-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index c052a9d..b0a3f82 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-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e97c0bb..d790ef1 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-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 90e744d..c6141da 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-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0ba3645..23e5bee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6706323..c1e2cb9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index ffcac19..856da5f 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-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e388a1d..09f2c4a 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-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 62ebe64..82fdbe8 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-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39d9423..b7b2dfc 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-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index e310bfd..ec9e100 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-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index e36fcf7..bd09726 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-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 81fb02b..4c96781 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-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1f622d9..2c24e41 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-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index bc41914..18c811c 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-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 93f9732..1171f4e 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 9caeb95..5345a36 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform modules/i3plus-pojo-model From b199c5995fe9bb322cff4ce81fd7db37adb37ef6 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 16 Jan 2020 17:43:22 +0800 Subject: [PATCH 02/10] Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-ics into test # Conflicts: # modules/i3plus-ics-console/src/main/resources/application.properties # modules/i3plus-ics-gateway/src/main/resources/application.properties # modules/i3plus-ics-regist/src/main/resources/application.properties --- modules/i3plus-pojo-ptl-pcn/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-ptl-pcn/pom.xml b/modules/i3plus-pojo-ptl-pcn/pom.xml index ed7ad85..25ad1a1 100644 --- a/modules/i3plus-pojo-ptl-pcn/pom.xml +++ b/modules/i3plus-pojo-ptl-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 92de049..0db7b7d 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-TEST-SNAPSHOT ../../pom.xml 4.0.0 From 7c77c90a3c3cbad19cba8a2ba3174dec86385a49 Mon Sep 17 00:00:00 2001 From: luweihao Date: Wed, 4 Mar 2020 16:59:06 +0800 Subject: [PATCH 03/10] =?UTF-8?q?task=20=20=E4=BD=9C=E4=B8=9A=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java index 0285bb7..5fb24e8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java @@ -45,4 +45,8 @@ public class MesProdRouteCfg extends BaseBean implements Serializable { @Column(name = "ROUTE_TYPE") @ApiParam("流程类型 10-扫描类型 20-监控类型") private Integer routeType; + + @Column(name = "PPT_CODE") + @ApiParam("产品生产类型") + private String pptCode; } From 0968cdc49e5289438d19f192abfd56bd4eb7741f Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 11 Mar 2020 11:35:36 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E3=80=907601=20=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E7=94=9F=E6=88=90=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=94=B1=E4=BA=8E=E7=94=9F=E6=88=90=E7=9A=84?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9D=A1=E7=A0=81=E4=B8=8D=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E4=BA=8E=E6=9D=A1=E7=A0=81=E8=A1=A8=E4=B8=AD=E3=80=82=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=9C=89=E4=B8=80=E4=B8=AA=E7=95=8C=E9=9D=A2=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E6=9F=A5=E5=88=B0=E8=BF=99=E4=BA=9B=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=B8=94=E6=89=93=E5=8D=B0=E5=87=BA=E6=9D=A5?= =?UTF-8?q?=EF=BC=8C=E7=9B=AE=E5=89=8D=E7=9A=84=E8=AF=9D=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E7=94=9F=E6=88=90=E9=82=A3=E6=AC=A1=E7=9A=84=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E4=BA=86=EF=BC=8C=E9=82=A3=E5=B0=B1=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=86=8D=E6=AC=A1=E6=89=93=E5=8D=B0=E6=94=B9=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E3=80=82=E3=80=91BUG#7601=20=E3=80=907567=20=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=8A=B6=E6=80=81=E6=8A=A5=E8=A1=A8=E5=B8=8C=E6=9C=9B?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AAASN=E7=BB=84=E5=8F=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8C=89=E9=92=AE=EF=BC=8C=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=98=AF=E5=B8=8C=E6=9C=9B=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=8C=89=E7=85=A7ASN=E7=BB=84=E5=8F=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E3=80=91bug#7567=20=E3=80=907520=20=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E5=8D=95=E4=B8=BB=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BA=93=E5=8C=BA=E4=B8=8E=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=BB=8E=E7=9B=98=E7=82=B9=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E9=87=8C=E5=8F=96=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=9C=89=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E5=BA=93=E5=8C=BA=E6=88=96=E8=80=85=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E5=88=99=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=B0=B1=E8=A1=8C,=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A1=86=E5=A2=9E=E5=8A=A0=E9=9B=B6=E4=BB=B6=E5=8F=B7=E4=B8=8E?= =?UTF-8?q?=E5=BA=93=E5=8C=BA=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2=E3=80=91?= =?UTF-8?q?bug#7520?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 8 ++++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index fe8ebc7..6d70ddc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -92,10 +92,18 @@ public class WmsCSOrderMaster extends BaseBean { public String[] wmsCSParts; @Transient + @ApiParam(value = "盘点物料清单") + public String wmsCSPartsStr; + + @Transient @ApiParam(value = "盘点存储区清单") public String[] wmsCSZones; @Transient + @ApiParam(value = "盘点存储区清单") + public String wmsCSZonesStr; + + @Transient @ApiParam(value = "盘点库位清单") public String[] wmsCSLocates; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 81cd4b4..f5631cd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -126,4 +126,9 @@ public class WmsDocMovementSn extends BaseBean { @Transient @ApiParam("父层级packcode对应的可回用零件号") private String parentReturnPart; + + + @Transient + @ApiParam("打印模板") + private String templateNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index f72a66b..eae8683 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -306,6 +306,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "预计完成时间") private String planCompleteTime; + @Transient + @ApiParam(value = "集装箱号") + private String containerNo; + public WmsStockSn() { } From ac4a8b0ab4a2601e5f82903e40b4f57ee2b2740b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 11 Mar 2020 15:07:09 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9ptl=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B8=85=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index b766f3f..8746630 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1551,13 +1551,20 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlWhereByClear(DdlPackBean packBean, String dateTime) { + LOGGER.info("ptl_pcn数据清除查询"); StringBuffer queryString = new StringBuffer(); - queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 and model.createDatetime <= " + dateTime + " "); + queryString.append("select model from " + persistentClass.getSimpleName() + + " as model where 1=1 and model.createDatetime <= " + "'" + dateTime + "'" + " "); if (packBean != null) { queryString.append(packBean.getWhereAppend()); } - return entityManager.createQuery(queryString.toString()).getResultList(); + Query query = entityManager.createQuery(queryString.toString()); + for (String key : packBean.getHqlPreparedMap().keySet()) { + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + } + + return query.getResultList(); } } From 102af98a75a7aafd4c196da55ca3f3b320cb0e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 11 Mar 2020 15:53:39 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E3=80=90PTL=5F=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=BB=E4=BB=BB=E5=8A=A1=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=92=8C=E7=BB=84=E5=86=85=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 10 ++++------ .../cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 4 ++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index c7554a2..1b817ca 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -72,19 +72,17 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品类型名称") private String produceCategoryNameRdd; - @Column(name = "PPT_CODE") - @ApiParam("产品生产类型") +@Column(name = "产品生产类型") + @ApiParam("产品类型名称") private String pptCode; - @Column(name = "QUEUE_GROUP_NO") + @Column(name = "QUEUE_GROUP_NO") @ApiParam("分组队列编号") private String queueGroupNo; @Column(name = "GROUP_NO") @ApiParam("组内编号") - private Integer groupNo; - - @Transient + private Integer groupNo; @Transient @ApiParam("队列序号") private Double queueSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index d4961d3..357f9e8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; +import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -79,6 +80,9 @@ public class StationRequestBean implements Serializable { @ApiParam("工步列表") private List stepList; + @ApiParam("生产主队列编号") + private String orderNo; + @Override public String toString() { return "StationRequestBean{" + From cb09776bdbf40e72736430ff6dae1ccb56830095 Mon Sep 17 00:00:00 2001 From: joke lin Date: Wed, 11 Mar 2020 18:13:16 +0800 Subject: [PATCH 07/10] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1435=20?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 10 +++-- .../i3plus/pojo/mes/bean/MesProdScatterDetail.java | 48 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/MesButtonFlagModel.java | 3 ++ .../repository/MesProdScatterDetailRepository.java | 13 ++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 25 ++++++++--- 5 files changed, 90 insertions(+), 9 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterDetailRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 9683119..5bf74c2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2917,7 +2917,8 @@ public class MesEnumUtil { BTS_ORDER(20, "BTS工单"), ATTEMPT_ORDER(30, "试制工单"), BH_ORDER(40, "B&H工单"), - JIT_ORDER(50, "JIT工单"); + JIT_ORDER(50, "JIT工单"), + STOCK_ORDER(60, "库存工单"); private int value; private String description; @@ -4142,7 +4143,9 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QUEUE_JIS_STATUS { - CREATE(10, "创建"); + CREATE(10, "创建"), + LANDED(20, "下达"), + SHIPMENT(30, "已发运"); private int value; private String description; @@ -4211,7 +4214,8 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QUEUE_JIS_DETAIL_STATUS { - CREATE(10, "创建"); + CREATE(10, "创建"), + SHIPMENT(20, "已发运"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java new file mode 100644 index 0000000..097c8d3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/3/11 8:59 上午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_SCATTER_DETAIL") +@Api("MES_散件产品配置关系") +public class MesProdScatterDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3602480079910597288L; + + @Column(name = "SP_CFG_CODE") + @ApiParam("散件配置编码") + private String spCfgCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "PART_NO") + @ApiParam("散件产品代码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("散件产品名称") + private String partName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java index d3ab791..3cd4e8b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java @@ -26,6 +26,9 @@ public class MesButtonFlagModel implements Serializable { @ApiParam("按配置修改按钮") private boolean updateButtonConfig; + @ApiParam("按散件修改按钮") + private boolean updateButtonScatter; + @ApiParam("下达按钮") private boolean transmitButton; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterDetailRepository.java new file mode 100644 index 0000000..254cfb8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterDetailRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProdScatterDetail; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/3/11 9:16 上午 + * @Modify: + */ +public interface MesProdScatterDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 9e068c0..914920f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -226,15 +226,28 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesQueueOrder.getIsValid(), "isValid", packBean); } + if (!StringUtils.isEmpty(mesQueueOrder.getWorkType())) { + DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getWorkType(), "workType", packBean); + } + if (!StringUtils.isEmpty(mesQueueOrder.getCustProdLineCode())) { + DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean); + } + if (!StringUtils.isEmpty(mesQueueOrder.getPgCode())) { + DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getPgCode(), "pgCode", packBean); + } + if (mesQueueOrder.getQueueType() != null) { + DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getQueueType(), "queueType", packBean); + } + // 只查询创建状态的队列 DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean); - // 时间段查询 - DdlPreparedPack.timeBuilder( - mesQueueOrder.getCreateDateTimeStart(), - mesQueueOrder.getCreateDateTimeEnd(), - "createDatetime", packBean, true); - + if (!StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesQueueOrder.getCreateDateTimeStart(), + mesQueueOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } // DdlPreparedPack.getOrderDefault(mesQueueOrder); return packBean; } From a5101960227f43bdfedd06c3236927836521ac95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 11 Mar 2020 18:49:33 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E8=BD=AF=E5=88=A0=E5=90=88=E5=90=8C?= =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=90=AF=E7=94=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/form/bean/BfDataObjectProperty.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/form/bean/BfElement.java | 17 ++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index 8e246ce..54b9201 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -112,6 +112,14 @@ public class BfDataObjectProperty extends BaseBean { } @Transient + @ApiParam(value ="是否为数据有效字段") + private transient Integer isValidProperty; + + @Transient + @ApiParam(value ="是否为弱删除字段") + private transient Integer isDeleteWeaklyProperty; + + @Transient @ApiParam(value ="元素值") private transient Object propertyFormValue; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 43874a3..ee72ad6 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.form.bean; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -79,6 +78,22 @@ public class BfElement extends BaseBean { @ApiParam(value = "是否删除") private Integer isObjectDel; + @Column(name = "IS_OBJECT_DEL_WEAK") + @ApiParam(value = "是否弱删除") + private Integer isObjectDelWeak; + + @Column(name = "ELEMENT_DEL_WEAK_ATTR_ID") + @ApiParam(value = "元素弱删除属性id") + private Long elementDelWeakAttrId; + + @Column(name = "IS_OBJECT_VALID") + @ApiParam(value = "是否有效") + private Integer isObjectValid; + + @Column(name = "ELEMENT_VALID_ATTR_ID") + @ApiParam(value = "元素有效属性id") + private Long elementValidAttrId; + @Column(name = "IS_OBJECT_EXPORT") @ApiParam(value = "是否导出") private Integer isObjectExport; From cd19bfb429401680477e9cc4c5a452978a69edb9 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 11 Mar 2020 19:24:40 +0800 Subject: [PATCH 09/10] ptlpcn --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 36 +++++++++++----------- .../estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 1 + 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index e452e94..6c75133 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -351,12 +351,12 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TAG_LIGHT_COLOR_CMD { - TAG_LIGHT_COLOR_RED("00", 0, "红"), - TAG_LIGHT_COLOR_GREEN("01", 1, "绿"), - TAG_LIGHT_COLOR_ORANGE("02", 2, "橙"), - TAG_LIGHT_COLOR_BLUE("03", 3, "蓝"), - TAG_LIGHT_COLOR_PINK_RED("04", 4, "粉红"), - TAG_LIGHT_COLOR_BLUE_GREEN("05", 5, "蓝绿"); + TAG_LIGHT_COLOR_RED("00", 1, "红"), + TAG_LIGHT_COLOR_GREEN("01", 2, "绿"), + TAG_LIGHT_COLOR_ORANGE("02", 3, "橙"), + TAG_LIGHT_COLOR_BLUE("03", 4, "蓝"), + TAG_LIGHT_COLOR_PINK_RED("04", 5, "粉红"), + TAG_LIGHT_COLOR_BLUE_GREEN("05", 6, "蓝绿"); private String code; private Integer value; @@ -441,18 +441,18 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FINISH_TAG_LIGHT_MUSIC_CMD { - FINISH_TAG_LIGHT_MUSIC_00H("00", 0, "Jingle bells"), - FINISH_TAG_LIGHT_MUSIC_01H("01", 1, "Carmen"), - FINISH_TAG_LIGHT_MUSIC_02H("02", 2, "Happy Chinese new year"), - FINISH_TAG_LIGHT_MUSIC_03H("03", 3, "Edelweiss"), - FINISH_TAG_LIGHT_MUSIC_04H("04", 4, "Going home"), - FINISH_TAG_LIGHT_MUSIC_05H("05", 5, "PAPALA"), - FINISH_TAG_LIGHT_MUSIC_06H("06", 6, "Classical"), - FINISH_TAG_LIGHT_MUSIC_07H("07", 7, "Listen to the rhythm of the falling rain"), - FINISH_TAG_LIGHT_MUSIC_08H("08", 8, "Rock and roll"), - FINISH_TAG_LIGHT_MUSIC_09H("09", 9, "Happy birthday"), - FINISH_TAG_LIGHT_MUSIC_0AH("0A", 10, "Do Re Me"), - FINISH_TAG_LIGHT_MUSIC_0BH("0B", 11, "Strauss"); + FINISH_TAG_LIGHT_MUSIC_00H("00", 1, "Jingle bells"), + FINISH_TAG_LIGHT_MUSIC_01H("01", 2, "Carmen"), + FINISH_TAG_LIGHT_MUSIC_02H("02", 3, "Happy Chinese new year"), + FINISH_TAG_LIGHT_MUSIC_03H("03", 4, "Edelweiss"), + FINISH_TAG_LIGHT_MUSIC_04H("04", 5, "Going home"), + FINISH_TAG_LIGHT_MUSIC_05H("05", 6, "PAPALA"), + FINISH_TAG_LIGHT_MUSIC_06H("06", 7, "Classical"), + FINISH_TAG_LIGHT_MUSIC_07H("07", 8, "Listen to the rhythm of the falling rain"), + FINISH_TAG_LIGHT_MUSIC_08H("08", 9, "Rock and roll"), + FINISH_TAG_LIGHT_MUSIC_09H("09", 10, "Happy birthday"), + FINISH_TAG_LIGHT_MUSIC_0AH("0A", 11, "Do Re Me"), + FINISH_TAG_LIGHT_MUSIC_0BH("0B", 12, "Strauss"); private String code; private Integer value; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 39fec2c..bbb4564 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -235,6 +235,7 @@ public class PtlHqlPack { DdlPreparedPack.timeBuilder(ptlAreaTask.getCreateDateTimeStart(), ptlAreaTask.getCreateDateTimeEnd() , "createDatetime", result, true); } + DdlPreparedPack.getStringEqualPack(ptlAreaTask.getAreaNo(), "areaNo", result); DdlPreparedPack.getNumEqualPack(ptlAreaTask.getStatus(), "status", result); DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskType(), "taskType", result); DdlPreparedPack.getStringEqualPack(ptlAreaTask.getOrganizeCode(), "organizeCode", result); From 068a0956dbeee70c93d9f346d1da694460ed62ec Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 11 Mar 2020 19:38:06 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index f8fa98e..ebd53c3 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 1414885..4fa7c5a 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d790ef1..e97c0bb 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c6141da..90e744d 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 23e5bee..0ba3645 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c1e2cb9..6706323 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 856da5f..ffcac19 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 09f2c4a..e388a1d 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..62ebe64 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index b7b2dfc..39d9423 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..e310bfd 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 0db7b7d..92de049 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..e36fcf7 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 4c96781..81fb02b 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 2c24e41..1f622d9 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 18c811c..bc41914 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 1171f4e..93f9732 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index bca9cbb..2ffb2ae 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform