Merge branch 'dev' into test

modules/i3plus-pojo-andon/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -38,4 +39,24 @@ public class AndonAlarmType extends BaseBean implements Serializable {
     @ApiParam("安灯类型名称")
     private String alarmName;
 
+    @Column(name = "CODE")
+    @ApiParam("菜单编号")
+    private String code;
+
+    @Column(name = "COLOR")
+    @ApiParam("BI颜色")
+    private String color;
+
+    @Column(name = "SEQ")
+    @ApiParam("顺序")
+    private Integer seq;
+
+    @Transient
+    @ApiParam("安灯类型代码")
+    private String value;
+
+    @Transient
+    @ApiParam("安灯类型名称")
+    private String description;
+
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java

@@ -10,10 +10,7 @@ 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;
 
 /**
@@ -81,4 +78,9 @@ public class AndonMessageRecord extends BaseBean implements Serializable {
     @Column(name = "MEMO")
     @ApiParam(value = "备注")
     private String memo;
+
+    @Lob
+    @Column(name = "MESSAGE")
+    @ApiParam(value = "广播内容")
+    private String message;
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java

@@ -85,15 +85,27 @@ public class AndonRouteStatus extends BaseBean implements Serializable {
     private Long alarmRouteId;
 
     @Transient
-    @ApiParam("默认不缓存")
+    @ApiParam("状态机异常时默认不缓存")
     private boolean cacheFlag = false;
 
     @Transient
-    @ApiParam("触发组件集默认未执行")
+    @ApiParam("当前状态点的触发组件集默认未执行")
     private boolean actionAmgIdFalg = false;
 
     @Transient
-    @ApiParam("触发类型默认不需要外部触发")
+    @ApiParam("进入触发方法时默认不需要校验外部触发")
     private boolean checkTriggerTypeFalg = false;
 
+    @Transient
+    @ApiParam("每个组件执行完成根据业务设置下个触发事件，如果需要外部告知下个触发事件则设置null，一个组件集执行完毕后将这个值赋给CommonMsgModel的triggerEvent")
+    private String nextTriggerEvent;
+
+    @Transient
+    @ApiParam("在一个组件集中默认继续执行下一个组件，当组件集中一个组件执行失败或者根据业务需要跳出去进去下个状态点，则设置未false(即这个组件集中剩余的组件停止执行),同时配置下个状态点的触发事件nextTriggerEvent")
+    private boolean execNextModuleFlag = true;
+
+    @Transient
+    @ApiParam("默认异常未处理，业务异常抛出后，如果需要缓存，则设置cacheFlag为true，因为会被catch捕获，所以这里需要设置为true，避免异常重复被处理")
+    private boolean doErrorFlag = false;
+
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java

@@ -9,10 +9,7 @@ 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;
 
 /**
@@ -53,7 +50,7 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl
     public String workCenterCode;
 
     @Column(name = "WORK_CELL_CODE")
-    @ApiParam(value = "工作中心")
+    @ApiParam(value = "工作单元")
     public String workCellCode;
 
     @Column(name = "ALARM_CODE")
@@ -64,4 +61,20 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl
     @ApiParam(value = "安灯来源类型")
     private String sourceType;
 
+    @Column(name = "CACHE_FLAG")
+    @ApiParam(value = "缓存标识")
+    private Integer cacheFlag;
+
+    @Column(name = "CACHE_KEY")
+    @ApiParam(value = "缓存KEY")
+    private String cacheKey;
+
+    @Column(name = "HANDLE_TYPE")
+    @ApiParam(value = "处理方式")
+    private Integer handleType;
+
+    @Column(name = "HANDLE_STATUS")
+    @ApiParam(value = "处理状态")
+    private Integer handleStatus;
+
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java

@@ -31,6 +31,6 @@ public class AndonActionModuleGroupModel implements Serializable {
     @ApiParam("流程组件参数集合")
     private List<AndonRouteModuleParam> routeModuleParamList;
 
-    @ApiParam("区域流程组件参数集合")
+    @ApiParam("安灯流程组件参数集合")
     private List<AndonAlarmRouteModuleParam> alarmRouteModuleParamList;
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java

@@ -42,7 +42,10 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("触发事件")
     private String triggerEvent;
 
-    @ApiModelProperty("下个触发事件，一个组件集执行完毕后这个值赋给triggerEvent")
-    private String nextTriggerEvent;
+    @ApiModelProperty("缓存KEY")
+    private String cacheKey;
+
+    @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
+    private boolean errorInnerAction = false;
 
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -97,6 +97,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpLevel(), "rpLevel", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpObjectCode(), "rpObjectCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getStatusCode(), "statusCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonMessageRecord.getIsSucceed(), "isSucceed", packBean);
         if(!StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeEnd())){
             DdlPreparedPack.timeBuilder(andonMessageRecord.getCreateDateTimeStart(), andonMessageRecord.getCreateDateTimeEnd(), "createDatetime", packBean, true);
         }

modules/i3plus-pojo-aps/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -13,6 +13,83 @@ import org.apache.commons.lang3.StringUtils;
 public class AndonEnumUtil {
 
     /**
+     * 状态机异常处理方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE {
+        INNER(10, "内部处理"),
+        OUTER(20, "外部处理"),
+        REVIEW(30, "人工审核");
+
+        private int value;
+        private String description;
+
+        ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 状态机异常处理状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS {
+        TRUE(10, "已处理"),
+        FALSE(20, "未处理");
+
+        private int value;
+        private String description;
+
+        ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 状态机异常缓存标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG {
+        FALSE(10, "否"),
+        TRUE(20, "是"),
+        ORIGINAL(30, "原先");
+
+        private int value;
+        private String description;
+
+        ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * 状态机执行方法
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -1175,7 +1252,6 @@ public class AndonEnumUtil {
         }
     }
 
-
     /**
      * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测
      *

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

@@ -6036,4 +6036,116 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 校枪状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CALIBRATION_STATUS {
+        UNEXECUTED(10, "UNEXECUTED", "待执行"),
+        EXECUTE(20, "EXECUTE", "执行中"),
+        CANCEL(30, "CANCEL", "取消"),
+        FINISH(40, "FINISH", "完成");
+
+        private int value;
+        private String code;
+        private String description;
+
+        CALIBRATION_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+
+    /**
+     * 扭矩枪类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum GUN_TYPE {
+        DL(10, "DL", "小枪"),
+        PF(20, "PF", "大枪");
+
+        private int value;
+        private String code;
+        private String description;
+
+        GUN_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

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

@@ -1816,8 +1816,8 @@ public class MesPcnEnumUtil {
         BH_ORDER(40, "B&H工单"),
         JIT_ORDER(50, "JIT工单"),
         STOCK_ORDER(60, "库存工单"),
-        REPAIR(70,"返修插单"),
-        EMERGENCY_ORDER(80,"紧急插单");
+        REPAIR(70, "返修插单"),
+        EMERGENCY_ORDER(80, "紧急插单");
 
         private int value;
         private String description;
@@ -2358,16 +2358,14 @@ public class MesPcnEnumUtil {
         }
     }
 
-
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PRODUCE_SN_STATUS {
-
         CREATE(10, "创建"),
         PROCESS(20, "加工"),
         OFFLINE(30, "下线"),
         PACKAGE_SCAN(35, "打包扫描"),
         INSTOCKED(40, "入库"),
-        SHIPING(50, "发运"),
+        SHIPPING(50, "发运"),
         CLOSE(90, "关闭");
 
         private int value;
@@ -2554,7 +2552,10 @@ public class MesPcnEnumUtil {
         BUTTON("button", "按钮"),
         TABLES("tables", "多个表格"),
         CUSTOM("custom", "定制页面"),
-        FORM("form", "文本按钮");
+        CUSTOM_DIALOG("custom_dialog", "定制弹窗"),
+        FORM("form", "文本按钮"),
+        SPEC_TEXT("spec_text", "工步弹框文本"),
+        SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格");
 
         private String value;
         private String description;
@@ -3253,7 +3254,7 @@ public class MesPcnEnumUtil {
 
         GREEN("green", "绿色"),
         RED("red", "红色"),
-        YELLOW("Yellow", "黄色");
+        YELLOW("yellow", "黄色");
 
         private String code;
         private String description;
@@ -3317,6 +3318,41 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 散件IT生产队列状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SP_SHIPPING_STATUS {
+        CREATE(10, "创建"),
+        SHIPPED(20, "已发运");
+
+        private int value;
+        private String description;
+
+        SP_SHIPPING_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int 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 == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FSM_EVENT {
         TRIGGER(10, "trigger", "触发"),
@@ -3756,5 +3792,255 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+    /**
+     * 界面类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WINDOW_TYPE {
+        BUTTON_CFG(10, "按钮组件"),
+        BOARD_BASE_WINDOW(20, "看板基础页面"),
+        STEP_WINDOW(30, "工步界面");
+
+        private int value;
+        private String description;
+
+        WINDOW_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int 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 == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 校枪状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CALIBRATION_STATUS {
+        UNEXECUTED(10, "UNEXECUTED", "待执行"),
+        EXECUTE(20, "EXECUTE", "执行中"),
+        CANCEL(30, "CANCEL", "取消"),
+        FINISH(40, "FINISH", "完成");
+
+        private int value;
+        private String code;
+        private String description;
+
+        CALIBRATION_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 扭矩枪类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum GUN_TYPE {
+        DL(10, "DL", "小枪"),
+        PF(20, "PF", "大枪");
+
+        private int value;
+        private String code;
+        private String description;
+
+        GUN_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 排序校验模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CHECK_PROD_SEQ_FLAG {
+        PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"),
+        CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"),
+        OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"),
+        ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序");
+
+        private int value;
+        private String code;
+        private String description;
+
+        CHECK_PROD_SEQ_FLAG(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String codeOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 生产异常操作记录
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCE_ERROR_RECORD {
+        JUMP_PROCESS(10, "跳过工序"),
+        JUMP_STEP(20, "跳过工步"),
+        JUMP_STATE(30, "跳过状态点");
+
+        private int value;
+        private String description;
+
+        PRODUCE_ERROR_RECORD(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int 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 == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 
 }

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

@@ -14,14 +14,14 @@ public class PtlEnumUtil {
      * 流程状态-触发类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum TRIGGER_TYPE {
+    public enum ROUTE_STATUS_TRIGGER_TYPE {
         INNER_TRIGGER(10, "内部触发"),
         OUTER_TRIGGER(20, "外部触发");
 
         private int value;
         private String description;
 
-        TRIGGER_TYPE(int value, String description) {
+        ROUTE_STATUS_TRIGGER_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -73,17 +73,16 @@ public class PtlEnumUtil {
      * 组件状态类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum STATUS_TYPE {
+    public enum ROUTE_STATUS_TYPE {
         START(10, "START", "开始状态"),
         EXECUTING(20, "EXECUTING", "执行中状态"),
-        TERMINATE(30, "TERMINATE", "中断状态"),
-        FINISH(40, "FINISH", "完成状态");
+        FINISH(30, "FINISH", "完成状态");
 
         private int value;
         private String code;
         private String description;
 
-        STATUS_TYPE(int value, String code, String description) {
+        ROUTE_STATUS_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;

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

@@ -654,14 +654,14 @@ public class PtlPcnEnumUtil {
      * 流程状态-触发类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum TRIGGER_TYPE {
+    public enum ROUTE_STATUS_TRIGGER_TYPE {
         INNER_TRIGGER(10, "内部触发"),
         OUTER_TRIGGER(20, "外部触发");
 
         private int value;
         private String description;
 
-        TRIGGER_TYPE(int value, String description) {
+        ROUTE_STATUS_TRIGGER_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -931,17 +931,16 @@ public class PtlPcnEnumUtil {
      * 组件状态类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum STATUS_TYPE {
+    public enum ROUTE_STATUS_TYPE {
         START(10, "START", "开始状态"),
         EXECUTING(20, "EXECUTING", "执行中状态"),
-        TERMINATE(30, "TERMINATE", "中断状态"),
-        FINISH(40, "FINISH", "完成状态");
+        FINISH(30, "FINISH", "完成状态");
 
         private int value;
         private String code;
         private String description;
 
-        STATUS_TYPE(int value, String code, String description) {
+        ROUTE_STATUS_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;

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

@@ -531,4 +531,119 @@ public class SwebEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 移库单业务类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OUT_MOVEMENT_BUSI_TYPE {
+        PRODUCTION_MATERIAS(10, "PROD_MATERIALS", "生产领料"),
+        CUSTOMER_SHPING(20, "CUS_SHPING", "客户发运"),
+        OUTWARD_SHIPMENT(30, "OUT_SHIPMENT", "委外发运"),
+        ALLOCATION(40, "ALLOCATION", "调拨"),
+        SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"),
+        SCATTERED_IN(60, "SCATTERED_IN", "零星入库"),
+        NC_WAREHOSING_IN(70, "NC_WAREHOSING", "NC入库"),
+        SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"),//默认DMR
+        CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"),
+        PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"),
+        INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"),
+        SCRAPPING_OUT(120, "SCRAPPING_OUT", "报废出库"),
+        RECEIVING_IN(130, "RECEIVING_IN", "收货入库"),
+        OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"),
+        NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库"),
+        SUPPLIER_RETURN_SMRR(190, "SUPPLIER_RETURN_SMRR", "供应商退货(SMRR)"),
+        NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"),
+        NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"),
+        LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"),
+        ASN(200, "ASN", "ASN"),
+        PO(210, "PO", "PO"),
+        QC(220, "QC", "QC"),
+        AMPR(230, "AMPR", "AMPR"),
+        FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"),
+        VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"),
+        VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"),
+        VDA_PICKING_GOODS(270, "VDA_PICKING_GOODS", "VDA生产领料"),
+        VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料"),
+        VDA_QC(290, "VDA_QC", "VDA质检"),
+        VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"),
+        VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"),
+        KT_RECEPTION(320, "KT_RECEPTION", "KT让步接收"),
+        KT_SCRAP(330, "KT_SCRAP", "KT报废"),
+        KT_QUARANTINE(340, "KT_QUARANTINE", "KT隔离"),
+        KT_BACK_QUARANTINE(350, "KT_BACK_QUARANTINE", "KT反隔离"),
+        KT_DEFINITE_FAIL(360, "KT_DEFINITE_FAIL", "KT不合格"),
+        KT_RETURN(370, "KT_RETURN", "KT退货"),
+        KT_REWORK(380, "KT_REWORK", "KT返工"),
+        KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"),
+        KT_SORTING(400, "KT_SORTING", "KT分选"),
+        VDA_STATIC_CS(410, "VDA_STATIC_CS", "静态盘点"),
+        VDA_CS_SEARCH(420, "VDA_CS_SEARCH", "VDA盘点查询"),
+        KT_DEFINITE(430, "KT_DEFINITE", "KT合格"),
+        VDA_PACKAGE_MANAGE(440, "VDA_PACKAGE_MANAGE", "VDA编组管理"),
+        KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"),
+        KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),
+        FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"),
+        KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"),
+        PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"),
+        UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
+        TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
+        EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
+        LOADING_ORDER(530, "LOADING_ORDER", "装车单");
+        private int value;
+        private String code;
+        private String description;
+
+        OUT_MOVEMENT_BUSI_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String codeOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

modules/i3plus-pojo-form/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-hardswitch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-ics/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-jobflow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-lac/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mdm/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mes/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -27,7 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "if_queue_shipping")
+@Table(name = "IF_QUEUE_SHIPPING")
 @Api("JIT发运数据同步")
 public class IfQueueShipping extends BaseBean implements Serializable {
 	private static final long serialVersionUID = -3385698810529084423L;
@@ -105,4 +105,20 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 	@ApiParam("接口代码")
 	private String ifCode;
 
+	@Column(name = "ITEM_PART_NO")
+	@ApiParam("原材料物料号")
+	private String itemPartNo;
+
+	@Column(name = "ITEM_PART_NAME")
+	@ApiParam("原材料物料名称")
+	private String itemPartName;
+
+	@Column(name = "ITEM_QTY")
+	@ApiParam("原材料物料用量")
+	private Double itemQty;
+
+	@Column(name = "ITEM_UNIT")
+	@ApiParam("原材料物料用量")
+	private String itemUnit;
+
 }

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

@@ -0,0 +1,63 @@
+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.*;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate:
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BLIND_HISTORY")
+@Api("MES_盲检记录")
+public class MesBlindHistory extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -7459452475180601499L;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "BLIND_OBJECT")
+    @ApiParam("盲检对象")
+    private String blindObject;
+
+    @Column(name = "BLIND_ITEM")
+    @ApiParam("盲检问题")
+    private String blindItem;
+
+    @Column(name = "SYSTEM_ANSWER")
+    @ApiParam("系统答案")
+    private String systemAnswer;
+
+    @Column(name = "CHOOSED_ANSWER")
+    @ApiParam("选中答案")
+    private String choosedAnswer;
+
+    @Column(name = "CHECKED")
+    @ApiParam("是否一致")
+    private Integer checked;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+}

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

@@ -0,0 +1,65 @@
+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: jessica.chen
+ * @CreateDate:
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BLIND_RULE")
+@Api("MES_盲检规则")
+public class MesBlindRule extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -7459452475180601498L;
+
+    @Column(name = "RULE_ID")
+    @ApiParam("匹配规则ID")
+    private String ruleId;
+
+    @Column(name = "CAR_TYPE")
+    @ApiParam("车辆类型")
+    private String carType;
+
+    @Column(name = "CAR_COLOR")
+    @ApiParam("车辆颜色")
+    private String carColor;
+
+    @Column(name = "PART_CODE")
+    @ApiParam("零件号")
+    private String partCode;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("零件名称")
+    private String partName;
+
+    @Column(name = "CAR_CONFIG")
+    @ApiParam("配置")
+    private String carConfig;
+
+    @Column(name = "CAR_LEVEL")
+    @ApiParam("等级")
+    private String carLevel;
+
+    @Column(name = "PART_COLOR")
+    @ApiParam("零件颜色")
+    private String partColor;
+
+}

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

@@ -0,0 +1,65 @@
+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: jessica.chen
+ * @CreateDate:
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BLIND_TOPIC_SETTING")
+@Api("MES_盲检问题设置")
+public class MesBlindTopicSetting extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -7459452475180601497L;
+
+    @Column(name = "TOPIC_ID")
+    @ApiParam("序号")
+    private String topicId;
+
+    @Column(name = "TOPIC_CODE")
+    @ApiParam("题目编号")
+    private String topicCode;
+
+    @Column(name = "TOPIC_DESC")
+    @ApiParam("题目描述")
+    private String topicDesc;
+
+    @Column(name = "TOPIC_OBJECT")
+    @ApiParam("零件名称")
+    private String topicObject;
+
+    @Column(name = "TOPIC_TYPE")
+    @ApiParam("盲检类型")
+    private Integer topicType;
+
+    @Column(name = "QTY")
+    @ApiParam("答案数量")
+    private Integer qty;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+}

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

@@ -62,6 +62,10 @@ public class MesEsop extends BaseBean implements Serializable {
     @ApiParam("文件id")
     private Long fileId;
 
+    @Column(name = "ESOP_URL")
+    @ApiParam("文件路径")
+    private String esopUrl;
+
     @Transient
     @ApiParam("文件名称")
     private String fileName;
@@ -90,4 +94,8 @@ public class MesEsop extends BaseBean implements Serializable {
     @ApiParam("同步标记")
     private Integer syncTag = 0;
 
+    @Transient
+    @ApiParam("过程条码")
+    private String serialNumber;
+
 }

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

@@ -0,0 +1,81 @@
+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 javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/5/27 2:20 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_GUN_CALIBRATION_RECORD")
+@Api("校枪记录表")
+public class MesGunCalibrationRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6166370020956801528L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "GUN_CODE")
+    @ApiParam("枪号")
+    private String gunCode;
+
+    @Column(name = "CUN_TYPE")
+    @ApiParam("扭矩枪类型")
+    private String cunType;
+
+    @Column(name = "PSET_CODE")
+    @ApiParam("PSET号")
+    private String psetCode;
+
+    @Column(name = "EXPECT_COUNT")
+    @ApiParam("设定枪数")
+    private Integer expectCount;
+
+    @Column(name = "REAL_COUNT")
+    @ApiParam("实际枪叔")
+    private Integer realCount;
+
+    @Column(name = "CALIBRATION_STATUS")
+    @ApiParam("校枪状态")
+    private Integer calibrationStatus;
+
+    @Column(name = "START_TIME")
+    @ApiParam("开始校枪时间")
+    private String startTime;
+
+    @Column(name = "END_TIME")
+    @ApiParam("结束校枪时间")
+    private String endTime;
+
+    @Transient
+    @ApiParam("校枪状态名称")
+    private String calibrationStatusName;
+
+    @Transient
+    @ApiParam("界面编号")
+    private String windowNo;
+}

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

@@ -0,0 +1,67 @@
+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;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/5/28 14:32
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PRODUCE_ERROR_RECORD")
+@Api("生产异常操作记录")
+public class MesProduceErrorRecord extends BaseBean {
+    private static final long serialVersionUID = 209753108845613052L;
+
+    @Column(name = "ERROR_TYPE")
+    @ApiParam("异常类型 10:工序跳过 20:工步跳过")
+    private Integer errorType;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位代码")
+    private String workCellCode;
+
+    @Column(name = "PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @Column(name = "STEP_CODE")
+    @ApiParam("工步代码")
+    private String stepCode;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam("状态点代码")
+    private String statusCode;
+
+
+}

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

@@ -70,4 +70,12 @@ public class MesQueueShippingDetail extends BaseBean implements Serializable {
     @Column(name = "qty")
     @ApiParam("数量")
     private Double qty;
+
+    @Column(name = "SEQ")
+    @ApiParam("队列明细序号")
+    private Double seq;
+
+    @Column(name = "PRODUCE_COLOR")
+    @ApiParam("产品颜色")
+    private Double produceColor;
 }

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

@@ -1,12 +1,20 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
 @Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class ButtonBean implements Serializable {
+    private static final long serialVersionUID = -4012120630477190414L;
+
     @ApiParam(value = "按钮代码")
     private String buttonCode;
 

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+* @Description : 盲检问题清单
+* @Reference :
+* @author: jessica.chen
+* @date: 2020/4/16 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="盲检问题清单",description = "盲检问题清单")
+public class MesBlindProbleModel extends BaseBean {
+
+    private static final long serialVersionUID = 5790342327875844345L;
+    @ApiParam(value = "零件名称")
+    private String partName;
+
+    @ApiParam(value = "提问内容")
+    private String questionContents;
+
+    @ApiParam(value = "答案集合")
+    private List<String> answerList;
+
+    @ApiParam(value = "正确答案")
+    private String rightKey;
+}

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

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+* @Description : 盲检规则模板
+* @Reference :
+* @author: jessica.chen
+* @date: 2020/4/16 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="盲检规则模板",description = "盲检规则模板")
+public class MesBlindRuleModel extends BaseBean {
+
+    private static final long serialVersionUID = 5790342327875844321L;
+    @ApiParam(value = "车辆类型")
+    @AnnoOutputColumn
+    private String carType;
+
+    @ApiParam(value = "车辆颜色")
+    @AnnoOutputColumn
+    private String carColor;
+
+    @ApiParam(value = "零件号")
+    private String partCode;
+
+    @ApiParam(value = "零件名称")
+    @AnnoOutputColumn
+    private String partName;
+
+    @ApiParam(value = "配置")
+    @AnnoOutputColumn
+    private String carConfig;
+
+    @ApiParam(value = "等级")
+    @AnnoOutputColumn
+    private String carLevel;
+
+    @ApiParam(value = "零件颜色")
+    @AnnoOutputColumn
+    private String partColor;
+
+    @ApiParam(value = "下标")
+    @AnnoOutputColumn
+    private Integer index;
+
+}

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

@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueShippingDetail;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/5/26 18:59
+ * @desc
+ */
+@Data
+@Api("散件队列发运model")
+public class SpQueueShippingModel {
+
+    @ApiParam("队列编号")
+    private String jitNo;
+
+    @ApiParam("vin")
+    private String vin;
+
+    @ApiParam("车号")
+    private String carNo;
+
+    @ApiParam("等级代码")
+    private String gradeCode;
+
+    @ApiParam("产品颜色")
+    private Double produceColor;
+
+}

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

@@ -132,6 +132,12 @@ public class StationRequestBean implements Serializable {
     @ApiParam("客户工厂代码")
     private String customerFactoryCode;
 
+    @ApiParam("工步弹框参数")
+    private String stepDialogParam;
+
+    @ApiParam("工步弹框状态")
+    private Boolean stepDialogStatus = false;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

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

@@ -52,4 +52,7 @@ public class StationResultBean<T> implements Serializable {
 
     @ApiParam("多个数据集")
     private List<StationResultBean<T>> stationResultBeans;
+
+    @ApiParam("定制页面名称")
+    private String customPageName;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBlindHistoryRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBlindHistory;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesBlindHistoryRepository extends BaseRepository<MesBlindHistory, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBlindRuleRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBlindRule;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesBlindRuleRepository extends BaseRepository<MesBlindRule, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBlindTopicSettingRepository.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.MesBlindHistory;
+import cn.estsh.i3plus.pojo.mes.bean.MesBlindTopicSetting;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesBlindTopicSettingRepository extends BaseRepository<MesBlindTopicSetting, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesGunCalibrationRecordRepository.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesGunCalibrationRecord;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/5/27 2:39 下午
+ * @Modify:
+ */
+public interface MesGunCalibrationRecordRepository extends BaseRepository<MesGunCalibrationRecord, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceErrorRecordRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceErrorRecord;
+
+/**
+ * @Description :IF_JIT发运数据
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2020-03-06 10:57 上午
+ * @Modify:
+ **/
+public interface MesProduceErrorRecordRepository extends BaseRepository<MesProduceErrorRecord, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2887,4 +2887,53 @@ public class MesHqlPack {
         getStringBuilderPack(details, result);
         return result;
     }
+
+//    public static DdlPackBean getMesBlindRule(MesBlindRule mesBlindRule) {
+//        DdlPackBean packBean = getAllBaseData(mesBlindRule.getOrganizeCode());
+//        DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarType(), "carType", packBean);
+//        DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarColor(), "carColor", packBean);
+//        DdlPreparedPack.getStringLikerPack(mesBlindRule.getPartCode(), "partCode", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartName(), "partName", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarConfig(), "carConfig", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarLevel(), "carLevel", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartColor(), "partColor", packBean);
+//        DdlPreparedPack.getNumEqualPack(mesBlindRule.getIsValid(), "isValid", packBean);
+//        return packBean;
+//    }
+
+//    public static DdlPackBean getMesBlindTopicSetting(MesBlindTopicSetting mesBlindTopicSetting) {
+//        DdlPackBean packBean = getAllBaseData(mesBlindTopicSetting.getOrganizeCode());
+//        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicCode(), "topicCode()", packBean);
+//        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicDesc(), "topicDesc", packBean);
+//        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getWorkCellCode(), "workCellCode", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindTopicSetting.getWorkCenterCode(), "workCenterCode", packBean);
+//        DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getIsValid(), "isValid", packBean);
+//        return packBean;
+//    }
+
+    /**
+     * MES 校枪记录
+     *
+     * @param gunCalibrationRecord
+     * @return
+     */
+    public static DdlPackBean getMesGunCalibrationRecord(MesGunCalibrationRecord gunCalibrationRecord, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(gunCalibrationRecord, organizeCode);
+        if (!StringUtils.isEmpty(gunCalibrationRecord.getWorkCellCode())) {
+            DdlPreparedPack.getStringEqualPack(gunCalibrationRecord.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (!StringUtils.isEmpty(gunCalibrationRecord.getGunCode())) {
+            DdlPreparedPack.getStringEqualPack(gunCalibrationRecord.getGunCode(), "gunCode", packBean);
+        }
+        if (gunCalibrationRecord.getCalibrationStatus() != null) {
+            DdlPreparedPack.getNumEqualPack(gunCalibrationRecord.getCalibrationStatus(), "calibrationStatus", packBean);
+        }
+        if (!StringUtils.isEmpty(gunCalibrationRecord.getStartTime())) {
+            DdlPreparedPack.getStringBiggerPack(gunCalibrationRecord.getStartTime(), "startTime", packBean);
+        }
+        if (!StringUtils.isEmpty(gunCalibrationRecord.getStartTime())) {
+            DdlPreparedPack.getStringSmallerPack(gunCalibrationRecord.getEndTime(), "endTime", packBean);
+        }
+        return packBean;
+    }
 }

modules/i3plus-pojo-model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
 import java.io.Serializable;
 
 /**
@@ -63,7 +62,7 @@ public class TorqueCollectionModel implements Serializable {
     private Integer pest8;
 
     @ApiParam("扭矩枪编号")
-    private String torqueNo;
+    private Integer torqueNo;
 
     @ApiParam("PEST号")
     private Integer pestNum;
@@ -101,10 +100,63 @@ public class TorqueCollectionModel implements Serializable {
     @ApiParam("组合码")
     private String groupCode;
 
+    @ApiParam("是否黄枪")
+    private Integer isYellowGun;
+
+    /**
+     * 大枪查询结果构造方法
+     * @param vinCode
+     * @param prodCfgTypeCode
+     * @param gradeCode
+     * @param colorCode
+     * @param partNo
+     * @param partName
+     * @param torqueNo
+     * @param checkScanCount
+     * @param sendSeq
+     * @param yellowGunRule
+     * @param isEndSeq
+     * @param groupCode
+     */
+    public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo,
+                                 String partName, Integer torqueNo, Integer checkScanCount, Integer sendSeq,
+                                 Integer yellowGunRule, Integer isEndSeq, String groupCode) {
+        this.vinCode = vinCode;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.gradeCode = gradeCode;
+        this.colorCode = colorCode;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.torqueNo = torqueNo;
+        this.checkScanCount = checkScanCount;
+        this.sendSeq = sendSeq;
+        this.yellowGunRule = yellowGunRule;
+        this.isEndSeq = isEndSeq;
+        this.groupCode = groupCode;
+    }
+
+    /**
+     * 小枪结果数据构造方法
+     * @param vinCode
+     * @param prodCfgTypeCode
+     * @param gradeCode
+     * @param colorCode
+     * @param partNo
+     * @param partName
+     * @param pest1
+     * @param pest2
+     * @param pest3
+     * @param pest4
+     * @param pest5
+     * @param pest6
+     * @param pest7
+     * @param pest8
+     * @param torqueNo
+     */
     public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode,
                                  String colorCode, String partNo, String partName, Integer pest1, Integer pest2,
                                  Integer pest3, Integer pest4, Integer pest5, Integer pest6, Integer pest7, Integer pest8,
-                                 String torqueNo, Integer checkScanCount, Integer sendSeq, Integer yellowGunRule, Integer isEndSeq, String groupCode) {
+                                 Integer torqueNo) {
         this.vinCode = vinCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.gradeCode = gradeCode;
@@ -120,10 +172,5 @@ public class TorqueCollectionModel implements Serializable {
         this.pest7 = pest7;
         this.pest8 = pest8;
         this.torqueNo = torqueNo;
-        this.checkScanCount = checkScanCount;
-        this.sendSeq = sendSeq;
-        this.yellowGunRule = yellowGunRule;
-        this.isEndSeq = isEndSeq;
-        this.groupCode = groupCode;
     }
 }

modules/i3plus-pojo-platform/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java

@@ -53,6 +53,15 @@ public class SysLogSystem extends BaseBean {
         return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
     }
 
+    @Indexed
+    @Column(name="LOG_MODULE_ID")
+    @ApiParam(value ="系统模块（枚举）", example = "1")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
+    private Integer logModuleId;
+    public String getLogModuleId() {
+        return logModuleId == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(logModuleId);
+    }
+
     @Column(name="REMOTE_IP")
     @ApiParam(value ="请求IP" , access ="请求IP")
     private String remoteIp;

modules/i3plus-pojo-ptl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java

@@ -85,8 +85,20 @@ public class PtlRouteStatus extends BaseBean implements Serializable {
     private boolean actionAmgIdFalg = false;
 
     @Transient
-    @ApiParam("触发组件集默认未执行")
+    @ApiParam("触发类型默认不需要外部触发")
     private boolean checkTriggerTypeFalg = false;
 
+    @Transient
+    @ApiParam("组件执行完成根据业务设置下个触发事件，如果是外部告知下个触发事件则设置null，一个组件集执行完毕后这个值赋给CommonMsgModel的triggerEvent")
+    private String nextTriggerEvent;
+
+    @Transient
+    @ApiParam("默认继续执行下个组件，当组件集中一个组件根据业务需要跳出去进去下个状态点，则设置未false,同时配置下个状态点的触发事件nextTriggerEvent")
+    private boolean execNextModuleFlag = true;
+
+    @Transient
+    @ApiParam("默认异常未处理")
+    private boolean doErrorFlag = false;
+
 
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java

@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.ptl.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.Lob;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "PTL_ROUTE_STATUS_ERROR_RECORD")
+@EqualsAndHashCode(callSuper = true)
+@Api("流程状态异常记录")
+public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4507582337334278877L;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @Column(name = "TASK_NO")
+    @ApiParam("主任务编号")
+    private String taskNo;
+
+    @Column(name = "ERROR_DESC")
+    @ApiParam(value = "失败描述")
+    public String errorDesc;
+
+    @Column(name = "AREA_NO")
+    @ApiParam("区域代码")
+    private String areaNo;
+
+    @Column(name = "CACHE_FLAG")
+    @ApiParam(value = "缓存标识")
+    private Integer cacheFlag;
+
+    @Lob
+    @Column(name = "CONTENT")
+    @ApiParam(value = "内容")
+    private String content;
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.ptl.model;
 
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -31,9 +30,6 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("消息类型")
     private String msgType;
 
-    @ApiModelProperty("是否重试")
-    private Integer isRestart= CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
-
     @ApiModelProperty("消息数据")
     private Map<String, Object> msgData;
 
@@ -52,4 +48,7 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("外部触发事件")
     private String triggerEvent;
 
+    @ApiModelProperty("流程类型")
+    private Integer routeType;
+
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteStatusErrorRecordRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteStatusErrorRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface PtlRouteStatusErrorRecordRepository extends BaseRepository<PtlRouteStatusErrorRecord, Long> {
+}

modules/i3plus-pojo-report/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-softswitch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-sweb/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java

@@ -0,0 +1,162 @@
+package cn.estsh.i3plus.pojo.sweb.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.ColumnDefault;
+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.Version;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-27
+ * @Modify:
+ **/
+@Data
+@Table(name = "SWEB_DOC_MOVEMENT_DETAILS")
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("移库单-明细")
+public class SwebDocMovementDetails extends BaseBean {
+    private static final long serialVersionUID = -1232334350341792942L;
+
+    @ApiParam("供应商编号")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
+
+    @Column(name = "DEST_AREA_NO")
+    @ApiParam("目的库存地代码")
+    public String destAreaNo;
+
+    @Column(name = "DEST_WH_NO")
+    @ApiParam("目标仓库代码")
+    public String destWhNo;
+
+    @Column(name = "DEST_ZONE_NO")
+    @ApiParam("目标存储区代码")
+    public String destZoneNo;
+
+    @Column(name = "DEST_LOCATE_NO")
+    @ApiParam("目标库位代码")
+    public String destLocateNo;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "移库单单号")
+    private String orderNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public String item;
+
+    /**
+     * 是否免费:0=计费,1=免费
+     */
+    @Column(name = "IS_FREE")
+    @ApiParam(value = "是否免费", example = "1")
+    public Integer isFree;
+
+    /**
+     * 状态:N=正常,C=行取消
+     */
+    @Column(name = "ITEM_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    private Integer itemStatus;
+
+    @Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "已拣货数量", example = "1")
+    private Double pickQty;
+
+    @Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "已出库数量", example = "1")
+    private Double outQty;
+
+    @Column(name = "REC_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "已收货数量", example = "1")
+    private Double recQty;
+
+    @Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "已移库数量", example = "1")
+    private Double moveQty;
+
+    @Column(name = "PLAN_DATE")
+    @ApiParam(value = "计划日期")
+    private String planDate;
+
+    @Column(name = "PLAN_TIME")
+    @ApiParam(value = "计划时间")
+    private String planTime;
+
+    @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "条码打印数量", example = "1")
+    private Double printQty;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "需求数量", example = "0")
+    public Double qty;
+
+    @Column(name = "REMARK")
+    @ApiParam(value = "操作原因")
+    private String remark;
+
+    @Column(name = "SRC_AREA_NO")
+    @ApiParam("源库存地代码")
+    public String srcAreaNo;
+
+    @Column(name = "SRC_WH_NO")
+    @ApiParam("源仓库代码")
+    public String srcWhNo;
+
+    @Column(name = "SRC_ZONE_NO")
+    @ApiParam("源存储区代码")
+    public String srcZoneNo;
+
+    @Column(name = "SRC_LOCATE_NO")
+    @ApiParam("源库位代码")
+    public String srcLocateNo;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public transient Integer lockVersion;
+
+    @Column(name = "IS_SN")
+    @ApiParam(value = "条码生成状态", example = "20")
+    public Integer isSn;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("批次")
+    public String lotNo;
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java

@@ -0,0 +1,149 @@
+package cn.estsh.i3plus.pojo.sweb.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;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-27
+ * @Modify:
+ **/
+@Data
+@Table(name = "SWEB_DOC_MOVEMENT_MASTER")
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("移库单-主表")
+public class SwebDocMovementMaster extends BaseBean {
+
+    private static final long serialVersionUID = -4539662053206835169L;
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "移库单单号")
+    private String orderNo;
+
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    public String busiType;
+
+    @Column(name = "CAR_NO")
+    @ApiParam(value = "车牌号")
+    private String carNo;
+
+    @Column(name = "CUST_NO")
+    @ApiParam(value = "客户编号")
+    private String custNo;
+
+    @Column(name = "CUST_ORDER_NO")
+    @ApiParam(value = "客户单号")
+    private String custOrderNo;
+
+    @Column(name = "ERP_SRC_NO")
+    @ApiParam(value = "ERP单号")
+    private String erpSrcNo;
+
+    @Column(name = "IS_TASK")
+    @ApiParam(value = "是否生产任务", example = "1")
+    public Integer isTask;
+
+    @Column(name = "IS_PART")
+    @ApiParam(value = "是否散件", example = "1")
+    private Integer isPart;
+
+    /**
+     * 移动类型:IN=入库,OUT=出库,MOVE=移库
+     */
+    @Column(name = "MOVE_TYPE")
+    @ApiParam("移动类型")
+    public Integer moveType;
+
+    /**
+     * 状态:0=新建,10=处理中
+     * ,20=已完成,90=已关闭,91=已取消
+     */
+    @Column(name = "ORDER_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    public Integer orderStatus;
+
+    @Column(name = "PRIORITY")
+    @ApiParam(value = "优先级", example = "1")
+    public Integer priority;
+
+    /**
+     * 关联单据类型:1=ASN,10=PO,20=SO
+     */
+    @Column(name = "REF_TYPE")
+    @ApiParam(value = "关联单据类型")
+    private String refType;
+
+    @Column(name = "REF_NO")
+    @ApiParam(value = "关联单据")
+    private String refNo;
+
+    @ApiParam("供应商编号")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
+
+    @Column(name = "VERSION")
+    @ApiParam(value = "版本", example = "1")
+    private Integer version;
+
+    @Column(name = "TAG")
+    @ApiParam(value = "标签")
+    private String tag;
+
+    @Column(name = "FLAG_NO")
+    @ApiParam(value = "客户发往地编号")
+    private String flagNo;
+
+    @Column(name = "PRINT_STATUS")
+    @ApiParam("打印状态")
+    private Integer printStatus;
+
+    @Column(name = "IS_SN")
+    @ApiParam("打印状态")
+    private Integer isSn;
+
+    @Column(name = "DEST_WH_NO")
+    @ApiParam("目的仓库代码")
+    private String destWhNo;
+
+    @Column(name = "DEST_ZONE_NO")
+    @ApiParam("目的存储区代码")
+    private String destZoneNo;
+
+    @Column(name = "PLAN_DATE")
+    @ApiParam("计划日期")
+    private String planDate;
+
+    @Column(name = "PLAN_TIME")
+    @ApiParam("计划时间")
+    private String planTime;
+
+    @Column(name = "SRC_WH_NO")
+    @ApiParam("源仓库代码")
+    private String srcWhNo;
+
+    @Column(name = "SRC_ZONE_NO")
+    @ApiParam("源存储区代码")
+    private String srcZoneNo;
+
+    @Column(name = "SHIP_TIME")
+    @ApiParam(value = "发运时间")
+    private String shipTime;
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java

@@ -0,0 +1,85 @@
+package cn.estsh.i3plus.pojo.sweb.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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-27
+ * @Modify:
+ **/
+@Data
+@Table(name = "SWEB_DOC_MOVEMENT_SN")
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("移库单-条码")
+public class SwebDocMovementSn extends BaseBean {
+
+    private static final long serialVersionUID = -8545031740048178867L;
+    @Column(name="ORDER_NO")
+    @ApiParam("订单号")
+    public String orderNo;
+
+    @Column(name="ITEM")
+    @ApiParam("行号")
+    public String item;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name="QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "数量", example = "0")
+    public Double qty;
+
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    /**
+     * 状态：操作状态  itemStatus
+     */
+    @Column(name="SN_STATUS")
+    @ApiParam(value = "操作状态", example = "10")
+    public Integer snStatus;
+
+    @Column(name="SN")
+    @ApiParam("条码")
+    public String sn;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    public String vendorNo;
+
+    @Column(name = "SN_TYPE")
+    @ApiParam(value = "条码类型")
+    private Integer snType;
+
+    @ApiParam("供应商编号")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebMovementToWms.java

@@ -0,0 +1,99 @@
+package cn.estsh.i3plus.pojo.sweb.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SWEB_MOVEMENT_TO_WMS")
+@Api("库存移动单处理成功后的记录")
+public class SwebMovementToWms extends BaseBean {
+    private static final long serialVersionUID = -8089219927352225317L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public String item;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "需求数量", example = "0")
+    public Double qty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name = "SRC_WH_NO")
+    @ApiParam("源仓库代码")
+    public String srcWhNo;
+
+    @Column(name = "DEST_ZONE_NO")
+    @ApiParam("目标存储区代码")
+    public String destZoneNo;
+
+    /**
+     * 移动类型:IN=入库,OUT=出库,MOVE=移库
+     */
+    @Column(name = "MOVE_TYPE")
+    @ApiParam("移动类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer moveType;
+    /**
+     * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
+     * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
+     * MI=移库入库,MO=移库出库,SO=发运
+     */
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer busiType;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer itemStatus;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoToWms.java

@@ -0,0 +1,97 @@
+package cn.estsh.i3plus.pojo.sweb.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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SWEB_PO_TO_WMS")
+@Api("库存移动单处理成功后的记录")
+public class SwebPoToWms extends BaseBean {
+
+    private static final long serialVersionUID = -3999194389200855165L;
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "VERSION")
+    @ApiParam("版本")
+    public String version;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    private Integer item;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
+    @ColumnDefault("0")
+    @ApiParam(value = "需求数量", example = "0")
+    private Double qty;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商")
+    private String vendorNo;
+
+    @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
+    @ColumnDefault("0")
+    @ApiParam(value = "条码打印数量", example = "0")
+    private Double printQty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    private String unit;
+
+    @Column(name = "PLAN_DATE")
+    @ApiParam("计划交货日期")
+    private String planDate;
+
+    @Column(name = "PLAN_TIME")
+    @ApiParam("计划交货时间")
+    private String planTime;
+
+    @Column(name = "ERP_AREA_NO")
+    @ApiParam("默认收货库存地")
+    private String erpAreaNo;
+
+    @Column(name = "SNP", columnDefinition = "decimal(18,8)")
+    @ApiParam("标准包装")
+    private Double snp;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer itemStatus;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java

@@ -68,9 +68,9 @@ public class SwebPurchaseOrderSn extends BaseBean {
     @ApiParam(value = "序列号")
     private String serialNo;
 
-    @Column(name = "BAR_CODE")
+    @Column(name = "SN")
     @ApiParam(value = "箱条码")
-    private String barCode;
+    private String sn;
 
     @Column(name = "ERP_WAREHOUSE")
     @ApiParam("库存地")

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsMovementToSweb.java

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.sweb.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_MOVEMENT_TO_SWEB")
+@Api("库存移动单处理成功后的记录")
+public class WmsMovementToSweb extends BaseBean {
+    private static final long serialVersionUID = 49215041475324487L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer itemStatus;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsPoToSweb.java

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.sweb.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;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PO_TO_SWEB")
+@Api("库存移动单处理成功后的记录")
+public class WmsPoToSweb extends BaseBean {
+    private static final long serialVersionUID = 4710841067412420270L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer itemStatus;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebMovementModel.java

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.sweb.modelbean;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class SwebMovementModel {
+
+    @ApiParam(value = "工厂代码")
+    private String organizeCode;
+
+    @ApiParam(value = "物料号")
+    private String partNo;
+
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @ApiParam(value = "需求数量")
+    private Double qty;
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java

@@ -61,4 +61,8 @@ public class SwebPOForPubListResultItemModel extends BaseBean {
     @Transient
     @ApiParam(value = "是否可编辑（前端使用）")
     public boolean isSet = false;
+
+    @Transient
+    @ApiParam(value = "预计到货日期")
+    public String expectedTime;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebDocMovementDetailsRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebDocMovementDetails;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SwebDocMovementDetailsRepository extends BaseRepository<SwebDocMovementDetails, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebDocMovementMasterRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebDocMovementMaster;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SwebDocMovementMasterRepository extends BaseRepository<SwebDocMovementMaster, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebDocMovementSnRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebDocMovementSn;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SwebDocMovementSnRepository extends BaseRepository<SwebDocMovementSn, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebMovementToWmsRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebMovementToWms;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SwebMovementToWmsRepository extends BaseRepository<SwebMovementToWms, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPoToWmsRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebPoToWms;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SwebPoToWmsRepository extends BaseRepository<SwebPoToWms, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsMovementToSwebRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.WmsMovementToSweb;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface WmsMovementToSwebRepository extends BaseRepository<WmsMovementToSweb, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsPoToSwebRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.WmsPoToSweb;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface WmsPoToSwebRepository extends BaseRepository<WmsPoToSweb, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.SwebEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.sweb.bean.*;
 import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel;
 import org.apache.commons.lang3.StringUtils;
@@ -48,8 +49,10 @@ public class SwebHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
+        if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) {
             DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
                     purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);
+        }
         DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(purchaseOrder, result);
@@ -171,4 +174,22 @@ public class SwebHqlPack {
         DdlPreparedPack.getNumNOEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result);
         return buildHql(details, result);
     }
+
+    public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
+        return buildHql(master, result);
+    }
+
+    public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result);
+        DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result);
+        DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
+        return buildHql(details, result);
+    }
 }

modules/i3plus-pojo-wms/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java

@@ -9,7 +9,8 @@ public class WmsInterfaceEnumUtil {
         SAP2WMS(10, "SAP2WMS", "SAP --> WMS"),
         WMS2SAP(20, "WMS2SAP", "WMS --> SAP"),
         MES2WMS(30, "MES2WMS", "MES --> WMS"),
-        WMS2MES(40, "WMS2MES", "WMS --> MES");
+        WMS2MES(40, "WMS2MES", "WMS --> MES"),
+        SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS");
 
         private int value;
         private String name;

modules/i3plus-pojo-workflow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
+    <version>1.0-DEV-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>