test merge ext-dev

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;
+        }
     }
 
     /**
@@ -7357,14 +7453,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;
         }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -2431,7 +2431,8 @@ public class MesPcnEnumUtil {
     public enum ROUTE_TYPE {
 
         SCAN(10, "扫描流程"),
-        MONITOR(20, "监控流程");
+        MONITOR(20, "监控流程"),
+        MACHINE(30, "状态机流程");
 
         private int value;
         private String description;
@@ -2745,6 +2746,7 @@ public class MesPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STATION_BUSI_TYPE {
+        GUIDE("guide", "引导信息"),
         MESSAGE("message", "返回信息"),
         STEP_LIST("stepList", "工步列表"),
         STATE_LIST("stateList", "状态列表"),
@@ -3619,8 +3621,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;
@@ -3643,57 +3645,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)
@@ -3844,7 +3892,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;
@@ -3875,7 +3923,7 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     * 组件状态类型
+     * 状态机状态点类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STATUS_TYPE {

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;

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")

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;

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

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;
+    }
 
 }

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;
+    }
+}

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")

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<Map<String, Object>> enumList;
-
-    @Transient
     @ApiParam("key的值")
     private Object geValue;
 

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<MesRoute> routeList;
+
+    @ApiParam("工序集合")
+    private List<MesProcess> processList;
+
+    @ApiParam("生产类型集合")
+    private List<MesPartProduceType> pptList;
+}

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<String, MesRouteProcess> routeProcessMap;
+
+    @ApiParam("状态机")
+    private MesStateMachine stateMachine;
+
+    @ApiParam("状态点")
+    private List<StateMachineStatusModel> stateMachineStatusList;
+
+    @ApiParam("流程工序Id")
+    private Long routeProcessId;
+
+    @ApiParam("产品流程Id")
+    private Long prodRouteCfgId;
+}

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<String, List<StateMachineStepModel>> stepGroupMap;
+
+    @ApiParam("下个状态点MAP")
+    private Map<String, Map<String, String>> nextStatusGroupMap;
+
+}

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<StateMachineStepParamModel> stepParamList;
+}

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<Map<String, Object>> enumList;
+}

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;
 }

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<StateModel> stateList;
+
     @ApiParam("扫描信息")
     private String scanInfo;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java

@@ -25,6 +25,8 @@ public class StepResult<T> {
 
     private MesPcnEnumUtil.STEP_RESULT_CMD cmd;
 
+    private String nextTriggerEvent;
+
     public static StepResult getNonComplete() {
         return new StepResult(false, "");
     }

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;
+
+}

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<MesStateMachineStep, Long> {
+}

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(),
@@ -3722,7 +3740,30 @@ public class MesHqlPack {
     }
 
     /**
+     * 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;
+    }
+
+    /**
      * 数据迁移表查询条件封装
+     * @param cfg
+     * @return
      */
     public static DdlPackBean getDataMigrationCfg(MesDataMigrationCfg cfg) {
         DdlPackBean packBean = getAllBaseData(cfg.getOrganizeCode());

sonar-project.properties

@@ -5,6 +5,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 
 # defaults to project key
 sonar.projectName=i3plus-pojo
+
 # defaults to 'not provided'
 sonar.projectVersion=1.0.0.1