From fba7f636d9437c6bb394bfc58fed36a94278ce1e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 20 Jan 2021 21:14:31 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 106 ++++++++++++++++++++- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 92 +++++++++++++----- .../i3plus/pojo/mes/bean/MesProdRouteCfg.java | 2 +- .../i3plus/pojo/mes/bean/MesProdRouteOptParam.java | 1 - .../cn/estsh/i3plus/pojo/mes/bean/MesRoute.java | 2 +- .../pojo/mes/bean/MesStateMachineStatus.java | 61 +++++++++--- .../i3plus/pojo/mes/bean/MesStateMachineStep.java | 80 ++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesStepGroup.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesStepParam.java | 4 - .../i3plus/pojo/mes/model/RouteProcessModel.java | 43 +++++++++ .../mes/model/StateMachineRouteDesignModel.java | 47 +++++++++ .../pojo/mes/model/StateMachineStatusModel.java | 31 ++++++ .../pojo/mes/model/StateMachineStepModel.java | 23 +++++ .../pojo/mes/model/StateMachineStepParamModel.java | 27 ++++++ .../cn/estsh/i3plus/pojo/mes/model/StateModel.java | 10 +- .../i3plus/pojo/mes/model/StationRequestBean.java | 9 ++ .../cn/estsh/i3plus/pojo/mes/model/StepResult.java | 2 + .../i3plus/pojo/mes/model/TestStateModel.java | 20 ++++ .../repository/MesStateMachineStepRepository.java | 15 +++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 83 +++++++++++----- 20 files changed, 584 insertions(+), 76 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RouteProcessModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineRouteDesignModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStatusModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepParamModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TestStateModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStepRepository.java 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 ea8bfa9..2d4b48e 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 @@ -4001,16 +4001,30 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STATION_BUSI_TYPE { + GUIDE("guide", "引导信息"), MESSAGE("message", "返回信息"), STEP_LIST("stepList", "工步列表"), + STATE_LIST("stateList", "状态列表"), STEP_CONTENT("stepContent", "工步内容"), - MODULE_CONTENT("moduleContent", "组件内容"), + MODULE_CONTENT("moduleContent", "展示组件内容"), + MODULE_HEAD("moduleHead", "展示组件头"), + GUIDE_CONTENT("guideContent", "指导内容"), + ASSISTANT_CONTENT("assistantContent", "辅助展示组件"), CUSTOM_COMPONENT("customComponent", "定制内容"), TASK_COMPLETE("taskComplete", "整个扫描完成"), STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), RUNNING_INFO("runningInfo", "执行信息"), STOP_PCS_CTL("stopPcsCtl", "停止监控"), - RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"); + RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"), + PROCESS_CONTENT("processContent", "过程组件内容"), + TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"), + TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"), + TIME_MODULE_START("timeModuleStart", "定时组件开始"), + ADDITIONAL_TIPS("additionalTips", "额外帮助信息显示"), + ADDITIONAL_TIPS_HIDE("additionalTipsHide", "额外帮助信息隐藏"), + TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"), + MESSAGE_POOL("messagePool", "消息池"), + FORCE_LOGOUT("forceLogout", "websocket强制下线"); private String value; @@ -4467,7 +4481,8 @@ public class MesEnumUtil { public enum ROUTE_TYPE { SCAN(10, "扫描流程"), - MONITOR(20, "监控流程"); + MONITOR(20, "监控流程"), + MACHINE(30, "状态机流程"); private int value; private String description; @@ -4494,7 +4509,88 @@ public class MesEnumUtil { } return tmp; } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FSM_EVENT { + TRIGGER(10, "trigger", "触发"), + ENTRY(20, "entry", "进入"), + EXIT(30, "exit", "离开"); + + private int value; + private String code; + private String description; + + private FSM_EVENT(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return this.value; + } + + public String getCode() { + return this.code; + } + + public String getDescription() { + return this.description; + } + + public static FSM_EVENT getByValue(int value) { + for (FSM_EVENT fsmEvent : values()) { + if (fsmEvent.getValue() == value) { + return fsmEvent; + } + } + return null; + } + + public static String valueOfDescription(int value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 状态机状态点类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STATUS_TYPE { + START(10, "START", "开始状态"), + EXECUTING(20, "EXECUTING", "执行中状态"), + TERMINATE(30, "TERMINATE", "中断状态"), + FINISH(40, "FINISH", "完成状态"), + BACK(99, "BACK", "回退状态"); + + private int value; + private String code; + private String description; + + STATUS_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } } /** @@ -7392,14 +7488,14 @@ public class MesEnumUtil { * 触发类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum STEP_TRIGGER_TYPE { + public enum TRIGGER_TYPE { INTERNAL_TRIGGER(10, "内部触发"), EXTERNAL_TRIGGER(20, "外部触发"); private int value; private String description; - STEP_TRIGGER_TYPE(int value, String description) { + TRIGGER_TYPE(int value, String description) { this.value = value; this.description = description; } 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 a19633d..3384c0a 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 @@ -2349,7 +2349,8 @@ public class MesPcnEnumUtil { public enum ROUTE_TYPE { SCAN(10, "扫描流程"), - MONITOR(20, "监控流程"); + MONITOR(20, "监控流程"), + MACHINE(30, "状态机流程"); private int value; private String description; @@ -2663,6 +2664,7 @@ public class MesPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STATION_BUSI_TYPE { + GUIDE("guide", "引导信息"), MESSAGE("message", "返回信息"), STEP_LIST("stepList", "工步列表"), STATE_LIST("stateList", "状态列表"), @@ -3537,8 +3539,8 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FSM_EVENT { TRIGGER(10, "trigger", "触发"), - ENTRY(20, "entry", "进入状态"), - EXIT(30, "exit", "离开状态"); + ENTRY(20, "entry", "进入"), + EXIT(30, "exit", "离开"); private int value; private String code; @@ -3561,57 +3563,103 @@ public class MesPcnEnumUtil { public String getDescription() { return this.description; } + + public static FSM_EVENT getByValue(int value) { + for (FSM_EVENT fsmEvent : values()) { + if (fsmEvent.getValue() == value) { + return fsmEvent; + } + } + return null; + } + + public static String valueOfDescription(int value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum FSM_STATE_TYPE { - BEGIN(10, "begin", "开始状态点"), - BACK(20, "back", "回退状态点"), - END(40, "end", "结束状态点"); + public enum TRIGGER_TYPE { + INNER_TRIGGER(10, "内部触发"), + OUTER_TRIGGER(20, "外部触发"); private int value; - private String code; private String description; - private FSM_STATE_TYPE(int value, String code, String description) { + TRIGGER_TYPE(int value, String description) { this.value = value; - this.code = code; this.description = description; } public int getValue() { - return this.value; - } - - public String getCode() { - return this.code; + return value; } public String getDescription() { - return this.description; + return description; } } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TRIGGER_TYPE { - INNER_TRIGGER(10, "内部触发"), - OUTER_TRIGGER(20, "外部触发"); + public enum ACTOR_RECEIVE_STRATEGY { + WS_CMD_INIT_MODULE(10, "initModule", "actorReceiveStrategyInitService", "展示组件初始化"), + WS_CMD_DO_SCAN(20, "doScan", "actorReceiveStrategyScanService", "执行扫描"), + WS_CMD_DO_MODULE(30, "doModule", "actorReceiveStrategyModuleService", "展示组件执行方法"), + WS_CMD_JUMP_PROCESS(40, "jumpProcess", "actorReceiveStrategyJumpProcessService", "跳过工序"), + WS_CMD_STOP_CELL_MONITOR(50, "stopCellMonitor", "actorReceiveStrategyStopCellMonitorService", "停止执行监听组件"); private int value; + private String code; + private String clazz; private String description; - TRIGGER_TYPE(int value, String description) { + ACTOR_RECEIVE_STRATEGY(int value, String code, String clazz, String description) { this.value = value; + this.code = code; + this.clazz = clazz; this.description = description; } + public static ACTOR_RECEIVE_STRATEGY getByCode(String code) { + for (ACTOR_RECEIVE_STRATEGY strategy : values()) { + if (strategy.getCode().equals(code)) { + return strategy; + } + } + return null; + } + public int getValue() { return value; } + public String getCode() { + return code; + } + + public String getClazz() { + return clazz; + } + public String getDescription() { return description; } + + public static String codeOfClazz(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].clazz; + } + } + return tmp; + } } @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -3762,7 +3810,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum LOAD_FSM_ROUTE_TYPE { - BY_PART("0", "通过物料号加载"), + BY_PART("0", "外部加载"), BY_AUTO("1", "自动加载"); private String value; @@ -3793,7 +3841,7 @@ public class MesPcnEnumUtil { } /** - * 组件状态类型 + * 状态机状态点类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STATUS_TYPE { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java index c4539bb..9aef4c6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java @@ -46,7 +46,7 @@ public class MesProdRouteCfg extends BaseBean implements Serializable { private String routeCode; @Column(name = "ROUTE_TYPE") - @ApiParam("流程类型 10-扫描类型 20-监控类型") + @ApiParam("流程类型 10-扫描类型 20-监控类型 30-状态机类型") private Integer routeType; @Column(name = "PPT_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java index 2a3b355..1e38879 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java @@ -86,7 +86,6 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable { @ApiParam("工步展示名称") private String stepDisplayName; - @Transient @Column(name = "PARAM_ATTRIBUTE") @ApiParam("参数属性") private String paramAttribute; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java index 0c20dd7..116e8ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java @@ -45,7 +45,7 @@ public class MesRoute extends BaseBean implements Serializable { private String position; @Column(name = "ROUTE_TYPE") - @ApiParam("流程类型 10-扫描类型 20-监控类型") + @ApiParam("流程类型 10-扫描类型 20-监控类型 30-状态机类型") private Integer routeType; @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java index 41c3fb4..e28f314 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -1,20 +1,14 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.mes.model.StepResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -37,10 +31,6 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @ApiParam("状态机代码") private String smCode; - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - @Column(name = "STATUS_CODE") @ApiParam("状态代码") private String statusCode; @@ -53,6 +43,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @ApiParam("状态名称") private String statusName; + @Column(name = "NEXT_STATUS_NAME") + @ApiParam("下一状态名称") + private String nextStatusName; + @Column(name = "TRIGGER_TYPE") @ApiParam("触发类型 10=内部触发 20=外部触发") private Integer triggerType; @@ -78,7 +72,7 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { private Long outAmgId; @Column(name = "STATUS_TYPE") - @ApiParam("状态类型 10=初始化状态") + @ApiParam("状态类型 10=初始化状态 20=执行中状态 99=回退状态 40=结束状态") private Integer statusType; @Column(name = "SEQ") @@ -90,6 +84,14 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { private Integer isInit = 1; @Transient + @ApiParam("流程代码") + private String routeCode; + + @Transient + @ApiParam("工序代码") + private String processCode; + + @Transient @ApiParam("状态点是否完成") private boolean isComplete; @@ -101,8 +103,37 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @ApiParam("前端显示颜色") private String color; -// @Transient -// @ApiParam("状态执行情况") -// private StepResult stepResult; + @Transient + @ApiParam("进入触发方法时默认校验外部触发") + private boolean isCheckOuterTrigger = true; + + @Transient + @ApiParam("客制化下个状态点的触发事件") + private String nextTriggerEvent; + + + public MesStateMachineStatus() { + } + + public MesStateMachineStatus(String smCode, String statusCode, String nextStatus, String statusName, String nextStatusName, Integer triggerType, + String triggerEvent, String triggerWhere, Long triggerAmgId, Long inAmgId, Long outAmgId, Integer statusType, Integer seq, + Integer isInit, String routeCode, String processCode) { + this.smCode = smCode; + this.statusCode = statusCode; + this.nextStatus = nextStatus; + this.statusName = statusName; + this.nextStatusName = nextStatusName; + this.triggerType = triggerType; + this.triggerEvent = triggerEvent; + this.triggerWhere = triggerWhere; + this.triggerAmgId = triggerAmgId; + this.inAmgId = inAmgId; + this.outAmgId = outAmgId; + this.statusType = statusType; + this.seq = seq; + this.isInit = isInit; + this.routeCode = routeCode; + this.processCode = processCode; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java new file mode 100644 index 0000000..613a5bd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java @@ -0,0 +1,80 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :状态机工步参数配置表 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STATE_MACHINE_STEP") +@Api("状态机工步参数配置表") +public class MesStateMachineStep extends BaseBean implements Serializable { + + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "AMG_ID") + @ApiParam("工步集代码") + private Long amgId; + + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STEP_SEQ") + @ApiParam("工步顺序") + private Integer stepSeq; + + @Column(name = "PARAM_CODE") + @ApiParam("工步参数代码") + private String paramCode; + + @Column(name = "PARAM_TYPE") + @ApiParam("工步参数类型") + private Integer paramType; + + @Column(name = "PARAM_VALUE") + @ApiParam("工步参数值") + private String paramValue; + + @Column(name = "PARAM_ATTRIBUTE") + @ApiParam("参数属性") + private String paramAttribute; + + + public int getStepSeq() { + return this.stepSeq == null ? 0 : this.stepSeq; + } + + public void setStepSeq(int stepSeq) { + this.stepSeq = stepSeq; + } + + public int getParamTypeVal() { + return this.paramType == null ? 0 : this.paramType; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java index f7200c8..cf5da7a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java @@ -36,7 +36,7 @@ public class MesStepGroup extends BaseBean implements Serializable { private Long amgId; @Column(name = "STEP_CODE") - @ApiParam("组件集代码") + @ApiParam("工步代码") private String stepCode; @Column(name = "SEQ") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index d2b01b9..c9409c9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java @@ -81,10 +81,6 @@ public class MesStepParam extends BaseBean implements Serializable { private String objectWhere; @Transient - @ApiParam("可选值的数据") - private List> enumList; - - @Transient @ApiParam("key的值") private Object geValue; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RouteProcessModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RouteProcessModel.java new file mode 100644 index 0000000..b0e5ec7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RouteProcessModel.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesPartProduceType; +import cn.estsh.i3plus.pojo.mes.bean.MesProcess; +import cn.estsh.i3plus.pojo.mes.bean.MesRoute; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 流程工序Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("流程工序Model") +public class RouteProcessModel { + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("产线代码") + private String workCenterCode; + + @ApiParam("流程代码") + private String routeCode; + + @ApiParam("流程类型") + private Integer routeType; + + @ApiParam("流程集合") + private List routeList; + + @ApiParam("工序集合") + private List processList; + + @ApiParam("生产类型集合") + private List pptList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineRouteDesignModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineRouteDesignModel.java new file mode 100644 index 0000000..25a2d08 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineRouteDesignModel.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesRoute; +import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess; +import cn.estsh.i3plus.pojo.mes.bean.MesStateMachine; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 状态机流程工序设计Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("状态机流程工序设计Model") +public class StateMachineRouteDesignModel { + + @ApiParam("工厂") + private String organizeCode; + + @ApiParam("用户") + private String userInfo; + + @ApiParam("流程") + private MesRoute route; + + @ApiParam("流程工序(根据Seq分组)") + private Map routeProcessMap; + + @ApiParam("状态机") + private MesStateMachine stateMachine; + + @ApiParam("状态点") + private List stateMachineStatusList; + + @ApiParam("流程工序Id") + private Long routeProcessId; + + @ApiParam("产品流程Id") + private Long prodRouteCfgId; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStatusModel.java new file mode 100644 index 0000000..295df7f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStatusModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 状态点设计Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("状态点设计Model") +public class StateMachineStatusModel extends MesStateMachineStatus { + + @ApiParam("状态点顺序") + private Integer seq = 0; + + @ApiParam("状态点工步集Map") + private Map> stepGroupMap; + + @ApiParam("下个状态点MAP") + private Map> nextStatusGroupMap; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepModel.java new file mode 100644 index 0000000..bf16352 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesStep; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 状态机流程工步设计Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("状态机流程工步设计Model") +public class StateMachineStepModel extends MesStep { + + @ApiParam("工步参数集合") + private List stepParamList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepParamModel.java new file mode 100644 index 0000000..4808522 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepParamModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesStepParam; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 状态机流程工步参数设计Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("状态机流程工步参数设计Model") +public class StateMachineStepParamModel extends MesStepParam { + + @ApiParam("参数值") + private String paramValue; + + @ApiParam("可选值的数据") + private List> enumList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateModel.java index 41bf108..7e4a62f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model; +import io.swagger.annotations.ApiParam; import lombok.Data; /** @@ -8,14 +9,17 @@ import lombok.Data; * @desc */ @Data -@Deprecated public class StateModel { + @ApiParam("状态点代码") private String stateCode; + @ApiParam("状态点名称") private String stateName; - private String routeCode; + @ApiParam("顺序") + private Integer seq; - private String smCode; + @ApiParam("颜色") + private String color; } 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 30814e3..dcfc6b9 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 @@ -25,6 +25,15 @@ public class StationRequestBean implements Serializable { private static final long serialVersionUID = -8597212451891803174L; + @ApiParam("新旧流程标识 默认新流程") + private boolean isOldRoute = false; + + @ApiParam("ACTOR接收策略类名") + private String actorReceiveStrategyClass; + + @ApiParam("工步列表") + private List stateList; + @ApiParam("扫描信息") private String scanInfo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java index c758545..7e880f4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java @@ -25,6 +25,8 @@ public class StepResult { private MesPcnEnumUtil.STEP_RESULT_CMD cmd; + private String nextTriggerEvent; + public static StepResult getNonComplete() { return new StepResult(false, ""); } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TestStateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TestStateModel.java new file mode 100644 index 0000000..0957f35 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TestStateModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author wangjie + * @date 2020/4/14 15:18 + * @desc + */ +@Data +public class TestStateModel { + + @ApiParam("扫描信息") + private String scanInfo; + + @ApiParam("时间") + private String createDatetime; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStepRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStepRepository.java new file mode 100644 index 0000000..9acea36 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStepRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStep; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019\10\9 + * @Modify: + **/ +public interface MesStateMachineStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 490fa74..7956f9d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -5,7 +5,6 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails; @@ -91,19 +90,19 @@ public class MesHqlPack { } // 时间段查询 - if (!StringUtil.isEmpty(mesPlanOrder.getStartTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getStartTimeEnd())) { + if (!StringUtils.isEmpty(mesPlanOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesPlanOrder.getStartTimeEnd())) { DdlPreparedPack.timeBuilder( mesPlanOrder.getStartTimeStart(), mesPlanOrder.getStartTimeEnd(), "startTime", packBean, true); } - if (!StringUtil.isEmpty(mesPlanOrder.getEndTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getEndTimeEnd())) { + if (!StringUtils.isEmpty(mesPlanOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesPlanOrder.getEndTimeEnd())) { DdlPreparedPack.timeBuilder( mesPlanOrder.getEndTimeStart(), mesPlanOrder.getEndTimeEnd(), "endTime", packBean, true); } - if (!StringUtil.isEmpty(mesPlanOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getCreateDateTimeEnd())) { + if (!StringUtils.isEmpty(mesPlanOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesPlanOrder.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( mesPlanOrder.getCreateDateTimeStart(), mesPlanOrder.getCreateDateTimeEnd(), @@ -190,19 +189,19 @@ public class MesHqlPack { } // 时间段查询 - if (!StringUtil.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getStartTimeEnd())) { + if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) { DdlPreparedPack.timeBuilder( mesWorkOrder.getStartTimeStart(), mesWorkOrder.getStartTimeEnd(), "startTime", packBean, true); } - if (!StringUtil.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getEndTimeEnd())) { + if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) { DdlPreparedPack.timeBuilder( mesWorkOrder.getEndTimeStart(), mesWorkOrder.getEndTimeEnd(), "endTime", packBean, true); } - if (!StringUtil.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) { + if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( mesWorkOrder.getCreateDateTimeStart(), mesWorkOrder.getCreateDateTimeEnd(), @@ -253,7 +252,7 @@ public class MesHqlPack { // 只查询创建状态的队列 DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean); - if (!StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeEnd())) { + if (!StringUtils.isEmpty(mesQueueOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesQueueOrder.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( mesQueueOrder.getCreateDateTimeStart(), mesQueueOrder.getCreateDateTimeEnd(), @@ -347,23 +346,42 @@ public class MesHqlPack { */ public static DdlPackBean packHqlMesRoute(MesRoute mesRoute, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesRoute, organizeCode); - DdlPreparedPack.getStringLikerPack(mesRoute.getRouteCode(), "routeCode", packBean); - DdlPreparedPack.getStringLikerPack(mesRoute.getRouteName(), "routeName", packBean); + if (!StringUtils.isEmpty(mesRoute.getRouteCode())) { + DdlPreparedPack.getStringLikerPack(mesRoute.getRouteCode(), "routeCode", packBean); + } + if (!StringUtils.isEmpty(mesRoute.getRouteName())) { + DdlPreparedPack.getStringLikerPack(mesRoute.getRouteName(), "routeName", packBean); + } + if (!StringUtils.isEmpty(mesRoute.getRouteType())) { + DdlPreparedPack.getNumEqualPack(mesRoute.getRouteType(), "routeType", packBean); + } return packBean; } /** * 产品流程配置查询条件封装 * - * @param mesProdRouteCfg + * @param prodRouteCfg * @param organizeCode * @return */ - public static DdlPackBean packHqlMesProdRouteCfg(MesProdRouteCfg mesProdRouteCfg, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdRouteCfg, organizeCode); - DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean); + public static DdlPackBean packHqlMesProdRouteCfg(MesProdRouteCfg prodRouteCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(prodRouteCfg, organizeCode); + if (!StringUtils.isEmpty(prodRouteCfg.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(prodRouteCfg.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(prodRouteCfg.getPartNo())) { + DdlPreparedPack.getStringEqualPack(prodRouteCfg.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(prodRouteCfg.getPptCode())) { + DdlPreparedPack.getStringEqualPack(prodRouteCfg.getPptCode(), "pptCode", packBean); + } + if (!StringUtils.isEmpty(prodRouteCfg.getRouteCode())) { + DdlPreparedPack.getStringEqualPack(prodRouteCfg.getRouteCode(), "routeCode", packBean); + } + if (!StringUtils.isEmpty(prodRouteCfg.getRouteType())) { + DdlPreparedPack.getNumEqualPack(prodRouteCfg.getRouteType(), "routeType", packBean); + } return packBean; } @@ -2104,10 +2122,10 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) { DdlPreparedPack.getStringEqualPack(mesProduceSn.getVinCode(), "vinCode", packBean); } - if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { + if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); } - if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeStart())) { + if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeStart())) { DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean); // DdlPreparedPack.timeBuilder( // mesProduceSn.getOutWorkCenterStartTime(), @@ -2302,10 +2320,10 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesProduceSnTravel.getVinCode())) { DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getVinCode(), "vinCode", packBean); } - if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeStart())) { + if (!StringUtils.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeStart())) { DdlPreparedPack.getStringBiggerPack(mesProduceSnTravel.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean); } - if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) { + if (!StringUtils.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) { DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); } if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCenterCode())) { @@ -2496,13 +2514,13 @@ public class MesHqlPack { if (queueJitActual.getStatus() != null) { DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean); } - if (!StringUtil.isEmpty(queueJitActual.getCreateDateTimeStart()) || !StringUtil.isEmpty(queueJitActual.getCreateDateTimeEnd())) { + if (!StringUtils.isEmpty(queueJitActual.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitActual.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( queueJitActual.getCreateDateTimeStart(), queueJitActual.getCreateDateTimeEnd(), "createDatetime", packBean, true); } - if (!StringUtil.isEmpty(queueJitActual.getCustPointStartDate()) || !StringUtil.isEmpty(queueJitActual.getCustPointEndDate())) { + if (!StringUtils.isEmpty(queueJitActual.getCustPointStartDate()) || !StringUtils.isEmpty(queueJitActual.getCustPointEndDate())) { DdlPreparedPack.timeBuilder( queueJitActual.getCustPointStartDate(), queueJitActual.getCustPointEndDate(), @@ -2780,7 +2798,6 @@ public class MesHqlPack { * MES 工位技能 * * @param mesWorkCellSkill - * @param organizeCode * @return */ public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill) { @@ -3717,4 +3734,24 @@ public class MesHqlPack { return packBean; } + /** + * MES_状态机信息查询条件封装 + * + * @param stateMachine + * @param organizeCode + * @return + */ + public static DdlPackBean packHqlMesStateMachine(MesStateMachine stateMachine, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(stateMachine, organizeCode); + if (!StringUtils.isEmpty(stateMachine.getSmCode())) { + DdlPreparedPack.getStringLikerPack(stateMachine.getSmCode(), "smCode", packBean); + } + if (!StringUtils.isEmpty(stateMachine.getSmName())) { + DdlPreparedPack.getStringLikerPack(stateMachine.getSmName(), "smName", packBean); + } + if (!StringUtils.isEmpty(stateMachine.getSmType())) { + DdlPreparedPack.getNumEqualPack(stateMachine.getSmType(), "smType", packBean); + } + return packBean; + } } From 84d9ec15f26372722befde83ac89d0b2a44521c3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 27 Jan 2021 16:21:44 +0800 Subject: [PATCH 2/8] pom --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..1e17935 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 9f5788e..dc13374 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..60d9861 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..190efa7 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f611147..e57acaf 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 39ed206a061cd6d2c53cd4d24184a3045c97936d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 2 Feb 2021 20:30:05 +0800 Subject: [PATCH 3/8] sonar --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index ae014e9..268eaf2 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-PROD-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 5af6f3ae7f432aa630261dcb8b47579a62b4353e Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 4 Feb 2021 10:58:57 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E3=80=9013795=2020027--=E7=8E=B0=E4=B8=AD?= =?UTF-8?q?=E8=88=AABH=E6=95=B0=E6=8D=AE=E6=A3=80=E9=AA=8C=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=90=8E=E6=97=A0=E6=B3=95=E5=B0=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=8E=A5=E5=8F=A3=E4=BC=A0=E8=BE=93=E5=88=B0?= =?UTF-8?q?=E8=80=81WMS=E7=B3=BB=E7=BB=9F--2021-01-21=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.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/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 278960b..ab1c7e6 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 @@ -7991,7 +7991,8 @@ public class WmsEnumUtil { public enum BH_SUMMARY_IS_SYNC { INIT(10, "INIT", "初始化"), WAIT_SYNC(20, "WAIT_SYNC", "待同步"), - FINISH_SYNC(30, "FINISH_SYNC", "已同步"); + FINISH_SYNC(30, "FINISH_SYNC", "已同步"), + OLD_WMS_FINISH_SYNC(40, "OLD_WMS_FINISH_SYNC", "老WMS已同步"); private int value; private String code; From 7b3ef8f2687f58701f56185e0eaefd4b4f7482e9 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 4 Feb 2021 11:08:24 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E3=80=9013795=2020027--=E7=8E=B0=E4=B8=AD?= =?UTF-8?q?=E8=88=AABH=E6=95=B0=E6=8D=AE=E6=A3=80=E9=AA=8C=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=90=8E=E6=97=A0=E6=B3=95=E5=B0=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=8E=A5=E5=8F=A3=E4=BC=A0=E8=BE=93=E5=88=B0?= =?UTF-8?q?=E8=80=81WMS=E7=B3=BB=E7=BB=9F--2021-01-21=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 ab1c7e6..278960b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -7991,8 +7991,7 @@ public class WmsEnumUtil { public enum BH_SUMMARY_IS_SYNC { INIT(10, "INIT", "初始化"), WAIT_SYNC(20, "WAIT_SYNC", "待同步"), - FINISH_SYNC(30, "FINISH_SYNC", "已同步"), - OLD_WMS_FINISH_SYNC(40, "OLD_WMS_FINISH_SYNC", "老WMS已同步"); + FINISH_SYNC(30, "FINISH_SYNC", "已同步"); private int value; private String code; From 462ed4f1de4694ac149fdfdf7c1199ace1c18109 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 4 Feb 2021 11:16:22 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E3=80=9013795=2020027--=E7=8E=B0=E4=B8=AD?= =?UTF-8?q?=E8=88=AABH=E6=95=B0=E6=8D=AE=E6=A3=80=E9=AA=8C=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=90=8E=E6=97=A0=E6=B3=95=E5=B0=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=8E=A5=E5=8F=A3=E4=BC=A0=E8=BE=93=E5=88=B0?= =?UTF-8?q?=E8=80=81WMS=E7=B3=BB=E7=BB=9F--2021-01-21=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.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/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 278960b..ab1c7e6 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 @@ -7991,7 +7991,8 @@ public class WmsEnumUtil { public enum BH_SUMMARY_IS_SYNC { INIT(10, "INIT", "初始化"), WAIT_SYNC(20, "WAIT_SYNC", "待同步"), - FINISH_SYNC(30, "FINISH_SYNC", "已同步"); + FINISH_SYNC(30, "FINISH_SYNC", "已同步"), + OLD_WMS_FINISH_SYNC(40, "OLD_WMS_FINISH_SYNC", "老WMS已同步"); private int value; private String code; From 4644639c2e82994bd8437154ca24fbf370b97978 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 4 Feb 2021 13:45:49 +0800 Subject: [PATCH 7/8] pom --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 1e17935..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37b8a51..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index dc13374..9f5788e 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index fdcf6e3..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 60d9861..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 54c8306..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 190efa7..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 5896851..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1351ed3..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 67b0bff..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 15d36cd..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index e57acaf..f611147 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From ae70490123703f465abc5ba03b7e928d48716f77 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 4 Feb 2021 14:17:11 +0800 Subject: [PATCH 8/8] sonar --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index ddb0c5a..591800b 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -7,7 +7,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./