From 7a6e9b9e218d06692a39352ea60bd895a3c2312a Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 26 Mar 2020 14:33:16 +0800 Subject: [PATCH 01/14] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1479=20?= =?UTF-8?q?=E6=96=99=E6=9E=B6=E6=89=93=E5=8D=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 36 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesLabelTemplate.java | 3 ++ ...EsProductData.java => EsProductDataModule.java} | 7 +++-- .../i3plus/pojo/mes/model/QueueOrderModel.java | 2 ++ .../i3plus/pojo/mes/model/StationRequestBean.java | 3 ++ .../i3plus/pojo/mes/model/StepPrintSnModel.java | 4 +++ 6 files changed, 53 insertions(+), 2 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{EsProductData.java => EsProductDataModule.java} (89%) 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 d48d6ad..81a11c6 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 @@ -3138,4 +3138,40 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 表格颜色 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TABLE_COLOR { + + GREEN("green", "绿色"), + YELLOW("Yellow", "黄色"); + + private String code; + private String description; + + TABLE_COLOR(String code, String description) { + this.code = code; + this.description = description; + } + + public String getCode() { + return code; + } + + 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].code.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java index 7555717..f11ae4d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -42,6 +42,9 @@ public class MesLabelTemplate extends BaseBean implements Serializable { @ApiParam(value = "模板内容") private String templateContent; + @ApiParam(value = "第二个模板内容") + private String otherTemplateContent; + // 参数拼接，多参数都好分隔，后台在做处理 @ApiParam(value = "模板参数拼接") @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java similarity index 89% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java index eaba2fa..b04492c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java @@ -3,12 +3,15 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch; import cn.estsh.i3plus.pojo.mes.annotation.Json4Es; +import com.sun.tools.javac.util.List; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.ArrayList; +import java.util.Map; /** * @Description: @@ -20,7 +23,7 @@ import java.io.Serializable; @AllArgsConstructor @NoArgsConstructor @ElasticSearch -public class EsProductData extends BaseBean implements Serializable { +public class EsProductDataModule extends BaseBean implements Serializable { private static final long serialVersionUID = 4514407617515827040L; @@ -80,7 +83,7 @@ public class EsProductData extends BaseBean implements Serializable { @Json4Es @ApiParam("生产数据") - private String lineData; + private ArrayList lineData; @ApiParam("字段总数") private Integer fieldNum; 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 195d0d4..f230fa8 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 @@ -66,6 +66,8 @@ public class QueueOrderModel implements Serializable { private Integer groupNo; @ApiParam("产品配置代码") private String prodCfgCode; + @ApiParam("是否已扫描") + private int isScan; public QueueOrderModel() { } 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 5ff5cdc..0aef82a 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 @@ -97,6 +97,9 @@ public class StationRequestBean implements Serializable { @ApiParam("生产主队列编号") private String orderNo; + @ApiParam("分组队列编号") + private String queueGroupNo; + @ApiParam("数据map") private Map dataMap; 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 9685268..0bc1675 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 @@ -96,5 +96,9 @@ public class StepPrintSnModel extends MesProduceSn { private String jitCarNo; @ApiParam("车型代码") private String carModuleCode; + @ApiParam("上一个序列号") + private Double lastQueDetailSeq; + @ApiParam("包装数量") + private Integer pgCodeNum; } From 35351607f8984555d342b61eb8ca8fab902c07ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 26 Mar 2020 15:17:35 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E3=80=90MES=5F=E5=8D=8A=E6=88=90?= =?UTF-8?q?=E5=93=81=E7=AE=B1=E6=9D=A1=E7=A0=81=E7=BB=91=E5=AE=9A=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index d48d6ad..61cd451 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 @@ -2928,7 +2928,7 @@ public class MesPcnEnumUtil { BARCODE_RULE_MATCHING(10, "条码规则匹配"), PROCESS_BARCODE_MATCHING(20, "过程条码匹配"), - BAR_CODE_MATCHING(20, "条码匹配"); + BAR_CODE_MATCHING(30, "箱条码匹配"); private int value; private String description; From bf427bbb31034a718bd50a9ea2b2f45c3196ae21 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 26 Mar 2020 16:08:05 +0800 Subject: [PATCH 03/14] =?UTF-8?q?bug7918=E3=80=907918=20=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E8=A1=A8=E5=9C=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=90=8E=EF=BC=8C=E7=BC=BA=E5=B0=91=E4=B8=80=E8=A1=8C?= =?UTF-8?q?=E5=85=B3=E8=81=94=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=EF=BC=88=E6=9B=B4=E6=96=B0=E5=90=8E=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=89=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 8688652..468634a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -80,6 +80,7 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "ref_sn") @ApiParam(value = "关联二维码") - private String refSN; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String refSN; } From 0502f6d736eaed5556e7a010e7ed93a8840015a1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 26 Mar 2020 17:27:32 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1529?= =?UTF-8?q?=EF=BC=8C=E6=96=99=E6=9E=B6=E5=88=86=E7=BB=84=E9=98=9F=E5=88=97?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 25 ++++++ .../pojo/mes/bean/MesWorkCellPointGroup.java | 89 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 15 ++++ .../MesWorkCellPointGroupRepository.java | 16 ++++ 4 files changed, 145 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellPointGroupRepository.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 81a11c6..4f212ba 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 @@ -1963,6 +1963,31 @@ public class MesPcnEnumUtil { } /** + * 工站分组队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_CELL_POINT_GROUP_STATUS { + CREATE(10, "创建"), + COMPLETE(20, "完成"); + + private int value; + private String description; + + WORK_CELL_POINT_GROUP_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** * MesPartCategory实体对应的categoryType值 条码表条码质量状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java new file mode 100644 index 0000000..9b36072 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java @@ -0,0 +1,89 @@ +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 : 工站分组队列 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-22 17:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_POINT_GROUP") +@Api("工站分组队列") +public class MesWorkCellPointGroup extends BaseBean implements Serializable { + private static final long serialVersionUID = -6817903235638554748L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "GROUP_NO") + @ApiParam("组内编号") + private Integer groupNo; + + @Column(name = "ORDER_NO") + @ApiParam("主队列编号") + private String orderNo; + + @Column(name = "QUEUE_SEQ") + @ApiParam("队列主表序号") + private Double queueSeq; + + @Column(name = "QUEUE_DETAIL_SEQ") + @ApiParam("队列明细表序号") + private Double queueDetailSeq; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Transient + @ApiParam("显示颜色") + private String color; + + public double getQueueSeqVal() { + return this.queueSeq == null ? 0 : this.queueSeq; + } + + public double getQueueDetailSeqVal() { + return this.queueDetailSeq == null ? 0 : this.queueDetailSeq; + } +} 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 f230fa8..60b7948 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 @@ -69,6 +69,9 @@ public class QueueOrderModel implements Serializable { @ApiParam("是否已扫描") private int isScan; + @ApiParam("队列编号") + private String orderNo; + public QueueOrderModel() { } @@ -126,4 +129,16 @@ public class QueueOrderModel implements Serializable { this.groupNo = groupNo; this.prodCfgCode = prodCfgCode; } + + public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo, + Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) { + this.queueGroupNo = queueGroupNo; + this.groupNo = groupNo; + this.orderNo = orderNo; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.organizeCode = organizeCode; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellPointGroupRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellPointGroupRepository.java new file mode 100644 index 0000000..921dcb6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellPointGroupRepository.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.MesWorkCellPointGroup; +import org.springframework.stereotype.Repository; + +/** + * @Description :工站分组队列 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-29 14:40 + * @Modify: + **/ +@Repository +public interface MesWorkCellPointGroupRepository extends BaseRepository { +} From 1cf4943751cdc4b8fc25a37f92e32d38f1a0ada3 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 26 Mar 2020 18:15:06 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 87a1750..4591fe3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,12 +5,12 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 - i3plus-pojo-andon + i3plus-pojo-aps jar @@ -18,6 +18,10 @@ i3plus.pojo i3plus-pojo-base + + org.hibernate.validator + hibernate-validator + From 5e2c592bbd5356485746f13829c446537551cfcb Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 26 Mar 2020 18:15:36 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E3=80=90IOT=E6=B5=8B=E8=AF=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 4591fe3..2bb8b09 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - i3plus-pojo-aps + i3plus-pojo-andon jar @@ -18,10 +18,6 @@ i3plus.pojo i3plus-pojo-base - - org.hibernate.validator - hibernate-validator - From d80b341620329dc83ff48146a7b144f027b3033f Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 27 Mar 2020 10:23:33 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E8=BF=98=E5=8E=9Ftest=20pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- .../i3plus/pojo/mes/model/StepDispatchModel.java | 5 +++- 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 | 34 +--------------------- 19 files changed, 22 insertions(+), 51 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index a616b12..f8fa98e 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 4591fe3..5ad51a1 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-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 0e3621b..e74f5ed 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-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 4d0a808..aa8f7a2 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-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 ecf48ed..7e87d1a 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-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 2241e93..062455e 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-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 c9fd4ee..a6258be 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-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 27731be..e958e79 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-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 2ba9ddd..d5ed765 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-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java index bf9d485..7585012 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java @@ -18,12 +18,15 @@ public class StepDispatchModel { private String cellParamKey; + private String requestBeanKey; + private String scanInfo; - public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String scanInfo) { + public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String scanInfo) { this.stepListKey = stepListKey; this.firstScanKey = firstScanKey; this.cellParamKey = cellParamKey; + this.requestBeanKey = requestBeanKey; this.scanInfo = scanInfo; } } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 3fd87ac..1c2fd71 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-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 c0524de..12f9ad0 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-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 4b73b1a..27e1b60 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-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 4ebc2f7..91d3fdd 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-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 b3c4fc8..756086b 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-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 b601666..770ace5 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-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 2d56516..c4dbbbe 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-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 4395f3c..6f974d5 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-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 96a06e4..37371d2 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform @@ -222,36 +222,4 @@ - - - dev - - DEV - - - true - - - - test - - TEST - - - - docker - - DOCKER - - - - prod - - PROD - - - - - ${project.artifactId}-${profileActive}-${project.version} - \ No newline at end of file From a887aa12362467509047e66022112910900437ef Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 27 Mar 2020 11:56:33 +0800 Subject: [PATCH 08/14] =?UTF-8?q?1454=20=E5=9F=BA=E4=BA=8E=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E5=8C=BA=E5=9F=9F=E5=92=8C=E7=8F=AD=E6=AC=A1=E7=9A=84?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java index 153aeff..a852b02 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java @@ -62,6 +62,10 @@ public class WmsAreaOwner extends BaseBean { @ApiParam(value = "是否预分配人员") private Integer isPreAssign; + @Column(name="SHIFT_NO") + @ApiParam("班次编码") + private String shiftNo; + @Transient @ApiParam(value = "供应商名称") private String vendorName; @@ -81,4 +85,8 @@ public class WmsAreaOwner extends BaseBean { @Column(name = "CUST_NO") @ApiParam(value = "客户编号") private String custNo; + + @Transient + @ApiParam(value = "分配次数") + private Integer count; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 8688652..468634a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -80,6 +80,7 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "ref_sn") @ApiParam(value = "关联二维码") - private String refSN; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String refSN; } From 6e1961c9d8b22a65ff39ac8a94a6e57231ad529a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 27 Mar 2020 14:21:21 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E3=80=90mes=5F=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E4=BD=8DBOM=E8=A1=A8=E4=B8=AD=E7=9A=84=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) 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 ad2e0e4..c594693 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 @@ -4560,4 +4560,42 @@ public class MesEnumUtil { return description; } } + + /** + * 工位BOM表中的匹配类型 + * 10. + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STATION_BOM_MATCH_RULE { + + BARCODE_RULE_MATCHING(10, "条码规则匹配"), + PROCESS_BARCODE_MATCHING(20, "过程条码匹配"), + BAR_CODE_MATCHING(30, "箱条码匹配"); + + private int value; + private String description; + + STATION_BOM_MATCH_RULE(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; + } + } } From 4cb3d89ad6b49e2443514e3d787cf9435ce1a3f5 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 27 Mar 2020 18:00:14 +0800 Subject: [PATCH 10/14] =?UTF-8?q?[bug:=207637=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AEees=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java index b04492c..151b5ef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch; import cn.estsh.i3plus.pojo.mes.annotation.Json4Es; -import com.sun.tools.javac.util.List; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; @@ -11,7 +10,6 @@ import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.ArrayList; -import java.util.Map; /** * @Description: From 3b763b45cd9a143dfae6862b3b460442b6db71c3 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 27 Mar 2020 18:31:40 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E3=80=901432=20=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E6=89=AB=E6=8F=8F-ESOP=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=BC=80=E5=8F=91=EF=BC=8C=E9=98=9F=E5=88=97=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=91=E3=80=90=E5=B7=A5=E4=BD=8D=E6=89=AB?= =?UTF-8?q?=E6=8F=8F-ESOP=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=E5=BC=80?= =?UTF-8?q?=E5=8F=91=EF=BC=8C=E9=98=9F=E5=88=97=E7=BB=84=E4=BB=B6=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 37 ++++++++- .../i3plus/pojo/mes/bean/IfQueueShipping.java | 91 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 1 + .../pojo/mes/bean/MesQueueJitActualDetail.java | 13 ++++ .../i3plus/pojo/mes/model/QueueShippingModel.java | 42 ++++++++++ .../mes/repository/IfQueueShippingRepository.java | 14 ++++ 6 files changed, 197 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueShippingModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQueueShippingRepository.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 472efe8..9b37512 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 @@ -2473,7 +2473,7 @@ public class MesPcnEnumUtil { IMAGE("image", "图片"), BUTTON("button", "按钮"), TABLES("tables", "多个表格"), - DATA("data", "表格"); + FORM("form", "文本按钮"); private String value; private String description; @@ -3199,4 +3199,39 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 客户发运JIT生产队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SHIPPING_ACTUAL_STATUS { + CREATE(10, "创建"), + CANCEL(20, "已发运"); + + private int value; + private String description; + + SHIPPING_ACTUAL_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; + } + } } 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 new file mode 100644 index 0000000..d239828 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -0,0 +1,91 @@ +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; +import java.util.Date; + +/** + * @Description :JIT发运数据同步 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-27 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "if_queue_shipping") +@Api("JIT发运数据同步") +public class IfQueueShipping extends BaseBean implements Serializable { + private static final long serialVersionUID = -8961182851667690154L; + @Column(name = "JIT_NO") + @ApiParam("JIT队列编号") + private String jitNo; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("操作人") + private String supplierCode; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private Date actionDateTime; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private Integer ifCode; + +} 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 c839b14..84375d0 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 @@ -33,6 +33,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable { private static final long serialVersionUID = 655875369308810110L; + @Column(name = "JIS_ACTUAL_NO") @ApiParam("队列编号") private String jisActualNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index 89cf68d..654cc56 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.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; /** @@ -47,6 +48,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @ApiParam("产品位置代码") private String produceCtgyCode; + @Transient + @ApiParam("产品位置") + private String prodCfgName; + @Column(name = "PART_NAME") @ApiParam("产品名称") private String partName; @@ -62,4 +67,12 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @Column(name = "GROUP_SEQ") @ApiParam("分组序号") private String groupSeq; + + @Column(name = "status") + @ApiParam("状态") + private Integer status; + + @Column(name = "seq") + @ApiParam("主序编号") + private String seq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueShippingModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueShippingModel.java new file mode 100644 index 0000000..47b326f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueShippingModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : JIT发运队列列表Model + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-05-22 16:34 + * @Modify: + **/ +@Data +@Api("JIT发运队列列表Model") +public class QueueShippingModel implements Serializable { + private Long id; + + @ApiParam("显示颜色") + private String color; + + @ApiParam("队列编号") + private String jisActualNo; + + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @ApiParam("产品位置") + private String prodCfgName; + + @ApiParam("起始vin") + private String vin; + + @ApiParam("结束vin") + private String endVin; + + @ApiParam("料架号") + private String queueGroupNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQueueShippingRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQueueShippingRepository.java new file mode 100644 index 0000000..1130943 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQueueShippingRepository.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.IfQueueShipping; + +/** + * @Description :IF_JIT发运数据 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-06 10:57 上午 + * @Modify: + **/ +public interface IfQueueShippingRepository extends BaseRepository { +} From a32d4b3b002f1315c47b653cccdb31628fbfdaff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 27 Mar 2020 18:32:55 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=8C=96=20=E8=B5=84=E6=BA=90=E5=B7=A5=E5=85=B7=E7=B1=BB?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/platform/bean/SysLabelTemplate.java | 5 +++ .../pojo/platform/bean/SysLocaleResource.java | 5 +++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 45 ++++++++-------------- 3 files changed, 26 insertions(+), 29 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index f52be12..fc4acd3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -54,6 +54,11 @@ public class SysLabelTemplate extends BaseBean { @ApiParam(value ="模板内容") private String templateContent; + @Lob + @Column(name="OTHER_TEMPLATE_CONTENT") + @ApiParam(value ="其他模板内容") + private String otherTemplateContent; + // 参数拼接，多参数都好分隔，后台在做处理 @Transient @ApiParam(value ="模板参数拼接") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index 5555d83..f8b4f4e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -37,6 +37,9 @@ public class SysLocaleResource extends BaseBean { private Integer resourceType; @Transient + private String resourceTypes; + + @Transient private String resourceTypeTxt; public String getResourceTypeTxt(){ @@ -56,6 +59,7 @@ public class SysLocaleResource extends BaseBean { @ApiParam(value = "语言名称",example = "浏览器语言名称") private String languageNameRdd; + @Lob @Column(name="resource_key") @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档") @AnnoOutputColumn @@ -82,4 +86,5 @@ public class SysLocaleResource extends BaseBean { @ApiParam(value = "是否系统参数",example = "2") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer isSystem; + } 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 44ddce3..51429a6 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 @@ -4,32 +4,10 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.platform.bean.SysBarcodeRule; -import cn.estsh.i3plus.pojo.platform.bean.SysConfig; -import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; -import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; -import cn.estsh.i3plus.pojo.platform.bean.SysFile; -import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate; -import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam; -import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; -import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; -import cn.estsh.i3plus.pojo.platform.bean.SysMenu; -import cn.estsh.i3plus.pojo.platform.bean.SysMessage; -import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; -import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; -import cn.estsh.i3plus.pojo.platform.bean.SysPosition; -import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment; -import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; -import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole; -import cn.estsh.i3plus.pojo.platform.bean.SysRole; -import cn.estsh.i3plus.pojo.platform.bean.SysTask; -import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle; -import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan; -import cn.estsh.i3plus.pojo.platform.bean.SysTool; -import cn.estsh.i3plus.pojo.platform.bean.SysToolType; -import cn.estsh.i3plus.pojo.platform.bean.SysUser; -import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; +import cn.estsh.i3plus.pojo.platform.bean.*; +import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.lang3.StringUtils; + import java.util.List; import java.util.stream.Collectors; @@ -42,6 +20,10 @@ import java.util.stream.Collectors; **/ public class CoreHqlPack { + private CoreHqlPack() { + throw new IllegalStateException("Utility class"); + } + /** * In 参数封装 * @param columnName @@ -81,6 +63,11 @@ public class CoreHqlPack { if(resource != null){ DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result); + // 是否多类型查询 + if(StringUtils.isNotBlank(resource.getResourceTypes())){ + DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result); + } + DdlPreparedPack.getNumEqualPack(resource.getSoftType(),"softType",result); DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result); DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result); @@ -630,7 +617,7 @@ public class CoreHqlPack { HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); HqlPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); - if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){ + if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()){ HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(), ","), "departmentId", result); } @@ -653,7 +640,7 @@ public class CoreHqlPack { DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getInPackList(idList,"id",result); - if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){ + if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty() ){ DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(),"departmentId",result); } @@ -677,7 +664,7 @@ public class CoreHqlPack { // And HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); - if(idList != null && idList.size() > 0){ + if(idList != null && !idList.isEmpty()){ HqlPack.getInPack(StringUtils.join(idList, ","), "id", result); } @@ -977,7 +964,7 @@ public class CoreHqlPack { */ public static DdlPackBean packHqlSysOrganize(List sysRefUserDepartments){ DdlPackBean packBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(d -> d.getOrganizeId()).collect(Collectors.toList()),"id",packBean); + DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(SysRefUserDepartment::getOrganizeId).collect(Collectors.toList()),"id",packBean); return packBean; } From 6ed34b9e5f6ee8c7f532c3742328330df22ffc14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 27 Mar 2020 18:35:58 +0800 Subject: [PATCH 13/14] =?UTF-8?q?FTP=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=B7=A5?= =?UTF-8?q?=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.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/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index da17aec..629d207 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -135,7 +135,8 @@ public class BlockSoftSwitchEnumUtil { CLIENT_MQ_RABBIT_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.MQ,150001,"RabbitMQ Client Hello测试服务"), /* FTP */ - CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器"); + CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器"), + SERVER_FTP_IMPP(SUIT_MODE.SERVER,CASE_TYPE.FTP,260001,"Client FTP服务端适配器"); private int value; private String description; From eed24e0297ecec6c18db3a5ee173db279ed70ff7 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Fri, 27 Mar 2020 21:43:48 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9pom?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC?= =?UTF-8?q?=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 | 3 ++- modules/i3plus-pojo-aps/pom.xml | 3 ++- modules/i3plus-pojo-base/pom.xml | 3 ++- modules/i3plus-pojo-form/pom.xml | 3 ++- modules/i3plus-pojo-hardswitch/pom.xml | 3 ++- modules/i3plus-pojo-jobflow/pom.xml | 3 ++- modules/i3plus-pojo-lac/pom.xml | 3 ++- modules/i3plus-pojo-mes-pcn/pom.xml | 3 ++- modules/i3plus-pojo-mes/pom.xml | 3 ++- modules/i3plus-pojo-model/pom.xml | 3 ++- modules/i3plus-pojo-platform/pom.xml | 3 ++- modules/i3plus-pojo-ptl/pom.xml | 3 ++- modules/i3plus-pojo-report/pom.xml | 3 ++- modules/i3plus-pojo-softswitch/pom.xml | 3 ++- modules/i3plus-pojo-sweb/pom.xml | 3 ++- modules/i3plus-pojo-wms/pom.xml | 3 ++- modules/i3plus-pojo-workflow/pom.xml | 3 ++- pom.xml | 2 +- 18 files changed, 35 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 2bb8b09..fe8e4eb 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-andon jar + 1.0-${profileActive}-SNAPSHOT @@ -49,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4591fe3..f1e9991 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-aps jar + 1.0-${profileActive}-SNAPSHOT @@ -53,7 +54,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 0e3621b..2183cdf 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-base jar + 1.0-${profileActive}-SNAPSHOT @@ -71,7 +72,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 4d0a808..65c6554 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-form jar + 1.0-${profileActive}-SNAPSHOT @@ -50,6 +51,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index ecf48ed..a1664bf 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-hardswitch jar + 1.0-${profileActive}-SNAPSHOT dev @@ -42,7 +43,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 2241e93..6a55282 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-jobflow jar + 1.0-${profileActive}-SNAPSHOT dev @@ -42,7 +43,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index c9fd4ee..232becd 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-lac jar + 1.0-${profileActive}-SNAPSHOT @@ -49,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 27731be..e65f727 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-mes-pcn jar + 1.0-${profileActive}-SNAPSHOT @@ -49,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 2ba9ddd..552f97e 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-mes jar + 1.0-${profileActive}-SNAPSHOT @@ -49,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 3fd87ac..beba8ba 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-model jar + 1.0-${profileActive}-SNAPSHOT @@ -90,7 +91,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index c0524de..8f191db 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-platform jar + 1.0-${profileActive}-SNAPSHOT @@ -49,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 4b73b1a..f0a5b7e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-ptl jar + 1.0-${profileActive}-SNAPSHOT @@ -49,6 +50,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 4ebc2f7..d9d461d 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-report jar + 1.0-${profileActive}-SNAPSHOT @@ -50,6 +51,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index b3c4fc8..309d149 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-softswitch jar + 1.0-${profileActive}-SNAPSHOT @@ -50,6 +51,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index b601666..f34bc03 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-sweb jar + 1.0-${profileActive}-SNAPSHOT @@ -49,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 2d56516..f9e982f 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-wms jar + 1.0-${profileActive}-SNAPSHOT @@ -53,7 +54,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 4395f3c..e2918a0 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-workflow jar + 1.0-${profileActive}-SNAPSHOT dev @@ -42,7 +43,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 96a06e4..06660e0 100644 --- a/pom.xml +++ b/pom.xml @@ -252,6 +252,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file