From e84d74d7beab0905b8ce3c115c3739fa54d33612 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 2 Apr 2020 10:35:32 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E3=80=90=E5=86=B2=E7=AA=81=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=89=BE=E5=9B=9E=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 2dad813..64f03c6 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 @@ -5502,6 +5502,10 @@ public class WmsEnumUtil { WAVE_MERGE_RULE(10, "WAVE_MERGE_RULE", "合并规则"), WAVE_MERGE_RANGE(20, "WAVE_MERGE_RANGE", "合并范围"); + int value; + String code; + String description; + WAVE_MERGE_TYPE(int value, String code, String description) { this.value = value; this.code = code; @@ -5725,6 +5729,14 @@ public class WmsEnumUtil { } 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 String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { From 57f2177ef64607d8635a10d4603f4ad18e6f3e60 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 2 Apr 2020 13:34:08 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E3=80=90=E6=B3=A2=E6=AC=A1=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E8=A7=84=E5=88=99--=E6=9E=9A=E4=B8=BE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=94=99=E8=AF=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 48 +++++++++++++++++++--- 1 file changed, 42 insertions(+), 6 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 64f03c6..4d4e450 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 @@ -5378,6 +5378,12 @@ public class WmsEnumUtil { private String fieldValue; + private int value; + + private String code; + + private String description; + WAVE_MERGE_RULE(String chName, String enName, String fieldValue, int waveMergeType) { this.chName = chName; this.enName = enName; @@ -5400,6 +5406,18 @@ public class WmsEnumUtil { public int getWaveMergeType() { return waveMergeType; } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public int getValue() { + return value; + } } /** @@ -5408,24 +5426,24 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RANGE { CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", - "custNo, custName", "custNo, custName", "custNo", + "custNo,custName", "custNo,custName", "custNo", 20, ""), WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse", - "code, name", "code, name", "code", + "code,name", "code,name", "code", 20, ""), PRIORITY("优先级", "priority", "PRIORITY_NEW", "", "", "", 20, ""), SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", - "zoneNo, zoneName", "zoneNo", "zoneNo", + "zoneNo,zoneName", "zoneNo", "zoneNo", 20, ""), DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", - "zoneNo, zoneName", "zoneNo", "zoneNo", + "zoneNo,zoneName", "zoneNo", "zoneNo", 20, ""), PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart", - "partNo, partName", "partNo", "partNo", + "partNo,partName", "partNo", "partNo", 20, ""), PART_GROUP_NO("物料组代码", "partGroupNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup", - "partGroupNo, partGroupName", "partGroupNo", + "partGroupNo,partGroupName", "partGroupNo", "partGroupNo", 20, ""), BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "", "", "", 20, ""), @@ -5449,6 +5467,12 @@ public class WmsEnumUtil { private String fieldValue; + private int value; + + private String code; + + private String description; + WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName, String searchColumnName, String explicitColumnName, int waveMergeType, String fieldValue) { this.chName = chName; @@ -5492,6 +5516,18 @@ public class WmsEnumUtil { public String getFieldValue() { return fieldValue; } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } } /** From 032fb350c8ef316b7c53267ff6b34be05173123b Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 2 Apr 2020 13:55:58 +0800 Subject: [PATCH 03/17] =?UTF-8?q?queueordermodel=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9E=84=E9=80=A0=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/QueueOrderModel.java | 54 +++++++++++++++------- 1 file changed, 37 insertions(+), 17 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 60d0f9e..b55e96d 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 @@ -90,7 +90,7 @@ public class QueueOrderModel implements Serializable { } public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType,Double finsihQty,Double qty) { + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType, Double finsihQty, Double qty) { this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; @@ -102,8 +102,8 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.snStatus = snStatus; this.workType = workType; - this.finsihQty=finsihQty; - this.qty=qty; + this.finsihQty = finsihQty; + this.qty = qty; } public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, @@ -120,8 +120,9 @@ public class QueueOrderModel implements Serializable { this.snStatus = snStatus; this.workType = workType; } - public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType,Double finsihQty,Double qty) { + + public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType, Double finsihQty, Double qty) { this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; @@ -133,12 +134,12 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.snStatus = snStatus; this.workType = workType; - this.finsihQty=finsihQty; - this.qty=qty; - this.orderNo=orderNo; + this.finsihQty = finsihQty; + this.qty = qty; + this.orderNo = orderNo; } - public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { this.id = id; this.queueSeq = queueSeq; @@ -151,8 +152,9 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.snStatus = snStatus; this.workType = workType; - this.orderNo=orderNo; + this.orderNo = orderNo; } + public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) { this.id = id; this.queDetailSeq = queDetailSeq; @@ -161,8 +163,26 @@ public class QueueOrderModel implements Serializable { this.groupNo = groupNo; this.prodCfgCode = prodCfgCode; } - public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType,Double finsihQty,Double qty) { + + public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String partNo, String partNameRdd, String workType, Double finsihQty, Double qty) { + 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; + } + + 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) { + this.serialNumber = serialNumber; this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; @@ -172,12 +192,12 @@ public class QueueOrderModel implements Serializable { this.partNo = partNo; this.partNameRdd = partNameRdd; this.workType = workType; - this.finsihQty=finsihQty; - this.qty=qty; - this.orderNo=orderNo; + this.finsihQty = finsihQty; + this.qty = qty; + this.orderNo = orderNo; } - public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String partNo, String partNameRdd, String workType) { this.id = id; this.queueSeq = queueSeq; @@ -188,6 +208,6 @@ public class QueueOrderModel implements Serializable { this.partNo = partNo; this.partNameRdd = partNameRdd; this.workType = workType; - this.orderNo=orderNo; + this.orderNo = orderNo; } } From 836a4f710dd4af9bc5a53d242311ffe120fcf871 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 3 Apr 2020 00:02:10 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/MesEquipmentToolingModel.java | 66 ++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentToolingModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentToolingModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentToolingModel.java new file mode 100644 index 0000000..b15294e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentToolingModel.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesTooling; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : MES_设备工装关系Model + * @Reference : + * @Author :qianhuasheng + * @CreateDate : 2020-04-02 16:34 + * @Modify: + **/ +@Data +@Api("MES_设备工装关系Model") +public class MesEquipmentToolingModel implements Serializable { + + private static final long serialVersionUID = 1947971352179107711L; + + private Long id; + + @ApiParam("显示颜色") + private String color; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("工装编号") + private String toolingNo; + + @ApiParam("工装代码") + private String toolingCode ; + + @ApiParam("工装名称") + private String toolingName; + + @ApiParam("工装类型") + private Integer toolingType; + + @ApiParam("使用次数") + private Integer useCount; + + @ApiParam("更换开始时间") + private String startTime; + + @ApiParam("更换结束时间") + private String endTime; + + @Transient + @ApiParam("最大次数") + private Integer useCountMax; + + public MesEquipmentToolingModel(MesTooling tooling, Integer useCount) { + this.toolingCode = tooling.getToolingCode(); + this.toolingName = tooling.getToolingName(); + this.useCount = useCount; + this.useCountMax = tooling.getUseCountMax(); + } + public MesEquipmentToolingModel() { + } +} From 965a8d37cd07c61607d64fa69adbd5412dd19299 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 3 Apr 2020 15:20:59 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99maven?= =?UTF-8?q?=20profile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/pom.xml b/pom.xml index d6a60cc..ed5d0a1 100644 --- a/pom.xml +++ b/pom.xml @@ -221,38 +221,6 @@ - - - dev - - DEV - - - true - - - - test - - TEST - - - - docker - - DOCKER - - - - prod - - PROD - - - - - ${project.artifactId}-${project.version} - From 35023af12c9ff54196fdaa859bc9865b89cdc4a8 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 3 Apr 2020 19:02:54 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E3=80=907988=2020011--=E5=A4=9A=E7=BA=A7?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=89=93=E5=8D=B0=E6=97=B6=E6=AF=8D=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=8E=B0=E5=9C=A8=E6=97=A0=E6=B3=95=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 d7b809e..6b6f2b8 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 @@ -3915,6 +3915,15 @@ public class WmsEnumUtil { } return tmp; } + + public static PRINT_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } } /** From a59a5e532e5cfd7fb5cfd6e2f5e344021b34417b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 3 Apr 2020 19:04:15 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E3=80=907988=2020011--=E5=A4=9A=E7=BA=A7?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=89=93=E5=8D=B0=E6=97=B6=E6=AF=8D=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=8E=B0=E5=9C=A8=E6=97=A0=E6=B3=95=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=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/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 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 6f59761..482c5a1 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 @@ -2590,7 +2590,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsPrintingQueue.getPrintNo(), "printNo", result); DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ETC_PRINT_STATUS.NOT_HIT.getValue(), "printStatus", result); - DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result); +// DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result); getStringBuilderPack(wmsPrintingQueue, result); From 46e0f502d077e7db9059c7c647a1c880244e510d Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 3 Apr 2020 19:04:47 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E3=80=907988=2020011--=E5=A4=9A=E7=BA=A7?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=89=93=E5=8D=B0=E6=97=B6=E6=AF=8D=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=8E=B0=E5=9C=A8=E6=97=A0=E6=B3=95=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=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/WmsStockSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index f9e000a..e048183 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 @@ -314,6 +314,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "集装箱号") private String containerNo; + @Transient + @ApiParam(value = "箱数") + private Integer boxQty; + public WmsStockSn() { } From e2894143632ce5187b3aa5f2fb96ff706fefae8e Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 3 Apr 2020 22:23:33 +0800 Subject: [PATCH 09/17] Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev --- .../java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java | 10 +++++++++- .../cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java index 809f29c..d97a57a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java @@ -18,8 +18,16 @@ public class CellFeedModel { private String partNo; + private String partName; + private String itemPartNo; - private String qty; + private String itemPartName; + + private String shouldQty; + + private String remainQty; + + private String scanQty; } 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 d1e1299..236115b 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 @@ -110,6 +110,9 @@ public class StationRequestBean implements Serializable { @ApiParam("当前流程状态") private MesRouteStatus curRouteStatus; + @ApiParam("展示组件") + private Object moduleService; + @Override public String toString() { return "StationRequestBean{" + From 7244fb38b17b07010bc2a010f6569bb83ab527e5 Mon Sep 17 00:00:00 2001 From: qianhs Date: Sun, 5 Apr 2020 23:16:15 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 b55e96d..784a25d 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 @@ -197,7 +197,7 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; } - public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String partNo, String partNameRdd, String workType) { this.id = id; this.queueSeq = queueSeq; @@ -209,5 +209,6 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.workType = workType; this.orderNo = orderNo; + this.serialNumber=serialNumber; } } From 8c635c355765bdf1967e7def310229fe1bebaa01 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 6 Apr 2020 11:22:48 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= 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, 2 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 236115b..0a5b42e 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 @@ -113,6 +113,8 @@ public class StationRequestBean implements Serializable { @ApiParam("展示组件") private Object moduleService; + @ApiParam("工步序号") + private Integer stepSeq; @Override public String toString() { return "StationRequestBean{" + From ba90a506216f52b7f76bccd4dc8f4be833ec80a7 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 6 Apr 2020 11:45:03 +0800 Subject: [PATCH 12/17] Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev --- .../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 ea3a703..0b19a64 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 @@ -26,7 +26,7 @@ import java.io.Serializable; }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) }) -@Api("包装规格") +@Api("包装表") public class MesPackage extends BaseBean implements Serializable { private static final long serialVersionUID = 5275923991324889995L; From ba4b45043723b57351f1fd1e258c14f9698a997a Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 6 Apr 2020 13:39:08 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 12 ++++++++++++ 1 file changed, 12 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 784a25d..c9781d7 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 @@ -211,4 +211,16 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; this.serialNumber=serialNumber; } + //料架分组队列展示组件 + 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; + } } From 14bb71f9f2b486bb30f51a64a028d5ef3ed45421 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 6 Apr 2020 17:10:25 +0800 Subject: [PATCH 14/17] =?UTF-8?q?[=E6=96=99=E6=9E=B6=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0=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/ActorMessageModel.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java index 05670be..dd891d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java @@ -30,7 +30,7 @@ public class ActorMessageModel { } public static ActorMessageModel getFailure() { - return new ActorMessageModel(true, null); + return new ActorMessageModel(false, null); } public static ActorMessageModel getSuccess(Object data) { 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 c9781d7..2d3d15c 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 @@ -71,6 +71,8 @@ public class QueueOrderModel implements Serializable { @ApiParam("队列编号") private String orderNo; + @ApiParam("料架是否已打印") + private Integer isGroupPrinted; public QueueOrderModel() { } @@ -155,13 +157,14 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; } - public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) { + public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted) { this.id = id; this.queDetailSeq = queDetailSeq; this.pgCode = pgCode; this.queueGroupNo = queueGroupNo; this.groupNo = groupNo; this.prodCfgCode = prodCfgCode; + this.isGroupPrinted = isGroupPrinted; } public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, From 7062e7a3831b553be259daccbfe393917f49fc9d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 7 Apr 2020 09:20:27 +0800 Subject: [PATCH 15/17] =?UTF-8?q?bug7935=E3=80=907935=20=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E6=94=B6=E8=B4=A7-=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E6=A0=BC=E5=BC=8F-=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E4=B8=8D=E9=80=9A=E8=BF=87=E7=B3=BB=E7=BB=9F=E5=BC=82=E5=B8=B8?= =?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/wms/bean/WmsTransportRule.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/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java index 5c91192..d34d0e6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java @@ -44,7 +44,7 @@ public class WmsTransportRule extends BaseBean { @Column(name = "BUSI_SCENE_TYPE") @ApiParam("业务场景") - //@AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BUSI_SCENE_TYPE") public Integer busiSceneType; From 703a3f2195d5279074243dda29427ee4bc9dbd53 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 7 Apr 2020 10:11:11 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=B6=88=E6=81=AF=20=E4=B8=BAfalse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.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/ActorMessageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java index 05670be..dd891d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java @@ -30,7 +30,7 @@ public class ActorMessageModel { } public static ActorMessageModel getFailure() { - return new ActorMessageModel(true, null); + return new ActorMessageModel(false, null); } public static ActorMessageModel getSuccess(Object data) { From 8a8c3ee34d37512061950abebdb87437d2ccfe91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 7 Apr 2020 13:42:00 +0800 Subject: [PATCH 17/17] =?UTF-8?q?pom=E7=89=88=E6=9C=AC=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 4 ++-- modules/i3plus-pojo-aps/pom.xml | 4 ++-- modules/i3plus-pojo-base/pom.xml | 4 ++-- modules/i3plus-pojo-form/pom.xml | 4 ++-- modules/i3plus-pojo-hardswitch/pom.xml | 4 ++-- modules/i3plus-pojo-jobflow/pom.xml | 4 ++-- modules/i3plus-pojo-lac/pom.xml | 4 ++-- modules/i3plus-pojo-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 4 ++-- modules/i3plus-pojo-platform/pom.xml | 4 ++-- modules/i3plus-pojo-ptl/pom.xml | 4 ++-- modules/i3plus-pojo-report/pom.xml | 4 ++-- modules/i3plus-pojo-softswitch/pom.xml | 4 ++-- modules/i3plus-pojo-sweb/pom.xml | 4 ++-- modules/i3plus-pojo-wms/pom.xml | 4 ++-- modules/i3plus-pojo-workflow/pom.xml | 4 ++-- pom.xml | 2 +- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index fe8e4eb..4988f31 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-andon jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f1e9991..4104107 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-aps jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f54aca..96472ad 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 65c6554..9be7e80 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-form jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0f73e78..53cfea6 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-hardswitch jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 7e73285..44c0526 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-jobflow jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 232becd..122cb94 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-lac jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e65f727..f9957c9 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 552f97e..409b79a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index beba8ba..846c302 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 8f191db..c94172f 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-platform jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index f0a5b7e..4dd7471 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ptl jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index d9d461d..c45f09e 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-report jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 309d149..1b72275 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index f34bc03..94fb42a 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-sweb jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index f9e982f..cac0256 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-wms jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index d561047..af52bb4 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-workflow jar - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/pom.xml b/pom.xml index a7c1de5..1384ee6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-${profileActive}-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform