task `1565` 发运pojo

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

@@ -3351,20 +3351,26 @@ public class MesPcnEnumUtil {
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STATION_REQUEST_BEAN_CMD {
-        JUMP_STATUS(10, "跳过状态点"),
+        JUMP_STATE(10, "JUMP_STATE", "跳过状态点"),
-        FORCE_DO_SPEC_STATUS(20, "强制执行制定的状态点");
+        FORCE_STATE(20, "FORCE_STATE", "强制执行制定的状态点");
 
         private int value;
+        private String code;
         private String description;
 
-        STATION_REQUEST_BEAN_CMD(int value, String description) {
+        STATION_REQUEST_BEAN_CMD(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;
@@ -3453,4 +3459,40 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 状态机流程加载类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOAD_FSM_ROUTE_TYPE {
+
+        BY_PART("0", "通过物料号加载"),
+        BY_AUTO("1", "自动加载");
+
+        private String value;
+        private String description;
+
+        LOAD_FSM_ROUTE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java

@@ -33,6 +33,10 @@ 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;

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

@@ -1,10 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
-import cn.estsh.i3plus.pojo.mes.bean.MesRouteStatus;
 import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -34,6 +31,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("物料号")
     private String partNo;
 
+    @ApiParam("生产类型")
+    private String pptCode;
+
     @ApiParam("组织代码")
     private String organizeCode;