From 8de23599262c713dc6f7d4e709644a6b2db86296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 13 Aug 2020 15:37:32 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2625?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 55 ++++++++++++++++++---- 1 file changed, 45 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 0c358df..f04cc9c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -90,9 +90,9 @@ public class WmsMoveMaster extends BaseBean { private String partNo; @Transient - @ApiParam("状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") - private Integer itemStatus; + @ApiParam("明细状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class) + private String itemStatus; @Transient @ApiParam("erp库存地") @@ -135,10 +135,14 @@ public class WmsMoveMaster extends BaseBean { private String srcZoneNo; @Transient - @ApiParam("处理数量") + @ApiParam("需求数量") private Double transQty; @Transient + @ApiParam("处理数量") + private Double handledQty; + + @Transient @ApiParam("不合格处理数量") private Double rejectQty; @@ -163,6 +167,10 @@ public class WmsMoveMaster extends BaseBean { private String snapshotTime; @Transient + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Transient private Integer isSnapshot; @Transient @@ -193,7 +201,7 @@ public class WmsMoveMaster extends BaseBean { this.errorMessage = errorMessage; this.busiTypeCode = busiTypeCode; this.partNo = partNo; - this.itemStatus = itemStatus; + this.itemStatus = itemStatus.toString(); this.refOrderNo = refOrderNo; this.carNo = carNo; this.refSrc = refSrc; @@ -216,7 +224,7 @@ public class WmsMoveMaster extends BaseBean { this.partNameRdd = partNameRdd; this.transTypeCode = transTypeCode; this.transTypeName = transTypeName; - this.itemStatus = itemStatus; + this.itemStatus = itemStatus.toString(); this.unit = unit; this.srcWhNo = srcWhNo; this.srcZoneNo = srcZoneNo; @@ -233,22 +241,25 @@ public class WmsMoveMaster extends BaseBean { this.modifyDatetime = modifyDatetime; } - public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus, - String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode, - String createDatetime, String createUser, String modifyUser, String modifyDatetime, String refSrc) { + public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, + String transTypeName, Integer itemStatus,String unit, String srcWhNo, String srcZoneNo, + String destWhNo, String destZoneNo, Double transQty,Double handledQty,Double rejectQty, + String fixId, Integer busiTypeCode,String createDatetime, String createUser, String modifyUser, + String modifyDatetime, String refSrc) { this.orderNo = orderNo; this.organizeCode = organizeCode; this.partNo = partNo; this.partNameRdd = partNameRdd; this.transTypeCode = transTypeCode; this.transTypeName = transTypeName; - this.itemStatus = itemStatus; + this.itemStatus = itemStatus.toString(); this.unit = unit; this.srcWhNo = srcWhNo; this.srcZoneNo = srcZoneNo; this.destWhNo = destWhNo; this.destZoneNo = destZoneNo; this.transQty = transQty; + this.handledQty = handledQty; this.rejectQty = rejectQty; this.fixId = fixId; this.busiTypeCode = busiTypeCode; @@ -259,6 +270,30 @@ public class WmsMoveMaster extends BaseBean { this.refSrc = refSrc; } + public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus, + String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode, + String createDatetime, String createUser, String modifyUser, String modifyDatetime) { + this.orderNo = orderNo; + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus.toString(); + this.unit = unit; + this.srcWhNo = srcWhNo; + this.srcZoneNo = srcZoneNo; + this.destWhNo = destWhNo; + this.destZoneNo = destZoneNo; + this.transQty = transQty; + this.rejectQty = rejectQty; + this.fixId = fixId; + this.busiTypeCode = busiTypeCode; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){ this.itemQty = itemQty; this.transTypeCode = transTypeCode; From 2740830e8f22d2db1d7b431361f1e856b3822264 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 6 Jan 2021 10:55:21 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E5=90=88=E5=B9=B6test=E4=BB=A3=E7=A0=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-mongo/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-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/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 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..11691be 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..8ef99a3 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..3751cf9 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..a6c1bea 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..0a2f9d4 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 9f5788e..2bf0e5c 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..557548a 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..f10cf39 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..34a7337 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..670eb15 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-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 ac387fd..ce2dc01 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..b8c9643 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..1d29933 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..284225c 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..7ff16c9 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..353a02b 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..b125cee 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..c9d54a9 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..39f1e2f 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..df01041 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-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f611147..a18cef1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..ae014e9 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-PROD-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From c8b21c0b69680a2b1484e4b54cf867d1b92f77cc Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 19 Jan 2021 15:03:38 +0800 Subject: [PATCH 03/18] pom --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/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-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/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 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 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 f902a7c..650ee5b 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-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/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 d2521de..1e17935 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 b599490..37b8a51 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 9f5788e..dc13374 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-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/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 1674a47..123fdc9 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 04b40d4..fdcf6e3 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-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/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 ac387fd..60d9861 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 bbe0ff9..54c8306 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 be533a6..190efa7 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 14e8567..5896851 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 102ab0e..aa3dd42 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 864c56a..80498fc 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 e755225..076f15a 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 194f0cb..1351ed3 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 60543fe..67b0bff 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 bdc4cab..15d36cd 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 f611147..e57acaf 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 From 1bc4c491b6704943cee0a2b2fa7910b7fa48475b Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 21 Jan 2021 13:14:25 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 18 ++++++++++++++ .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 10 -------- .../estsh/i3plus/pojo/aps/bean/StandOperation.java | 5 ---- .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 16 ------------ .../estsh/i3plus/pojo/aps/holders/EMaterial.java | 2 ++ .../src/main/resources/relations/Material.xml | 2 ++ .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 29 +--------------------- 7 files changed, 23 insertions(+), 59 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index 0b1ec28..dcdd0ba 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import cn.estsh.i3plus.pojo.aps.holders.EMaterial; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; @@ -60,6 +61,11 @@ public class Material extends BaseAPS { @FieldAnnotation(defaultValue = "ONEBYONE") private ApsEnumUtil.REPLENISHMENT_TYPE replType; + @Column(name="GROUP_ID") + @ApiParam(value ="物料组") + @FieldAnnotation(relation = "Material") + private Long groupId; + @Column(name="PURCHASE_LEAD_TIME") @ApiParam(value ="采购提前期") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) @@ -151,6 +157,18 @@ public class Material extends BaseAPS { @ApiParam(value ="标签颜色") private String labelColor; + public Material getGroup() { + return BeanRelation.get(this, EMaterial.Group); + } + + public void setGroup(Material material) { + this.groupId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EMaterial.Group, material); + } + + @JsonBackReference + public List getChilds() { return BeanRelation.list(this, EMaterial.Childs); } + @JsonBackReference public List getProductRoutings() { return BeanRelation.list(this, EMaterial.ProductRoutings); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 8f2d668..4493b0e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -117,16 +117,6 @@ public class Resource extends BaseAPS { @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) private Integer timeTailRound; - @Column(name="LOCK_TYPE") - @ApiParam(value ="锁定类型") - @FieldAnnotation(defaultValue = "NONE") - private ApsEnumUtil.RESOURCE_LOCK_TYPE lockType; - - @Column(name="LOCK_TIME") - @ApiParam(value ="锁定时间长度") - @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) - private String lockTime; - @ApiParam(value ="是否存在任务冲突") @FieldAnnotation(property = false) @Transient diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 9fab094..220aac2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -65,9 +65,4 @@ public class StandOperation extends BaseAPS { @ApiParam(value ="生产组合方式") @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") private ApsEnumUtil.RES_COMB_TIME_TYPE combType; - - @Column(name="LOCK_TYPE") - @ApiParam(value ="锁定组合方式") - @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") - private ApsEnumUtil.RES_COMB_LOCK_TYPE lockType; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index dd55c06..8c15fbd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -99,22 +99,6 @@ public class WorkPlan extends BaseAPS { @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer postSetTime; - @Column(name="LOCK_BEGIN") - @ApiParam(value ="锁定开始时间") - @FieldAnnotation(modify = false) - @RippleAnnotation(dependence = {"MainWork.PostRelations.PostWork.MainPlan.produceBegin", "produceBegin"}, method = "calcPositiveLock") - private Date lockBegin; - - @Column(name="LOCK_END") - @ApiParam(value ="锁定结束时间") - @FieldAnnotation(modify = false) - private Date lockEnd; - - @Column(name="LOCK_TIME") - @ApiParam(value ="锁定时间") - @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) - private Integer lockTime; - @Column(name="FORCE_POST_SET_ZERO") @ApiParam(value ="是否将后设置时间强制设置成0") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java index 65cc748..eaa363a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EMaterial { + Group, + Childs, ProductRoutings, OperInputs, OperOutputs, diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml index 51da8ba..33c5974 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml @@ -2,4 +2,6 @@ + + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 2573b1e..279c6b0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -471,32 +471,6 @@ public class ApsEnumUtil { } /** - * 锁定时间计算方式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RES_COMB_LOCK_TYPE { - KEEP_ORIGIN("KEEP_ORIGIN", "各自锁定"), - MAIN_LOCK("MAIN_LOCK", "主资源锁定"), - MAX_ALL_RESOURCE("MAX_ALL_RESOURCE", "最大锁定时间"); - - private String value; - private String description; - - RES_COMB_LOCK_TYPE(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** * 生产时间计算方法 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -958,8 +932,7 @@ public class ApsEnumUtil { public enum PLAN_TYPE { PREV_SET("", "前设置"), PRODUCE("", "生产"), - POST_SET("", "后设置"), - LOCK("", "锁定"); + POST_SET("", "后设置"); private String value; private String description; From 5d25ecc9b58c5120a53fae1518e9fa7323ced3f0 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 21 Jan 2021 16:59:54 +0800 Subject: [PATCH 05/18] =?UTF-8?q?13829=20mgn-bj=20=E8=A1=A5=E6=89=93?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 15 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java | 6 +++--- 2 files changed, 18 insertions(+), 3 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 97126f7..56784ab 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 @@ -265,4 +265,19 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { this.assyNo = assyNo; this.queueType = queueType; } + + public MesQueueOrderDetail(Long id, String orderNo, String vinCode, String produceCategoryCode, String productSn, String serialNumber, + String groupSeq, String queueGroupNo, Integer groupNo, String groupSide, String jisBackflushStatus) { + this.id = id; + this.orderNo = orderNo; + this.vinCode = vinCode; + this.produceCategoryCode = produceCategoryCode; + this.productSn = productSn; + this.serialNumber = serialNumber; + this.groupSeq = groupSeq; + this.queueGroupNo = queueGroupNo; + this.groupNo = groupNo; + this.groupSide = groupSide; + this.jisBackflushStatus = jisBackflushStatus; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java index bc8a783..6d0c829 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java @@ -21,16 +21,16 @@ public class MaterialLotModel implements Serializable { private String modifyDateTime; - @ApiParam("生产日期") + @ApiParam("供应商批次") private String dateCode; - @ApiParam("批次") + @ApiParam("收货日期") private String lotNo; @ApiParam("特殊批次") private String fixLotNo; - @ApiParam("生产批次") + @ApiParam("生产日期") private String leftCode; @ApiParam("物料代码") From 5b2f57450b7048d768edafc4ff3c1803df17e182 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 22 Jan 2021 10:30:00 +0800 Subject: [PATCH 06/18] =?UTF-8?q?feat(core):=20=E6=9D=BE=E4=B8=8BGID?= =?UTF-8?q?=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 支持E9方式的SSo --- .../i3plus/pojo/base/bean/BaseThreadLocal.java | 60 ++--- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 247 ++++++++++++--------- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 88 +++++--- .../i3plus/pojo/model/platform/RoleRealmModel.java | 25 +++ .../pojo/model/platform/SystemLoginModel.java | 40 ++++ 5 files changed, 304 insertions(+), 156 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RoleRealmModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java index 8420e4b..55c6e7a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java @@ -23,48 +23,48 @@ public class BaseThreadLocal { return new HashMap(); } };*/ - private static final ThreadLocal> DATA_THREAD_LOCAL = ThreadLocal.withInitial(() -> new HashMap<>()); + private static final ThreadLocal> DATA_THREAD_LOCAL = ThreadLocal.withInitial(() -> new HashMap<>()); public static Object getData(String key) { - if(DATA_THREAD_LOCAL.get() != null) { + if (DATA_THREAD_LOCAL.get() != null) { return DATA_THREAD_LOCAL.get().get(key); - }else{ + } else { return null; } } public static String getDataStr(String key) { Object data = getData(key); - if(data != null){ + if (data != null) { return data.toString(); - }else{ + } else { return null; } } public static int getDataInt(String key) { Object data = getData(key); - if(data != null){ + if (data != null) { return Integer.parseInt(data.toString()); - }else{ + } else { return 0; } } public static long getDataLong(String key) { Object data = getData(key); - if(data != null){ + if (data != null) { return Long.parseLong(data.toString()); - }else{ + } else { return 0L; } } public static double getDataDouble(String key) { Object data = getData(key); - if(data != null){ + if (data != null) { return Double.parseDouble(data.toString()); - }else{ + } else { return 0.0; } } @@ -78,8 +78,8 @@ public class BaseThreadLocal { * 手动再次清除线程变量 * 需要在方法后调用，或者通过ascept拦截后进行清空 */ - public static void removeThreadLocal(){ - if(DATA_THREAD_LOCAL != null) { + public static void removeThreadLocal() { + if (DATA_THREAD_LOCAL != null) { if (DATA_THREAD_LOCAL.get() != null) { //清空数据 DATA_THREAD_LOCAL.get().clear(); @@ -89,16 +89,16 @@ public class BaseThreadLocal { } } - public static String getInfo(){ + public static String getInfo() { Thread thread = Thread.currentThread(); return "thead-id:" + thread.getId() + ",thread:" + thread; } - public static void printDetail(){ + public static void printDetail() { LOGGER.info("========本地线程临时数据======="); LOGGER.info("数据数量：{}", DATA_THREAD_LOCAL.get().size()); - for(String key : DATA_THREAD_LOCAL.get().keySet()){ - LOGGER.info("key:{},value:{}",key, DATA_THREAD_LOCAL.get().get(key)); + for (String key : DATA_THREAD_LOCAL.get().keySet()) { + LOGGER.info("key:{},value:{}", key, DATA_THREAD_LOCAL.get().get(key)); } } @@ -107,18 +107,22 @@ public class BaseThreadLocal { public static final String EMP_NAME = "USER_NAME"; //用户名 public static final String ORGANIZE_CODE = "ORGANIZE_CODE"; //组织代码 public static final String LANGUAGE_CODE = "LANGUAGE_CODE"; //语言代码 + /** + * 单点登录标志 + */ + public static final String OSS_LOGIN = "OSS_LOGIN"; - public static boolean isInit(){ + public static boolean isInit() { Object data = getData(INIT_INFO); - if(data != null){ + if (data != null) { return Boolean.parseBoolean(data.toString()); - }else{ + } else { return false; } } //初始化用户数据 - public static void initSessionUserThreadLocal(String empName, String organizeCode,String languageCode){ + public static void initSessionUserThreadLocal(String empName, String organizeCode, String languageCode) { setData(BaseThreadLocal.EMP_NAME, empName); setData(BaseThreadLocal.ORGANIZE_CODE, organizeCode); setData(BaseThreadLocal.LANGUAGE_CODE, languageCode); @@ -126,25 +130,27 @@ public class BaseThreadLocal { } //获取线程中的人员姓名 - public static String getThreadEmpName(){ + public static String getThreadEmpName() { String empName = getDataStr(EMP_NAME); - if(empName == null){ + if (empName == null) { empName = "系统"; } return empName; } + //获取线程中的组织代码 - public static String getThreadOrganizeCode(){ + public static String getThreadOrganizeCode() { String organizeCode = getDataStr(ORGANIZE_CODE); - if(organizeCode == null){ + if (organizeCode == null) { organizeCode = "-1"; } return organizeCode; } + //获取线程中的语言代码 - public static String getThreadLanguageCode(){ + public static String getThreadLanguageCode() { String organizeCode = getDataStr(LANGUAGE_CODE); - if(organizeCode == null){ + if (organizeCode == null) { organizeCode = "CN/zh"; } return organizeCode; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 70ebd4e..aeaa624 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -20,20 +20,28 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SOFT_TYPE { - /** WMS 服务 */ + /** + * WMS 服务 + */ WMS(3, 8200, 10, 102000000L, "i3wms", "仓库管理软件"), SWEB(7, 8800, 19, 108000000L, "i3sweb", "供应商服务"), QMS(5, 0, 0, 0, "i3qms", "质量管理软件"), - /** Mes 服务 */ + /** + * Mes 服务 + */ MES(4, 8300, 11, 103000000L, "i3mes", "生产管理软件"), MES_PCN(6, 8350, 12, 107000000L, "i3mes-pcn", "生产管理软件-节点中心"), - /** PTL 服务 */ + /** + * PTL 服务 + */ PTL(8, 8700, 20, 111000000L, "i3ptl", "亮灯自动拣选"), PTL_PCN(9, 8750, 21, 109000000L, "i3ptl-pcn", "亮灯自动拣选-节点中心"), - /** Block 服务 */ + /** + * Block 服务 + */ FORM(20, 8900, 16, 104000000L, "block-form", "智能表单"), REPORT(21, 8910, 17, 105000000L, "block-report", "智能报表"), WORKFLOW(22, 0, 0, 0, "block-workflow", "智能工作流"), @@ -41,42 +49,66 @@ public class CommonEnumUtil { SOFTSWITCH(24, 8920, 18, 130000000L, "block-softswitch", "软件适配器"), HARDSWITCH(25, 0, 0, 0, "block-hardswitch", "硬件适配器"), - /** LAC 服务 */ + /** + * LAC 服务 + */ LAC(26, 8600, 13, 150000000L, "lac", "连接适配器"), - /** 安灯服务 */ + /** + * 安灯服务 + */ ANDON(27, 8500, 14, 110000000L, "andon", "安灯"), - /** 计划排产服务 */ + /** + * 计划排产服务 + */ APS(28, 8400, 15, 140000000L, "i3aps", "高级计划与排产"), SURFACE(98, 0, 0, 0, "i3surface", "对外服务"), - /** 基础服务 */ + /** + * 基础服务 + */ IMPP(1, 0, 0, 100000000L, "impp-platform", "IMPP平台"), CONSOLE(95, 8010, 0, 0, "impp-console", "服务监控台"), GATEWAY(96, 9000, 0, 0, "impp-gateway", "服务网关"), CLOUD(97, 0, 0, 0, "i3cloud", "微服务"), CENTER(99, 8000, 1, 0, "icloud-server", "注册中心"), - /** 平台服务 */ + /** + * 平台服务 + */ CORE(2, 8100, 4, 101000000L, "i3core", "i3业务平台"), MDM(29, 8150, 22, 0, "i3mdm", "数据中心MDM"), - /** 调试服务 */ + /** + * 调试服务 + */ DEV(9999, 0000, 0, 120000000L, "Development", "系统调试"); - /** 产品ID */ + /** + * 产品ID + */ private int value; - /** 应用默认端口 */ + /** + * 应用默认端口 + */ private int port; - /** 应用默认雪花DataBaseId(0-31)共32 个存储区 */ + /** + * 应用默认雪花DataBaseId(0-31)共32 个存储区 + */ private int snowflakeId; - /** 产品代码 */ + /** + * 产品代码 + */ private String code; - /** 顶级菜单代码 */ + /** + * 顶级菜单代码 + */ private long menuRootId; - /** 产品描述 */ + /** + * 产品描述 + */ private String description; SOFT_TYPE(int value, int port, int snowflakeId, long menuRootCode, String code, String description) { @@ -177,6 +209,7 @@ public class CommonEnumUtil { } return null; } + public synchronized static int descriptionOfValue(String desc) { int tmp = IMPP.value; for (int i = 0; i < values().length; i++) { @@ -187,6 +220,7 @@ public class CommonEnumUtil { } return tmp; } + public static int descOf(String desc) { int tmp = IMPP.value; for (int i = 0; i < values().length; i++) { @@ -253,7 +287,7 @@ public class CommonEnumUtil { return boolIntVal == 1 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); } - public static TRUE_OR_FALSE valueOfEnum(int value){ + public static TRUE_OR_FALSE valueOfEnum(int value) { for (int i = 0; i < values().length; i++) { if (values()[i].value == value) { return values()[i]; @@ -262,13 +296,18 @@ public class CommonEnumUtil { return null; } - public static String valueOfDescription(int val) {return valueOf(val);} - public static int descriptionOfValue(String desc) {return descOf(desc);} + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } public static boolean valueOfBoolean(int val) { - if(val == TRUE.value){ + if (val == TRUE.value) { return true; - }else { + } else { return false; } } @@ -348,6 +387,7 @@ public class CommonEnumUtil { } return tmp; } + public static int descOf(String desc) { int tmp = COMMON.value; for (int i = 0; i < values().length; i++) { @@ -357,9 +397,11 @@ public class CommonEnumUtil { } return tmp; } + public static String valueOfDescription(int val) { return valueOf(val); } + public static int descriptionOfValue(String val) { return descOf(val); } @@ -453,7 +495,7 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum USER_STATUS { -// EMPTY(1, "fa fa-success cell-fa fa-check", "正常"), + // EMPTY(1, "fa fa-success cell-fa fa-check", "正常"), // FREEZE(2, "冻结", "冻结_FREEZE"), // ABERRANT(3, "异常", "异常_ABERRANT"), // RESIGNATION(4, "离职", "离职_RESIGNATION"), @@ -508,6 +550,7 @@ public class CommonEnumUtil { return tmp; } } + /** * 数据类型 * 1库存移动数据 @@ -569,6 +612,7 @@ public class CommonEnumUtil { return tmp; } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum USER_INFO_STATUS { INCUMBENT(1, "正常", "正常_NORMAL"), @@ -619,9 +663,9 @@ public class CommonEnumUtil { /** * 数据状态 - * 1 启用 - * 2 禁用 - * 3 锁定 + * 1 启用 + * 2 禁用 + * 3 锁定 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_STATUS { @@ -711,7 +755,7 @@ public class CommonEnumUtil { return tmp; } - public static METHOD_LEVEL get(int id){ + public static METHOD_LEVEL get(int id) { for (int i = 0; i < values().length; i++) { if (values()[i].value == id) { return values()[i]; @@ -805,9 +849,9 @@ public class CommonEnumUtil { /** * 父节点配置 */ - public enum PARENT{ + public enum PARENT { - DEFAULT(-1L,"根节点"); + DEFAULT(-1L, "根节点"); private Long value = -1L; private String description = null; @@ -876,9 +920,9 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CLOUD_APP_STATUS { - UP(1,"UP" ,"在线"), - DOWN(2, "DOWN","断线"), - RESTRICTED(3,"RESTRICTED" ,"受限"); + UP(1, "UP", "在线"), + DOWN(2, "DOWN", "断线"), + RESTRICTED(3, "RESTRICTED", "受限"); private int value; private String code; @@ -991,6 +1035,7 @@ public class CommonEnumUtil { /** * -1 未识别操作系统 + * * @param desc * @return */ @@ -1051,6 +1096,7 @@ public class CommonEnumUtil { } return tmp; } + public static String valueOfDescription(int val) { return valueOf(val); } @@ -1092,6 +1138,7 @@ public class CommonEnumUtil { this.value = value; this.description = description; } + public static CONTENT_TYPE valueOfContenType(String val) { CONTENT_TYPE tmp = null; for (int i = 0; i < values().length; i++) { @@ -1128,10 +1175,10 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HTTP_METHOD_TYPE { - GET(1,"GET" ,"GET"), - POST(2, "POST","POST"), - DELETE(3, "DELETE","DELETE"), - PUT(4, "PUT","PUT"); + GET(1, "GET", "GET"), + POST(2, "POST", "POST"), + DELETE(3, "DELETE", "DELETE"), + PUT(4, "PUT", "PUT"); private int value; private String code; @@ -1210,13 +1257,13 @@ public class CommonEnumUtil { * 变量类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum BASIS_TYPE { + public enum BASIS_TYPE { INT(1, "int"), DOUBLE(2, "double"), LONG(3, "long"), FLOAT(4, "float"), CHAR(5, "char"), - BOOLEAN(6,"boolean"), + BOOLEAN(6, "boolean"), BYTE(7, "byte"), SHORT(8, "short"); @@ -1329,14 +1376,14 @@ public class CommonEnumUtil { TEXT(200, "TEXT", "文本"), NUMBER(210, "NUMBER", "数字"), PASSWORD(230, "PASSWORD", "密码"), - DATE_TIME(300, "DATE", "日期",SQL_WHERE.BETWEEN), + DATE_TIME(300, "DATE", "日期", SQL_WHERE.BETWEEN), // DATE(300, "DATE", "日期(yyyy-MM-dd)"), // DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), // ELEMENT(700, "DICT_SELECT", "元素"), DICTIONARY(800, "DICT_SELECT", "字典"), CASCADE(900, "CASCADE", "级联"), PICK_UP(1000, "PICK_UP", "拾取"), - INTERVAL(1100, "INTERVAL", "区间",SQL_WHERE.INTERVAL); + INTERVAL(1100, "INTERVAL", "区间", SQL_WHERE.INTERVAL); //FILE(400, "file", "文件"), //IMAGE(410, "image", "image"), //OFF(500, "color", "颜色"), @@ -1440,7 +1487,7 @@ public class CommonEnumUtil { MORE(20, " > ", "大于"), LESS(30, " < ", "小于"), MORE_OR_EQUAL(21, " >= ", "大于等于"), - LESS_OR_EQUAL (31, " <= ", "小于等于"), + LESS_OR_EQUAL(31, " <= ", "小于等于"), LIKE(40, " LIKE ", "全模糊"), START_LIKE(41, " LIKE ", "前模糊"), END_LIKE(52, " LIKE ", "后模糊"), @@ -1531,7 +1578,7 @@ public class CommonEnumUtil { private int value; private String description; - private MiSS_RESOURCE_SOURCE(int value, String description) { + private MiSS_RESOURCE_SOURCE(int value, String description) { this.value = value; this.description = description; } @@ -1606,7 +1653,7 @@ public class CommonEnumUtil { */ private Class clzFullName; /** - * 属性类型 对应的 控件类型 + * 属性类型 对应的 控件类型 */ private PROPERTY_CONTROL_TYPE controlType; /** @@ -1622,8 +1669,8 @@ public class CommonEnumUtil { */ private String defaultValue; - private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, - PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) { + private PROPERTY_TYPE(int value, String code, String description, String classPath, Class clzFullName, + PROPERTY_CONTROL_TYPE controlType, SQL_WHERE defaultWhere) { this.value = value; this.code = code; this.description = description; @@ -1633,8 +1680,8 @@ public class CommonEnumUtil { this.defaultWhere = defaultWhere; } - private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, - PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) { + private PROPERTY_TYPE(int value, String code, String description, String classPath, Class clzFullName, + PROPERTY_CONTROL_TYPE controlType, SQL_WHERE defaultWhere, String defaultValue) { this.value = value; this.code = code; this.description = description; @@ -1646,8 +1693,8 @@ public class CommonEnumUtil { this.defaultFormat = defaultFormat; } - private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, - PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue,String defaultFormat) { + private PROPERTY_TYPE(int value, String code, String description, String classPath, Class clzFullName, + PROPERTY_CONTROL_TYPE controlType, SQL_WHERE defaultWhere, String defaultValue, String defaultFormat) { this.value = value; this.code = code; this.description = description; @@ -1813,11 +1860,11 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_SOURCE_TYPE { - SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null), - SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"), - SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null), - SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"), - SOURCE_SAP_HANA(500, "SapHana", "SapHana","com.sap.db.jdbc.Driver",39015,null); + SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null), + SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"), + SOURCE_ORACLE(300, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null), + SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public"), + SOURCE_SAP_HANA(500, "SapHana", "SapHana", "com.sap.db.jdbc.Driver", 39015, null); private int value; private String code; @@ -1826,7 +1873,7 @@ public class CommonEnumUtil { private int defaultPort; private String defaultSchemaPattern; - private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) { + private DATA_SOURCE_TYPE(int value, String code, String description, String driverClassName, int port, String defaultSchemaPattern) { this.value = value; this.code = code; this.description = description; @@ -1910,51 +1957,51 @@ public class CommonEnumUtil { } public String getSchemaPattern(String schema) { - if(this.equals(SOURCE_SAP_HANA)){ + if (this.equals(SOURCE_SAP_HANA)) { return schema; } return defaultSchemaPattern; } - public String getJDBCUrl(String database,String host,Integer port){ - if(this.getValue() == SOURCE_MARIA_DB.getValue()){ - return getJDBCUrlMySQL(database,host,port); - }else if(this.getValue() == SOURCE_ORACLE.getValue()){ - return getJDBCUrlOracle(database,host,port); - }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){ - return getJDBCUrlPostgreSQL(database,host,port); - }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){ - return getJDBCUrlSQLServer(database,host,port); - }else if(this.getValue() == SOURCE_SAP_HANA.getValue()){ - return getJDBCUrlSapHana(database,host,port); + public String getJDBCUrl(String database, String host, Integer port) { + if (this.getValue() == SOURCE_MARIA_DB.getValue()) { + return getJDBCUrlMySQL(database, host, port); + } else if (this.getValue() == SOURCE_ORACLE.getValue()) { + return getJDBCUrlOracle(database, host, port); + } else if (this.getValue() == SOURCE_POSTGRE_SQL.getValue()) { + return getJDBCUrlPostgreSQL(database, host, port); + } else if (this.getValue() == SOURCE_SQL_SERVER.getValue()) { + return getJDBCUrlSQLServer(database, host, port); + } else if (this.getValue() == SOURCE_SAP_HANA.getValue()) { + return getJDBCUrlSapHana(database, host, port); } return null; } - public String getJDBCUrl(String database,String host,Integer port,String instanceName){ - if(this.getValue() == SOURCE_MARIA_DB.getValue()){ - return getJDBCUrlMySQL(database,host,port); - }else if(this.getValue() == SOURCE_ORACLE.getValue()){ - return getJDBCUrlOracle(database,host,port); - }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){ - return getJDBCUrlPostgreSQL(database,host,port); - }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){ - return getJDBCUrlSQLServer(database,host,port,instanceName); + public String getJDBCUrl(String database, String host, Integer port, String instanceName) { + if (this.getValue() == SOURCE_MARIA_DB.getValue()) { + return getJDBCUrlMySQL(database, host, port); + } else if (this.getValue() == SOURCE_ORACLE.getValue()) { + return getJDBCUrlOracle(database, host, port); + } else if (this.getValue() == SOURCE_POSTGRE_SQL.getValue()) { + return getJDBCUrlPostgreSQL(database, host, port); + } else if (this.getValue() == SOURCE_SQL_SERVER.getValue()) { + return getJDBCUrlSQLServer(database, host, port, instanceName); } return null; } - public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ - if(StringUtils.isNotBlank(databaseProductName)){ - if(databaseProductName.indexOf(":mysql:") != -1){ + public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName) { + if (StringUtils.isNotBlank(databaseProductName)) { + if (databaseProductName.indexOf(":mysql:") != -1) { return SOURCE_MARIA_DB; - }else if(databaseProductName.indexOf(":oracle:") != -1){ + } else if (databaseProductName.indexOf(":oracle:") != -1) { return SOURCE_ORACLE; - }else if(databaseProductName.indexOf(":postgresql:") != -1){ + } else if (databaseProductName.indexOf(":postgresql:") != -1) { return SOURCE_POSTGRE_SQL; - }else if(databaseProductName.indexOf(":sqlserver:") != -1){ + } else if (databaseProductName.indexOf(":sqlserver:") != -1) { return SOURCE_SQL_SERVER; - }else if(databaseProductName.indexOf(":sap:") != -1){ + } else if (databaseProductName.indexOf(":sap:") != -1) { return SOURCE_SAP_HANA; } } @@ -1963,9 +2010,9 @@ public class CommonEnumUtil { // cn.estsh.i3plus.mes.pcn.util.BsJdbcTemplateConfigTest - private String getJDBCUrlMySQL(String database,String host,Integer port){ + private String getJDBCUrlMySQL(String database, String host, Integer port) { // 针对mysql 8.0 先加上allowPublicKeyRetrieval 赋予默认时区CST - return "jdbc:mysql://"+host+":"+port+"/"+database+ + return "jdbc:mysql://" + host + ":" + port + "/" + database + "?autoReconnect=true" + "&useSSL=false" + "&characterEncoding=utf-8" + @@ -1973,23 +2020,23 @@ public class CommonEnumUtil { "&serverTimezone=CST"; } - private String getJDBCUrlOracle(String database,String host,Integer port){ - return "jdbc:oracle:thin:@"+host+":"+port+":"+database; + private String getJDBCUrlOracle(String database, String host, Integer port) { + return "jdbc:oracle:thin:@" + host + ":" + port + ":" + database; } - private String getJDBCUrlPostgreSQL(String database,String host,Integer port){ - return "jdbc:postgresql://"+host+":"+port+"/"+database; + private String getJDBCUrlPostgreSQL(String database, String host, Integer port) { + return "jdbc:postgresql://" + host + ":" + port + "/" + database; } - private String getJDBCUrlSQLServer(String database,String host,Integer port){ - return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true"; + private String getJDBCUrlSQLServer(String database, String host, Integer port) { + return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database + ";autoReconnect=true"; } - private String getJDBCUrlSapHana(String database,String host,Integer port){ + private String getJDBCUrlSapHana(String database, String host, Integer port) { return "jdbc:sap://" + host + ":" + port + "?reconnect=true"; } - private String getJDBCUrlSQLServer(String database,String host,Integer port,String instanceName){ + private String getJDBCUrlSQLServer(String database, String host, Integer port, String instanceName) { StringBuffer sb = new StringBuffer(); sb.append("jdbc:sqlserver://").append(host); // 实例 @@ -2010,7 +2057,7 @@ public class CommonEnumUtil { * 变量类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum LICENSE_SOURCE { + public enum LICENSE_SOURCE { LOCAL_SYSTEM_FILE(1, "本地文件"), NETWORK_ESTSH(2, "网络-官方授权"), SENSE_HARDWARE_USB_LOCK(3, "硬件锁"), @@ -2102,8 +2149,8 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ACTUATOR_ENV_PATH { - PID(1,"/PID" ,"PID"), - JAVA_VERSION(2, "/java.version","jdk版本"); + PID(1, "/PID", "PID"), + JAVA_VERSION(2, "/java.version", "jdk版本"); private int value; private String path; @@ -2202,7 +2249,7 @@ public class CommonEnumUtil { this.description = description; } - private ACTUATOR_METRICS_INFO(int value, String path, String tag, String description) { + private ACTUATOR_METRICS_INFO(int value, String path, String tag, String description) { this.value = value; this.path = path; this.tag = tag; @@ -2216,6 +2263,7 @@ public class CommonEnumUtil { public String getPath() { return path; } + public String getTag() { return tag; } @@ -2276,7 +2324,7 @@ public class CommonEnumUtil { private String code; private String description; - private DATA_SOURCE_STATUS (int value, String code, String description) { + private DATA_SOURCE_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -2295,7 +2343,6 @@ public class CommonEnumUtil { } - public static String valueOfCode(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -2466,7 +2513,6 @@ public class CommonEnumUtil { } - /** * 业务表：库存条码质检状态 */ @@ -2589,7 +2635,7 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DYNAMIC_DATA_SOURCE_TYPE { - MASTER,NODE + MASTER, NODE } /** @@ -2687,5 +2733,4 @@ public class CommonEnumUtil { } - } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 1892d1e..bc39e95 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -445,7 +445,7 @@ public class ImppEnumUtil { MESSAGE_SEND_STATUS() { } - MESSAGE_SEND_STATUS(int value, String description) { + MESSAGE_SEND_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -1032,10 +1032,10 @@ public class ImppEnumUtil { REF_OBJECT(3, "对象"), REF_DICT(4, "字典"); - private int value; - private String description; + private final int value; + private final String description; - private COL_REF_TYPE(int value, String description) { + COL_REF_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -1084,8 +1084,8 @@ public class ImppEnumUtil { WORK_WECHAT(8, "企业微信配置"), SMS(9, "短信配置"); - private int value; - private String description; + private final int value; + private final String description; public int getValue() { return value; @@ -1095,7 +1095,7 @@ public class ImppEnumUtil { return description; } - private SYS_CONFIG_GROUP(int value, String description) { + SYS_CONFIG_GROUP(int value, String description) { this.value = value; this.description = description; } @@ -1118,8 +1118,8 @@ public class ImppEnumUtil { EXTERNAL(2, "外部人员"), URGENT(3, "紧急联系人"), SUPPLIER(4, "供应商"); - private int value; - private String description; + private final int value; + private final String description; public int getValue() { return value; @@ -1129,7 +1129,7 @@ public class ImppEnumUtil { return description; } - private MESSAGE_RECEIVER_TYPE(int value, String description) { + MESSAGE_RECEIVER_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -1222,8 +1222,8 @@ public class ImppEnumUtil { public enum DICTIONARY_GROUP { SYSTEM(1, "系统字典"), EXTERNAL(2, "业务字典"); - private int value; - private String description; + private final int value; + private final String description; public int getValue() { return value; @@ -1233,7 +1233,7 @@ public class ImppEnumUtil { return description; } - private DICTIONARY_GROUP(int value, String description) { + DICTIONARY_GROUP(int value, String description) { this.value = value; this.description = description; } @@ -1254,10 +1254,10 @@ public class ImppEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum LOG_STORAGE { -// MONGO(1, "MongoDB"), + // MONGO(1, "MongoDB"), ELASTICSEARCH(2, "Elasticsearch"); - private int value; - private String description; + private final int value; + private final String description; public int getValue() { return value; @@ -1267,7 +1267,7 @@ public class ImppEnumUtil { return description; } - private LOG_STORAGE(int value, String description) { + LOG_STORAGE(int value, String description) { this.value = value; this.description = description; } @@ -1299,8 +1299,8 @@ public class ImppEnumUtil { public enum CHECK_TEXT { PASSWORD_VERIFY(1, "保存策略"), PASSWORD_LOGIN(2, "登录策略"); - private int value; - private String description; + private final int value; + private final String description; public int getValue() { return value; @@ -1310,7 +1310,7 @@ public class ImppEnumUtil { return description; } - private CHECK_TEXT(int value, String description) { + CHECK_TEXT(int value, String description) { this.value = value; this.description = description; } @@ -1342,8 +1342,8 @@ public class ImppEnumUtil { public enum USER_CUSTOMIZE_CONFIG_TYPE { WEB_TABLE_SHOW_COL(10, "前端表格显示列"); - private int value; - private String description; + private final int value; + private final String description; USER_CUSTOMIZE_CONFIG_TYPE(int value, String description) { this.value = value; @@ -1387,8 +1387,8 @@ public class ImppEnumUtil { public enum USER_EXTERNAL_REF { WORK_WECHAT(10, "企业微信"); - private int value; - private String description; + private final int value; + private final String description; USER_EXTERNAL_REF(int value, String description) { this.value = value; @@ -1429,7 +1429,7 @@ public class ImppEnumUtil { * 用户绑定属性 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum USER_BIND_PROPERTY{ + public enum USER_BIND_PROPERTY { USER_LOGIN_NAME("userId", "登录名称"), USER_NAME("userName", "用户名称"), EMAIL("email", "邮箱"), @@ -1437,10 +1437,10 @@ public class ImppEnumUtil { USER_EMP_NO("empNo", "工号"), USER_WECHAT_NO("userWeChatNo", "微信号"); - private String value; - private String description; + private final String value; + private final String description; - private USER_BIND_PROPERTY(String value, String description) { + USER_BIND_PROPERTY(String value, String description) { this.value = value; this.description = description; } @@ -1638,4 +1638,36 @@ public class ImppEnumUtil { return tmp; } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AUTH_LOGIN_STRATEGY { + ACCOUNT(10, "Default", "defaultLoginStrategy", "账户密码登录"), + E9(20, "E9", "e9LoginStrategy", "泛微单点登录策略"); + + private final int value; + private final String code; + private final String strategyName; + private final String description; + + AUTH_LOGIN_STRATEGY(int value, String code, String strategyName, String description) { + this.value = value; + this.code = code; + this.strategyName = strategyName; + this.description = description; + } + + public String getCode() { + return code; + } + + public static String codeOfStrategyName(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].strategyName; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RoleRealmModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RoleRealmModel.java new file mode 100644 index 0000000..5aae99e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RoleRealmModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.shiro.realm.Realm; + +/** + * @author Wynne.Lu + * @date 2021/1/19 下午1:29 + * @desc + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class RoleRealmModel { + + private Realm userRealm; + + private Realm saRealm; + + private Realm adminRealm; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java new file mode 100644 index 0000000..32c8d93 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2021/1/18 上午10:56 + * @desc 系统登录模型 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Api("系统登录模型") +public class SystemLoginModel { + + @ApiParam(value = "登录名") + private String loginName; + + @ApiParam(value = "登录密码") + private String loginPwd; + + @ApiParam(value = "语言代码") + private String languageCode; + + @ApiParam(value = "设备id") + private String deviceId; + + @ApiParam(value = "单点登录策略") + private String loginStrategy; + + @ApiParam(value = "app Id") + private String appId; + +} From c5d56b2c327c951ab52d2fd1d7eed1915d0b2a65 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 22 Jan 2021 12:25:35 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E7=82=89=E5=86=85=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E=E6=96=B9=E5=90=91=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java index e5c4ae0..40df439 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java @@ -42,6 +42,10 @@ public class MesFurnaceLocation extends BaseBean implements Serializable { @ApiParam("炉内位置代码") private String fnLocationNo; + @Column(name = "orientation") + @ApiParam("方向") + private String orientation; + @Column(name = "SEQ") @ApiParam("推荐顺序") private Integer seq; From 01877b80d5dd82da2fa8a5546376b54dc9db9303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 22 Jan 2021 17:08:01 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E3=80=9013614=2019048=20=E5=96=B7?= =?UTF-8?q?=E6=B6=82=E7=9C=8B=E6=9D=BF=E5=AE=9E=E9=99=85=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=92=8C=E8=AE=A1=E5=88=92=E6=95=B0=E9=87=8F=E9=83=BD=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=2020210107=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index 3be6af1..c8e1ea9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -87,9 +87,22 @@ public class TJMgnBoardModel extends BaseBean implements Serializable { @ApiParam("产线") private String workCenterCode; + @Transient + @ApiParam("创建时间") + private String createDatetime; + public TJMgnBoardModel() { } + public TJMgnBoardModel(String partNo, String partNameRdd, Integer qcStatus, String workOrderNo, Integer snQty, String createDatetime) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qcStatus = qcStatus; + this.workOrderNo = workOrderNo; + this.snQty = snQty; + this.createDatetime = createDatetime; + } + public TJMgnBoardModel(String partNo, String partNameRdd, Integer qcStatus, String workOrderNo, Integer snQty) { this.partNo = partNo; this.partNameRdd = partNameRdd; From 378993b225bbb50fe67a36057b525c90b1a585ce Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 25 Jan 2021 09:46:43 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E8=A1=A5=E6=89=93=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 56784ab..3816fc1 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 @@ -267,7 +267,8 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { } public MesQueueOrderDetail(Long id, String orderNo, String vinCode, String produceCategoryCode, String productSn, String serialNumber, - String groupSeq, String queueGroupNo, Integer groupNo, String groupSide, String jisBackflushStatus) { + String groupSeq, String queueGroupNo, Integer groupNo, String groupSide, String jisBackflushStatus, + String modifyUser) { this.id = id; this.orderNo = orderNo; this.vinCode = vinCode; @@ -279,5 +280,6 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { this.groupNo = groupNo; this.groupSide = groupSide; this.jisBackflushStatus = jisBackflushStatus; + this.modifyUser = modifyUser; } } From 983565aca13ca5119a761e021cce43645abd1aff Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 25 Jan 2021 10:27:54 +0800 Subject: [PATCH 10/18] Fix bug#13752 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 6fc02ee..cbcbc49 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -8,8 +8,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -18,6 +16,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; @@ -109,7 +109,7 @@ public class WmsPart extends BaseBean { @Column(name = "ABC") @ApiParam(value = "分类") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "PART_ABC") private String abc; @Column(name = "BUY_UNIT") From c8d97daa589bde395fe13bb47a4327bec00ebd53 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 25 Jan 2021 15:04:25 +0800 Subject: [PATCH 11/18] Fix bug#13248 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 1 file changed, 4 insertions(+) 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 7023c0c..c7f840e 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 @@ -397,6 +397,10 @@ public class WmsStockSn extends BaseBean { private Integer boxQty; @Transient + @ApiParam(value = "箱数") + private String boxQtyStr; + + @Transient @ApiParam(value = "是否报工") private String isReport; From ca50493d2026a9114ea4d86f66a59121f4fe6dc5 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Mon, 25 Jan 2021 19:54:03 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E6=8A=A5=E8=A1=A820210125?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java index 317587c..a99b138 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.mes.model.report; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; + /** * 生产统计 * @author yumingxing @@ -13,6 +15,12 @@ import lombok.Data; public class ProductStatisticsQueryModel { @ApiParam("生产线") + private List workCenterCodeList; + @ApiParam("工序") + private List processCodeList; + @ApiParam("零件号") + private List partNoList; + @ApiParam("生产线") private String workCenterCode; @ApiParam("工序") private String processCode; From 86a6fb1390e39caa65fbfb648c9264f7e523e0cc Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Tue, 26 Jan 2021 18:51:09 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E6=8A=A5=E8=A1=A82021026?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java index 5762969..0174515 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java @@ -33,11 +33,15 @@ public class ProcessScrapRate { @ApiParam("报废率") private BigDecimal scrapRate; + @ApiParam("物料号") + private String partNo; - public ProcessScrapRate(String processCode,String processName, String prodCfgTypeCode, String workCellCode) { + + public ProcessScrapRate(String processCode,String processName, String prodCfgTypeCode, String workCellCode,String partNo) { this.processCode = processCode; this.processName = processName; this.prodCfgTypeCode = prodCfgTypeCode; this.workCellCode = workCellCode; + this.partNo = partNo; } } From 5e1fac42fe0fd54b26853e19e07ceb3708458298 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 27 Jan 2021 10:24:30 +0800 Subject: [PATCH 14/18] =?UTF-8?q?12112=20=E8=AE=BE=E5=A4=87=E5=91=A8?= =?UTF-8?q?=E6=9C=9F=E4=BD=9C=E4=B8=9A=E8=AE=A1=E5=88=92=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E4=B8=8E=E4=BD=9C=E4=B8=9A=E8=A6=81=E6=B1=82=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/bean/MesEquTaskDetailStandard.java | 50 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java | 12 +++--- .../pojo/mes/bean/MesEquTaskPlanStandard.java | 50 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/MesEquTaskPlanModel.java | 7 ++- .../MesEquTaskDetailStandardRepository.java | 13 ++++++ .../MesEquTaskPlanStandardRepository.java | 13 ++++++ 6 files changed, 137 insertions(+), 8 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetailStandard.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanStandard.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailStandardRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanStandardRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetailStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetailStandard.java new file mode 100644 index 0000000..97c9310 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetailStandard.java @@ -0,0 +1,50 @@ +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.*; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/1/25 10:47 AM + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_EQU_TASK_DETAIL_STANDARD") +@Api("设备作业任务要求") +public class MesEquTaskDetailStandard extends BaseBean implements Serializable { + private static final long serialVersionUID = 8033976649492744091L; + + @Column(name = "TASK_DETAIL_ID") + @ApiParam("任务明细ID") + private Long taskDetailId; + + @Column(name = "ACTION_ITEM") + @ApiParam("操作项") + private String actionItem; + + @Column(name = "ACTION_STANDARD") + @ApiParam("操作标准") + private String actionStandard; + + @Column(name = "ACTION_GUIDE") + @ApiParam("操作指导") + private String actionGuide; + + @Column(name = "ACTION_GUIDE_URL") + @ApiParam("指导文件路径") + private String actionGuideUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java index 3454a65..b19137b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -5,17 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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 javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; +import java.util.List; /** * @Description :设备周期作业计划 @@ -78,4 +74,8 @@ public class MesEquTaskPlan extends BaseBean implements Serializable { @ApiParam("作业任务编号") private String taskNo; + @Transient + @ApiParam("设备作业要求") + private List equTaskStandards; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanStandard.java new file mode 100644 index 0000000..71b4157 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanStandard.java @@ -0,0 +1,50 @@ +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.*; +import java.io.Serializable; + +/** + * @Description: 设备周期计划作业要求 + * @Author: jokelin + * @Date: 2021/1/25 10:43 AM + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_EQU_TASK_PLAN_STANDARD") +@Api("设备周期计划作业要求") +public class MesEquTaskPlanStandard extends BaseBean implements Serializable { + private static final long serialVersionUID = 8284644034068953809L; + + @Column(name = "PLAN_ID") + @ApiParam("计划ID") + private Long planId; + + @Column(name = "ACTION_ITEM") + @ApiParam("操作项") + private String actionItem; + + @Column(name = "ACTION_STANDARD") + @ApiParam("操作标准") + private String actionStandard; + + @Column(name = "ACTION_GUIDE") + @ApiParam("操作指导") + private String actionGuide; + + @Column(name = "ACTION_GUIDE_URL") + @ApiParam("指导文件路径") + private String actionGuideUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java index 0538b0f..0fdaca2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java @@ -1,12 +1,12 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanCfg; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanStandard; import io.swagger.annotations.ApiParam; import lombok.Data; -import lombok.Getter; -import lombok.Setter; import java.io.Serializable; +import java.util.List; @Data public class MesEquTaskPlanModel implements Serializable { @@ -73,6 +73,9 @@ public class MesEquTaskPlanModel implements Serializable { @ApiParam("设备周期计划配置") private MesEquTaskPlanCfg planCfg; + @ApiParam("设备作业要求") + private List equTaskStandards; + public MesEquTaskPlanModel() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailStandardRepository.java new file mode 100644 index 0000000..38c311a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailStandardRepository.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.MesEquTaskDetailStandard; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/1/25 10:49 AM + * @Modify: + */ +public interface MesEquTaskDetailStandardRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanStandardRepository.java new file mode 100644 index 0000000..03b79f7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanStandardRepository.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.MesEquTaskPlanStandard; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/1/25 10:46 AM + * @Modify: + */ +public interface MesEquTaskPlanStandardRepository extends BaseRepository { +} From f1db936f42c4d8b7bb9ea3b41514ba39a0f8dffb Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 27 Jan 2021 16:15:37 +0800 Subject: [PATCH 15/18] pom --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/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-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/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 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 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 650ee5b..f902a7c 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-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/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 1e17935..d2521de 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 37b8a51..b599490 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 dc13374..9f5788e 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-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/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 123fdc9..1674a47 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 fdcf6e3..04b40d4 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-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/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 60d9861..ac387fd 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 54c8306..bbe0ff9 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 190efa7..be533a6 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 5896851..14e8567 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-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 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 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 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 076f15a..e755225 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 1351ed3..194f0cb 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 67b0bff..60543fe 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 15d36cd..bdc4cab 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 e57acaf..f611147 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 From 5a5874b137c54f9343d6de7d38fe1c9cf935e71c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 27 Jan 2021 17:13:59 +0800 Subject: [PATCH 16/18] test --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/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-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/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 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..bc7071b 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-PROD-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 8ef99a3..f902a7c 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 3751cf9..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-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 a6c1bea..d2521de 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-PROD-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 0a2f9d4..b599490 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-PROD-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 2bf0e5c..9f5788e 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 557548a..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-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 f10cf39..1674a47 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-PROD-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 34a7337..04b40d4 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 670eb15..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-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 ce2dc01..ac387fd 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-PROD-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 b8c9643..bbe0ff9 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-PROD-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 1d29933..be533a6 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-PROD-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 284225c..14e8567 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-PROD-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 7ff16c9..102ab0e 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-PROD-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 353a02b..864c56a 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-PROD-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 b125cee..e755225 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-PROD-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 c9d54a9..194f0cb 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-PROD-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 39f1e2f..60543fe 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-PROD-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 df01041..bdc4cab 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index a18cef1..f611147 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 696a0a8c3f87334174335e1af4c5620e72953adb Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 28 Jan 2021 10:50:41 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=B1=95=E5=BC=80=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 11 +++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) 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 65c5ee9..278960b 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 @@ -9540,6 +9540,17 @@ public class WmsEnumUtil { public static String valueOfDescription(int val) { return valueOf(val); + + } + + public static int descriptionOfValue(String desc) { + int tmp = ISOLATED_SCRAP.value; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; } } 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 ed0c231..70b41fe 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 @@ -753,7 +753,7 @@ public WmsDocMovementDetails (String partNo,String orderNo) { public WmsDocMovementDetails(String organizeCode, String workOrderCode, String orderNo, Integer moveType, Integer busiType, String item, String partNo, String partNameRdd, String unit, Double qty, - Integer isSn, Integer orderMasterStatus, String createUser, String createDatetime, String seqNo) { + Integer isSn, Integer orderMasterStatus, String createUser, String createDatetime, String seqNo, String assignDateCode) { this.organizeCode = organizeCode; this.workOrderCode = workOrderCode; this.orderNo = orderNo; @@ -769,6 +769,7 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.createUser = createUser; this.createDatetime = createDatetime; this.seqNo = seqNo; + this.assignDateCode = assignDateCode; } public WmsDocMovementDetails(String orderNo, String partNo, String custPartNo, String srcZoneNo, String destZoneNo, String destLocateNo, Double qty, Double pickQty, String createDatetime, Integer orderStatus, String createUser) { From cf908f2d04bc6f7d0a570b3a3e7fd8d7f187d9af Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 29 Jan 2021 17:36:19 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E5=8D=A1=E6=96=AF=E9=A9=AC=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E7=95=8C=E9=9D=A2--=E5=AE=A2=E6=88=B7=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E8=A7=84=E5=88=99=E3=80=81=E4=BA=A7=E5=93=81=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E5=AE=B9=E9=87=8F=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 32 +++++++++++++++------- 1 file changed, 22 insertions(+), 10 deletions(-) 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 490fa74..0e9a4f0 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 @@ -3611,23 +3611,35 @@ public class MesHqlPack { /** * MES客户条码规则查询条件封装 * - * @param mesCustomerSnRule - * @return + * @param customerSnRule 客户条码规则查询条件 + * @return 查询数据 */ - public static DdlPackBean getMesCustomerSnRule(MesCustomerSnRule mesCustomerSnRule) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesCustomerSnRule, mesCustomerSnRule.getOrganizeCode()); - if (!StringUtils.isEmpty(mesCustomerSnRule.getOrganizeCode())) { - DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getOrganizeCode(), "organizeCode", packBean); + public static DdlPackBean getMesCustomerSnRule(MesCustomerSnRule customerSnRule) { + DdlPackBean packBean = getAllBaseDataByNormalPro(customerSnRule, customerSnRule.getOrganizeCode()); + if (!StringUtils.isEmpty(customerSnRule.getOrganizeCode())) { + DdlPreparedPack.getStringLikerPack(customerSnRule.getOrganizeCode(), "organizeCode", packBean); + } + if (!StringUtils.isEmpty(customerSnRule.getCustomerCode())) { + DdlPreparedPack.getStringLikerPack(customerSnRule.getCustomerCode(), "customerCode", packBean); + } + if (!StringUtils.isEmpty(customerSnRule.getCustomerPartNo())) { + DdlPreparedPack.getStringLikerPack(customerSnRule.getCustomerPartNo(), "customerPartNo", packBean); } - if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerCode())) { - DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerCode(), "customerCode", packBean); + if (!StringUtils.isEmpty(customerSnRule.getPartNo())) { + DdlPreparedPack.getStringLikerPack(customerSnRule.getPartNo(), "partNo", packBean); } - if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerPartNo())) { - DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerPartNo(), "customerPartNo", packBean); + if (!StringUtils.isEmpty(customerSnRule.getLength())) { + DdlPreparedPack.getNumEqualPack(customerSnRule.getLength(), "length", packBean); } return packBean; } + /** + * MES物料上炉模式查询条件封装 + * + * @param partFurnace 物料上炉模式查询条件 + * @return 查询数据 + */ public static DdlPackBean getPartFurnace(MesPartFurnace partFurnace) { DdlPackBean packBean = getAllBaseData(partFurnace.getOrganizeCode()); DdlPreparedPack.getStringLikerPack(partFurnace.getPartNo(), "partNo", packBean);