From d8779f42fbe1b3469df0eaaba43dfee872d24d85 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 25 Mar 2020 16:00:55 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BB=8Edev=E6=8B=89=E5=8F=96=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 141 ++++++++++++++++++++- .../estsh/i3plus/pojo/wms/bean/MesPpDetails.java | 4 + .../cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java | 4 + .../estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 4 + .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 5 + .../cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java | 51 ++++++++ .../i3plus/pojo/wms/bean/WmsPullTaskDetails.java | 4 + .../i3plus/pojo/wms/bean/WmsPullTaskMaster.java | 8 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 15 +++ .../pojo/wms/modelbean/WmsPullOrderModel.java | 39 ++++++ .../pojo/wms/repository/WmsPullRuleRepository.java | 16 +++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 16 +++ 12 files changed, 306 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPullOrderModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullRuleRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 4fd1ad6..a0dd0ef 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 @@ -4512,7 +4512,9 @@ public class WmsEnumUtil { SAFETY_STOCK_PULL(10, "安全库存拉动"), ELECTRONIC_KANBAN_PULL(20, "电子看板拉动"), LINE_PULL(30, "巡线拉动"), - PLANNED_PULL(40, "计划拉动"); + PLANNED_PULL(40, "计划拉动"), + ANDON_PULL(50, "安灯拉动"), + EXTERNAL_PULL(60, "手工拉动"); private int value; private String description; @@ -4551,6 +4553,53 @@ public class WmsEnumUtil { } /** + * 尾数计算方式 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TAIL_QTY_MODE { + NONE(1, "不处理"), + ORIGIN_NUMBER(10, "原数值"), + UP_ROUND(20, "向上取整"), + DOWN_ROUND(30, "向下取整"); + + private int value; + private String description; + + TAIL_QTY_MODE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static TAIL_QTY_MODE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } + + /** * 收货看板状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -5301,4 +5350,94 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 存储区-补货方式 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ZONE_PULL_WAY { + JOB_CYCLE(10, "JOB周期"), + FIXED_CYCLE(20, "固定周期"); + + private int value; + private String description; + + ZONE_PULL_WAY(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static ZONE_PULL_WAY codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } + + /** + * 拉动任务-任务类型 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PULL_TASK_TYPE { + NORMAL_PULL(10, "普通拉动"), + GROUP_PULL(20, "组合拉动"); + + private int value; + private String description; + + PULL_TASK_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static PULL_TASK_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java index b87c776..04436ff 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java @@ -52,6 +52,10 @@ public class MesPpDetails extends BaseBean{ @ApiParam(value = "工单数量", example = "0") public Double qty; + @Column(name="PART_GROUP_NO") + @ApiParam("零件组号") + public String partGroupNo; + public Integer getItem() { return item == null ? 0 : this.item.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java index e9d4e61..8ec1cae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java @@ -58,6 +58,10 @@ public class MesPpMaster extends BaseBean{ @ApiParam(value = "单据状态", example = "0") private Integer orderStatus = 0; + @Column(name="SEQ") + @ApiParam(value = "排序号", example = "0") + private Integer seq = 0; + public Integer getOrderStatus() { return orderStatus == null ? 0 : this.orderStatus.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index a0ea3cb..c4b5956 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -62,6 +62,10 @@ public class WmsLocatePart extends BaseBean { @ApiParam(value = "安全库存", example = "0") private Double safetyStock; + @Column(name = "MOQ", columnDefinition = "decimal(18,8)") + @ApiParam(value = "起订量", example = "0") + private Double moq; + @Transient @ApiParam("库位类型") private Integer locateType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 85ec609..ca95598 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -244,6 +244,11 @@ public class WmsPart extends BaseBean { @ApiParam(value = "拉动方式") private String pullWay; + @Column(name = "TAIL_QTY_MODE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE") + @ApiParam(value = "尾数计算方式", example = "1") + private Integer tailQtyMode; + @Column(name = "CYCLE_RQUEST_PERIOD") @ApiParam(value = "循环补货周期", example = "0") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java new file mode 100644 index 0000000..90b3a58 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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.Index; +import javax.persistence.Table; + +/** + * @Description 拉动规则实体 + * @Author Jason + * @Date 2020-03-20 + * @ModifyDate 2020-03-20 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PULL_RULE") +@Api("拉动规则") +public class WmsPullRule extends BaseBean { + @Column(name = "PULL_WAY") + @ApiParam(value = "拉动类型", example = "10") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PULL_WAY_STATUS") + private Integer pullWay; + + @Column(name = "CONTAIN_UNFINISH_ORDER") + @ApiParam(value = "考虑未完成的移库单", example = "0") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + private Integer containUnfinishOrder; + + @Column(name = "CONTAIN_EXIST_PERIOD") + @ApiParam(value = "考虑现有库存", example = "0") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + private Integer containExistStock; + + @Column(name = "TAIL_QTY_MODE") + @ApiParam(value = "尾数计算方式", example = "0") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE") + private Integer tailQtyMode; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java index 0a41d3e..4eaabf1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java @@ -110,6 +110,10 @@ public class WmsPullTaskDetails extends BaseBean{ @ApiParam(value = "明细状态", example = "0") private Integer orderStatus = 0; + @Column(name="PART_GROUP_NO") + @ApiParam("零件组号") + public String partGroupNo; + public Integer getOrderStatus() { return orderStatus == null ? 0 : this.orderStatus.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java index f7d6c15..aa9559c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java @@ -62,6 +62,14 @@ public class WmsPullTaskMaster extends BaseBean{ @ApiParam(value = "是否暂停", example = "0") private Integer isSuspend = 2; + @Column(name="PULL_TASK_TYPE") + @ApiParam(value = "拉动任务类型", example = "10") + private Integer pullTaskType; + + @Column(name="SEQ") + @ApiParam(value = "排序号", example = "0") + private Integer seq; + public Integer getOrderStatus() { return orderStatus == null ? 0 : this.orderStatus.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index e11133a..f916604 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -117,6 +117,21 @@ public class WmsZones extends BaseBean { @ApiParam(value = "三维位置") private String position; + @Column(name = "ZONE_PULL_WAY") + @ApiParam(value = "补货方式", example = "10") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "ZONE_PULL_WAY") + private Integer zonePullWay; + + @Column(name = "PULL_CYCLE") + @ApiParam(value = "固定拉动周期", example = "0") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer pullCycle; + + @Column(name = "LAST_PULL_TIME") + @ApiParam(value = "上次拉动时间") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + private String lastPullTime; + @Transient @ApiParam(value = "子存储区列表") private List childList; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPullOrderModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPullOrderModel.java new file mode 100644 index 0000000..6a41bbc --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPullOrderModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @description + * @author jason.niu + * @date 2020/03/25 + */ +@Data +@Api("外部拉动单模型") +public class WmsPullOrderModel { + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("车间") + private String workShopCode; + + @ApiParam("产线") + private String lineNo; + + @ApiParam("库位") + private String locateNo; + + @ApiParam("零件号") + private String partNo; + + @ApiParam("供应商") + private String vendorNo; + + @ApiParam("数量") + private Double qty; + + @ApiParam("业务类型") + private Integer busiType; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullRuleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullRuleRepository.java new file mode 100644 index 0000000..efb40b5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullRuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPullRule; +import org.springframework.stereotype.Repository; + +/** + * @Description :拉动规则Repository的方法接口 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-03-23 15:38 + * @Modify: + **/ +@Repository +public interface WmsPullRuleRepository extends BaseRepository { +} 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 68b8086..09eaafe 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 @@ -559,6 +559,22 @@ public class WmsHqlPack { } /** + * 拉动规则 分页查询 + * @param rule + * @return + */ + public static DdlPackBean packHqlWmsPullRule(WmsPullRule rule) { + //查询参数封装 + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getNumEqualPack(rule.getPullWay(), "pullWay", result); + + getStringBuilderPack(rule, result); + return result; + } + + /** * 根据类型查询库位分页 * * @param wmsLocate From c37809d5b78d170e306f38ca0690f31e2cfb62ea Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 27 Mar 2020 13:47:14 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=BA=90=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E7=9A=84=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, 1 insertion(+), 1 deletion(-) 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..4ac20ee 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,7 @@ 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 com.sun.tools.javac.util.List; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; From 5de3c0bd7b4bb82a657e472c60dda5727518e19a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 31 Mar 2020 15:35:03 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java index d7129a5..8f0336a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java @@ -84,4 +84,7 @@ public class WmsDocMovementModel { @ApiParam(value = "一步法/两步法") private Integer isSingleStep; + + @ApiParam(value = "创建时间") + private String createDateTime; } From 6925ce3b18bb325cc6d82ff8a49060485a3b735e Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 31 Mar 2020 18:20:24 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E3=80=901483=E3=80=91?= =?UTF-8?q?=EF=BC=9ALES-=E6=96=B0=E5=A2=9E=E6=8B=89=E5=8A=A8=E8=A7=84?= =?UTF-8?q?=E5=88=99=E8=A1=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901484=E3=80=91?= =?UTF-8?q?=EF=BC=9ALES-=E7=89=A9=E6=96=99=E8=A1=A8=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=20=E4=BB=BB=E5=8A=A1=E3=80=901485=E3=80=91?= =?UTF-8?q?=EF=BC=9ALES-=E5=BA=93=E4=BD=8D=E7=89=A9=E6=96=99=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB=E5=8A=A1=E3=80=901486?= =?UTF-8?q?=E3=80=91=EF=BC=9ALES-=E5=AD=98=E5=82=A8=E5=8C=BA=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB=E5=8A=A1=E3=80=901487?= =?UTF-8?q?=E3=80=91=EF=BC=9ALES-=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E3=80=901488=E3=80=91=EF=BC=9ALES-=E6=8B=89=E5=8A=A8=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=B1=9E=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=901489=E3=80=91=EF=BC=9ALES-=E5=85=A5=E5=9C=BA?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E7=AA=97=E5=8F=A3=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=A1=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901490=E3=80=91?= =?UTF-8?q?=EF=BC=9ALES-=E5=B7=A1=E7=BA=BF=E6=8B=89=E5=8A=A8=20=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=901491=E3=80=91=EF=BC=9ALES-=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8B=89=E5=8A=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901492=E3=80=91?= =?UTF-8?q?=EF=BC=9ALES-=E8=BF=87=E7=82=B9=E6=8B=89=E5=8A=A8=20=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=901493=E3=80=91=EF=BC=9ALES-=E6=89=8B=E5=B7=A5?= =?UTF-8?q?=E6=8B=89=E5=8A=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901494=E3=80=91?= =?UTF-8?q?=EF=BC=9ALES-=E9=A2=84=E7=95=99=E5=A4=96=E9=83=A8=E6=8B=89?= =?UTF-8?q?=E5=8A=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 98 +++++++++++++++++++++- .../cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 4 + .../cn/estsh/i3plus/pojo/wms/bean/WareHouse.java | 4 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java | 4 + .../cn/estsh/i3plus/pojo/wms/bean/WmsDock.java | 51 +++++++++++ .../i3plus/pojo/wms/bean/WmsDockOrderInfo.java | 72 ++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDockWindowTime.java | 42 ++++++++++ .../pojo/wms/modelbean/DockDashboardModel.java | 32 +++++++ .../pojo/wms/modelbean/WmsPullOrderModel.java | 33 ++++++-- .../wms/repository/WmsDockOrderInfoRepository.java | 16 ++++ .../pojo/wms/repository/WmsDockRepository.java | 16 ++++ .../repository/WmsDockWindowTimeRepository.java | 16 ++++ 12 files changed, 378 insertions(+), 10 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/DockDashboardModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockOrderInfoRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockWindowTimeRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index a0dd0ef..81a5477 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 @@ -713,7 +713,8 @@ public class WmsEnumUtil { KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"), PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"), UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"), - TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"); + TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"), + EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"); private int value; private String code; @@ -5440,4 +5441,99 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 道口预约订单状态 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DOCK_ORDER_STATUS { + WAIT_SEND(10, "待送货"), + ARRIVED(20, "已到达"), + RECEIVED(30, "已收货"), + CANCELED(40, "已取消"); + + private int value; + private String description; + + DOCK_ORDER_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static DOCK_ORDER_STATUS codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String 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; + } + } + + /** + * 道口预约订单状态 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DOCK_APPOINTMENT_STATUS { + WAIT_SEND(10, "待送货"), + HAS_SENDED(20, "已送达"), + RECEIVING(30, "收货中"), + COMPLETED(40, "已完成"), + OVERTIME(50, "供货超时"); + + private int value; + private String description; + + DOCK_APPOINTMENT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static DOCK_APPOINTMENT_STATUS codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String 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; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java index d940955..ebf9603 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java @@ -89,6 +89,10 @@ public class BasVendor extends BaseBean{ @Column(name = "VENDOR_TYPE") private Integer vendorType; + @Column(name = "MAP_LOCATION") + @ApiParam("经纬度") + private String mapLocation; + public BasVendor() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java index 30d7725..2bbb7c8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java @@ -68,6 +68,10 @@ public class WareHouse extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double baseUnit; + @Column(name = "MAP_LOCATION") + @ApiParam("经纬度") + private String mapLocation; + @Transient @ApiParam(value = "存储区列表") private List zoneList; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java index d60df26..6c8b97a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java @@ -61,4 +61,8 @@ public class WmsCar extends BaseBean { @Transient @ApiParam(value = "供应商名称") private String vendorNameRdd; + + @Column(name = "MAP_LOCATION") + @ApiParam("经纬度") + private String mapLocation; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java new file mode 100644 index 0000000..8e638b7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 道口 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-03-29 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_DOCK") +@Api("道口预约信息") +public class WmsDock extends BaseBean { + @Column(name="DOCK_CODE") + @ApiParam("道口代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String dockCode; + + @Column(name="DOCK_ADDRESS") + @ApiParam("道口发运地址") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String dockAddress; + + @Column(name="DOCK_DESC") + @ApiParam("道口发运地址描述") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String dockDesc; + + @Column(name="DOCK_TYPE") + @ApiParam("道口类型") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String dockType; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java new file mode 100644 index 0000000..e26a736 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 道口预约信息 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-03-29 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_DOCK_ORDER_INFO") +@Api("道口预约信息") +public class WmsDockOrderInfo extends BaseBean { + + @Column(name="DOCK_CODE") + @ApiParam("道口代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String dockCode; + + @Column(name="ORDER_DATE") + @ApiParam("预约日期") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + private String orderDate; + + @Column(name="WINDOW_TIME") + @ApiParam("窗口时间") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + private String windowTime; + + @Column(name="ORDER_STATUS") + @ApiParam("预约状态") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_ORDER_STATUS") + private Integer orderStatus; + + @Column(name="SUPPLIER_CODE") + @ApiParam("供应商编码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String supplierCode; + + @Column(name="CAR_NO") + @ApiParam("车辆编号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String carNo; + + @Column(name="DRIVER_NAME") + @ApiParam("驾驶员") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String driverName; + + @Column(name="ORDER_NO") + @ApiParam("单据号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String orderNo; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java new file mode 100644 index 0000000..0084679 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 道口窗口时间 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-03-29 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_DOCK_WINDOW_TIME") +@Api("道口窗口时间") +public class WmsDockWindowTime extends BaseBean { + + @Column(name="DOCK_CODE") + @ApiParam("道口代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String dockCode; + + @Column(name="WINDOW_TIME") + @ApiParam("窗口时间") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + private String windowTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/DockDashboardModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/DockDashboardModel.java new file mode 100644 index 0000000..4910ff6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/DockDashboardModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @description 道口看板数据模型 + * @author jason.niu + * @date 2020/03/31 + */ +@Data +@Api("道口看板数据模型") +public class DockDashboardModel { + @ApiParam("预约时间") + private String orderDate; + + @ApiParam("预约状态") + private Integer appointmentStatus; + + @ApiParam("供应商编码") + private String supplierCode; + + @ApiParam("单号") + private String orderNo; + + @ApiParam("车牌号") + private String carNo; + + @ApiParam("驾驶员") + private String driverName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPullOrderModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPullOrderModel.java index 6a41bbc..57be8ae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPullOrderModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPullOrderModel.java @@ -5,7 +5,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; /** - * @description + * @description 外部拉动数据结构 * @author jason.niu * @date 2020/03/25 */ @@ -16,24 +16,39 @@ public class WmsPullOrderModel { @ApiParam("工厂代码") private String organizeCode; - @ApiParam("车间") - private String workShopCode; - @ApiParam("产线") private String lineNo; + @ApiParam("仓库代码") + public String WhNo; + + @ApiParam("存储区代码") + public String ZoneNo; + + @ApiParam("目标库位代码") + public String destLocateNo; + @ApiParam("库位") private String locateNo; - @ApiParam("零件号") + @ApiParam("物料编码") private String partNo; - @ApiParam("供应商") - private String vendorNo; + @ApiParam("物料名称") + public String partName; + + @ApiParam("源仓库代码") + public String srcWhNo; + + @ApiParam("源存储区代码") + public String srcZoneNo; @ApiParam("数量") private Double qty; - @ApiParam("业务类型") - private Integer busiType; + @ApiParam("单位") + public String unit; + + @ApiParam("批次") + public String lotNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockOrderInfoRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockOrderInfoRepository.java new file mode 100644 index 0000000..d6681f7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockOrderInfoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsDockOrderInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description :道口预约信息 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-03-29 + * @Modify: + **/ +@Repository +public interface WmsDockOrderInfoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockRepository.java new file mode 100644 index 0000000..757e006 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsDock; +import org.springframework.stereotype.Repository; + +/** + * @Description :道口 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-03-30 + * @Modify: + **/ +@Repository +public interface WmsDockRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockWindowTimeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockWindowTimeRepository.java new file mode 100644 index 0000000..6cc4a8c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockWindowTimeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsDockWindowTime; +import org.springframework.stereotype.Repository; + +/** + * @Description :道口窗口时间 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-03-29 + * @Modify: + **/ +@Repository +public interface WmsDockWindowTimeRepository extends BaseRepository { +} From 3b987436d85fc8e62f4c8671f1e0fafbc3770fb0 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 31 Mar 2020 19:10:47 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=96=B0=E5=A2=9ELES=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= 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 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 335f882..fe8e4eb 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-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 7d63653..f1e9991 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-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 284f019..9f54aca 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-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 63c691b..65c6554 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-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 35c0762..0f73e78 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-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index cbdf688..7e73285 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-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 51958ba..232becd 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-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 From 82d53328615b34c0d4114df631224017f8f0b7c7 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 31 Mar 2020 19:11:30 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8DPOM=E6=96=87=E4=BB=B6?= =?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-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 3 +-- 10 files changed, 10 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index a0cbb85..e65f727 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-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 1c38fc4..552f97e 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-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 9c029b3..beba8ba 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-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 876096e..8f191db 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-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index c56e1c6..f0a5b7e 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-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 4e4a397..d9d461d 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-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 442875c..309d149 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-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 8573c4e..f34bc03 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-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index a578bda..f9e982f 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-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 067d448..d561047 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-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -14,7 +14,6 @@ jar 1.0-${profileActive}-SNAPSHOT - dev