From 163d610265507b003e3bdf32d6e165ca03013695 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 30 Jul 2020 08:46:26 +0800 Subject: [PATCH 001/109] Finish Task #2080 Cost:8h --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index 025d045..c7981a7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -72,6 +72,12 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "工厂代码") public String organizeCode; + @ApiParam(value = "是否展示删除按钮") + public Integer isShowDeleteButton; + + @ApiParam(value = "跳转后端请求") + public String actionUrl; + public WmsTaskInfoModel() { } From c8726638475eb20ce0160e191bbd74628bfa050f Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 4 Aug 2020 02:37:04 +0800 Subject: [PATCH 002/109] Finish Task #2080 Cost:8h --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../i3plus/pojo/model/wms/WmsJobParamModel.java | 1 + .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 24 ++++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) mode change 100644 => 100755 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java 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 a0618cf..17ac869 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 @@ -307,7 +307,7 @@ public class WmsEnumUtil { public enum REC_STATUS_KANBAN { TO_BE_RECEIVED(10, "TO_BE_RECEIVED", "待收货"), RECEIVING(20, "RECEIVING", "收货中"), - DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟未收货"), + DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟"), COMPLETED(40, "COMPLETED", "已完成"); private int value; @@ -1720,6 +1720,7 @@ public class WmsEnumUtil { public enum QC_STATUS { INSPECTION_FREE(10, "免检"), PENDING_QUALITY_INSPECTION(20, "待质检"), + DELAYED_NON_QC(40, "延迟"), QUALITY_INSPECTION_COMPLETED(30, "质检完成"); private int value; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java old mode 100644 new mode 100755 index 2c30912..009c019 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java @@ -21,6 +21,7 @@ public class WmsJobParamModel implements Serializable { private Integer snType;//条码类型（虚拟，实物） private String devOpsEmail;//运维人员邮箱 private Integer minuteDiff;//处理周期(分钟) + private String whereHql;//业务查询条件HQL public int getMinuteDiffVal() { return this.minuteDiff == null ? 0 : this.minuteDiff.intValue(); 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..1bd27d4 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 @@ -259,6 +259,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; + 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 d5d16569bbbc4a9d0d8732d4311f0a4cb8014ae5 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 5 Aug 2020 10:40:08 +0800 Subject: [PATCH 003/109] =?UTF-8?q?Fix=20bug#10283=2020089+=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E7=A7=BB=E5=8A=A8=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=9F=A5=E8=AF=A2=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 4 ++++ 1 file changed, 4 insertions(+) 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..35a819c 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 @@ -163,6 +163,10 @@ public class WmsMoveMaster extends BaseBean { private String snapshotTime; @Transient + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Transient private Integer isSnapshot; @Transient From 39f6819e9b9b1ee00670196cc43018b2d1c699ce Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 5 Aug 2020 11:07:12 +0800 Subject: [PATCH 004/109] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-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 +- 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/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 5f809e6..aca1465 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 8778b3c..a6a0d68 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 c2104bf..cc8fce6 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 diff --git a/sonar-project.properties b/sonar-project.properties index ae014e9..0786d8d 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-PROD-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 067a859e83489e041748378a116013dcd7960760 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 5 Aug 2020 11:28:28 +0800 Subject: [PATCH 005/109] =?UTF-8?q?=E3=80=9010229=2019081--=20=E5=9C=A8?= =?UTF-8?q?=E5=B7=B2=E6=9C=89=E7=9A=84=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=8A=A5=E5=B7=A5=E9=80=BB=E8=BE=91=E4=B8=8A=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E5=8E=9F=E6=9D=90=E6=96=99=E6=89=A3=E5=87=8F=E9=80=BB?= =?UTF-8?q?=E8=BE=91=20--20200802=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 4b8e041..67ddf69 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -80,7 +80,6 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam("条码") public String sn; - /** * 质检状态:1=未质检,10=质检中,20=质检合格, * 30=质检不合格,40=已退货 @@ -117,6 +116,10 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam(value = "供应商编码") public String vendorNo; + @Column(name = "LOT_NO", nullable = false) + @ApiParam("收货批次") + public String lotNo = ""; + @Transient @ApiParam(value = "实盘数量", example = "1") @AnnoOutputColumn(hidden = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 7bea734..3a6c6f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -47,6 +48,10 @@ public class WmsCSRange extends BaseBean { @ApiParam("物料名称") public String partNameRdd; + @Column(name = "WH_NO") + @ApiParam("仓库代码") + public String whNo; + @Column(name = "ZONE_NO") @ApiParam("存储区编号") public String zoneNo; @@ -64,6 +69,15 @@ public class WmsCSRange extends BaseBean { @ApiParam("原单号") public String srcOrderNo; + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "库存数量", example = "0") + public Double qty; + + @Column(name = "LOT_NO", nullable = false) + @ApiParam("收货批次") + public String lotNo = ""; + @Transient @ApiParam("存储区编号组") @AnnoOutputColumn(hidden = true) From fa4b1e09aae287d40ebd09210ac82cd082c18dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 5 Aug 2020 14:47:24 +0800 Subject: [PATCH 006/109] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java index 9d94855..974c7e4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java @@ -170,7 +170,7 @@ public class TorqueCollectionModel implements Serializable { public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo, String partName, Integer torqueNo, Integer checkScanCount, Integer sendSeq, Integer yellowGunRule, Integer isEndSeq, String groupCode, Integer isPf, Double qualifiedCount, - String pokeYokeFix) { + String pokeYokeFix, String pokeYokeLength) { this.vinCode = vinCode; this.prodCfgTypeCode = prodCfgTypeCode; this.gradeCode = gradeCode; @@ -186,6 +186,7 @@ public class TorqueCollectionModel implements Serializable { this.isPf = isPf; this.qualifiedCount = qualifiedCount; this.pokeYokeFix = pokeYokeFix; + this.pokeYokeLength = pokeYokeLength; } /** From ba3f5fde4d9aa9252c6feafcc76b827349a42377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 5 Aug 2020 18:08:37 +0800 Subject: [PATCH 007/109] =?UTF-8?q?=E3=80=90=E6=80=BB=E8=A3=85=E3=80=81?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E3=80=81=E6=B3=A8=E5=A1=91=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 36 ++++++++++++++++++++++ .../pojo/mes/dbinterface/MesInterfaceEnumUtil.java | 3 +- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 1 + 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 1e81a07..9d9f831 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -298,6 +298,42 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("客户物料号") private String customerPartNo; + @Transient + @ApiParam("客户物料名称") + private String customerPartName; + + @Transient + @ApiParam("客户物料颜色") + private String customerPartColor; + + @Transient + @ApiParam("项目名称") + private String prodCfgTypeName; + + @Transient + @ApiParam("颜色代码") + private String colorCode; + + @Transient + @ApiParam("挂架数") + private Integer shelvesAmount; + + @Transient + @ApiParam("供漆罐代码") + private String paintTankCode; + + @Transient + @ApiParam("计划报表标识") + private String reportFormCode; + + @Transient + @ApiParam("一检数量") + private Integer firstInspectionQty; + + @Transient + @ApiParam("二检数量") + private Integer secondInspectionQty; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java index b1355c7..409f31b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java @@ -10,7 +10,8 @@ public class MesInterfaceEnumUtil { WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), MES2WMS(30, "MES2WMS", "MES --> WMS"), WMS2MES(40, "WMS2MES", "WMS --> MES"), - MES2SAP(50, "MES2SAP", "MES --> SAP"); + MES2SAP(50, "MES2SAP", "MES --> SAP"), + SAP2MES(60, "SAP2MES", "SAP --> MES"); private int value; private String name; 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 d0caed6..ffe7ac6 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 @@ -205,6 +205,7 @@ public class MesHqlPack { mesWorkOrder.getCreateDateTimeEnd(), "createDatetime", packBean, true); } + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getAreaCode(), "areaCode", packBean); DdlPreparedPack.getOrderDefault(mesWorkOrder); return packBean; } From 8eade912c71f24857aceabd449c296bb7cb3c15f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 5 Aug 2020 20:00:51 +0800 Subject: [PATCH 008/109] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=B7=A5?= =?UTF-8?q?=E8=BF=94=E4=BF=AE=E6=95=B0=E6=8D=AE=E5=A4=8D=E6=A0=B8=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java index e29550d..fa938cc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java @@ -6,6 +6,12 @@ import lombok.Data; @Data public class TorqueReviewModel { + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("工作中心代码") + private String workCenterCode; + @ApiParam("工作单元代码") private String workCellCode; From 162e2d33d777e7a0ab82421abf511d26625ccd07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 5 Aug 2020 22:01:43 +0800 Subject: [PATCH 009/109] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 8 +++++++- 1 file changed, 7 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 96d6044..16df925 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 @@ -180,6 +180,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品条码") private String productSn; + @Transient + @ApiParam("队列类型") + private Integer queueType; + public double getQueueSeqVal() { return this.queueSeq == null ? 0.0d : this.queueSeq; } @@ -207,7 +211,8 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { public MesQueueOrderDetail(String orderNo, String vinCode, String partNo, String partNameRdd, String produceCategoryCode, Integer status, String serialNumber, Double seq, Integer isGroupPrinted, String createDatetime, - String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,String gradeCode,String assyNo) { + String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor, + String gradeCode,String assyNo,Integer queueType) { this.orderNo = orderNo; this.vinCode = vinCode; this.partNo = partNo; @@ -224,5 +229,6 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { this.produceColor = produceColor; this.gradeCode = gradeCode; this.assyNo = assyNo; + this.queueType = queueType; } } From f9061f5d270e1afe796f6d5aa4c1afc93098e2e3 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 5 Aug 2020 22:47:20 +0800 Subject: [PATCH 010/109] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 5b06475..78806fe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -229,6 +229,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam(value = "jis料架号") private String queueGroupNo; + @Column(name = "CUST_ORDER_NO") + @ApiParam(value = "客户单号") + private String custOrderNo; + @Transient private Long shippingId; From 7f291a26cda5ca571c452d03e218af5c86ecf6e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 6 Aug 2020 01:45:44 +0800 Subject: [PATCH 011/109] =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE-=E8=B0=83=E6=95=B4=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) 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 91912ab..3d4b375 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 @@ -2558,4 +2558,54 @@ public class CommonEnumUtil { public enum DYNAMIC_DATA_SOURCE_TYPE { MASTER,NODE } + + + + /** + * 业务表：库存条码状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SESSION_MODE { + DEFAULT(10, "默认"), + OVERWRITE(20, "覆盖"), + SEIZE(30, "抢占"); + + private int value; + private String description; + + SESSION_MODE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + + public static Integer descriptionOfValue(String desc) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } From 7482a6dd747a13c66986aa731ab9f01dbf955b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 6 Aug 2020 09:19:33 +0800 Subject: [PATCH 012/109] =?UTF-8?q?BUG#9928=20=E5=92=8C=E4=BB=BB=E5=8A=A1#?= =?UTF-8?q?2590?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java index 345b775..904fd3d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java @@ -8,11 +8,7 @@ import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * 脚本持久化实体类 @@ -26,7 +22,9 @@ import javax.persistence.Transient; @DynamicUpdate @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@Table(name = "SCRIPT_PERSISTENCE") +@Table(name = "SCRIPT_PERSISTENCE", uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SCRIPT_NO"}) +}) @Api("系统动态脚本") public class EngineScriptPersistence extends BaseBean { private static final long serialVersionUID = 7893111140559759490L; From 14e68803dfccb0d16c4c6d9017ea2149d7f25e99 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 6 Aug 2020 09:55:54 +0800 Subject: [PATCH 013/109] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=B7=E5=8F=96=E5=BA=93=E5=AD=98=E5=9C=B0?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E5=BE=AE=E6=9C=8D=E5=8A=A1=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 98a1d3f..5419a1b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -395,7 +395,16 @@ public class WmsHqlPack { DdlPreparedPack.getStringRightLikerPack(wmsPart.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); - DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result); + if (!StringUtil.isEmpty(wmsPart.getPartType()) && wmsPart.getPartType().contains(",")) { + String types[] = wmsPart.getPartType().split(","); + List partTypes = new ArrayList<>(); + for (String type : types) { + partTypes.add(type); + } + DdlPreparedPack.getInPackList(partTypes, "partType", result); + } else { + DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result); + } DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); DdlPreparedPack.getNumEqualPack(wmsPart.getIsValuable(), "isValuable",result); getStringBuilderPack(wmsPart, result); From 5413fc259c1cf24b9cfaa4890d122ece5d444035 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 6 Aug 2020 12:48:32 +0800 Subject: [PATCH 014/109] =?UTF-8?q?pcn=20=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 10 ++++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 ++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 8040d62..be00964 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -4378,6 +4378,16 @@ public class MesPcnEnumUtil { return tmp; } + public static int codeOf(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + public static String valueOfDescription(int val) { return valueOf(val); } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java index d95ebc1..ae079bb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java @@ -65,7 +65,7 @@ public class IfDefectData extends BaseBean implements Serializable { @Column(name = "DEFECT_ACTION_TYPE") @ApiParam("不良处理类型") - private Integer defectActionType; + private String defectActionType; @Column(name = "QTY") @ApiParam("数量") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index fbd81ad..f5f986b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -82,7 +82,7 @@ public class MesDefectRecord extends BaseBean implements Serializable { @Column(name = "DEFECT_ACTION_TYPE") @ApiParam("不良处理类型") - private Integer defectActionType; + private String defectActionType; @Transient private List mesDefectList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 0fe7b90..44080c9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -148,6 +148,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("生产批次") private String lotNo; + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private String defectActionType; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") From 6e455f5d726b15f79b14f98af3b4abd6b262a1ca Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 6 Aug 2020 13:04:57 +0800 Subject: [PATCH 015/109] =?UTF-8?q?reqBean=20=E6=B7=BB=E5=8A=A0productSn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index e566905..91f1cc3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -27,9 +27,12 @@ public class StationRequestBean implements Serializable { @ApiParam("扫描信息") private String scanInfo; - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; + @ApiParam("产品条码") + private String productSn; + @ApiParam("物料号") private String partNo; From 731b1c60ee0a00960a73f6344abf900649874983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 6 Aug 2020 16:41:44 +0800 Subject: [PATCH 016/109] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 +- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java | 41 ++++++++++++++++++++++ .../pojo/ptl/repository/PtlLogRepository.java | 16 +++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLogRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index be00964..2c603a8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -797,7 +797,8 @@ public class MesPcnEnumUtil { public enum MES_WORK_CELL_TYPE { NORMAL(10, "正常"), - REWORK(20, "返修"); + REWORK(20, "返修"), + ON_LINE(30, "上线工位"); private int value; private String description; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java new file mode 100644 index 0000000..6df2fe0 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_LOG") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_LOG") +public class PtlLog extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3885987217528730391L; + + @Column(name = "METHOD_NAME") + @ApiParam(value = "方法名") + private String methodName; + + @Column(name = "EXCEPTION_LOG") + @ApiParam(value = "异常日志") + private String exceptionLog; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLogRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLogRepository.java new file mode 100644 index 0000000..d8d7409 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.IfPickData; +import cn.estsh.i3plus.pojo.ptl.bean.PtlLog; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlLogRepository extends BaseRepository { + +} From 6e60bee0dd99e5c6fdb0d1d431a4fff96224c99f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 6 Aug 2020 17:09:20 +0800 Subject: [PATCH 017/109] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index ba0b0c0..4ee916c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2339,7 +2339,8 @@ public class MesEnumUtil { public enum MES_WORK_CELL_TYPE { NORMAL(10, "正常"), - REWORK(20, "返修"); + REWORK(20, "返修"), + ON_LINE(30, "上线工位"); private int value; private String description; From 55b047448bd8032746f3b8b16c1588b6afe02168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 6 Aug 2020 18:53:48 +0800 Subject: [PATCH 018/109] =?UTF-8?q?fix:=E4=BC=9A=E8=AF=9D=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E4=B8=BA=E9=BB=98=E8=AE=A4=E6=97=B6=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8=E8=A6=86=E7=9B=96=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 3d4b375..1dba3c4 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 @@ -2559,10 +2559,8 @@ public class CommonEnumUtil { MASTER,NODE } - - /** - * 业务表：库存条码状态 + * 会话模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SESSION_MODE { From 6aaa26b19287637336d71390c4014759f0d6ca91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 7 Aug 2020 11:48:57 +0800 Subject: [PATCH 019/109] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java index 6df2fe0..6a79a55 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java @@ -38,4 +38,24 @@ public class PtlLog extends BaseBean implements Serializable { @Column(name = "EXCEPTION_LOG") @ApiParam(value = "异常日志") private String exceptionLog; + + @Column(name = "CONTROL_CODE") + @ApiParam(value = "控制器") + private String controlCode; + + @Column(name = "IP") + @ApiParam(value = "IP") + private String ip; + + @Column(name = "AREA_NO") + @ApiParam(value = "区域") + private String areaNo; + + @Column(name = "SECTION_CODE") + @ApiParam(value = "区段") + private String sectionCode; + + @Column(name = "TAG_NO") + @ApiParam(value = "标签地址") + private Integer tagNo; } From a3e8caf085899920ad036cd9daf6b17853b35799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 7 Aug 2020 13:45:03 +0800 Subject: [PATCH 020/109] =?UTF-8?q?fix:detachObject=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E6=97=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index afd81eb..3b2f5a2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -61,6 +61,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep } public void detachObject(T t){ + if (t == null) { + return; + } entityManager.detach(t); } From 3af4d32a974a18dec0dbeb264cc409a98ef89f36 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 7 Aug 2020 14:53:49 +0800 Subject: [PATCH 021/109] =?UTF-8?q?mes=E5=B7=A5=E4=BD=8D=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 18 ++++++++- .../pojo/mes/pcn/bean/MesWorkCellStatus.java | 47 ++++++++++++++++++++++ .../repository/MesWorkCellStatusRepository.java | 16 ++++++++ .../i3plus/pojo/mes/bean/MesWorkCellStatus.java | 47 ++++++++++++++++++++++ .../repository/MesWorkCellStatusRepository.java | 16 ++++++++ 5 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellStatusRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 2c603a8..fdd1204 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -4653,8 +4653,24 @@ public class MesPcnEnumUtil { public int getValue() { return value; } - } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GET_AND_SET { + GET(10, "get"), + SET(20, "set"); + + private int value; + private String description; + + GET_AND_SET(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java new file mode 100644 index 0000000..5932327 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :配置表 + * @Reference : + * @Author : crish + * @CreateDate : 2019-06-04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_STATUS") +@Api("工位运行状态") +public class MesWorkCellStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = 102975351699481524L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "TIME_OUT_STATUS") + @ApiParam("超时状态") + private Integer timeOutStatus; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java new file mode 100644 index 0000000..1295a8d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellStatus; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 11:21 + * @Modify: + **/ +@Repository +public interface MesWorkCellStatusRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java new file mode 100644 index 0000000..ba1090a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :配置表 + * @Reference : + * @Author : crish + * @CreateDate : 2019-06-04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_STATUS") +@Api("工位运行状态") +public class MesWorkCellStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = 102975351699481524L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "TIME_OUT_STATUS") + @ApiParam("超时状态") + private Integer timeOutStatus; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellStatusRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellStatusRepository.java new file mode 100644 index 0000000..43d28e4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellStatusRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellStatus; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 11:21 + * @Modify: + **/ +@Repository +public interface MesWorkCellStatusRepository extends BaseRepository { +} From 625b780aaf2d350e7edcd26c3ed9d129fdaafb84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 7 Aug 2020 18:37:35 +0800 Subject: [PATCH 022/109] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E6=95=B0=E6=8D=AE=E5=A4=8D=E6=A0=B8=E5=B7=A5=E6=AD=A5?= =?UTF-8?q?=E5=92=8C=E4=BA=A7=E7=BA=BF=E7=8A=B6=E6=80=81=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 49 +++++++++++ .../i3plus/pojo/mes/bean/MesEquipmentTravel.java | 98 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/PlcEquStatusModel.java | 4 + .../repository/MesEquipmentTravelRepository.java | 17 ++++ 4 files changed, 168 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTravel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentTravelRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index fdd1204..1d26919 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -4673,4 +4673,53 @@ public class MesPcnEnumUtil { } } + /** + * mes设备状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQUIPMENT_STATUS { + + INUSE(10, "在用"), + SPARE(20, "停止"), + FAULT(30, "故障"), + SERVICE(40, "检修"), + STOPUSING(50, "暂停"); + + private int value; + private String description; + + MES_EQUIPMENT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTravel.java new file mode 100644 index 0000000..0480688 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTravel.java @@ -0,0 +1,98 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :设备运行履历表 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQUIPMENT_TRAVEL") +@Api("设备运行履历表") +public class MesEquipmentTravel extends BaseBean implements Serializable { + + private static final long serialVersionUID = -419342647505833190L; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name = "STATUS") + @ApiParam("设备状态") + private Integer status; + + @Column(name = "EQUIPMENT_TYPE") + @ApiParam("设备类型") + private Integer equipmentType; + + @Column(name = "EQUIPMENT_CATEGORY") + @ApiParam("设备类别") + private String equipmentCategory; + + @Column(name = "EQUIPMENT_MODEL") + @ApiParam("型号") + private String equipmentModel; + + @Column(name = "EQUIPMENT_SPEC") + @ApiParam("规格") + private String equipmentSpec; + + @Column(name = "EQUIPMENT_MAKER") + @ApiParam("制造商") + private String equipmentMaker; + + @Column(name = "RELEASE_DATE") + @ApiParam("出厂日期") + private String releaseDate; + + @Column(name = "RECEIVE_DATE") + @ApiParam("接收日期") + private String receiveDate; + + @Column(name = "ENABLE_DATE") + @ApiParam("启用日期") + private String enableDate; + + @Column(name = "CONNECT_TYPE") + @ApiParam("连接类型") + private Integer connectType; + + @Column(name = "CHECK_MODEL") + @ApiParam("作业校验模式") + private Integer checkModel; + + @Column(name = "STATUS_START_TIME") + @ApiParam("状态开始时间") + private String statusStartTime; + + @Column(name = "STATUS_END_TIME") + @ApiParam("状态结束时间") + private String statusEndTime; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java index 6891043..fa219c6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java @@ -32,6 +32,10 @@ public class PlcEquStatusModel implements Serializable { @ApiParam("产线状态") private Integer workCenterStatus; + // 电检设备切换密码 + @ApiParam("电检设备切换密码") + private String equChoosePassWard; + @ApiParam("停机类型") private Integer stopType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentTravelRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentTravelRepository.java new file mode 100644 index 0000000..515ee67 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentTravelRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipment; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentTravel; +import org.springframework.stereotype.Repository; + +/** + * @Description :设备运行履历 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEquipmentTravelRepository extends BaseRepository { +} From 54b0af00ccca63b54abf25372bf633414ca794df Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 7 Aug 2020 22:01:50 +0800 Subject: [PATCH 023/109] =?UTF-8?q?Sweb=E5=8A=9F=E8=83=BD=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/SwebEnumUtil.java | 57 ++++++++++ .../estsh/i3plus/pojo/sweb/bean/SwebPoSnToWms.java | 118 +++++++++++++++++++++ .../i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 5 + .../pojo/sweb/bean/SwebPurchaseOrderDetails.java | 5 +- .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 22 ++-- 5 files changed, 199 insertions(+), 8 deletions(-) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoSnToWms.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index fd9784a..2184f9a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -136,6 +136,63 @@ public class SwebEnumUtil { } /** + * PO订单来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_SOURCE { + WMS(10, "WMS", "WMS"), + SWEB(20, "SWEB", "SWEB"); + + private int value; + private String code; + private String description; + + ORDER_SOURCE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static int codeOf(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** * 包装类型枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoSnToWms.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoSnToWms.java new file mode 100644 index 0000000..493338b --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoSnToWms.java @@ -0,0 +1,118 @@ +package cn.estsh.i3plus.pojo.sweb.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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SWEB_PO_SN_TO_WMS") +@Api("库存移动单处理成功后的记录") +public class SwebPoSnToWms extends BaseBean { + + private static final long serialVersionUID = 746409789382994374L; + @Column(name = "ORDER_NO") + @ApiParam("单号") + public String orderNo; + + @ApiParam("供应商编号") + @Column(name = "VENDOR_CODE") + private String vendorCode; + + @ApiParam("供应商名称") + @Column(name = "VENDOR_NAME") + private String vendorName; + + @Column(name = "PART_NO") + @ApiParam(value = "零件号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "零件名称") + private String partName; + + @ApiParam("零件类型") + @Column(name = "PART_TYPE") + private Integer partType; + + @ApiParam(value = "单位") + @Column(name = "UNIT") + private String unit; + + @Column(name = "BOX_QTY") + @ColumnDefault("0") + @ApiParam(value = "箱数", example = "0") + private Integer boxQty; + + @Column(name = "SERIAL_NO") + @ApiParam(value = "序列号") + private String serialNo; + + @Column(name = "SN") + @ApiParam(value = "箱条码") + private String sn; + + @Column(name = "ERP_WAREHOUSE") + @ApiParam("库存地") + private String erpWarehouse; + + @Column(name = "PRODUCTION_TIME") + @ApiParam(value = "产生时间") + private String productionTime; + + @Column(name = "PRINT_TIME") + @ApiParam(value = "打印时间") + private String printTime; + + @Column(name = "PRINTS") + @ApiParam("打印次数") + private Integer prints; + + @Column(name = "CHECK_CODE") + @ApiParam(value = "检验编号") + private String checkCode; + + @Column(name = "STOVE_NO") + @ApiParam(value = "特殊批号") + private String stoveNo; + + @Column(name = "BATCH_NO") + @ApiParam(value = "批次号") + private String batchNo; + + @ApiParam("是否同步") + @Column(name = "IS_SYN") + private String isSyn; + + @Column(name = "REC_TIME") + @ApiParam(value = "收货时间") + private String recTime; + + @Column(name = "PACKAGE_NO") + @ApiParam(value = "包装编号") + private String packageNo; + + @ColumnDefault("0") + @Column(name = "WEIGHT") + @ApiParam(value = "重量") + private Double weight; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index dde1758..723d9cb 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -104,6 +104,11 @@ public class SwebPurchaseOrder extends BaseBean { @ApiParam(value = "合同号") private String refNo; + // SwebEnumUtil.ORDER_SOURCE + @Column(name = "ORDER_SOURCE") + @ApiParam(value = "订单来源") + private Integer orderSource; + @Transient @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "预计到货时间 开始时间") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index a343b51..80833fe 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -55,9 +55,9 @@ public class SwebPurchaseOrderDetails extends BaseBean { @ApiParam(value = "零件名称") private String partName; - @ApiParam(value = "订单类型", example = "1") + /*@ApiParam(value = "订单类型", example = "1") @Column(name = "ORDER_TYPE") - public Integer orderType; + public Integer orderType;*/ @ApiParam("零件类型") @Column(name = "PART_TYPE") @@ -105,6 +105,7 @@ public class SwebPurchaseOrderDetails extends BaseBean { @ApiParam("库存地") private String erpWarehouse; + // 停用 @Column(name = "REF_QTY") @ColumnDefault("0") @ApiParam(value = "订单数量", example = "0") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 459a7e8..276b52b 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -11,6 +11,8 @@ import cn.estsh.i3plus.pojo.sweb.bean.*; import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel; import org.apache.commons.lang3.StringUtils; +import java.util.List; + /** * @Description : hql 封装 * @Reference : @@ -45,15 +47,21 @@ public class SwebHqlPack { return hqlStr; } - public static DdlPackBean getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder) { + public static DdlPackBean getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder, List vendorNos) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result); + if (StringUtil.isEmpty(purchaseOrder.getVendorCode())) { + DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result); + } else { + DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); + } if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) { DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(), purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false); } DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result); + DdlPreparedPack.getNumEqualPack(purchaseOrder.getPoStatus(), "poStatus", result); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); return buildHql(purchaseOrder, result); } @@ -118,6 +126,8 @@ public class SwebHqlPack { public static DdlPackBean getProcurementPlanOrderDeatilsWhereHql(SwebProcurementPlanOrderDetails swebProcurementPlanOrderDetails) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartName(), "partName", result); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); return buildHql(swebProcurementPlanOrderDetails, result); } @@ -136,7 +146,7 @@ public class SwebHqlPack { DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result); - DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); + //DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); return buildHql(details, result); } @@ -145,7 +155,7 @@ public class SwebHqlPack { DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); - DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); + //DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); return buildHql(details, result); } @@ -158,7 +168,7 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); - DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); + //DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); // DdlPreparedPack.getNumEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result); return buildHql(details, result); } From e70192d3c288a8f4b9ee555bfc1c76d356da498a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 8 Aug 2020 09:39:10 +0800 Subject: [PATCH 024/109] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesLog.java | 35 ++++++++++++++++++++++ .../pojo/mes/repository/MesLogRepository.java | 14 +++++++++ 2 files changed, 49 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLog.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLogRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLog.java new file mode 100644 index 0000000..f81f827 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLog.java @@ -0,0 +1,35 @@ +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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "MES_LOG") +@Api("MES_日志表") +public class MesLog extends BaseBean implements Serializable { + private static final long serialVersionUID = 4089347882308864216L; + + @Column(name = "METHOD_NAME") + @ApiParam(value = "方法名") + private String methodName; + + @Column(name = "LOG") + @ApiParam(value = "日志") + private String log; + + @Column(name = "RESULT") + @ApiParam(value = "更新结果") + private String result; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLogRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLogRepository.java new file mode 100644 index 0000000..e1369c2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLogRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesLog; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesLogRepository extends BaseRepository { +} From 653b413623aeb6f15cc5df76ba0a37e28fd56ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 10 Aug 2020 11:07:38 +0800 Subject: [PATCH 025/109] =?UTF-8?q?=E3=80=9010334=2019048-MES=E3=80=81WMS?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3JIT02=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=86=85?= =?UTF-8?q?=E9=83=A8=E5=B7=A5=E5=8D=95=E5=8F=B7=EF=BC=81-2020-08-03?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 2be9e5b..1b57440 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -131,4 +131,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "CUSTOMER_CODE") @ApiParam("客户代码") private String customerCode; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; } From 7c3594a870610ee4d6ac0abadb2949c69d72be4a Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 10 Aug 2020 11:22:30 +0800 Subject: [PATCH 026/109] Fix Bug #9589 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index dd0d6b0..cd1bd7f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java @@ -69,6 +69,10 @@ public class MesStepParam extends BaseBean implements Serializable { @ApiParam("type") private Integer type = 0; + @Column(name = "OBJECT_WHERE") + @ApiParam("参数对象查询条件") + private String objectWhere; + @Transient @ApiParam("可选值的数据") private List> enumList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index d40bd16..3f2bef5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -67,7 +67,7 @@ public class MesWorkCell extends BaseBean implements Serializable { private String workCellPort; @Column(name = "GRADE") - @ApiParam("工作等级") + @ApiParam("工位等级") private Integer grade; @Column(name = "TARGET_PASS_RATE") From 523d2ffc806fc80c8a1d36746cdd7e06df4aa612 Mon Sep 17 00:00:00 2001 From: ypf <2609529090@qq.com> Date: Mon, 10 Aug 2020 13:29:00 +0800 Subject: [PATCH 027/109] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E6=AC=A7=E6=B4=B2?= =?UTF-8?q?=E9=A2=86=E6=96=99=E7=9C=8B=E6=9D=BF=E9=80=BB=E8=BE=91=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=9A=84=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 4 ++++ 1 file changed, 4 insertions(+) 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 80a7f60..329d006 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 @@ -103,6 +103,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "计划时间") private String planTime; + @Transient + @ApiParam(value = "超时时间(单位:分钟)") + private Integer timeOut; + @Column(name = "SRC_NO") @ApiParam(value = "源单号") private String srcNo; From 51f9d92d36e31e4ff09280ca96a5ffdff844cfd7 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 10 Aug 2020 16:37:05 +0800 Subject: [PATCH 028/109] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3esop=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/QueueOrderModel.java | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 5f310b4..f4b82d7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -91,6 +91,9 @@ public class QueueOrderModel implements Serializable { @ApiParam("产品位置") private String produceCategoryCode; + @ApiParam("项目代码") + private String prodCfgTypeCode; + public QueueOrderModel() { } @@ -221,6 +224,47 @@ public class QueueOrderModel implements Serializable { this.produceCategoryCode = produceCategoryCode; } + //getWaitQueueOrderModelNoSnMgn + public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String prodCfgTypeCode, + String vinCode) { + this.serialNumber = serialNumber; + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workType = workType; + this.finsihQty = finsihQty; + this.qty = qty; + this.orderNo = orderNo; + this.pptCode = pptCode; + this.produceCategoryCode = produceCategoryCode; + this.prodCfgTypeCode = prodCfgTypeCode; + this.vinCode = vinCode; + } + + //getAlreadyQueueOrderModelNoSnMgn + public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workType = workType; + this.orderNo = orderNo; + this.serialNumber = serialNumber; + this.prodCfgTypeCode = prodCfgTypeCode; + this.vinCode = vinCode; + } + //getAlreadyQueueOrderModelNoSn public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String partNo, String partNameRdd, String workType) { From 4bdd2b770b5ccd0daa313b1b7a67d2be025ee2bc Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 10 Aug 2020 16:43:10 +0800 Subject: [PATCH 029/109] Fix Bug #10486 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 ffe7ac6..9b16fbb 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 @@ -1199,7 +1199,10 @@ public class MesHqlPack { public static DdlPackBean getMesWorkCellPoint(MesWorkCellPoint workCellPoint, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(workCellPoint, organizeCode); if (!StringUtils.isEmpty(workCellPoint.getWorkCellCode())) { - DdlPreparedPack.getStringEqualPack(workCellPoint.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringLikerPack(workCellPoint.getWorkCellCode(), "workCellCode", packBean); + } + if (!StringUtils.isEmpty(workCellPoint.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(workCellPoint.getWorkCenterCode(), "workCenterCode", packBean); } return packBean; } From f495ffed5415df4d9ad1155d92a5b2130cf87ee3 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 10 Aug 2020 17:07:20 +0800 Subject: [PATCH 030/109] Fix Bug #10477 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 9b16fbb..692a297 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 @@ -326,6 +326,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesWorkCell.getWorkCellCode())) { DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); } + if (!StringUtils.isEmpty(mesWorkCell.getWorkCellName())) { + DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellName(), "workCellName", packBean); + } return packBean; } @@ -1904,6 +1907,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateName())) { DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateName(), "codeType", packBean); } + if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateName())) { + DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateName(), "templateName", packBean); + } return packBean; } From 8c2fd8a587d03f3975fbd77ba7cb4e5943e5c916 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 10 Aug 2020 17:09:54 +0800 Subject: [PATCH 031/109] Fix Bug #10476 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 692a297..7acc4df 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 @@ -283,7 +283,10 @@ public class MesHqlPack { public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode); if (!StringUtils.isEmpty(mesArea.getAreaCode())) { - DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean); + DdlPreparedPack.getStringLikerPack(mesArea.getAreaCode(), "areaCode", packBean); + } + if (!StringUtils.isEmpty(mesArea.getAreaName())) { + DdlPreparedPack.getStringLikerPack(mesArea.getAreaName(), "areaName", packBean); } return packBean; From 4a99857248b46d3945b172ba7f26c7a25390003e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 10 Aug 2020 17:31:48 +0800 Subject: [PATCH 032/109] =?UTF-8?q?=E3=80=9010414=2019048=20-=20=E6=B3=A8?= =?UTF-8?q?=E5=A1=91=E4=BA=A7=E5=93=81=E6=B6=88=E8=80=97BOM=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=EF=BC=81-2020-08-05=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 9d9f831..255e7b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -334,6 +334,18 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("二检数量") private Integer secondInspectionQty; + @Transient + @ApiParam("子零件") + private String itemPartNo; + + @Transient + @ApiParam(value = "子零件数量", example = "0") + private Double itemQty = 0d; + + @Transient + @ApiParam(value = "子零件总数", example = "0") + private Double itemQtyCount = 0d; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } @@ -366,4 +378,17 @@ public class MesWorkOrder extends BaseBean implements Serializable { return this.approvalStatus == null ? 0 : this.approvalStatus; } + public MesWorkOrder(){} + + public MesWorkOrder(String orderNo,String startTime,String workCenterCode,Double qty, + String partNo,String partNameRdd,String itemPartNo,Double itemQty){ + this.orderNo = orderNo; + this.startTime = startTime; + this.workCenterCode = workCenterCode; + this.qty = qty; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.itemPartNo = itemPartNo; + this.itemQty = itemQty; + } } From 9e8cb0b844189a67bca17d2ecec5541d6e2e6d00 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 10 Aug 2020 21:55:34 +0800 Subject: [PATCH 033/109] =?UTF-8?q?=E6=B3=A8=E5=A1=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java | 4 ++++ .../i3plus/pojo/mes/model/InjectionProductionControlModel.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index f5f986b..9c5f0e9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -84,6 +84,10 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("不良处理类型") private String defectActionType; + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + @Transient private List mesDefectList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java index 0b33b5d..1544ebe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java @@ -45,6 +45,12 @@ public class InjectionProductionControlModel { @ApiParam("箱条码状态") private String printStatusName; + @ApiParam("缺陷代码") + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + @ApiParam("序号") private Integer index; From 772229b983a7cabc44dc1988daa240876c20b8ec Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 10 Aug 2020 22:54:28 +0800 Subject: [PATCH 034/109] andon --- .../i3plus/pojo/andon/model/AndonUserModel.java | 35 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/NotifyUserModel.java | 16 ---------- 2 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java new file mode 100644 index 0000000..846bc5d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; + +/** + * @Description : 人员model + * @Reference : + * @Author : wangjie + * @CreateDate : 2018-10-11 11:02 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("用户信息model") +public class AndonUserModel extends BaseBean { + + @ApiParam(value ="部门名称") + private String departmentNameRdd; + + @ApiParam(value ="用户名称" , access ="账号名称") + private String userName; + + @Column(name="USER_LOGIN_NAME") + @ApiParam(value ="员工编号") + private String userEmpNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java index 9a5b3a8..dc8fe48 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java @@ -1,22 +1,11 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -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 java.util.List; /** * @Description : 设备任务通知人员model @@ -34,23 +23,18 @@ public class NotifyUserModel extends BaseBean { @ApiParam(value ="账户ID") private Long userInfoId; - @Column(name="USER_NAME_RDD") @ApiParam(value ="用户名称" , access ="账号名称") private String userName; - @Column(name="USER_LOGIN_NAME") @ApiParam(value ="登陆名称" , access ="登陆名称") private String userLoginName; - @Column(name="USER_EMAIL") @ApiParam(value ="邮箱" , access ="邮箱") private String userEmail; - @Column(name="USER_PHONE") @ApiParam(value ="手机号" , access ="手机号") private String userPhone; - @Column(name="USER_STATUS") @ApiParam(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1") private Integer userStatus; From 8d17cfcec00c1f80142ed40c67a01cd1eaeab3ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 11 Aug 2020 11:43:42 +0800 Subject: [PATCH 035/109] =?UTF-8?q?feat:=E7=94=A8=E6=88=B7=E5=AE=9A?= =?UTF-8?q?=E5=88=B6=E5=8C=96=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 45 ++++++++++++++ .../pojo/platform/bean/SysUserCustomizeConfig.java | 69 ++++++++++++++++++++++ .../SysUserCustomizeConfigRepository.java | 14 +++++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 20 +++++++ 4 files changed, 148 insertions(+) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserCustomizeConfig.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserCustomizeConfigRepository.java 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 f6eb1ae..76f1b9b 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 @@ -1331,4 +1331,49 @@ public class ImppEnumUtil { return null; } } + + /** + * 用户定制化配置类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum USER_CUSTOMIZE_CONFIG_TYPE { + WEB_TABLE_SHOW_COL(10, "前端表格显示列"); + + private int value; + private String description; + + USER_CUSTOMIZE_CONFIG_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + + public static Integer descriptionOfValue(String desc) { + Integer tmp = null; + 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-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserCustomizeConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserCustomizeConfig.java new file mode 100644 index 0000000..68a5917 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserCustomizeConfig.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.StringUtils; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-08-10 15:13 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_USER_CUSTOMIZE_CONFIG") +@ApiModel(value="用户定制化配置",description = "用户定制化配置") +public class SysUserCustomizeConfig extends BaseBean { + + private static final long serialVersionUID = -3757585990009089233L; + + @Column(name="USER_ID") + @ApiModelProperty(value ="用户id" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + @Column(name="CUSTOMIZE_CONFIG_TYPE") + @ApiModelProperty(value ="定制化配置类型" , example = "-1") + @AnnoOutputColumn(refClass = ImppEnumUtil.USER_CUSTOMIZE_CONFIG_TYPE.class) + private Integer customizeConfigType; + + public String getCustomizeConfigTypeTxt() { + return customizeConfigType == null ? "无" : ImppEnumUtil.USER_CUSTOMIZE_CONFIG_TYPE.valueOf(customizeConfigType); + } + + @Column(name="CONFIG_KEY") + @ApiModelProperty(value ="定制化配置类型" , example = "-1") + private String configKey; + + @Column(name="CONFIG_VALUE") + @ApiModelProperty(value ="配置值" , example = "-1") + private String configValue; + + public String getRedisKey(String keyPrefix) { + String redisKey = this.getUserId() + ":" + this.getCustomizeConfigType() + ":" + this.getConfigKey(); + if (StringUtils.isNotBlank(keyPrefix)) { + return keyPrefix + ":" + redisKey; + } else { + return redisKey; + } + } + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserCustomizeConfigRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserCustomizeConfigRepository.java new file mode 100644 index 0000000..5093383 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserCustomizeConfigRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysUserCustomizeConfig; + +/** + * @Description : 用户定制化配置 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-08-10 15:34 + * @Modify: + **/ +public interface SysUserCustomizeConfigRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index e00e6e9..0da42ea 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -1149,4 +1149,24 @@ public class CoreHqlPack { return ddlPackBean; } + public static DdlPackBean packHqlSysUserCustomizeConfigOnly(SysUserCustomizeConfig sysUserCustomizeConfig){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig); + + DdlPreparedPack.getNumNOEqualPack(sysUserCustomizeConfig.getId(),"id",ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(),"userId",ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(),"configKey",ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(),"customizeConfigType",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlGetSysUserCustomizeConfig(SysUserCustomizeConfig sysUserCustomizeConfig){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig); + + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(),"userId",ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(),"configKey",ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(),"customizeConfigType",ddlPackBean); + + return ddlPackBean; + } } \ No newline at end of file From 18dd2cbcb210dc6cbe11c03fe871262cfc335d2d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 11 Aug 2020 11:52:34 +0800 Subject: [PATCH 036/109] zs --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java index 25ac166..d353601 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java @@ -48,7 +48,7 @@ public class MesWorkCellDefect extends BaseBean implements Serializable { private String partAssemble; @Column(name = "AREA_CODE") - @ApiParam("物料集") + @ApiParam("区域代码") private String areaCode; @Column(name = "DEFECT_TYPE") From 84f61e65fc9aaa544eb306c0137f45bcd5c73505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 11 Aug 2020 13:59:24 +0800 Subject: [PATCH 037/109] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/HncDataReviewModel.java | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/HncDataReviewModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/HncDataReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/HncDataReviewModel.java new file mode 100644 index 0000000..8117bef --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/HncDataReviewModel.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("海纳川数据复核model") +public class HncDataReviewModel { + + @ApiParam("关键件") + private String itemPartNo; + + @ApiParam("关键件名称") + private String itemPartName; + + @ApiParam("需要数量") + private String needNum; + + @ApiParam("实际数量") + private String realNum; + + @ApiParam("对象代码") + private String objectCode; + + @ApiParam("是否合格标识") + private Integer reviewFlag; + + @ApiParam("是否合格") + private String reviewResult; + + @ApiParam("关键件颜色") + private String keyPartColor; + + @ApiParam("生产数据颜色") + private String prodDataColor; + +} From a522db04a9bc65ffebeeb191ba3366a940a54614 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 11 Aug 2020 17:34:03 +0800 Subject: [PATCH 038/109] =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5vinCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 44080c9..92c400f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -152,6 +152,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("不良处理类型") private String defectActionType; + @Column(name = "VIN_CODE") + @ApiParam("Vin") + private String vinCode; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index fb90102..f439e4f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -126,6 +126,10 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @ApiParam("托盘号") private String trayNo; + @Column(name = "VIN_CODE") + @ApiParam("Vin") + private String vinCode; + @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java index 7642f27..2249e46 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java @@ -85,4 +85,8 @@ public class MesScatterBomCfg extends BaseBean implements Serializable { @Column(name = "RECIPE_SEQ") @ApiParam("配方序号") private String recipeSeq; + + @Column(name = "CHANGE_NO") + @ApiParam("change No") + private String changeNo; } From 9b9871534a0191c2aec9e7a94782d860f3854850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 11 Aug 2020 20:12:44 +0800 Subject: [PATCH 039/109] =?UTF-8?q?=E3=80=9010493=2019048-=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E9=A2=9C=E8=89=B2=E6=97=A0=E5=AF=BC=E5=85=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 4ee916c..50c47c9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -1968,7 +1968,9 @@ public class MesEnumUtil { MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"), MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"), BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"), - BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入"); + BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入"), + MES_PROD_WORK_CENTER(530, "prodWorkCenterExcelService", "产品工作中心配置导入"), + MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入"); private int value; private String service; From 1707f6b228f7cb629d0b8322154d76c68f476860 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 12 Aug 2020 10:12:10 +0800 Subject: [PATCH 040/109] MesProdWorkCenter --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java index e2e4915..738bfd3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java @@ -48,6 +48,10 @@ public class MesProdWorkCenter extends BaseBean implements Serializable { @ApiParam("料箱条码") private String partSn; + @Column(name = "RACK_NO") + @ApiParam("料箱编号") + private String rackNo; + @Column(name = "TARGET_PASS_RATE") @ApiParam("目标合格率") private Double targetPassRate; @@ -55,4 +59,7 @@ public class MesProdWorkCenter extends BaseBean implements Serializable { @Column(name = "PRIORITY_ORDER") @ApiParam("优先级顺序") private Integer priorityOder = 0; + + @ApiParam("物料名称") + private String partName; } From 175052ebcc6e46a1dfa74257a918a34364f2993e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 12 Aug 2020 10:50:01 +0800 Subject: [PATCH 041/109] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E8=A1=A8=E5=8A=A0?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=8A=B6=E6=80=81=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=90=88=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 1b57440..807a90b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -135,4 +135,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "WORK_ORDER_NO") @ApiParam("生产工单号") private String workOrderNo; + + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus = 10; } From bf902b836649b9d551cfb2d38ffd9af7ed68d977 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 12 Aug 2020 11:39:32 +0800 Subject: [PATCH 042/109] Fix Bug #10294 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 7acc4df..b5c5b21 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 @@ -2012,6 +2012,9 @@ public class MesHqlPack { if (mesProduceSn.getQcStatus() != null) { DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean); } + if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getVinCode(), "vinCode", packBean); + } if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); } @@ -2206,6 +2209,9 @@ public class MesHqlPack { if (mesProduceSnTravel.getQcStatus() != null) { DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getQcStatus(), "qcStatus", packBean); } + if (!StringUtils.isEmpty(mesProduceSnTravel.getVinCode())) { + DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getVinCode(), "vinCode", packBean); + } if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeStart())) { DdlPreparedPack.getStringBiggerPack(mesProduceSnTravel.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean); } From ba558d640ea6e3c10e8ecac19ef24b6d6bd45cf6 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 12 Aug 2020 15:50:00 +0800 Subject: [PATCH 043/109] tmp --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 19 +++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 1d26919..3b86867 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -4673,6 +4673,25 @@ public class MesPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_BUSI_TYPE { + AGV_EMERGENCY_STOP(10, "紧急停止"), + AGV_EMERGENCY_RESET(20, "急停复位"), + AGV_DELAY_HELP(30, "延时帮助"); + + private int value; + private String description; + + PLC_BUSI_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + } + /** * mes设备状态 */ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index d43d5af..43c3535 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -88,7 +88,7 @@ public class MesPlc extends BaseBean implements Serializable { @Column(name = "BUSI_TYPE") @ApiParam("业务类型") - private String busiType; + private Integer busiType; @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") From 1c02cd6562068eff2c7ccf2fc0d0c12e63631594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 12 Aug 2020 16:42:44 +0800 Subject: [PATCH 044/109] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2612=EF=BC=8C2613?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 77 +++++++++++++++++++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 21 ++++++ .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 17 ++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java | 21 ++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 5 files changed, 126 insertions(+), 12 deletions(-) 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 6b820ef..e41c77c 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 @@ -6188,19 +6188,21 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WEEK_TYPE { - MONDAY(20, "星期一"), - TUESDAY(30, "星期二"), - WEDNESDAY(40, "星期三"), - THURSDAY(50, "星期四"), - FRIDAY(60, "星期五"), - SATURDAY(70, "星期六"), - SUNDAY(10, "星期日"); + MONDAY(20, 1, "星期一"), + TUESDAY(30, 2, "星期二"), + WEDNESDAY(40, 3, "星期三"), + THURSDAY(50, 4, "星期四"), + FRIDAY(60, 5, "星期五"), + SATURDAY(70, 6, "星期六"), + SUNDAY(10, 0, "星期日"); private final int value; + private final int code; private final String description; - WEEK_TYPE(int value, String description) { + WEEK_TYPE(int value, int code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -6208,6 +6210,10 @@ public class WmsEnumUtil { return value; } + public int getCode() { + return code; + } + public String getDescription() { return description; } @@ -6230,6 +6236,15 @@ public class WmsEnumUtil { } return tmp; } + + public static int getValByCode(int code) { + for (int i = 0; i < values().length; i++) { + if (values()[i].code == code) { + return values()[i].value; + } + } + return 0; + } } /** @@ -8794,4 +8809,50 @@ public class WmsEnumUtil { return null; } } + + /** + * 收货看板状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RC_BOARD_STATUS { + FINISH(10, "已完成(绿色)"), + OVER_TIME(20, "已超时（红色）"), + UNRECEIVED(30, "未收货（蓝色）"), + VARIANT(40, "有差异（黄色）"); + + private int value; + private String description; + + RC_BOARD_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static RC_BOARD_STATUS codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 902425b..485ce2e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -161,6 +161,18 @@ public class WmsPOMaster extends BaseBean { private String planDateEnd; @Transient + @ApiParam("计划日期") + private String planDate; + + @Transient + @ApiParam("计划时间") + private String planTime; + + @Transient + @ApiParam("看板状态") + private Integer boardStatus; + + @Transient private List orderNoList; @Column(name = "DOCK", columnDefinition = "varchar(50) default ''") @@ -193,6 +205,15 @@ public class WmsPOMaster extends BaseBean { this.createDatetime = createDateTime; this.createDateTimeStart = receiveDateTime; } + public WmsPOMaster(String orderNo, Integer poStatus, String vendorNo, + String dockCode, String planDate, String planTime) { + this.orderNo = orderNo; + this.poStatus = poStatus; + this.vendorNo = vendorNo; + this.dock = dockCode; + this.planDate = planDate; + this.planTime = planTime; + } public int getPoStatusVal() { return this.poStatus == null ? 0 : this.poStatus; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 2f5c2fb..9cc690d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -128,6 +128,10 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam(value = "是否免费", example = "1") private Integer isFree; + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + @Transient @ApiParam(value = "散件收货输入数量", example = "0") private Double inputRcQty; @@ -185,9 +189,6 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("结束时间") private String planEndDate; - @Column(name = "REMARK") - @ApiParam("备注") - private String remark; public Double getSnpVal() { return snp; @@ -245,4 +246,14 @@ public class WmsPOMasterDetails extends BaseBean { this.modifyDatetime = modifyDatetime; this.remark = remark; } + + public WmsPOMasterDetails(String partNo,String partNameRdd,String planDate, + Double snp,Long totalBoxes,Double qty){ + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.planDate = planDate;//批次号（yyyyMMdd） + this.snp=snp; + this.totalBoxes = totalBoxes.intValue(); + this.qty = qty; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java index 78913f6..3b1566e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库区物料 @@ -87,4 +88,24 @@ public class WmsZonePart extends BaseBean{ @ApiParam(value = "安全量", example = "0") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double safetyQty; + + @Transient + @ApiParam(value = "总件数") + private Double totalSnQty ; + + @Transient + @ApiParam(value = "库存是否正常") + private Integer isNormal ; + + public WmsZonePart() { + } + + public WmsZonePart(String zoneNo, String partNo, String partNameRdd, Double min, Double max, Double totalSnQty) { + this.zoneNo = zoneNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.min = min; + this.max = max; + this.totalSnQty = totalSnQty; + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index cbddf7b..0cbc776 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -563,7 +563,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); if (wmsLocate.getZoneNo() != null) { - DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "zoneNo", result); + DdlPreparedPack.getInPackArray(wmsLocate.getZoneNo().split(","), "zoneNo", result); } if (wmsLocate.getLocateNoArr() != null) { DdlPreparedPack.getInPackArray(wmsLocate.getLocateNoArr(), "locateNo", result); From 2bef33960c819e0446d934971a7f840565419bd2 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 12 Aug 2020 18:20:54 +0800 Subject: [PATCH 045/109] =?UTF-8?q?=E3=80=902617=2008=201.2.2.2.4=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BF=9D=E8=B4=A8=E6=9C=9F=E6=A3=80=E6=9F=A5=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 5 +++++ 1 file changed, 5 insertions(+) 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 ac5fe1a..ca27941 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 @@ -290,6 +290,11 @@ public class WmsPart extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.FREQUENCY.class, refForeignKey = "value", value = "description", hidden = true) private Integer frequency; + @Column(name = "LIMIT_QUALITY_DAYS") + @ApiParam(value = "卡控周期", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer limitQualityDays; + public int getIqcVal() { return this.iqc == null ? 0 : this.iqc.intValue(); From 74cc0c757d1b30517d4b47e47669e8e2555d75a4 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 12 Aug 2020 19:57:11 +0800 Subject: [PATCH 046/109] =?UTF-8?q?=E6=88=90=E5=93=81=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 11 +++++++++-- .../java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 7 +++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index f4b82d7..b71500a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -94,6 +94,9 @@ public class QueueOrderModel implements Serializable { @ApiParam("项目代码") private String prodCfgTypeCode; + @ApiParam("配方内容") + private String formulaContent; + public QueueOrderModel() { } @@ -227,7 +230,7 @@ public class QueueOrderModel implements Serializable { //getWaitQueueOrderModelNoSnMgn public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String prodCfgTypeCode, - String vinCode) { + String vinCode, String formulaContent, String queueGroupNo) { this.serialNumber = serialNumber; this.id = id; this.queueSeq = queueSeq; @@ -245,11 +248,13 @@ public class QueueOrderModel implements Serializable { this.produceCategoryCode = produceCategoryCode; this.prodCfgTypeCode = prodCfgTypeCode; this.vinCode = vinCode; + this.formulaContent = formulaContent; + this.queueGroupNo = queueGroupNo; } //getAlreadyQueueOrderModelNoSnMgn public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode) { + String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, String queueGroupNo) { this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; @@ -263,6 +268,8 @@ public class QueueOrderModel implements Serializable { this.serialNumber = serialNumber; this.prodCfgTypeCode = prodCfgTypeCode; this.vinCode = vinCode; + this.formulaContent = formulaContent; + this.queueGroupNo = queueGroupNo; } //getAlreadyQueueOrderModelNoSn diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 2ac3a02..405eeb6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -108,4 +108,11 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("产品配置名称") private String prodCfgCodeName; + @ApiParam("项目代码") + private String prodCfgTypeCode; + @ApiParam("产品位置") + private String produceCategoryCode; + @ApiParam("结果") + private String result; + } From 89bd4f189a1637e9e2fb64d398e2f0facbb87bee Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 12 Aug 2020 21:04:07 +0800 Subject: [PATCH 047/109] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=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/MesProdCfgType.java | 8 ++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 8 ++++++++ 3 files changed, 21 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java index 419799b..d648c10 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java @@ -37,4 +37,12 @@ public class MesProdCfgType extends BaseBean implements Serializable { @Column(name = "PROD_CFG_TYPE_NAME") @ApiParam("项目名称") private String prodCfgTypeName; + + @Column(name = "PCT_VERSION") + @ApiParam("项目版本") + private String pctVersion; + + @Column(name = "DWG_VERSION") + @ApiParam("图纸版本") + private String dwgVersion; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java index 5a00f18..e1066b7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -61,4 +62,8 @@ public class MesQueueOrderBom extends BaseBean implements Serializable { @Column(name = "OPTION_TYPE") @ApiParam("选配类型") private Integer optionType; + + @Transient + @ApiParam("物料类型3") + private String categoryCode3; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 405eeb6..c7f67a2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -114,5 +114,13 @@ public class StepPrintSnModel extends MesProduceSn { private String produceCategoryCode; @ApiParam("结果") private String result; + @ApiParam("项目版本") + private String pctVersion; + @ApiParam("图纸版本") + private String dwgVersion; + @ApiParam("班次名称") + private String shiftName; + @ApiParam("JIT排序号") + private String jitSeq; } From 0d3a8a3af729294a504c885b74b543f3ce4e8fea Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 12 Aug 2020 23:18:36 +0800 Subject: [PATCH 048/109] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=BE=E8=A1=8C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 3b86867..2d69e23 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -4067,7 +4067,8 @@ public class MesPcnEnumUtil { JUMP_STEP(20, "跳过工步"), JUMP_STATE(30, "跳过状态点"), ABNORMAL_DEDUCTION(40, "扣减异常"), - REDO_STATION(50, "工位重做"); + REDO_STATION(50, "工位重做"), + RELEASE(60, "放行继续"); private int value; private String description; From 2d52fe0a407ec14b9387d398ac19b494e3edc8b7 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 13 Aug 2020 13:53:15 +0800 Subject: [PATCH 049/109] Fix Bug #10535 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index c7f67a2..7f07cff 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -122,5 +122,7 @@ public class StepPrintSnModel extends MesProduceSn { private String shiftName; @ApiParam("JIT排序号") private String jitSeq; + @ApiParam("产品位置名称") + private String produceCategoryName; } From 19b1bfb9b6cd13f7f66ac661980e882bdb7fbb58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 13 Aug 2020 15:46:54 +0800 Subject: [PATCH 050/109] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E6=89=93=E5=8D=B0?= 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, 4 insertions(+) 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 16df925..efeeefb 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 @@ -184,6 +184,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("队列类型") private Integer queueType; + @Transient + @ApiParam("等级名称") + private String gradeName; + public double getQueueSeqVal() { return this.queueSeq == null ? 0.0d : this.queueSeq; } From 4ec98581829abe93f16a5005f493a3cdc14ce3d2 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:51:37 +0800 Subject: [PATCH 051/109] =?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 | 29 ++++++++++++++-------- 1 file changed, 18 insertions(+), 11 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 aa46876..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; @@ -197,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; @@ -220,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; @@ -237,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; @@ -272,7 +279,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; From 763b88b4209d6d8d194c57f7f5658f971a26b616 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 13 Aug 2020 16:54:29 +0800 Subject: [PATCH 052/109] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E6=AD=A5=E8=A7=A6=E5=8F=91=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java index bad1874..7b08457 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java @@ -51,6 +51,10 @@ public class MesStep extends BaseBean implements Serializable { @ApiParam("工步对象") private String stepObject; + @Column(name = "TRIGGER_TYPE") + @ApiParam("触发类型") + private Integer triggerType; + /** * 工位扫描业务所需使用字段 */ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java index 4d37f07..e3fcd90 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java @@ -82,11 +82,15 @@ public class StepModel implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @ApiParam("触发类型") + private Integer triggerType; + public StepModel() { } public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject, - String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, String workCellCode) { + String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, + String workCellCode, Integer triggerType) { this.stepCode = stepCode; this.stepName = stepName; this.stepText = stepText; @@ -98,5 +102,6 @@ public class StepModel implements Serializable { this.paramCode = paramCode; this.stepDisplayName = stepDisplayName; this.workCellCode = workCellCode; + this.triggerType = triggerType; } } From 38f9adc2dd286bde2c3e8bf4cf4856ac14854299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 13 Aug 2020 19:40:44 +0800 Subject: [PATCH 053/109] =?UTF-8?q?=E3=80=9010554=2019048--=E5=96=B7?= =?UTF-8?q?=E6=B6=82=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=9F=A5=E8=AF=A2=E5=87=BA=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E8=BD=A6=E9=97=B4=E7=9A=84=E7=94=9F=E4=BA=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=EF=BC=81-2020-08-13=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 04924a2..a6caac9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -221,6 +221,7 @@ public class MesPcnHqlPack { mesWorkOrder.getCreateDateTimeEnd(), "createDatetime", packBean, true); } + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getAreaCode(), "areaCode", packBean); return packBean; } From a5ea72f593fa249bf4de86a0ede40ec41473d01f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 13 Aug 2020 19:43:08 +0800 Subject: [PATCH 054/109] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E5=AE=9E=E4=BD=93=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesLocation.java | 61 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 8 +++ .../pojo/mes/repository/MesLocationRepository.java | 15 ++++++ 3 files changed, 84 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLocationRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java new file mode 100644 index 0000000..9ce2fba --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :MES_库位信息 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_LOCATION") +@Api("MES_库位信息") +public class MesLocation extends BaseBean implements Serializable { + private static final long serialVersionUID = -896118285166769048L; + @Column(name = "LOCATION_CODE") + @ApiParam("库位代码") + private String locationCode; + + @Column(name = "LOCATION_NAME") + @ApiParam("库位名称") + private String locationName; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty = 0d; + + @Column(name = "MAX_QTY") + @ApiParam("最大存储量") + private Integer maxQty = 0; + + @Transient + @ApiParam("物料名称") + private String partNameRdd; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 560dcd0..f07a65e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -132,6 +132,14 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("包装二维码") private String qrCode; + @Column(name = "LOCATION_CODE") + @ApiParam("库位代码") + private String locationCode; + + @Transient + @ApiParam("目标库位代码") + private String destLocationCode; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLocationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLocationRepository.java new file mode 100644 index 0000000..ab1fbc1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLocationRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfProductOffLine; +import cn.estsh.i3plus.pojo.mes.bean.MesLocation; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:32 + * @Modify: + **/ +public interface MesLocationRepository extends BaseRepository { +} From a45d1ed104e14b58a0c657ec91f05439d20d7c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 13 Aug 2020 22:28:58 +0800 Subject: [PATCH 055/109] =?UTF-8?q?fix:=E5=88=86=E9=A1=B5=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E8=A1=8C=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 38 ++++++++++++++++------ 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index d537b55..a609d5f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -15,6 +15,7 @@ import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.*; import java.io.Serializable; +import java.util.LinkedHashMap; /** * @Description : @@ -142,24 +143,41 @@ public abstract class BaseBean implements Serializable { public transient Integer ascOrDesc = 1; public int getIsValidVal() { - return this.isValid == null ? 0 : this.isValid.intValue(); + return this.isValid == null ? 0 : this.isValid; } public int getIsDeletedVal() { - return this.isDeleted == null ? 0 : this.isDeleted.intValue(); + return this.isDeleted == null ? 0 : this.isDeleted; } + @Transient + @ApiParam(value = "多列排序") + @AnnoOutputColumn(hidden = true) + public LinkedHashMap sortParamMap; + //排序方式 public String orderBy(){ - String result = ""; - if (orderByParam!=null&&orderByParam.trim().length()>0) { - result = " order by " + orderByParam; - if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { - result += " asc"; - }else{ - result += " desc"; + StringBuffer result = new StringBuffer(" order by "); + + if (sortParamMap != null && sortParamMap.size() != 0) { + for (String key : sortParamMap.keySet()) { + packOrderByHql(result,orderByParam,ascOrDesc); } + } else if (orderByParam != null && orderByParam.trim().length() > 0) { + packOrderByHql(result,orderByParam,ascOrDesc); + }else{ + return ""; } - return result; + return result.subSequence(0, result.length() - 1).toString(); } + + private void packOrderByHql(StringBuffer stringBuffer, String orderByParam, Integer ascOrDesc) { + stringBuffer.append(" ").append(orderByParam); + if (ascOrDesc == null || ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + stringBuffer.append(" asc"); + } else { + stringBuffer.append(" desc,"); + } + } + } From 15aa885cf86ac6df6c0269aea3ded84fec91f62a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 13 Aug 2020 22:29:28 +0800 Subject: [PATCH 056/109] =?UTF-8?q?fix:=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=A9=BA=E6=8C=87=E9=92=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index 9d1de96..1294aa0 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -90,6 +90,10 @@ public class SysLogTaskTime extends BaseBean { @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer taskStatus; + public int getTaskStatusVal() { + return taskStatus == null ? CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() : taskStatus; + } + @Column(name="TASK_LOG_ERROR") @ApiParam(value ="任务异常日志") private String taskLogError; From 6ba2d2826af44339e2f82a5027f2a20694e0ca60 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 13 Aug 2020 22:56:18 +0800 Subject: [PATCH 057/109] =?UTF-8?q?=E3=80=90=E9=BA=A6=E6=A0=BC=E7=BA=B3?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 4 ++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 3a6c6f6..9ba02c1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -74,9 +74,9 @@ public class WmsCSRange extends BaseBean { @ApiParam(value = "库存数量", example = "0") public Double qty; - @Column(name = "LOT_NO", nullable = false) + @Column(name = "LOT_NO") @ApiParam("收货批次") - public String lotNo = ""; + public String lotNo; @Transient @ApiParam("存储区编号组") 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 212b746..8776fad 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 @@ -466,4 +466,13 @@ public class WmsDocMovementDetails extends BaseBean { this.custNo = custNo; } + public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo,Integer priority,String createDatetime) { + this.orderNo = orderNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.destLocateNo = destLocateNo; + this.priority = priority; + this.createDatetime = createDatetime; + } + } From f45137db945d5d990d831750db70e118fd04f557 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 13 Aug 2020 23:34:26 +0800 Subject: [PATCH 058/109] =?UTF-8?q?=E6=B3=A8=E5=A1=91=E4=B8=8A=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java | 4 +++ .../i3plus/pojo/mes/bean/MesCellFeedRecord.java | 4 +++ .../i3plus/pojo/mes/bean/MesProdWorkCenter.java | 4 --- .../mes/model/InjectionFeedingDetailModel.java | 41 ++++++++++++++++++++++ .../pojo/mes/model/InjectionFeedingModel.java | 38 ++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 ++ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 21 +++++++++++ 7 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingDetailModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index a7e233a..a5a8a52 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java @@ -72,6 +72,10 @@ public class MesCellFeed extends BaseBean implements Serializable { @ApiParam("供应商代码") private String supplierCode; + @Column(name = "RACK_NO") + @ApiParam("料箱编号") + private String rackNo; + @Transient @ApiParam(value = "原料类型名称") private String rawTypeName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java index 9056293..aec9dcf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java @@ -71,6 +71,10 @@ public class MesCellFeedRecord extends BaseBean implements Serializable { @ApiParam("供应商代码") private String supplierCode; + @Column(name = "RACK_NO") + @ApiParam("料箱编号") + private String rackNo; + public double getRawQtyVal() { return this.rawQty == null ? 0l : this.rawQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java index 738bfd3..c835f5d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java @@ -44,10 +44,6 @@ public class MesProdWorkCenter extends BaseBean implements Serializable { @ApiParam("是否默认") private Integer isDefault; - @Column(name = "PART_SN") - @ApiParam("料箱条码") - private String partSn; - @Column(name = "RACK_NO") @ApiParam("料箱编号") private String rackNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingDetailModel.java new file mode 100644 index 0000000..4468c74 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingDetailModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author wangjie + * @date 2020/4/9 18:00 + * @desc TJ注塑上料展示组件顶部数据集合model + */ +@Data +public class InjectionFeedingDetailModel { + + @ApiParam("是否选中：1=是，2=否") + private Integer isCheck = 2; + + @ApiParam("机台编号") + private String workCenterCode; + + @ApiParam("机台名称") + private String workCenterName; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("工单状态") + private Integer workOrderStatus; + + @ApiParam("工单状态名称") + private String workOrderStatusName; + + @ApiParam("工单计划数量") + private String qty; + + @ApiParam("颜色") + private String color; + + @ApiParam("错误信息") + private String error; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java new file mode 100644 index 0000000..8820837 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author wangjie + * @date 2020/4/9 18:00 + * @desc TJ注塑上料展示组件顶部数据model + */ +@Data +public class InjectionFeedingModel { + + @ApiParam("料箱") + private String rackNo; + + @ApiParam("原材料物料号") + private String partNo; + + @ApiParam("是否锁定：1=是，2=否") + private Integer lockFlag; + + @ApiParam("机台工单集合") + private List detailModelList = new ArrayList<>(); + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("组织代码") + private String organizeCode; + +} 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 b5c5b21..af1083e 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 @@ -3174,6 +3174,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(prodWorkCenter.getPartNo())) { DdlPreparedPack.getStringLikerPack(prodWorkCenter.getPartNo(), "partNo", packBean); } + if (!StringUtils.isEmpty(prodWorkCenter.getRackNo())) { + DdlPreparedPack.getStringLikerPack(prodWorkCenter.getRackNo(), "rackNo", packBean); + } if (!StringUtils.isEmpty(prodWorkCenter.getWorkCenterCode())) { DdlPreparedPack.getStringLikerPack(prodWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index a6caac9..067f00b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -668,4 +668,25 @@ public class MesPcnHqlPack { return packBean; } + + /** + * 产品工作中心配置 + * + * @param prodWorkCenter + * @param organizeCode + * @return + */ + public static DdlPackBean getMesProdWorkCenter(MesProdWorkCenter prodWorkCenter, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(prodWorkCenter, organizeCode); + if (!StringUtils.isEmpty(prodWorkCenter.getPartNo())) { + DdlPreparedPack.getStringLikerPack(prodWorkCenter.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(prodWorkCenter.getRackNo())) { + DdlPreparedPack.getStringLikerPack(prodWorkCenter.getRackNo(), "rackNo", packBean); + } + if (!StringUtils.isEmpty(prodWorkCenter.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(prodWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + } + return packBean; + } } From dd7347d352be89c1bd6a76efb6f432873a536f52 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 14 Aug 2020 16:09:40 +0800 Subject: [PATCH 059/109] =?UTF-8?q?Sweb=E5=8A=9F=E8=83=BD=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebMovementModel.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java index dbf70ee..187829f 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java @@ -71,6 +71,10 @@ public class SwebDocMovementDetails extends BaseBean { @ApiParam("行号") public String item; + @Column(name = "SNP") + @ApiParam(value = "标准包装", example = "1") + private Double snp; + /** * 是否免费:0=计费,1=免费 */ diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebMovementModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebMovementModel.java index ce5dc84..50ee5d7 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebMovementModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebMovementModel.java @@ -17,4 +17,10 @@ public class SwebMovementModel { @ApiParam(value = "需求数量") private Double qty; + + @ApiParam("计划日期") + private String planDate; + + @ApiParam("计划时间") + private String planTime; } From 2fb46609c3acc227950a16470831dda88ca02aa8 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 14 Aug 2020 16:21:12 +0800 Subject: [PATCH 060/109] =?UTF-8?q?sweb=E5=8A=9F=E8=83=BD=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 8776fad..0e3179e 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 @@ -240,7 +240,6 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "父位置号") private String seqNo; - @Transient @ApiParam(value = "客户编号") private String custNo; From 44b90bf6396d1e71f30e5e21382f938689aa33b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 14 Aug 2020 17:03:23 +0800 Subject: [PATCH 061/109] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java index fa938cc..3d2a2da 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java @@ -27,4 +27,7 @@ public class TorqueReviewModel { @ApiParam("显示颜色") private String showColor; + @ApiParam("是否大枪") + private Integer isPf; + } From 8d7b0fae6ae7ec8f520b2b19b67afa632e726e23 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 14 Aug 2020 17:23:14 +0800 Subject: [PATCH 062/109] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B0=8F=E6=9E=AA?= =?UTF-8?q?=E6=97=A5=E5=BF=97=20=E4=B8=8E=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=89=93=E6=9E=AA=E7=BB=91=E5=AE=9A=20=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=B7=B3=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 30 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/model/StepResult.java | 11 ++++++++ 2 files changed, 41 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 2d69e23..fdf2914 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -3543,6 +3543,36 @@ public class MesPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STEP_RESULT_CMD { + JUMP_STEP(10, "JUMP_STEP", "跳过工步"), + REDO_PROCESS(20, "REDO_PROCESS", "重做工序"), + JUMP_PROCESS(30, "JUMP_PROCESS", "跳过工序"), + NORMAL_COMPLETE(40, "NORMAL_COMPLETE", "正常完成"); + + private int value; + private String code; + private String description; + + STEP_RESULT_CMD(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + /** * 容器使用状态 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java index ffe3af7..c758545 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java @@ -23,6 +23,8 @@ public class StepResult { private StationRequestBean stationRequestBean; + private MesPcnEnumUtil.STEP_RESULT_CMD cmd; + public static StepResult getNonComplete() { return new StepResult(false, ""); } @@ -69,6 +71,10 @@ public class StepResult { return new StepResult(true, msg); } + public static StepResult getSuccessComplete(MesPcnEnumUtil.STEP_RESULT_CMD cmd) { + return new StepResult(true, cmd); + } + public static StepResult getSuccessComplete() { return new StepResult(true, ""); } @@ -101,6 +107,11 @@ public class StepResult { this.msg = msg; } + private StepResult(boolean isCompleted, MesPcnEnumUtil.STEP_RESULT_CMD cmd) { + this.isCompleted = isCompleted; + this.cmd = cmd; + } + public StepResult(boolean isCompleted, StationRequestBean stationRequestBean) { this.isCompleted = isCompleted; From 1cf11c4500e3dd953fe61c40b7839c11fd3752b1 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 14 Aug 2020 18:41:41 +0800 Subject: [PATCH 063/109] Fix Bug #10477 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 --- 1 file changed, 3 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 af1083e..0c38eff 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 @@ -1908,9 +1908,6 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); } if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateName())) { - DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateName(), "codeType", packBean); - } - if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateName())) { DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateName(), "templateName", packBean); } return packBean; From d699e88984387c8d0ce6159b0664445523906c54 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 14 Aug 2020 19:53:48 +0800 Subject: [PATCH 064/109] StationRequestBean --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 91f1cc3..d4c880d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -134,6 +134,9 @@ public class StationRequestBean implements Serializable { @ApiParam("当前流程状态") private MesStateMachineStatus curFsmState; + @ApiParam("是否重选进入") + private boolean isRechoose; + @JsonIgnore @ApiParam("展示组件") private Object moduleService; From f42ece4f6c22b42868d824614f9f71869b3aca34 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 14 Aug 2020 22:25:45 +0800 Subject: [PATCH 065/109] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E5=AE=B6=E6=89=A7=E8=A1=8C=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 9 +++++---- .../cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java | 7 ++++++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 6 +++++- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java | 7 ++++++- 8 files changed, 28 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 3b2f5a2..4505d1a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -48,6 +48,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep private SnowflakeIdMaker snowflakeIdMaker; /* 默认查询数据条数 */ private static final Pager DEFAULT_PAGER = new Pager(10,10); + private static final Pager GETBYPROPERTY_PAGER = new Pager(1,1); public BaseRepositoryImpl(Class clz, EntityManager em, SnowflakeIdMaker snowflakeIdMaker) { super(clz, em); @@ -512,7 +513,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(DdlPackBean packBean) { try { - List list = findByHqlWherePage(packBean,DEFAULT_PAGER); + List list = findByHqlWherePage(packBean,GETBYPROPERTY_PAGER); return list != null && list.size() != 0 ? list.get(0) : null; }catch(NoResultException ne){ LOGGER.error("数据不存在，DdlPackBean：{}",packBean); @@ -525,17 +526,17 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(String propertyName, Object value) { - return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, DEFAULT_PAGER); + return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, GETBYPROPERTY_PAGER); } @Override public T getByProperty(String[] propertyNames, Object[] values) { - return getByPropertyPager(propertyNames, values, DEFAULT_PAGER); + return getByPropertyPager(propertyNames, values, GETBYPROPERTY_PAGER); } @Override public T getByPropertyPager(String[] propertyNames, Object[] values, Pager pager) { - pager = pager == null ? DEFAULT_PAGER: pager; + pager = pager == null ? GETBYPROPERTY_PAGER: pager; if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java index 6069c18..dff1e11 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -26,7 +27,11 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SWEB_PROCUREMENT_PLAN_ORDER") +@Table(name="SWEB_PROCUREMENT_PLAN_ORDER", indexes = { + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "VENDOR_CODE"), + @Index(columnList = "PART_NO") +}) @Api("开口合同主表") public class SwebProcurementPlanOrder extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 8734084..2779b7f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; import javax.persistence.Transient; @@ -26,7 +27,10 @@ import javax.persistence.Transient; **/ @Data @Entity -@Table(name = "WMS_LOCATE") +@Table(name = "WMS_LOCATE", indexes = { + @Index(columnList = "LOCATE_NO"), + @Index(columnList = "ORGANIZE_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 4e5da1c..14534dd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -36,6 +36,7 @@ import javax.persistence.Version; @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), @Index(columnList = "ITEM_STATUS"), + @Index(columnList = "REF_SRC"), @Index(columnList = "ORGANIZE_CODE") }) @Api("库存移动单明细信息") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 40da59c..1645a74 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -35,6 +35,8 @@ import javax.persistence.Version; @Index(columnList = "ORDER_NO"), @Index(columnList = "ITEM_STATUS"), @Index(columnList = "SN"), + @Index(columnList = "VENDOR_NO"), + @Index(columnList = "PACKAGE_NO"), @Index(columnList = "ORGANIZE_CODE") }) @Api("库存移动单条码信息") 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 ca27941..f3e05c4 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 @@ -32,6 +32,7 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_PART", indexes = { + @Index(columnList = "PART_NO"), @Index(columnList = "ORGANIZE_CODE") }) @Api("物料表") 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 6d0cf25..b2cd128 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 @@ -43,7 +43,8 @@ import java.util.List; @Index(columnList = "LOT_NO"), @Index(columnList = "FIX_LOT_NO"), @Index(columnList = "DATE_CODE"), - @Index(columnList = "VENDOR_NO") + @Index(columnList = "VENDOR_NO"), + @Index(columnList = "ORGANIZE_CODE") }) @DynamicInsert @DynamicUpdate diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java index 5fbc76e..3c3cf1e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,11 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_UNIT_CONVERT") +@Table(name="WMS_UNIT_CONVERT", indexes = { + @Index(columnList = "UNIT_CODE"), + @Index(columnList = "DEST_UNIT_CODE"), + @Index(columnList = "ORGANIZE_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) From ef83a7aa085b1ce3fb692e4aa27f4420eb8f8b26 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sat, 15 Aug 2020 14:44:28 +0800 Subject: [PATCH 066/109] =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=87=8D=E9=80=89?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=90=8D=E7=A7=B0=20=20=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E6=9E=AA=E4=B8=8E=E7=BB=91=E5=AE=9A=E6=94=AF=E6=8C=81=E5=B9=B6?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index d4c880d..29a1729 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -135,7 +135,7 @@ public class StationRequestBean implements Serializable { private MesStateMachineStatus curFsmState; @ApiParam("是否重选进入") - private boolean isRechoose; + private boolean isReselect; @JsonIgnore @ApiParam("展示组件") From ba7cdc84e531cbb27dde831769610c2274104f4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 15 Aug 2020 15:00:21 +0800 Subject: [PATCH 067/109] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesWcCurrentStatus.java | 50 ++++++++++++++++++++++ .../repository/MesWcCurrentStatusRepository.java | 13 ++++++ 2 files changed, 63 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCurrentStatus.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCurrentStatusRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCurrentStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCurrentStatus.java new file mode 100644 index 0000000..b746ee9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCurrentStatus.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/21 1:45 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WC_CURRENT_STATUS") +@Api("工位实时状态表") +public class MesWcCurrentStatus extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4224360275760211780L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "VIN_CODE") + @ApiParam("当前VIN号") + private String vinCode; + + @Column(name = "LAST_VIN_CODE") + @ApiParam("上一VIN号") + private String lastVinCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCurrentStatusRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCurrentStatusRepository.java new file mode 100644 index 0000000..134273f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCurrentStatusRepository.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.MesWcCurrentStatus; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/23 7:30 PM + * @Description: + **/ +public interface MesWcCurrentStatusRepository extends BaseRepository { +} From 887e1d04f77ee298a4cd810e9b119709d919277b Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sat, 15 Aug 2020 15:07:40 +0800 Subject: [PATCH 068/109] =?UTF-8?q?baseBean=20sortParamMap=20=E5=85=88?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index a609d5f..9ef4ab0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -150,26 +150,26 @@ public abstract class BaseBean implements Serializable { return this.isDeleted == null ? 0 : this.isDeleted; } - @Transient - @ApiParam(value = "多列排序") - @AnnoOutputColumn(hidden = true) - public LinkedHashMap sortParamMap; - - //排序方式 - public String orderBy(){ - StringBuffer result = new StringBuffer(" order by "); - - if (sortParamMap != null && sortParamMap.size() != 0) { - for (String key : sortParamMap.keySet()) { - packOrderByHql(result,orderByParam,ascOrDesc); - } - } else if (orderByParam != null && orderByParam.trim().length() > 0) { - packOrderByHql(result,orderByParam,ascOrDesc); - }else{ - return ""; - } - return result.subSequence(0, result.length() - 1).toString(); - } +// @Transient +// @ApiParam(value = "多列排序") +// @AnnoOutputColumn(hidden = true) +// public LinkedHashMap sortParamMap; +// +// //排序方式 +// public String orderBy(){ +// StringBuffer result = new StringBuffer(" order by "); +// +// if (sortParamMap != null && sortParamMap.size() != 0) { +// for (String key : sortParamMap.keySet()) { +// packOrderByHql(result,orderByParam,ascOrDesc); +// } +// } else if (orderByParam != null && orderByParam.trim().length() > 0) { +// packOrderByHql(result,orderByParam,ascOrDesc); +// }else{ +// return ""; +// } +// return result.subSequence(0, result.length() - 1).toString(); +// } private void packOrderByHql(StringBuffer stringBuffer, String orderByParam, Integer ascOrDesc) { stringBuffer.append(" ").append(orderByParam); From a400bf5aa7d463b8231b185561601ba88f0b83db Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sat, 15 Aug 2020 15:11:11 +0800 Subject: [PATCH 069/109] =?UTF-8?q?=E8=BF=98=E5=8E=9ForderBy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 35 ++++++++-------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 9ef4ab0..c6e3a32 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -154,30 +154,19 @@ public abstract class BaseBean implements Serializable { // @ApiParam(value = "多列排序") // @AnnoOutputColumn(hidden = true) // public LinkedHashMap sortParamMap; -// -// //排序方式 -// public String orderBy(){ -// StringBuffer result = new StringBuffer(" order by "); -// -// if (sortParamMap != null && sortParamMap.size() != 0) { -// for (String key : sortParamMap.keySet()) { -// packOrderByHql(result,orderByParam,ascOrDesc); -// } -// } else if (orderByParam != null && orderByParam.trim().length() > 0) { -// packOrderByHql(result,orderByParam,ascOrDesc); -// }else{ -// return ""; -// } -// return result.subSequence(0, result.length() - 1).toString(); -// } - - private void packOrderByHql(StringBuffer stringBuffer, String orderByParam, Integer ascOrDesc) { - stringBuffer.append(" ").append(orderByParam); - if (ascOrDesc == null || ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { - stringBuffer.append(" asc"); - } else { - stringBuffer.append(" desc,"); + + //排序方式 + public String orderBy(){ + String result = ""; + if (orderByParam!=null&&orderByParam.trim().length()>0) { + result = " order by " + orderByParam; + if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + result += " asc"; + }else{ + result += " desc"; + } } + return result; } } From 85b606713365f4822d7b308ae993e550ad299d0a Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 15 Aug 2020 17:53:25 +0800 Subject: [PATCH 070/109] =?UTF-8?q?BI=E4=BC=98=E5=8C=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java index c2e0eb3..5f3da6c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java @@ -75,6 +75,12 @@ public class ProductBiModel { @ApiParam("总页数") private Integer totalPage; + @ApiParam("开启工单标识") + private Integer opWoFlag = 2; + + @ApiParam("工位序号") + private Integer workCellSeq; + @ApiParam("x坐标内容") private List xAxis; From fde40074cea0de8d2a8c23e25af654d4f9ae6c10 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 16 Aug 2020 15:44:03 +0800 Subject: [PATCH 071/109] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java index 3086942..61a450f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java @@ -93,7 +93,7 @@ public class WmsAutoForkCallBackDetails extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String robotCode; - @Column(name = "STATUS", nullable = false, columnDefinition = "default 10") + @Column(name = "STATUS", nullable = false, columnDefinition = "int default 10") @ApiParam("处理标准") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "AUTO_FORK_TASK_STATUS") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) From 163c385842dcabd54d00e24af43ec4657f26427b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 17 Aug 2020 11:38:53 +0800 Subject: [PATCH 072/109] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java index 3d2a2da..50c2935 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java @@ -30,4 +30,7 @@ public class TorqueReviewModel { @ApiParam("是否大枪") private Integer isPf; + @ApiParam("对象代码") + private String objectCode; + } From 841742e4746d04e8ebc3d6a31bd23e5295405ab6 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 17 Aug 2020 14:30:38 +0800 Subject: [PATCH 073/109] =?UTF-8?q?=E6=89=98=E6=A0=87=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E5=90=88=E5=B9=B6=E5=88=B0=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E6=94=B6=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 752e8bb..691defd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -10,7 +10,8 @@ public class WmsInterfaceEnumUtil { WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), MES2WMS(30, "MES2WMS", "MES --> WMS"), WMS2MES(40, "WMS2MES", "WMS --> MES"), - SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"); + SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"), + WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"); private int value; private String name; From fe2017fbe4e458af8fb2a372456e459749bc9046 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 17 Aug 2020 15:17:03 +0800 Subject: [PATCH 074/109] =?UTF-8?q?=E3=80=90622=2008=201.2.2.2.6=20BOM?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=99=9A=E9=98=B6=E9=9B=B6=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/util/BeanMapUtils.java | 23 ++++++++++ .../i3plus/pojo/wms/modelbean/BomItemModel.java | 53 ++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BomItemModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BeanMapUtils.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BeanMapUtils.java index 1504765..0985f97 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BeanMapUtils.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BeanMapUtils.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.base.util; +import com.google.common.collect.Lists; import org.apache.commons.beanutils.BeanUtils; import org.springframework.cglib.beans.BeanGenerator; import org.springframework.cglib.beans.BeanMap; @@ -24,6 +25,7 @@ public class BeanMapUtils { return map; } + /** * 将map集合中的数据转化为指定对象的同名属性中 */ @@ -37,6 +39,7 @@ public class BeanMapUtils { /** * 键值对转换为对象 + * * @param mapList * @return */ @@ -61,4 +64,24 @@ public class BeanMapUtils { return null; } } + + /** + * 将List转换为List> + * @param objList + * @param + * @return + */ + public static List> objectsToMaps(List objList) { + List> list = Lists.newArrayList(); + if (objList != null && objList.size() > 0) { + Map map = null; + T bean = null; + for (int i = 0, size = objList.size(); i < size; i++) { + bean = objList.get(i); + map = beanToMap(bean); + list.add(map); + } + } + return list; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BomItemModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BomItemModel.java new file mode 100644 index 0000000..43e1cb4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BomItemModel.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description : Bom接口数据Model + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-08-17 10:03 + * @Modify: + **/ +@Data +@Api("Bom接口数据Model") +@AllArgsConstructor +@NoArgsConstructor +public class BomItemModel { + + @ApiParam("父物料号") + private String partNo; + @ApiParam("父物料描述") + private String partName; + @ApiParam(value = "数量") + private Double qty; + @ApiParam(value = "计量单位") + private String unit; + + @ApiParam(value = "子物料号") + private String itemPartNo; + @ApiParam(value = "子料物料描述") + private String itemPartNam; + @ApiParam(value = "子计量单位") + private String itemUnit; + @ApiParam(value = "子用量") + private Double itemQty; + + @ApiParam(value = "是否虚阶物料") + private String category; + + @ApiParam(value = "有效起始日期") + private String effStartTime; + @ApiParam(value = "有效截止日期") + private String effEndTime; + + @ApiParam(value = "工厂代码") + private String organizeCode; + + private boolean isVirtualPart = false; + +} From 562ba3e33957e8c407101e8648a66adbb4b984b5 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 17 Aug 2020 17:08:24 +0800 Subject: [PATCH 075/109] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E7=81=AF?= =?UTF-8?q?=E5=81=9C=E6=9C=BA=E6=97=B6=E9=95=BF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 4 ++++ .../cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 2c741b0..21177f7 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -286,6 +286,10 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { @ApiParam(value ="安灯类型名称") private String alarmCodeName; + @Transient + @ApiParam(value ="响应时长-分钟") + private Integer downtime; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java index 06230c4..b1ddedc 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java @@ -93,6 +93,9 @@ public class AndonMenuInterfaceModel implements Serializable { @ApiParam("当前产线的未解决故障统计") private List pendingSolveBrokenInfoList; + @ApiParam("安灯队列停机时长") + private List andonManageQueueList; + public double getExceptionTimeVal() { return exceptionTime == null ? 0 : exceptionTime; } From a7c3167eef1ff6401e6e5f9ec6eae6e0a5589148 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 17 Aug 2020 20:07:08 +0800 Subject: [PATCH 076/109] =?UTF-8?q?=E6=B3=A8=E5=A1=91=E4=B8=8A=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesContainer.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java index 12e6ad0..671b482 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java @@ -40,4 +40,24 @@ public class MesContainer extends BaseBean { @Column(name = "USE_STATUS") @ApiParam(value = "使用状态") private String useStatus; + + @Column(name = "IP_ADDRESS") + @ApiParam(value = "IP") + private String ipAddress; + + @Column(name = "PORT") + @ApiParam(value = "端口") + private String port; + + @Column(name = "UNLOCK_DO") + @ApiParam(value = "接收DO") + private String unlockDo; + + @Column(name = "RED_LIGHT_DO") + @ApiParam(value = "红灯DO") + private String redLightDo; + + @Column(name = "TIME_SECOND") + @ApiParam(value = "处理时间(秒)") + private String timeSecond; } From 4d816de5da921800247d4f6864a7229ff7fe0131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 18 Aug 2020 12:59:25 +0800 Subject: [PATCH 077/109] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E9=97=AE=E9=A2=98,=E6=B7=BB=E5=8A=A0PTL=E6=96=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=85=B3=E8=81=94bug:10538?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java index 1144a04..a95f2be 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -173,4 +173,8 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @Column(name = "IS_CHECK") @ApiParam("是否复核校验") private Integer isCheck; + + @Column(name = "PICK_QTY") + @ApiParam("拣货数量") + private Integer pickQty; } From 5bfd54240266cfa0777ddf3a02589136b46afc5b Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 18 Aug 2020 13:01:34 +0800 Subject: [PATCH 078/109] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=8B=89=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java | 5 +++++ 2 files changed, 7 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 1d991da..203174c 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 @@ -4768,7 +4768,8 @@ public class WmsEnumUtil { LINE_PULL(30, "巡线拉动"), PLANNED_PULL(40, "计划拉动"), ANDON_PULL(50, "安灯拉动"), - EXTERNAL_PULL(60, "手工拉动"); + EXTERNAL_PULL(60, "手工拉动"), + WORKORDER_PULL(70, "工单拉动"); private int value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java index 04436ff..48df648 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java @@ -52,6 +52,11 @@ public class MesPpDetails extends BaseBean{ @ApiParam(value = "工单数量", example = "0") public Double qty; + @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "处理数量", example = "0") + public Double transQty = 0D; + @Column(name="PART_GROUP_NO") @ApiParam("零件组号") public String partGroupNo; From 72afe6891bd4f3da00e4b6efeac542ec1dccaad6 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 18 Aug 2020 15:57:44 +0800 Subject: [PATCH 079/109] =?UTF-8?q?=E6=96=99=E7=AE=B1=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java index c835f5d..1b57111 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java @@ -58,4 +58,7 @@ public class MesProdWorkCenter extends BaseBean implements Serializable { @ApiParam("物料名称") private String partName; + + @ApiParam("工作中心名称") + private String workCenterName; } From 6db85d596b0d4f51d63a77a6efbcc53aa69021d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 18 Aug 2020 16:53:43 +0800 Subject: [PATCH 080/109] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java index d73253f..7ee2845 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java @@ -84,6 +84,9 @@ public class ProductInfoManageModel { @ApiParam("主队列编号") private String orderNo; + @ApiParam("校验VIN") + private String checkVinCode; + @ApiParam("总队列类型") private List queueTypeList; From ee927b70566b042e86b15bc8af5478e2c684517a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 18 Aug 2020 17:16:39 +0800 Subject: [PATCH 081/109] =?UTF-8?q?=E3=80=902607=2008=20ext=20PCR-20062300?= =?UTF-8?q?1=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4-=E9=A2=84=E7=BB=84?= =?UTF-8?q?=E8=A3=85=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index 2d24638..839c6e8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -57,4 +57,8 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { @Column(name = "TOTAL_PLAN_QTY") @ApiParam("JSP总数") private Integer totalPlanQty; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; } From 406c6259740c3abe88e4f5e674786dc19cc542ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 18 Aug 2020 17:18:14 +0800 Subject: [PATCH 082/109] =?UTF-8?q?=E3=80=902634=2019048--=E6=B6=82?= =?UTF-8?q?=E8=A3=85Unpack=E6=B5=81=E7=A8=8B=EF=BC=81=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index 6da48a8..16cf9c5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -58,5 +58,10 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("包装编码4") private String packageNo4; + @Transient + @ApiParam("批次") + private String lotNo; + + } From 1d86ce64294d1ca620762e700921377870d9a2d5 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 18 Aug 2020 19:45:46 +0800 Subject: [PATCH 083/109] =?UTF-8?q?=E6=80=BB=E8=A3=85=E6=89=93=E5=8C=85=20?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=20=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B0=81=E7=AE=B1=E7=8A=B6=E6=80=81=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java index 809a892..7daee9e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java @@ -69,6 +69,9 @@ public class ProdPackModel implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @ApiParam("是否封箱名称") + private String isSealedName; + public ProdPackModel() { } From 09b8ccd1e3f2997d13ef2b63e6204fb99103d98b Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 18 Aug 2020 19:45:54 +0800 Subject: [PATCH 084/109] Fix Bug #10520 --- .../i3plus/pojo/mes/bean/MesProduceCategory.java | 4 ++++ .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 4 ++++ .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 ++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 17 +++++++++++++++-- .../i3plus/pojo/mes/model/StepPrintSnModel.java | 22 ++++++++++++++++++---- 5 files changed, 45 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java index 853652c..dff6968 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java @@ -41,4 +41,8 @@ public class MesProduceCategory extends BaseBean implements Serializable { @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; + + @Column(name = "PRODUCE_CTGY_DESC") + @ApiParam("产品类型描述") + private String produceCategoryDesc; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index c0251f8..56e17ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -86,6 +86,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("JIT排序号") private String jitSeq; + @Column(name = "JIA_SEQ") + @ApiParam("JIA排序号") + private String jiaSeq; + @Column(name = "SUPPLIER_CODE") @ApiParam("供应商代码") private String supplierCode; 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 efeeefb..382dd6a 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 @@ -120,6 +120,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("料架摆放位置") private String groupSide; + @Column(name = "GROUP_SEQ") + @ApiParam("分组序号") + private String groupSeq; + @Transient @ApiParam("Vin") private String vinCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index b71500a..a3e4049 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -97,6 +97,9 @@ public class QueueOrderModel implements Serializable { @ApiParam("配方内容") private String formulaContent; + @ApiParam("分组序号") + private String groupSeq; + public QueueOrderModel() { } @@ -180,7 +183,9 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; } - public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo) { + // getPrintSnQueueOrderModel + public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo, + String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq) { this.id = id; this.queDetailSeq = queDetailSeq; this.pgCode = pgCode; @@ -189,6 +194,12 @@ public class QueueOrderModel implements Serializable { this.prodCfgCode = prodCfgCode; this.isGroupPrinted = isGroupPrinted; this.jitActualNo = jitActualNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.produceCategoryCode = produceCategoryCode; + this.qty = qty; + this.vinCode = vinCode; + this.queueSeq = queueSeq; + this.groupSeq = groupSeq; } public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, @@ -209,7 +220,7 @@ public class QueueOrderModel implements Serializable { //getWaitQueueOrderModelNoSn public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode) { + String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String queueGroupNo, Integer groupNo) { this.serialNumber = serialNumber; this.id = id; this.queueSeq = queueSeq; @@ -225,6 +236,8 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; this.pptCode = pptCode; this.produceCategoryCode = produceCategoryCode; + this.queueGroupNo = queueGroupNo; + this.groupNo = groupNo; } //getWaitQueueOrderModelNoSnMgn diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 7f07cff..e93626f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -92,14 +92,28 @@ public class StepPrintSnModel extends MesProduceSn { private String vinCode; @ApiParam("客户JIT生产队列排序号") private Double seq; - @ApiParam("jit车号") - private String jitCarNo; + @ApiParam("JIA排序号") + private String jiaSeq; + @ApiParam("JIP排序号") + private String jipSeq; @ApiParam("车型代码") private String carModuleCode; @ApiParam("上一个序列号") - private String lastQueDetailSeq; + private String lastSeq; + @ApiParam("第一个序列号") + private String firstSeq; + @ApiParam("序列架号") + private String serialFrameNum; + @ApiParam("DOCK") + private String dock; @ApiParam("包装数量") - private Integer pgCodeNum; + private Integer pgNum; + @ApiParam("数量") + private Integer num; + @ApiParam("客户工厂代码") + private String custPlantCode; + @ApiParam("产品类型描述") + private String produceCategoryDesc; @ApiParam("批次") private String lotNo; From d3ae797ba025a0d7a1b7207a62cd1fac43f0835f Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 19 Aug 2020 15:00:59 +0800 Subject: [PATCH 085/109] =?UTF-8?q?=E3=80=90=E5=9D=A4=E6=B3=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=E3=80=91=20=E3=80=90=E8=B4=A8?= =?UTF-8?q?=E4=BF=9D=E5=91=A8=E6=9C=9F=E6=A3=80=E6=9F=A5=E7=BB=84=E4=BB=B6?= =?UTF-8?q?--=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 63e1e37..f965f02 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -155,6 +155,18 @@ public class WmsPoSn extends BaseBean { @ApiParam(value = "生产批次") private String leftCode = ""; + @Transient + @ApiParam("erp单号") + private String erpSrcNo; + + @Transient + @ApiParam("仓库") + private String whNo; + + @Transient + @ApiParam("汇总数量") + private Double sumQty; + public WmsPoSn(){} @@ -163,4 +175,17 @@ public class WmsPoSn extends BaseBean { this.earliestReceTime = earliestReceTime; this.latestReceTime = latestReceTime; } + + public WmsPoSn(String orderNo,String erpSrcNo,String item,String partNo,String lotNo,String dateCode,String whNo, + String createDatetime,Double sumQty){ + this.orderNo = orderNo; + this.erpSrcNo = erpSrcNo; + this.item = item; + this.partNo = partNo; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.whNo = whNo; + this.createDatetime = createDatetime; + this.sumQty = sumQty; + } } From 5f495a1b98f64b5f7cfafc1f26106dd54c3bd866 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 19 Aug 2020 15:42:03 +0800 Subject: [PATCH 086/109] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java index 1b57111..ed640d7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java @@ -59,6 +59,4 @@ public class MesProdWorkCenter extends BaseBean implements Serializable { @ApiParam("物料名称") private String partName; - @ApiParam("工作中心名称") - private String workCenterName; } From b56cf991be126a6741f8492168b7fdb079052d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 19 Aug 2020 20:08:42 +0800 Subject: [PATCH 087/109] =?UTF-8?q?=E3=80=902607=2008=20ext=20PCR-20062300?= =?UTF-8?q?1=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4-=E9=A2=84=E7=BB=84?= =?UTF-8?q?=E8=A3=85=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index 839c6e8..6c41884 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -36,7 +36,11 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { @Column(name = "MIN_CAPACITY") @ApiParam("最小库存") - private Integer minCapacity; + private Integer minCapacity = 0; + + @Column(name = "MAX_CAPACITY") + @ApiParam("最大库存") + private Integer maxCapacity = 0; @Column(name = "TOTAL_CAPACITY") @ApiParam("总容量") From 9299f17c3bacea31df94181fe906d8792a32c427 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 19 Aug 2020 20:42:45 +0800 Subject: [PATCH 088/109] =?UTF-8?q?Fix=20bug#10671=20=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E6=94=B6=E8=B4=A7=E6=89=AB=E6=8F=8F=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=B3=BB=E7=BB=9F=E5=BC=82=E5=B8=B8=20--2020?= =?UTF-8?q?0821?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java index 2eb3864..0e69083 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java @@ -76,6 +76,11 @@ public class MesPpMaster extends BaseBean{ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer seq = 0; + @Column(name = "REMARK") + @ApiParam("备注") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String remark; + public Integer getOrderStatus() { return orderStatus == null ? 0 : this.orderStatus.intValue(); } From f275d70136d4b000a664c23968c82ec10bae2427 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 19 Aug 2020 23:15:47 +0800 Subject: [PATCH 089/109] Fix Bug #10674 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java index 4d2528a..7d1c6f2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java @@ -36,4 +36,7 @@ public class Head implements Serializable { @XStreamAlias("status") private String status; + @XStreamAlias("vehicleName") + private String vehicleName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java index f6024e5..b060637 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java @@ -25,6 +25,9 @@ public class Part implements Serializable { @XStreamAlias("qty") private String qty; + @XStreamAlias("componentGroup") + private String componentGroup; + @ApiParam("是否是baseModule") private boolean isBaseModule; @@ -49,7 +52,6 @@ public class Part implements Serializable { @ApiParam("配方顺序") private String recipeSeq; - @ApiParam("Mes物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java index c1d74b6..846bec2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -36,7 +37,7 @@ public class Pn implements Serializable { private List parts; @XStreamAlias("optioncode") - private List codeRules; + private List codeRules = new ArrayList<>(); @ApiParam("新vin号") private String newVin; From 15314209ae64755a349aaaf819dd32671b5c6557 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 20 Aug 2020 13:59:37 +0800 Subject: [PATCH 090/109] =?UTF-8?q?=E3=80=902636=2007=201.2.3.4.3=E5=9D=A4?= =?UTF-8?q?=E6=B3=B0ERP&WMS=E6=8E=A5=E5=8F=A3=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 2db18a2..d74ecbd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -156,10 +156,38 @@ public class WmsDocMovementSn extends BaseBean { @Transient private String requerimentCode; + @Transient + @ApiParam(value = "客户编号") + private String custNo; + + @Transient + @ApiParam("汇总数量") + private Double sumQty; + + @Transient + @ApiParam(value = "送货批号") + public String lotNo; + + @Transient + @ApiParam("仓库") + private String whNo; + public WmsDocMovementSn(){} public WmsDocMovementSn(Long countBox,String partNo) { this.countBox = countBox; this.partNo = partNo; } + + public WmsDocMovementSn(String orderNo,String custNo,String partNo,String partNameRdd,String lotNo, + String whNo,String createDatetime,Double sumQty) { + this.orderNo = orderNo; + this.custNo = custNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.lotNo = lotNo; + this.whNo = whNo; + this.createDatetime = createDatetime; + this.sumQty = sumQty; + } } From d17161d359a0fbbf74cd2c8d450fcc8811035bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 20 Aug 2020 19:00:15 +0800 Subject: [PATCH 091/109] =?UTF-8?q?=E3=80=902658=20LPS=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=BC=80=E5=8F=91=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/LpsStockQuanModel.java | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/LpsStockQuanModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/LpsStockQuanModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/LpsStockQuanModel.java new file mode 100644 index 0000000..ed9db98 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/LpsStockQuanModel.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** +* @Description : LPS库存 +* @Reference : +* @author: jessica.chen +* @date: 2019/12/10 17:10 +* @Modify: +*/ + +@Data +@Api(value="LPS库存模板",description = "LPS库存模板") +public class LpsStockQuanModel extends BaseBean { + + private static final long serialVersionUID = 2167743108452607913L; + + //源存储区 + @ApiParam(value = "FromLocation") + @AnnoOutputColumn + private String srcZoneNo; + + //目标库位 + @ApiParam(value = "ToBIn") + @AnnoOutputColumn + private String locateNo; + + //零件号 + @ApiParam(value = "Item") + @AnnoOutputColumn + private String partNo; + + @ApiParam(value = "Qty") + @AnnoOutputColumn + private String qty; + + @ApiParam(value = "下标值") + @AnnoOutputColumn(required = false) + private Integer index; +} From 84dcf36c86e61912acd4b7fa8228bf14a87f5dd6 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 20 Aug 2020 20:32:35 +0800 Subject: [PATCH 092/109] Fix Bug #10708 --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 36 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/IfQueueShipping.java | 4 +++ 2 files changed, 40 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index fdf2914..9600ace 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -4772,4 +4772,40 @@ public class MesPcnEnumUtil { } } + /** + * JIT队列锁定池 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum JIT_LOCK_CACHE_STATUS { + CREATE(10, "创建"), + RELEASE(20, "下达"), + ONLINE_COMPLETE(30, "上线完成"); + + private Integer value; + private String description; + + JIT_LOCK_CACHE_STATUS(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index 42e7bfb..1a8afdd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -143,4 +143,8 @@ public class IfQueueShipping extends BaseBean implements Serializable { @Column(name = "DOCK_NO") @ApiParam("道口") private String dockNo; + + @Column(name = "VERSION") + @ApiParam("版本号") + private String version; } From c0d5b46979cfa7b84a1c20a58e908e8dc96b554e Mon Sep 17 00:00:00 2001 From: "frin.fei@estsh.com" Date: Fri, 21 Aug 2020 10:52:37 +0800 Subject: [PATCH 093/109] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-mdm/pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 modules/i3plus-pojo-mdm/pom.xml diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml new file mode 100644 index 0000000..b79a192 --- /dev/null +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -0,0 +1,16 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-mdm + + + \ No newline at end of file From d81a7bf22e1dfa0558812b9992d14b04bf047845 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 21 Aug 2020 21:39:04 +0800 Subject: [PATCH 094/109] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E6=98=A0?= =?UTF-8?q?=E5=B0=84=E4=BC=98=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 8 +++ .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 79 +++++++++++++++++++++- 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 6447a3a..306e070 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -182,6 +182,14 @@ public class WmsDocFgDetail extends BaseBean { @ApiParam(value = "jis编号") private String jisNo; + @Column(name = "TERMINAL_NO") + @ApiParam(value = "工位号") + private String terminalNo; + + @Column(name = "PROCESS_TIME") + @ApiParam(value = "离开时间") + private String processTime; + public WmsDocFgDetail(String jisNo) { this.jisNo = jisNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index d74ecbd..28a59c5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -172,6 +172,14 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("仓库") private String whNo; + @Transient + @ApiParam(value = "ERP单号") + private String erpSrcNo; + + @Transient + @ApiParam(value = "版本") + private String version; + public WmsDocMovementSn(){} public WmsDocMovementSn(Long countBox,String partNo) { @@ -179,15 +187,82 @@ public class WmsDocMovementSn extends BaseBean { this.partNo = partNo; } - public WmsDocMovementSn(String orderNo,String custNo,String partNo,String partNameRdd,String lotNo, - String whNo,String createDatetime,Double sumQty) { + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String custNo,String partNameRdd, + String whNo,Double sumQty) { this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; this.custNo = custNo; + this.partNameRdd = partNameRdd; + this.whNo = whNo; + this.sumQty = sumQty; + } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String custNo,String partNameRdd, + String whNo,String erpSrcNo,Double sumQty) { + this.orderNo = orderNo; this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.custNo = custNo; this.partNameRdd = partNameRdd; + this.whNo = whNo; + this.erpSrcNo = erpSrcNo; + this.sumQty = sumQty; + } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String custNo,String partNameRdd, + String whNo,String erpSrcNo,String version,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.custNo = custNo; + this.partNameRdd = partNameRdd; this.whNo = whNo; + this.erpSrcNo = erpSrcNo; + this.version = version; + this.sumQty = sumQty; + } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime, + String whNo,String erpSrcNo,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.whNo = whNo; + this.erpSrcNo = erpSrcNo; + this.sumQty = sumQty; + } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, + String version,String whNo,String custNo, + String erpSrcNo,String planDate,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; this.createDatetime = createDatetime; + this.partNameRdd = partNameRdd; + this.version = version; + this.whNo = whNo; + this.custNo = custNo; + this.erpSrcNo = erpSrcNo; + this.planDate = planDate; + this.sumQty = sumQty; + } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, + String version,String vendorNo,Integer snStatus,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.partNameRdd = partNameRdd; + this.version = version; + this.whNo = whNo; + this.snStatus = snStatus; this.sumQty = sumQty; } } From f6460749dbffc56106e09d91514bc80950d591f8 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 22 Aug 2020 00:22:29 +0800 Subject: [PATCH 095/109] =?UTF-8?q?jsp=E8=A7=A3=E6=9E=90=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/IfQueueShipping.java | 1 - .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index 1a8afdd..fbe8994 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -93,7 +93,6 @@ public class IfQueueShipping extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") - @Lob private String errorMessage; @Column(name = "ACTION_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java index b55af50..9998bf4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -116,4 +116,8 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Transient @ApiParam("计划上线结束时间") private String planEndDate; + + @Transient + @ApiParam("版本") + private String ifVersion; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java index b060637..79c108a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java @@ -19,15 +19,15 @@ public class Part implements Serializable { @XStreamAlias("item") private String item; + @XStreamAlias("componentGroup") + private String componentGroup; + @XStreamAlias("dock") private String dock; @XStreamAlias("qty") private String qty; - @XStreamAlias("componentGroup") - private String componentGroup; - @ApiParam("是否是baseModule") private boolean isBaseModule; From fd771bccf8e9eb2f396ef3685d25dcca5b47c9f1 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 22 Aug 2020 15:21:19 +0800 Subject: [PATCH 096/109] =?UTF-8?q?=E6=8A=A5=E5=8A=9F=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8D=95=E7=B1=BB=E5=9E=8B=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 807a90b..f259c54 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -139,4 +139,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "QC_STATUS") @ApiParam("质量状态") private Integer qcStatus = 10; + + @Column(name = "WO_TYPE") + @ApiParam("工单类型") + private Integer workOrderType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java index 79c108a..b091b3a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java @@ -29,7 +29,7 @@ public class Part implements Serializable { private String qty; @ApiParam("是否是baseModule") - private boolean isBaseModule; + private Integer isBaseModule; @ApiParam("前左数量") private String flQty; From ba5befe291a387619304cbea3186d961e6375f08 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 22 Aug 2020 17:57:56 +0800 Subject: [PATCH 097/109] =?UTF-8?q?Finish=20Task=20#2645=20Cost:8h=20?= =?UTF-8?q?=E3=80=90PCR-20200525-003=5F=E5=A7=94=E5=A4=96=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=9D=A1=E7=A0=81=E5=8F=98=E6=9B=B4=E3=80=91=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E9=9B=B6=E4=BB=B6=E5=8F=B7=E8=BD=AC=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 50 +++++++++++++++++++- .../estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 8 ++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 12 +++++ .../estsh/i3plus/pojo/wms/bean/WmsPartChange.java | 55 ++++++++++++++++++++++ .../wms/repository/WmsPartChangeRepository.java | 17 +++++++ 5 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartChangeRepository.java 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 203174c..37ae66f 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 @@ -856,7 +856,9 @@ public class WmsEnumUtil { INTERNAL_WORK_ORDER_MATERIAL_OUT_STOCK(650, "INTERNAL_SHIPPING", "内部工单物料出库"), CUSTOMER_RETURN_SCRAP(660, "CUSTOMER_RETURN_SCRAP", "客户退货报废"), MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"), - PROD_SCRAP(680, "PROD_SCRAP", "生产报废"); + PROD_SCRAP(680, "PROD_SCRAP", "生产报废"), + OUT_RETURN_SOURCING(690, "PROD_SCRAP", "委外返工发料"); + private int value; private String code; private String description; @@ -9023,4 +9025,50 @@ public class WmsEnumUtil { return null; } } + + + /** + * 成品条码状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCT_STATUS { + NORMAL(10, "正常"), + REPAIRE(20, "返工"), + SCRAP(30, "报废"); + + private int value; + private String description; + + PRODUCT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static PRODUCT_STATUS codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 306e070..ac880ab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -1,8 +1,10 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -190,6 +192,12 @@ public class WmsDocFgDetail extends BaseBean { @ApiParam(value = "离开时间") private String processTime; + @Column(name = "PRODUCT_STATUS") + @ApiParam(value = "成品条码状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRODUCT_STATUS.class, refForeignKey = "value", value = "description") + private Integer productStatus; + + public WmsDocFgDetail(String jisNo) { this.jisNo = jisNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 07812e0..21658c2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -244,6 +244,18 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "备注2") private String secondaryRemake; + @Column(name = "THIRD_REMAKE") + @ApiParam(value = "备注3") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_REMARK_PERSON", listColumnName = "name", explicitColumnName = "dictionaryValue") + private String thirdRemake; + + @Column(name = "FOURTH_REMAKE") + @ApiParam(value = "备注4") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_DEPARTMENT_REMARK", listColumnName = "name", explicitColumnName = "dictionaryValue") + private String fourthRemake; + @Transient @ApiParam(value = "发运单号") private String shipOrderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java new file mode 100644 index 0000000..90a60c4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.wms.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 零件装换信息 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-08-19 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_PART_CHANGE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "零件装换信息", description = "零件装换信息") +public class WmsPartChange extends BaseBean { + private static final long serialVersionUID = -2857107665974689720L; + + @Column(name = "BEF_PART_NO") + @ApiParam(value = "转换前物料编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") + private String befPartNo; + + @Column(name = "AFT_PART_NO") + @ApiParam(value = "转换后物料编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") + private String aftPartNo; + + + @Column(name = "REMARK") + @ApiParam(value = "备注") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String remark; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartChangeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartChangeRepository.java new file mode 100644 index 0000000..fca0c32 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartChangeRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartChange; +import org.springframework.stereotype.Repository; + +/** + * @Description : 零件装换信息数据访问层 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-08-19 + * @Modify: + **/ +@Repository +public interface WmsPartChangeRepository extends BaseRepository { +} From 41422d895e63dd29c21d957a9419e68a81229045 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 22 Aug 2020 20:24:20 +0800 Subject: [PATCH 098/109] =?UTF-8?q?=E6=B6=82=E8=A3=85=20=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=20=E4=BA=8C=E7=AE=B1=20=E6=9F=A5=E8=AF=A2=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 255e7b6..e375c26 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -291,6 +291,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { private List custList; @Transient + @ApiParam("父级零件号集合") + List parentPartNoList; + + @Transient @ApiParam("工位完成数量") private Integer stationCompleteQty = 0; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 067f00b..0c482cf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -631,8 +631,8 @@ public class MesPcnHqlPack { if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); } - if (!CollectionUtils.isEmpty(mesWorkOrder.getCustList())) { - DdlPreparedPack.getInPackList(mesWorkOrder.getCustList(), "custCode", packBean); + if (!CollectionUtils.isEmpty(mesWorkOrder.getParentPartNoList())) { + DdlPreparedPack.getInPackList(mesWorkOrder.getParentPartNoList(), "parentPartNo", packBean); } if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); From 4c9b5d087c963833cd3850de79dafb61823a1d2e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 22 Aug 2020 22:00:08 +0800 Subject: [PATCH 099/109] =?UTF-8?q?=E6=B6=82=E8=A3=85=20=E4=BA=8C=E7=AE=B1?= =?UTF-8?q?=20=E5=AE=A2=E6=88=B7=20=E6=9F=A5=E8=AF=A2=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 ---- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 3 --- 2 files changed, 7 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index e375c26..255e7b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -291,10 +291,6 @@ public class MesWorkOrder extends BaseBean implements Serializable { private List custList; @Transient - @ApiParam("父级零件号集合") - List parentPartNoList; - - @Transient @ApiParam("工位完成数量") private Integer stationCompleteQty = 0; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 0c482cf..c7e2797 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -631,9 +631,6 @@ public class MesPcnHqlPack { if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); } - if (!CollectionUtils.isEmpty(mesWorkOrder.getParentPartNoList())) { - DdlPreparedPack.getInPackList(mesWorkOrder.getParentPartNoList(), "parentPartNo", packBean); - } if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); } From e3146c9fb44fb82a6091e0ed67f103b57e1841a3 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 24 Aug 2020 02:14:57 +0800 Subject: [PATCH 100/109] Fix Bug #0776 --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 48 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/IfProductOffLine.java | 6 +-- .../i3plus/pojo/mes/bean/MesQueueJitPlan.java | 4 -- .../i3plus/pojo/mes/model/QueueOrderModel.java | 3 +- .../cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java | 2 +- 5 files changed, 54 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 50c47c9..0e93187 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -6933,4 +6933,52 @@ public class MesEnumUtil { return tmp; } } + + /** + * 产品位置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCE_CATEGORY { + + FL("FL", "DOOR_FRONT_LEFT"), + FR("FR", "DOOR_FRONT_RIGHT"), + RL("RL", "DOOR_REAR_LEFT"), + RR("RR", "DOOR_REAR_RIGHT"); + + private String description; + private String value; + + PRODUCE_CATEGORY(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String description) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index f259c54..e27e140 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -140,7 +140,7 @@ public class IfProductOffLine extends BaseBean implements Serializable { @ApiParam("质量状态") private Integer qcStatus = 10; - @Column(name = "WO_TYPE") - @ApiParam("工单类型") - private Integer workOrderType; + @Column(name = "JIS_BACKFLUSH_STATUS") + @ApiParam("回冲状态") + private String jisBackflushStatus; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java index 9998bf4..b55af50 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -116,8 +116,4 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Transient @ApiParam("计划上线结束时间") private String planEndDate; - - @Transient - @ApiParam("版本") - private String ifVersion; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index a3e4049..c16f45c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -185,7 +185,7 @@ public class QueueOrderModel implements Serializable { // getPrintSnQueueOrderModel public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo, - String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq) { + String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq, String serialNumber) { this.id = id; this.queDetailSeq = queDetailSeq; this.pgCode = pgCode; @@ -200,6 +200,7 @@ public class QueueOrderModel implements Serializable { this.vinCode = vinCode; this.queueSeq = queueSeq; this.groupSeq = groupSeq; + this.serialNumber = serialNumber; } public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java index 846bec2..fbf4020 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java @@ -37,7 +37,7 @@ public class Pn implements Serializable { private List parts; @XStreamAlias("optioncode") - private List codeRules = new ArrayList<>(); + private List codeRules; @ApiParam("新vin号") private String newVin; From 6d59e00fc532364763bd8539ca40d1498dbab39a Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 24 Aug 2020 15:44:15 +0800 Subject: [PATCH 101/109] =?UTF-8?q?Fix=20bug#10545=2010545=2019081=20--=20?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E7=95=8C=E9=9D=A2=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=2020200814?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/dynamictable/WmsListElement.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java index 5ebf953..0ffdd1d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java @@ -104,4 +104,14 @@ public class WmsListElement extends BaseBean { @Column(name = "EXPLICIT_COLUMN_NAME") @ApiParam(value = "回显列名") private String explicitColumnName; + + public WmsListElement() { + } + + public WmsListElement(Integer seq, String userCode, Long functionId, String organizeCode) { + this.seq = seq; + this.userCode = userCode; + this.functionId = functionId; + this.organizeCode = organizeCode; + } } From 086c78f828a2391c3153411fc77d9b5b16112c7b Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 24 Aug 2020 16:04:03 +0800 Subject: [PATCH 102/109] =?UTF-8?q?=E6=96=B0=E5=A2=9Epcn=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E8=BE=85=E5=8A=A9=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 45 +++++++++++++++++++++- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 9600ace..d464a7f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -63,7 +63,8 @@ public class MesPcnEnumUtil { BUTTON_MODULE(30, "按钮组件"), TIMING_MODULE(40, "定时组件"), PCS_BACK_MODULE(50, "工序后台组件"), - PLC_CALLBACK_MODULE(60, "PLC回调工位参数"); + PLC_CALLBACK_MODULE(60, "PLC回调工位参数"), + ASSIST_MODULE(70, "辅助组件"); private int value; private String description; @@ -2578,7 +2579,10 @@ public class MesPcnEnumUtil { STEP_LIST("stepList", "工步列表"), STATE_LIST("stateList", "状态列表"), STEP_CONTENT("stepContent", "工步内容"), - MODULE_CONTENT("moduleContent", "组件内容"), + MODULE_CONTENT("moduleContent", "展示组件内容"), + MODULE_HEAD("moduleHead", "展示组件头"), + GUIDE_CONTENT("guideContent", "指导内容"), + ASSISTANT_CONTENT("assistantContent", "辅助展示组件"), CUSTOM_COMPONENT("customComponent", "定制内容"), TASK_COMPLETE("taskComplete", "整个扫描完成"), STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), @@ -2634,6 +2638,8 @@ public class MesPcnEnumUtil { FORM("form", "文本按钮"), SPEC_TEXT("spec_text", "工步弹框文本"), IMAGE_LIST("image_list", "图片列表"), + MODULE_HEAD("module_head", "展示组件头部"), + MODULE_GUIDE("module_guide", "展示组件知道内容"), SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格"), BACKGROUND_COLOR_TEXT("BACKGROUND_COLOR_TEXT", "背景色文字"); @@ -4808,4 +4814,39 @@ public class MesPcnEnumUtil { } } + /** + * JIT队列锁定池 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ASSISTANT_MODULE_DISPLAY { + MULTIMEDIA_PLUG(10, "多媒体插头"), + ATTENTION_INFO(20, "关注内容"); + + private Integer value; + private String description; + + ASSISTANT_MODULE_DISPLAY(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } From 68fef2b051bdebdc430f9c40bba518ceb737feb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 24 Aug 2020 17:08:16 +0800 Subject: [PATCH 103/109] =?UTF-8?q?=E3=80=902634=2019048--=E6=B6=82?= =?UTF-8?q?=E8=A3=85Unpack=E6=B5=81=E7=A8=8B=EF=BC=81-2020-08-05=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index f07a65e..17e6815 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -76,7 +76,7 @@ public class MesPackage extends BaseBean implements Serializable { @Column(name = "PACK_LEVEL") @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") - private Integer packLevel; + private Integer packLevel = 1; @Column(name = "WORK_ORDER_NO") @ApiParam("生产工单号") From a5d7ff1ef47ea30b17eb418b7801b08e3b434c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 24 Aug 2020 20:39:47 +0800 Subject: [PATCH 104/109] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E8=A7=A3=E6=9E=90=E6=A0=A1=E9=AA=8C=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java index a0b2a6a..3ec55dc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -50,4 +51,13 @@ public class SysBarcodeRule extends BaseBean { @ApiParam(value ="条码规则描述") private String barcodeRuleDescription; + @Column(name = "CHECK_MODE", columnDefinition = "default 1") + @ApiParam(value ="校验模式") + @AnnoOutputColumn(refClass = CommonEnumUtil.BARCODE_CHECK_MODE.class) + private Integer checkMode; + + public int getCheckModeVal() { + return checkMode == null ? CommonEnumUtil.BARCODE_CHECK_MODE.SEPARATOR_NUM.getValue() : checkMode; + } + } From 103137e2fc0d690bd0df69e39fd4b552e197333a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 24 Aug 2020 20:41:54 +0800 Subject: [PATCH 105/109] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E8=A7=A3=E6=9E=90=E6=A0=A1=E9=AA=8C=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) 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 1dba3c4..5e6fc6d 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 @@ -2606,4 +2606,53 @@ public class CommonEnumUtil { } } + /** + * 条码解析校验模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BARCODE_CHECK_MODE { + SEPARATOR_NUM(10, "分割数"), + ANALYTIC_NUM(20, "解析数"), + WEAK(30, "弱校验"); + + private int value; + private String description; + + BARCODE_CHECK_MODE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + + public static Integer descriptionOfValue(String desc) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + + } From 26cf4c5e92d1d250184f7444d4a46a43d77fa620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 24 Aug 2020 20:43:43 +0800 Subject: [PATCH 106/109] =?UTF-8?q?feat:mongo=E6=A8=A1=E5=9D=97=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base-mongo/pom.xml | 30 ++++++++++++++++++++ .../pojo/base/jpa/dao/BaseMongoRepository.java | 2 -- .../base/jpa/daoimpl/BaseMongoRepositoryImpl.java | 0 .../factory/BaseMongoRepositoryFactoryBean.java | 0 .../estsh/i3plus/pojo/base/tool/BsonPackTool.java | 0 .../SysLogExceptionRepository.java | 0 .../SysLogOperateRepository.java | 0 .../SysLogSystemRepository.java | 0 .../SysLogTaskTimeRepository.java | 0 .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 9 +++--- .../pojo/platform/platbean/SysLogConsole.java | 33 ---------------------- .../pojo/platform/platbean/SysLogException.java | 16 +---------- .../pojo/platform/platbean/SysLogOperate.java | 15 ---------- .../pojo/platform/platbean/SysLogSystem.java | 27 ------------------ .../pojo/platform/platbean/SysLogTaskTime.java | 19 ------------- pom.xml | 6 +--- 16 files changed, 36 insertions(+), 121 deletions(-) create mode 100644 modules/i3plus-pojo-base-mongo/pom.xml rename modules/{i3plus-pojo-base => i3plus-pojo-base-mongo}/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java (94%) rename modules/{i3plus-pojo-base => i3plus-pojo-base-mongo}/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java (100%) rename modules/{i3plus-pojo-base => i3plus-pojo-base-mongo}/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java (100%) rename modules/{i3plus-pojo-base => i3plus-pojo-base-mongo}/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java (100%) rename modules/{i3plus-pojo-platform => i3plus-pojo-base-mongo}/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java (100%) rename modules/{i3plus-pojo-platform => i3plus-pojo-base-mongo}/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java (100%) rename modules/{i3plus-pojo-platform => i3plus-pojo-base-mongo}/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java (100%) rename modules/{i3plus-pojo-platform => i3plus-pojo-base-mongo}/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java (100%) diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml new file mode 100644 index 0000000..15ad445 --- /dev/null +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -0,0 +1,30 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-base-mongo + + + + org.springframework.boot + spring-boot-starter-data-mongodb + + + i3plus.pojo + i3plus-pojo-base + + + i3plus.pojo + i3plus-pojo-platform + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java similarity index 94% rename from modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java rename to modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java index 04c9a2d..a399769 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java +++ b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java @@ -2,13 +2,11 @@ package cn.estsh.i3plus.pojo.base.jpa.dao; import cn.estsh.i3plus.pojo.base.common.Pager; import org.bson.conversions.Bson; -import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.repository.NoRepositoryBean; import java.io.Serializable; import java.util.List; -import java.util.Map; /** * @Description : 自定义Repository的方法接口 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java similarity index 100% rename from modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java rename to modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java similarity index 100% rename from modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java rename to modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java similarity index 100% rename from modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java rename to modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java similarity index 100% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java rename to modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java similarity index 100% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java rename to modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java similarity index 100% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java rename to modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java similarity index 100% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java rename to modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index a609d5f..d2479aa 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -10,12 +10,11 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; import org.hibernate.annotations.GenericGenerator; -import org.springframework.data.mongodb.core.index.IndexDirection; -import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.*; import java.io.Serializable; import java.util.LinkedHashMap; +import java.util.Map; /** * @Description : @@ -89,7 +88,6 @@ public abstract class BaseBean implements Serializable { searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") public String createUser; - @Indexed(direction = IndexDirection.DESCENDING) @Column(name="CREATE_DATE_TIME",updatable = false) @ApiParam(value = "创建日期") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) @@ -153,6 +151,7 @@ public abstract class BaseBean implements Serializable { @Transient @ApiParam(value = "多列排序") @AnnoOutputColumn(hidden = true) + @JsonSerialize(using = ToStringSerializer.class) public LinkedHashMap sortParamMap; //排序方式 @@ -160,8 +159,8 @@ public abstract class BaseBean implements Serializable { StringBuffer result = new StringBuffer(" order by "); if (sortParamMap != null && sortParamMap.size() != 0) { - for (String key : sortParamMap.keySet()) { - packOrderByHql(result,orderByParam,ascOrDesc); + for (Map.Entry entry : sortParamMap.entrySet()) { + packOrderByHql(result, entry.getKey(), entry.getValue()); } } else if (orderByParam != null && orderByParam.trim().length() > 0) { packOrderByHql(result,orderByParam,ascOrDesc); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java index d53eb6b..f45692e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -8,12 +8,6 @@ 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 org.springframework.data.mongodb.core.mapping.Document; - -import javax.persistence.Column; -import javax.persistence.Table; /** * @Description : @@ -23,115 +17,88 @@ import javax.persistence.Table; * @Modify: **/ @Data -@Document -@DynamicInsert -@DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_CONSOLE") @Api(value="系统异常表",description = "记录系统出现的异常") public class SysLogConsole extends BaseBean { private static final long serialVersionUID = -6073378683575266830L; /******** 服务器信息 ********/ - @Column(name="SOFT_TYPE") @ApiParam(value ="产品名称") private Integer softType; public String getSoftTypeTxt() { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } - @Column(name="LOG_HOST") @ApiParam(value ="服务器IP") private String logHost; - @Column(name="LOG_PID") @ApiParam(value ="应用PID") @JsonSerialize(using = ToStringSerializer.class) private Long logPid; - @Column(name="LOG_PORT") @ApiParam(value ="应用端口") private Integer logPort; - @Column(name="LOG_GROUP") @ApiParam(value ="日志分组(日志记录器名称，getLogger方法的参数值)") private String logGroup; - @Column(name="LOG_LEVEL") @ApiParam(value ="日志等级(OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL)") private String logLevel; - @Column(name="LOG_TYPE") @ApiParam(value ="操作类型(post,put,get)") private String logType; /******** 用户信息 ********/ - @Column(name="USER_HOST") @ApiParam(value ="用户登录IP") private String userHost; - @Column(name="USER_BROWSER") @ApiParam(value ="用户登录浏览器") private String userBrowser; - @Column(name="USER_OS") @ApiParam(value ="用户登录操作系统") private String userOs; - @Column(name="USER_ID") @ApiParam(value ="账号ID") @JsonSerialize(using = ToStringSerializer.class) private Long userId; - @Column(name="USER_LOGIN_NAME") @ApiParam(value ="用户登录名称") private String userLoginName; /******** 日志信息 ********/ - @Column(name="REQUEST_ID") @ApiParam(value ="请求ID") @JsonSerialize(using = ToStringSerializer.class) private Long requestId; - @Column(name="EXECUTE_THREAD_ID") @ApiParam(value ="执行线程") private String executeThreadId; - @Column(name="EXECUTE_CLASS_NAME") @ApiParam(value ="执行Class") private String executeClassName; - @Column(name="EXECUTE_METHOD") @ApiParam(value ="执行方法") private String executeMethod; - @Column(name="EXECUTE_LINE_NUMBER") @ApiParam(value ="报错行数") private Integer executeLineNumber; - @Column(name="EXECUTE_TITLE") @ApiParam(value ="方法标题") private String executeTitle; - @Column(name="EXECUTE_ARGS") @ApiParam(value ="执行参数") private String executeArgs; - @Column(name="EXECUTE_TIME") @ApiParam(value ="执行耗时") private Integer executeTime; - @Column(name="EXECUTE_STATUS") @ApiParam(value ="执行状态") private String executeStatus; - @Column(name="EXECUTE_MESSAGE") @ApiParam(value ="执行日志信息") private String executeMessage; - @Column(name="ERROR_STACK_TRACE",length = 5000) @ApiParam(value ="执行异常堆栈信息") private String errorStackTrace; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java index 90e1854..7b67f0d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java @@ -7,14 +7,8 @@ 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 org.springframework.data.mongodb.core.index.Indexed; -import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; /** * @Description : 系统异常 @@ -24,18 +18,13 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Document -@DynamicInsert -@DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_EXCEPTION") @Api(value="系统异常表",description = "记录系统出现的异常") public class SysLogException extends BaseBean { private static final long serialVersionUID = -2844455884020022321L; //CommonEnumUtil.SOFT_TYPE - @Indexed - @Column(name="SOFT_TYPE") + @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") private Integer softType; @@ -43,15 +32,12 @@ public class SysLogException extends BaseBean { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } - @Column(name="EXC_CLASS_NAME") @ApiParam(value ="异常类名") private String excClassName; - @Column(name="EXC_MESSAGE") @ApiParam(value ="异常信息") private String excMessage; - @Column(name="EXC_STACK") @ApiParam(value ="堆栈信息") private String excStack; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index f14accf..3558410 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -12,11 +12,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.data.mongodb.core.index.Indexed; -import org.springframework.data.mongodb.core.mapping.Document; -import javax.persistence.Column; -import javax.persistence.Entity; import javax.persistence.Table; /** @@ -27,7 +23,6 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) @@ -36,8 +31,6 @@ import javax.persistence.Table; public class SysLogOperate extends BaseBean { private static final long serialVersionUID = 1515035521283176727L; - @Indexed - @Column(name="SOFT_TYPE") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") private Integer softType; @@ -45,8 +38,6 @@ public class SysLogOperate extends BaseBean { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } - @Indexed - @Column(name="OPERATE_TYPE") @ApiParam(value ="操作类型" , example = "-1") @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description") private Integer operateType; @@ -55,19 +46,15 @@ public class SysLogOperate extends BaseBean { return operateType == null ? null : ImppEnumUtil.OPERATE_TYPE.valueOfDescription(operateType); } - @Column(name="OPERATE_MESSAGE") @ApiParam(value ="操作信息" , access ="操作信息") private String operateMessage; - @Column(name="USER_LOGIN_NAME") @ApiParam(value ="登录用户名称" , access ="登录用户名称") private String userLoginName; - @Column(name="REMOTE_IP") @ApiParam(value ="请求IP" , access ="请求IP") private String remoteIp; - @Column(name="REQUEST_URL") @ApiParam(value ="请求路径" , access ="请求路径") private String requestUrl; @@ -75,11 +62,9 @@ public class SysLogOperate extends BaseBean { // @ApiParam(value ="http请求方法" , access ="http请求方法") // private String httpMethod; - @Column(name="LOG_ARGS") @ApiParam(value ="方法入参" , access ="方法入参") private String logArgs; - @Column(name="EXECUTE_TIME") @ApiParam(value ="执行耗时") @JsonSerialize(using = ToStringSerializer.class) private Long executeTime; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index c45cd05..789e923 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -10,14 +10,8 @@ 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 org.springframework.data.mongodb.core.index.Indexed; -import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; /** * @Description : 系统日志表 @@ -27,17 +21,11 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Document -@DynamicInsert -@DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_SYSTEM") @Api(value="系统日志表",description = "系统日志表") public class SysLogSystem extends BaseBean { private static final long serialVersionUID = -2209777442410263684L; - @Indexed - @Column(name="LOG_LEVEL") @ApiParam(value ="日志级别" , example ="1") @AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class,refForeignKey = "value",value = "name") private Integer logLevel; @@ -45,8 +33,6 @@ public class SysLogSystem extends BaseBean { return logLevel == null ? null : ImppEnumUtil.LOG_LEVEL.valueOfDescription(logLevel); } - @Indexed - @Column(name="SOFT_TYPE") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") private Integer softType; @@ -54,8 +40,6 @@ public class SysLogSystem extends BaseBean { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } - @Indexed - @Column(name="LOG_MODULE_ID") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") private Integer logModuleId; @@ -63,48 +47,37 @@ public class SysLogSystem extends BaseBean { return logModuleId == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(logModuleId); } - @Column(name="REMOTE_IP") @ApiParam(value ="请求IP" , access ="请求IP") private String remoteIp; - @Column(name="REQUEST_URL") @ApiParam(value ="请求路径" , access ="请求路径") private String requestUrl; - @Column(name="HTTP_METHOD") @ApiParam(value ="http请求方法" , access ="http请求方法") private String httpMethod; - @Column(name="LOG_CLASS") @ApiParam(value ="触发类路径" , access ="触发类路径") private String logClass; - @Column(name="LOG_METHOD") @ApiParam(value ="触发方法" , access ="触发方法") private String logMethod; - @Column(name="ARGS_COUNT") @ApiParam(value ="入参数量" , access ="入参数量", example = "0") private Integer argsCount; - @Column(name="LOG_ARGS") @ApiParam(value ="方法入参" , access ="方法入参") private String logArgs; - @Column(name="LOG_TITLE") @ApiParam(value ="日志标题") private String logTitle; - @Column(name="LOG_DETAIL") @ApiParam(value ="日志详情") private String logDetail; - @Column(name="SERVER_HOST") @ApiParam(value ="服务器") private String serverHost; - @Column(name="EXECUTE_TIME") @ApiParam(value ="执行耗时") @JsonSerialize(using = ToStringSerializer.class) private Long executeTime; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index 1294aa0..f94befb 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -11,11 +11,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.data.mongodb.core.index.Indexed; -import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; -import javax.persistence.Table; /** * @Description : 定时任务执行记录 @@ -25,67 +22,52 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_TASK_TIME") @Api(value="定时任务执行日志",description = "定时任务执行记录") public class SysLogTaskTime extends BaseBean { private static final long serialVersionUID = -841008177433745529L; - @Column(name="SCHEDULER_INSTANCE_ID") @ApiParam(value ="调度器实例id") private String schedulerInstanceId; - @Column(name="SCHEDULER_SERVER_IP") @ApiParam(value ="调度服务器ip") private String schedulerServerIp; - @Column(name="SCHEDULER_SERVER_PORT") @ApiParam(value ="调度服务器端口") private Integer schedulerServerPort; - @Column(name="TASK_THREAD_ID") @ApiParam(value ="任务线程id") @JsonSerialize(using = ToStringSerializer.class) private Long taskThreadId; - @Column(name="NAME") @ApiParam(value ="任务名称") private String name; - @Column(name="GROUP_NAME") @ApiParam(value ="任务组名称") private String groupName; - @Column(name="TASK_PLAN_ID") @ApiParam(value ="任务计划id" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long taskPlanId; - @Column(name="SOFT_TYPE") @ApiParam(value ="产品名称") private Integer softType; public String getSoftTypeTxt() { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } - @Column(name="TASK_CYCLE_NAME_RDD") @ApiParam(value ="任务周期名称") private String taskCycleNameRdd; - @Column(name="TASK_CYCLE_EXPS_RDD") @ApiParam(value ="任务周期表达式") private String taskCycleExpsRdd; - @Indexed - @Column(name="EXECUTE_TIME") @ApiParam(value ="执行耗时") @JsonSerialize(using = ToStringSerializer.class) private Long executeTime; - @Column(name="TASK_STATUS") @ApiParam(value ="任务完成情况(枚举：1正常，2失败)") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer taskStatus; @@ -94,7 +76,6 @@ public class SysLogTaskTime extends BaseBean { return taskStatus == null ? CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() : taskStatus; } - @Column(name="TASK_LOG_ERROR") @ApiParam(value ="任务异常日志") private String taskLogError; } diff --git a/pom.xml b/pom.xml index 2eddf76..f06d17f 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,7 @@ modules/i3plus-pojo-ptl modules/i3plus-pojo-ics modules/i3plus-pojo-mdm + modules/i3plus-pojo-base-mongo @@ -50,11 +51,6 @@ - - org.springframework.boot - spring-boot-starter-data-mongodb - - io.springfox From dd75e3729ba3f63d7830b639257949cc3b8252fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 24 Aug 2020 21:32:21 +0800 Subject: [PATCH 107/109] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E8=A7=A3=E6=9E=90=E6=A0=A1=E9=AA=8C=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java index 3ec55dc..5d3fdec 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java @@ -51,7 +51,7 @@ public class SysBarcodeRule extends BaseBean { @ApiParam(value ="条码规则描述") private String barcodeRuleDescription; - @Column(name = "CHECK_MODE", columnDefinition = "default 1") + @Column(name = "CHECK_MODE") @ApiParam(value ="校验模式") @AnnoOutputColumn(refClass = CommonEnumUtil.BARCODE_CHECK_MODE.class) private Integer checkMode; From 35d3a85b60d0a5682e82420bc9df406001a3b6f1 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 24 Aug 2020 23:02:33 +0800 Subject: [PATCH 108/109] =?UTF-8?q?=E5=90=88=E5=B9=B6master=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 310da99743c9bebfb63ef47a81950c9af64ae18e Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 25 Aug 2020 01:01:56 +0800 Subject: [PATCH 109/109] =?UTF-8?q?=E5=90=88=E5=B9=B6master=E4=BB=A3?= =?UTF-8?q?=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 aca1465..5f809e6 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 a6a0d68..8778b3c 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 cc6131f..0cfb344 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=./