Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-aps/pom.xml

@@ -13,6 +13,7 @@
     <artifactId>i3plus-pojo-aps</artifactId>
     <packaging>jar</packaging>
 
+
     <dependencies>
         <dependency>
             <groupId>i3plus.pojo</groupId>

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -82,7 +82,8 @@ public abstract class BaseBean implements Serializable {
     @Column(name="CREATE_USER",updatable = false)
     @ApiParam(value = "创建用户")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
+            isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name")
     public String createUser;
 
     @Indexed(direction = IndexDirection.DESCENDING)
@@ -94,7 +95,8 @@ public abstract class BaseBean implements Serializable {
     @Column(name="MODIFY_USER")
     @ApiParam(value = "修改人")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
+            isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name")
     public String modifyUser;
 
     @Column(name="MODIFY_DATE_TIME")

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

@@ -38,7 +38,7 @@ public class CommonEnumUtil {
         HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"),
         LAC(26, 8600, 13, "lac", "连接适配器"),
         ANDON(27, 8500, 14, "andon", "安灯"),
-        APS(28, 8400, 15, "i3aps", "高级计划与排程"),
+        APS(28, 8400, 15, "i3aps", "高级计划与排产"),
         CENTER(99, 8000, 1, "icloud-server", "注册中心"),
         SURFACE(98, 0, 0, "i3surface", "对外服务"),
         CLOUD(97, 0, 0, "i3cloud", "微服务"),

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

@@ -13,6 +13,74 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * 排序方式
+     */
+    public enum ASC_OR_DESC {
+        ASC(1, "正序"), DESC(2, "倒序");
+
+        private int value;
+        private String description;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        private ASC_OR_DESC(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 监听任务明细-采集数据方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MONITOR_TASK_DETAIL_COLLECT_TYPE {
+        SELF_ADDITION(10, "自增列"),
+        FEED_FIELD(20, "反馈字段");
+
+        private int value;
+        private String description;
+
+        MONITOR_TASK_DETAIL_COLLECT_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;
+        }
+    }
+
+    /**
      * 动作-module
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -1735,7 +1803,8 @@ public class MesEnumUtil {
         MES_PLC(390, "PLC地址清单"),
         MES_PROCESS(400, "工序信息"),
         MES_KPSN_RULE(410, "关键件条码校验规则"),
-        MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列");
+        MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列"),
+        MES_PART_BOM_IMPORT(430, "散件BOM导入");
 
         private int value;
         private String description;
@@ -1812,18 +1881,18 @@ public class MesEnumUtil {
     }
 
     /**
-     * mes设备作业通知配置-通知方式
+     * mes通知配置-通知方式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_EQU_TASK_NOTIFY_CFG_PATTERN {
+    public enum NOTIFY_CFG_PATTERN {
 
-        EMAIL(10, "邮件"),
-        USERPHONE(20, "手机号");
+        EMAIL(10, "邮件");
+//        USERPHONE(20, "手机号");
 
         private int value;
         private String description;
 
-        MES_EQU_TASK_NOTIFY_CFG_PATTERN(int value, String description) {
+        NOTIFY_CFG_PATTERN(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -4164,8 +4233,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MONITOR_TASK_OBJECT_TYPE {
 
-        PLC(10, "PLC");
-//        DB(20, "DB");
+        PLC(10, "PLC"),
+        DB(20, "DB");
 
         private int value;
         private String description;
@@ -4645,4 +4714,137 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 脚本语言类型
+     * 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby
+     */
+    public enum LANGUAGE_TYPE {
+        GROOVY(1, "Groovy", 10),
+        PYTHON(2, "jython", 20), // "jython" string can not change
+        JS(3, "JavaScript", 30);
+        // 下面这2种语言没人会写，暂不支持
+        //SCALA(40,"scala"),
+        //JRUBY(50,"jruby");
+
+        private int index;
+        private String description;
+        private int value;
+
+        LANGUAGE_TYPE(int index, String description, int value) {
+            this.index = index;
+            this.description = description;
+            this.value = value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public int getIndex() {
+            return this.index;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        // 根据枚举编号获取语言代码
+        public static String getCodeByIndex(Integer index) {
+            for (MesEnumUtil.LANGUAGE_TYPE languageType : MesEnumUtil.LANGUAGE_TYPE.values()) {
+                if (languageType.getValue() == index.intValue()) {
+                    return languageType.getDescription();
+                }
+            }
+
+            return null;
+        }
+    }
+
+
+    /**
+     * 产品特性
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_TRAIT {
+        NORMAL(10, "正常件"),
+        FICTITIOUS_ASSEMBLY(20, "虚拟散件总成"),
+        FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成");
+
+        private int value;
+        private String description;
+
+        PART_TRAIT(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;
+        }
+
+        public static String valueOfDescription2(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 配置类型
+     */
+    /**
+     * mes工步类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROD_CFG_TYPE {
+
+        NORMAL("10", "正常"),
+        SCATTERED("20", "散件");
+
+        private String value;
+        private String description;
+
+        PROD_CFG_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(String 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-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, "跳过状态点"),
-        FORCE_DO_SPEC_STATUS(20, "强制执行制定的状态点");
+        JUMP_STATE(10, "JUMP_STATE", "跳过状态点"),
+        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;
@@ -3416,4 +3422,77 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 换膜状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DIE_CHANGE_STATUS {
+
+        INITIALIZATION(0, "初始化"),
+        START(1, "开始换模"),
+        COMPLETE(2, "完成换模");
+
+        private int value;
+        private String description;
+
+        DIE_CHANGE_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 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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java

@@ -11,6 +11,113 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class PtlEnumUtil {
 
     /**
+     * 作业流程类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ACTION_ROUTE_TYPE {
+        GEN_TASK(10, "GEN_TASK", "生成任务"),
+        OFF_TAG(20, "OFF_TAG", "灭灯");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ACTION_ROUTE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 状态机执行方法
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_EVENT {
+        TRIGGER(10, "trigger", "触发"),
+        ENTRY(20, "entry", "进入状态"),
+        EXIT(30, "exit", "离开状态");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ROUTE_EVENT(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;
+        }
+    }
+
+    /**
+     * 组件参数类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ACTION_MODULE_PARAM_TYPE {
+
+        QUALIFIED(10, "number", "数字"),
+        DEFECTED(20, "text", "字符串"),
+        SCRAPED(30, "select", "可选值"),
+        BUTTON(40, "button", "按钮");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ACTION_MODULE_PARAM_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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)

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

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.base.enumutil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.util.StringUtils;
 
+import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_MESSAGE_TYPE.*;
+
 /**
  * @author Wynne.Lu
  * @date 2020/2/12 17:41
@@ -547,8 +549,11 @@ public class PtlPcnEnumUtil {
 
     }
 
+    /**
+     * 状态机执行方法
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum RouteEvent {
+    public enum ROUTE_EVENT {
         TRIGGER(10, "trigger", "触发"),
         ENTRY(20, "entry", "进入状态"),
         EXIT(30, "exit", "离开状态");
@@ -557,7 +562,7 @@ public class PtlPcnEnumUtil {
         private String code;
         private String description;
 
-        RouteEvent(int value, String code, String description) {
+        ROUTE_EVENT(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -576,8 +581,11 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 流程状态
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum RouteState {
+    public enum ROUTE_STATE {
         START(10, "START", "开启流程"),
         TERMINATE(20, "TERMINATE", "终止流程"),
         FINISH(30, "FINISH", "结束流程");
@@ -586,7 +594,7 @@ public class PtlPcnEnumUtil {
         private String code;
         private String description;
 
-        RouteState(int value, String code, String description) {
+        ROUTE_STATE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -605,6 +613,9 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 标签类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TAG_TYPE {
         BIN_TAG(10, "库位标签"),
@@ -639,15 +650,18 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 流程状态-触发类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum TriggerType {
+    public enum TRIGGER_TYPE {
         INNER_TRIGGER(10, "内部触发"),
         OUTER_TRIGGER(20, "外部触发");
 
         private int value;
         private String description;
 
-        TriggerType(int value, String description) {
+        TRIGGER_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -661,8 +675,11 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 作业流程类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum RouteType {
+    public enum ACTION_ROUTE_TYPE {
         GEN_TASK(10, "GEN_TASK", "生成任务"),
         OFF_TAG(20, "OFF_TAG", "灭灯");
 
@@ -670,7 +687,7 @@ public class PtlPcnEnumUtil {
         private String code;
         private String description;
 
-        RouteType(int value, String code, String description) {
+        ACTION_ROUTE_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -689,6 +706,9 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 监听消息类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MONITOR_PROCESS_MESSAGE_TYPE {
         CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"),
@@ -732,7 +752,7 @@ public class PtlPcnEnumUtil {
             if (StringUtils.isEmpty(code)) {
                 return null;
             }
-            for (MONITOR_PROCESS_MESSAGE_TYPE enums : MONITOR_PROCESS_MESSAGE_TYPE.values()) {
+            for (MONITOR_PROCESS_MESSAGE_TYPE enums : values()) {
                 if (enums.getCode().equals(code)) {
                     return enums;
                 }
@@ -741,6 +761,9 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 界面消息类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum INTERFACE_SIGNAL_MESSAGE_TYPE {
         CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"),
@@ -794,7 +817,7 @@ public class PtlPcnEnumUtil {
     }
 
     /**
-     * 生成任务actor message type
+     * 任务消息类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum GEN_TASK_MESSAGE_TYPE {
@@ -841,8 +864,11 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * websocket业务类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum WsBusiType {
+    public enum WS_BUSI_TYPE {
         MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"),
         INTERFACE_PROCESS(20, "INTERFACE_PROCESS", "界面处理");
 
@@ -850,7 +876,7 @@ public class PtlPcnEnumUtil {
         private String code;
         private String description;
 
-        WsBusiType(int value, String code, String description) {
+        WS_BUSI_TYPE(int value, String code, String description) {
             this.value = value;
             this.description = description;
             this.code = code;
@@ -869,8 +895,11 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * websocket消息类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum WsDataType {
+    public enum WS_DATA_TYPE {
         TEXT(10, "TEXT", "正常信息"),
         EXP_TEXT(20, "EXP_TEXT", "异常信息"),
         TABLE(30, "TABLE", "表格");
@@ -879,7 +908,7 @@ public class PtlPcnEnumUtil {
         private String code;
         private String description;
 
-        WsDataType(int value, String code, String description) {
+        WS_DATA_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -898,6 +927,9 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 组件状态类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STATUS_TYPE {
         START(10, "START", "开始状态"),

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

@@ -5906,4 +5906,49 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 道口类型
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DOCK_TYPE {
+        WAIT_SEND(10, "收货道口"),
+        HAS_SENDED(20, "发运道口");
+
+        private int value;
+        private String description;
+
+        DOCK_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static DOCK_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java

@@ -21,6 +21,23 @@ import java.util.Map;
 public interface BaseRepository <T, ID extends Serializable> extends JpaRepository<T, ID> {
 
     /**
+     * 清空一级缓存，可能影响service中对象的状态，慎用
+     */
+    void clearSession();
+
+    /**
+     * 清除一级缓存对象，设为游离态
+     * @param t
+     */
+    void detachObject(T t);
+
+    /**
+     * 清除一级缓存集合，设为游离态
+     * @param list
+     */
+    void detachList(List<T> list);
+
+    /**
      * 新增对象<br/>
      * 注意：如果对象id是long，并且为0，则设为
      * 字符串，并且没有赋值，该方法将自动设置为uuid值

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -48,6 +48,24 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         this.snowflakeIdMaker = snowflakeIdMaker;
     }
 
+    public void clearSession(){
+        entityManager.clear();
+    }
+
+    public void detachObject(T t){
+        entityManager.detach(t);
+    }
+
+    //集合设置为游离态
+    public void detachList(List<T> list){
+        if(list != null){
+            for(T t : list) {
+                //设置对象为游离态
+                entityManager.detach(t);
+            }
+        }
+    }
+
     private void setParameter(Query query, String[] propName, Object[] propValue) {
         String name = null;
         Object value = null;

modules/i3plus-pojo-form/pom.xml

@@ -13,6 +13,7 @@
     <artifactId>i3plus-pojo-form</artifactId>
     <packaging>jar</packaging>
 
+
     <dependencies>
 
         <dependency>

modules/i3plus-pojo-jobflow/pom.xml

@@ -13,6 +13,7 @@
     <artifactId>i3plus-pojo-jobflow</artifactId>
     <packaging>jar</packaging>
 
+
     <profiles>
         <profile>
             <id>dev</id>

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

@@ -0,0 +1,103 @@
+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;
+
+/**
+ * @Description : 供应商
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BAS_VENDOR")
+@Api("供应商信息")
+public class BasVendor extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592779L;
+    @Column(name="VENDOR_NO")
+    @ApiParam("供应商编号")
+    private String vendorNo;
+
+    @Column(name="VENDOR_NAME")
+    @ApiParam("供应商简称")
+    private String vendorName;
+
+    @Column(name="VENDOR_DESC")
+    @ApiParam("供应商全称")
+    private String vendorDesc;
+
+    @Column(name="VENDOR_ADDR")
+    @ApiParam("供应商地址")
+    private String vendorAddr;
+
+    @Column(name="VENDOR_OWNER")
+    @ApiParam("联系人")
+    private String vendorOwner;
+
+    @Column(name="VENDOR_EMAIL")
+    @ApiParam("邮箱")
+    private String vendorEmail;
+
+    @Column(name = "IS_ASN")
+    @ApiParam(value = "是否发ASN", example = "0")
+    private Integer isAsn;
+
+    @Column(name = "USER_NAME")
+    @ApiParam(value = "用户名")
+    private String userName;
+
+    @Column(name = "PASSWORD")
+    @ApiParam(value = "密码")
+    private String password;
+
+    @Column(name = "VENDOR_CALL")
+    @ApiParam("供应商电话")
+    private String vendorCall;
+
+    @Column(name = "VENDOR_FAX")
+    @ApiParam("传真")
+    private String vendorFax;
+
+    @Column(name = "VENDOR_PHONE")
+    @ApiParam("手机")
+    private String vendorPhone;
+
+    @Column(name = "KILOBIT")
+    @ApiParam("千位符号")
+    private String kilobit;
+
+    @Column(name = "DECIMALS")
+    @ApiParam("小数位符号")
+    private String decimals;
+
+    //20-承运商
+    @Column(name = "VENDOR_TYPE")
+    private Integer vendorType;
+
+    @Column(name = "MAP_LOCATION")
+    @ApiParam("经纬度")
+    private String mapLocation;
+
+    public BasVendor() {
+    }
+
+    public BasVendor(Long id, String userName) {
+        this.id = id;
+        this.userName = userName;
+    }
+}

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

@@ -79,13 +79,12 @@ public class IfQueueShipping extends BaseBean implements Serializable {
     @ApiParam("异常消息")
     private String errorMessage;
 
-
     @Column(name = "ACTION_CODE")
     @ApiParam("动作代码")
     private String actionCode;
 
     @Column(name = "IF_CODE")
     @ApiParam("接口代码")
-    private Integer ifCode;
+    private String ifCode;
 
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.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.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2020/04/03 7:12 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DATA_WARNING")
+@Api("数据预警配置")
+public class MesDataWarning extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8328008752104417017L;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "WARNING_RULE")
+    @ApiParam("预警规则")
+    private String warningRule;
+
+    @Column(name = "CHECK_TIME")
+    @ApiParam("校验时间")
+    private String checkTime;
+
+    @Column(name = "QTY")
+    @ApiParam("数据量最大限制(分钟)")
+    private Integer qty;
+
+    @Column(name = "WARNING_ITEM")
+    @ApiParam("预警内容项")
+    private String warningItem;
+
+    @Column(name = "INFORM_MODE")
+    @ApiParam("通知方式")
+    private Integer informMode;
+
+    @Lob
+    @Column(name = "INFORM_USER")
+    @ApiParam("通知对象")
+    private String informUser;
+
+}

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

@@ -37,6 +37,10 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String serialNumber;
 
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;
@@ -77,6 +81,11 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("备注")
     private String memo;
 
+//    @Column(name = "WORK_ORDER_NO")
+//    @ApiParam("工单号")
+//    private String workOrderNo;
+
+
     @Transient
     private List<MesDefect> mesDefectList;
 

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

@@ -56,6 +56,10 @@ public class MesDismantleRecord extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String sn;
 
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
     @Column(name = "QTY")
     @ApiParam("产品数量")
     private Double qty;
@@ -92,6 +96,10 @@ public class MesDismantleRecord extends BaseBean implements Serializable {
     @ApiParam("关联批次")
     private String lotNo;
 
+//    @Column(name = "WORK_ORDER_NO")
+//    @ApiParam("工单号")
+//    private String workOrderNo;
+
     @Transient
     private String serialNumber;
 }

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

@@ -92,6 +92,10 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("产品类型名称")
     private String pptCode;
 
+    @Column(name = "PART_TRAIT")
+    @ApiParam("物料特性")
+    private Integer partTrait;
+
     @Transient
     @ApiParam("产品类型名称")
     private String produceCategoryName;

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

@@ -53,7 +53,7 @@ public class MesPartCheck extends BaseBean implements Serializable {
     private String recordNumSpelExpress;
 
     @Column(name = "RECORD_NUM_DESC")
-    @ApiParam("校验表达式")
+    @ApiParam("校验表达式描述")
     private String recordNumDesc;
 
 }

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.model.ProductDataModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -127,7 +128,7 @@ public class MesPlc extends BaseBean implements Serializable {
 
     @Transient
     @ApiParam("OPC值")
-    private String opcValue;
+    private List<ProductDataModel> opcValue;
 
     @Column(name = "TOOLING_CODE ")
     @ApiParam("工装代码")

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

@@ -123,6 +123,7 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码类型 10=正常 20=首检件")
     private Integer snType;
 
+
     @Column(name = "TRAY_NO")
     @ApiParam("托盘号")
     private String trayNo;
@@ -164,6 +165,8 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码类型名称")
     private String snTypeName;
 
+
+
     public MesProduceSn() {
     }
 

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

@@ -82,6 +82,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("生产组代码")
     private String pgCode;
 
+    @Column(name = "JIT_SEQ")
+    @ApiParam("JIT排序号")
+    private String jitSeq;
+
     @Transient
     @ApiParam("客户需求开始时间")
     private String custPointStartDate;

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

@@ -92,6 +92,14 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("生产组代码")
     private String pgCode;
 
+    @Column(name = "JIT_LOT_NO")
+    @ApiParam("JIT队列批次")
+    private String jitLotNo;
+
+    @Column(name = "JIT_ACTUAL_NO")
+    @ApiParam("客户JIT队列编号")
+    private String jitActualNo;
+
     @Transient
     @ApiParam("起始车号")
     private String custFlagNoStart;

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

@@ -0,0 +1,66 @@
+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 :MES_JIT发运队列
+ * @Reference :
+ * @Author : qianhausheng
+ * @CreateDate : 2020-03-06 10:16 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_SHIPPING")
+@Api("MES_JIT发运队列")
+public class MesQueueShipping extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 655875369308414110L;
+
+    @Column(name = "JIT_NO")
+    @ApiParam("队列编号")
+    private String jitNo;
+
+    @Column(name = "PROD_CFG_CODE")
+    @ApiParam("配置代码")
+    private String prodCfgCode;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("vin")
+    private String vinCode;
+
+    @Column(name = "CUST_FLAG_NO")
+    @ApiParam("客户标识号")
+    private String custFlagNo;
+
+    @Column(name = "SEQ")
+    @ApiParam("排序号")
+    private Double seq;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name = "CUST_PLANT_CODE")
+    @ApiParam("客户产线代码")
+    private String custPlantCode;
+
+}

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

@@ -0,0 +1,73 @@
+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 :MES_JIT发运队列明细
+ * @Reference :
+ * @Author : qianhausheng
+ * @CreateDate : 2020-03-06 10:16 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_SHIPPING_DETAIL")
+@Api("MES_JIT发运队列明细")
+public class MesQueueShippingDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1442091799346314190L;
+
+    @Column(name = "JIT_NO")
+    @ApiParam("队列编号")
+    private String jitNo;
+
+    @Column(name = "PROD_CFG_CODE")
+    @ApiParam("配置代码")
+    private String prodCfgCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "status")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name="SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("组内编号")
+    private Integer groupNo;
+
+    @Column(name = "GROUP_SEQ")
+    @ApiParam("分组序号")
+    private String groupSeq;
+
+    @Column(name = "qty")
+    @ApiParam("数量")
+    private Double qty;
+}

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/bean/MesWorkOrder.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description:
@@ -187,6 +188,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     private String areaCodeName;
 
     @Transient
+    @ApiParam("状态-下达，启动，暂停")
+    private List<Integer> statusList;
+
+    @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59")
     public String startTimeStart;
@@ -219,6 +224,18 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("批量打包开窗页面查询工单=1")
     private String pageType;
 
+    @Transient
+    @ApiParam("产品批次")
+    private String productBatch;
+
+    @Transient
+    @ApiParam("工单类型描述")
+    private String workOrderTypeDesc;
+
+    @Transient
+    @ApiParam("工单状态描述")
+    private String workOrderStatusDesc;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MappingItem.java

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.mes.dbinterface;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Mes - SAP 字段映射关系
+ * 暂时不考虑字段的类型
+ *
+ * @author Rock.Yu
+ * @since 2019-06-09 21:06
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MappingItem {
+    /**
+     * 来源字段名称
+     */
+    public String srcName;
+    /**
+     * 目标对象的名称
+     */
+    public String destBeanName;
+    /**
+     * 目标对象的属性名称
+     */
+    public String destName;
+    /**
+     * 该字段在目标表是不是主键
+     * 1=主键
+     */
+    public Integer destPk;
+    /**
+     * 目标字段的默认值，通过此默认值识别字段类型，一定要配置正确
+     * 可以使用的表达式： #date, #time, #guid, #Q.warehouse(#zone)
+     */
+    public Object defaultValue;
+
+    @Override
+    public String toString() {
+        return "srcName:"
+                + this.srcName + ", destBeanName:"
+                + this.destBeanName + ", destName"
+                + this.destName + ", defaultValue:"
+                + this.defaultValue + ", destPk:"
+                + this.destPk;
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java

@@ -0,0 +1,161 @@
+package cn.estsh.i3plus.pojo.mes.dbinterface;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * Mes - SAP 中间数据库接口映射关系
+ *
+ * @author Rock.Yu
+ * @since 2019-06-09 20:08
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_INTERFACE_DATA_MAPPER")
+@Api("接口数据映射")
+public class MesInterfaceDataMapper extends BaseBean {
+    /**
+     * 排序编号
+     */
+    @Column(name = "SEQ")
+    public Integer seq;
+    /**
+     * 来源表的每次查询记录数，防止大量数据造成内存溢出
+     */
+    @Column(name = "SRC_GET_LIMIT")
+    public Integer srcGetLimit;
+    /**
+     * 接口数据源编号（在动态表单中配置）
+     */
+    @Column(name = "SRC_DATA_SOURCE", length = 50)
+    public String dataSource;
+    /**
+     * 来源表名
+     */
+    @Column(name = "SRC_TABLE_NAME", length = 50)
+    public String srcTableName;
+    /**
+     * 来源表的排序条件
+     */
+    @Column(name = "SRC_ORDER_BY", length = 50)
+    public String srcOrderBy;
+    /**
+     * 来源表的查询条件
+     */
+    @Column(name = "SRC_WHERE", length = 500)
+    public String srcWhere;
+
+    /**
+     * 来源表的分组条件，按分组发送，多个列名用半角逗号分隔
+     */
+    @Column(name = "SRC_GROUP_COLUMNS", length = 255)
+    public String srcGroupColumns;
+    /**
+     * 数据同步到业务库后需要更新的接口库标记字段，多个字段用半角逗号分隔
+     * 例如：SYNFLG=Y,SYNDATE={#XX}
+     * 可以使用的动态变量： #sap_date, #sap_time, #date, #time, #guid
+     */
+    @Column(name = "SRC_UPDATE_SYNC", length = 255)
+    public String srcUpdateSync;
+    /**
+     * 业务表单的主键，多个主键用半角逗号分隔
+     */
+    @Column(name = "SRC_PK_COLUMNS", length = 255)
+    public String srcPkColumns;
+    /**
+     * 按照组织代码(半角逗号分隔)复制多份到业务表（用于物料、供应商、客户...等集团数据）
+     */
+    @Column(name = "COPY_BY_ORGS", length = 50)
+    public String copyByOrgs;
+    /**
+     * 目标实体对象的名字，多个字段用半角逗号分隔
+     */
+    @Column(name = "DEST_BEAN_NAME", length = 500)
+    public String destBeanName;
+    /**
+     * 目标实体对象判断数据是否存在的一组业务属性名称，多个属性用半角逗号分隔
+     */
+    @Column(name = "DEST_PK_PROPERTIES", length = 500)
+    public String destPkProperties;
+    /**
+     * 源表字段与目标对象属性的映射关系，List<MappingItem> 对象，JSON 格式存储
+     *
+     */
+    @Column(name = "DEST_COLUMN_MAPPING", length = 5000)
+    public String destColumnMapping;
+
+    /**
+     * 接口分组名称
+     * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS
+     */
+    @Column(name = "GROUP_NAME")
+    public String groupName;
+
+    /**
+     * 业务的路由规则
+     * 一表对多表时需要配置路由规则
+     */
+    @Column(name = "BUSI_ROUTE")
+    public String busiRoute;
+
+    /**
+     * 同步频率
+     */
+    @Column(name = "SYNC_FREQUENCY")
+    public Integer syncFrequency;
+
+    /**
+     * 上次同步时间
+     */
+    @Column(name = "LAST_SYNC_TIME")
+    public String lastSyncTime;
+
+    /**
+     * 软适配编号
+     */
+    @Column(name = "SOFT_ADAPATOR_CODE")
+    public String softAdaptorCode;
+
+    /**
+     * 扩展脚本编号，用于扩展接口功能
+     */
+    @Column(name = "SCRIPT_NO")
+    public String scriptNo;
+
+    /**
+     * 调用脚本方法获取数据
+     */
+    @Column(name = "USE_SCRIPT_PULL")
+    public Integer useScriptPull;
+
+    /**
+     * 调用脚本方法保存数据
+     */
+    @Column(name = "USE_SCRIPT_PUSH")
+    public Integer useScriptPush;
+
+    /**
+     * 调用脚本方法更新同步标志
+     */
+    @Column(name = "USE_SCRIPT_MARK")
+    public Integer useScriptMark;
+
+    /**
+     * 调用脚本方法过滤数据（查询来源数据后过滤）
+     */
+    @Column(name = "USE_SCRIPT_FILTER")
+    public Integer useScriptFilter;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java

@@ -0,0 +1,74 @@
+package cn.estsh.i3plus.pojo.mes.dbinterface;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+public class MesInterfaceEnumUtil {
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DIRECTION_TYPE {
+        SAP2WMS(10, "SAP2WMS", "SAP --> WMS"),
+        WMS2SAP(20, "WMS2SAP", "WMS --> SAP"),
+        MES2WMS(30, "MES2WMS", "MES --> WMS"),
+        WMS2MES(40, "WMS2MES", "WMS --> MES");
+
+        private int value;
+        private String name;
+        private String description;
+
+        DIRECTION_TYPE() {
+        }
+
+        DIRECTION_TYPE(int value, String name, String description) {
+            this.value = value;
+            this.name = name;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        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].getName();
+                }
+            }
+            return tmp;
+        }
+
+        public static int nameOf(String val) {
+            int tmp = -1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].name.equals(val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        /**
+         * -1 不在范围内
+         * @param desc
+         * @return
+         */
+        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;
+        }
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/UpdateSyncItem.java

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.mes.dbinterface;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 回写接口库的值
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UpdateSyncItem {
+
+    /**
+     * 字段名
+     */
+    public String columnName;
+
+    /**
+     * 写入的值
+     * 支持表达式
+     * #sap_date, #sap_time, #guid
+     */
+    public String updateValue;
+}

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

@@ -52,4 +52,7 @@ public class ButtonComponentReqModel {
     @ApiParam("客户标识号")
     private String custFlagNo;
 
+    @ApiParam("用户信息")
+    private String userInfo;
+
 }

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

@@ -39,4 +39,7 @@ public class ExcelImportResultModel<T> implements Serializable {
     @ApiParam("导入数据集合")
     private List<T> excelList;
 
+    @ApiParam("导入进度")
+    private String importSpeed;
+
 }

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

@@ -43,6 +43,15 @@ public class GenSerialNoModel {
     @ApiParam("日")
     private String day;
 
+    @ApiParam("时")
+    private String hour;
+
+    @ApiParam("分")
+    private String minute;
+
+    @ApiParam("秒")
+    private String second;
+
     @ApiParam("过程条码")
     private String serialNumber;
 

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

@@ -0,0 +1,118 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.LinkedList;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("散件BOM导入MODEL")
+public class ImportBomExcelDataModel {
+
+    @ApiParam("零件号")
+    private String partNo;
+
+    @ApiParam("零件名称")
+    private String partName;
+
+    @ApiParam("零件简称")
+    private String briefText;
+
+    @ApiParam("零件规格")
+    private String partSpec;
+
+    @ApiParam("分类1")
+    private String categoryCode1;
+
+    @ApiParam("分类2")
+    private String categoryCode2;
+
+    @ApiParam("分类3")
+    private String categoryCode3;
+
+    @ApiParam("单位")
+    private String unit;
+
+    @ApiParam("包装规格代码")
+    private String packSpecCode;
+
+    @ApiParam("默认工作中心")
+    private String defaultWorkCenter;
+
+    @ApiParam("产品位置")
+    private String produceCategoryCode;
+
+    @ApiParam("过程编码匹配类型")
+    private Integer processMatchType;
+
+    @ApiParam("包装编码匹配类型")
+    private Integer packageMatchType;
+
+    @ApiParam("产品编码匹配类型")
+    private Integer productMatchType;
+
+    @ApiParam("产品类型代码")
+    private String pptCode;
+
+    @ApiParam("物料特性")
+    private Integer partTrait;
+
+    @ApiParam("产品类型名称")
+    private String produceCategoryName;
+
+    @ApiParam("过程编码匹配类型名称")
+    private String processMatchTypeName;
+
+    @ApiParam("包装编码匹配类型")
+    private String packageMatchTypeName;
+
+    @ApiParam("产品编码匹配类型")
+    private String productMatchTypeName;
+
+    @ApiParam("分类名称")
+    private String categoryName;
+
+    @ApiParam("原材料物料号")
+    private String itemPartNo;
+
+    @ApiParam("原材料物料名称")
+    private String itemPartName;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("产出工位")
+    private String workCellCode;
+
+    @ApiParam("工位名称")
+    private String workCellName;
+
+    @ApiParam(value = "数量", example = "0")
+    private Double qty;
+
+    @ApiParam("消耗工位")
+    private String usedWorkCellCode;
+
+    @ApiParam("客户物料号")
+    private String custPartNo;
+
+    @ApiParam("配置")
+    private LinkedList<String> cfgCodeList;
+
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("用户名")
+    private String userName;
+
+    @ApiParam("关键物料类型")
+    private String keyPartType;
+
+    @ApiParam("是否关键件")
+    private String isKeyPart;
+}

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

@@ -63,4 +63,12 @@ public class MesQueueShipping extends BaseBean implements Serializable {
     @ApiParam("客户产线代码")
     private String custPlantCode;
 
+    @Column(name = "JIT_LOT_NO")
+    @ApiParam("JIT队列批次")
+    private String jitLotNo;
+
+    @Column(name = "JIT_ACTUAL_NO")
+    @ApiParam("客户JIT队列编号")
+    private String jitActualNo;
+
 }

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

@@ -24,4 +24,7 @@ public class MesRouteCfgModel {
 
     @ApiParam("流程代码")
     private String routeCode;
+
+    @ApiParam("是否执行 1=是 2=否")
+    private Integer isActive;
 }

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

@@ -18,8 +18,5 @@ public class MesRouteCfgParamModel {
     @ApiParam("工序代码")
     private String processCode;
 
-    @ApiParam("是否执行 1=是 2=否")
-    private Integer isActive;
-
     List<MesRouteCfgStepModel> stepModelList;
 }

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

@@ -18,5 +18,11 @@ public class MesRouteCfgStepModel {
     @ApiParam("工步代码")
     private String stepCode;
 
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @ApiParam("参数值")
+    private String paramValue;
+
     List<MesRouteCfgModel> routeCfgModelList;
 }

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

@@ -29,7 +29,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Api("用户信息model")
-public class EquTaskNotifyUserModel extends BaseBean {
+public class NotifyUserModel extends BaseBean {
 
     @ApiParam(value ="账户ID")
     private Long userInfoId;

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

@@ -88,6 +88,15 @@ public class QcCheckDataModel {
     @ApiParam(value = "修改日期")
     private String modifyDatetime;
 
+    @ApiParam(value = "工单开始时间")
+    private String startTime;
+
+    @ApiParam(value = "工单结束时间")
+    private String endTime;
+
+    @ApiParam(value = "检测时间")
+    private String checkTime;
+
     public QcCheckDataModel() {
 
     }
@@ -121,4 +130,45 @@ public class QcCheckDataModel {
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
     }
+
+    public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String partNo, String workCenterCode
+            , String workCellCode, String partName, String modifyUser, String modifyDatetime, String startTime, String endTime, String orderNo) {
+        this.id = id;
+        this.organizeCode = organizeCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.partNo = partNo;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.partName = partName;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.startTime = startTime;
+        this.endTime = endTime;
+        this.orderNo = orderNo;
+    }
+
+    public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, Integer checkType) {
+        this.id = id;
+        this.organizeCode = organizeCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.checkType = checkType;
+    }
+
+    public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, Integer checkType, String checkItem, String checkStandard, String checkGuide
+            , String checkFrequency, String checkValue, String checkResult, String sn) {
+        this.id = id;
+        this.organizeCode = organizeCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.checkType = checkType;
+        this.checkItem = checkItem;
+        this.checkStandard = checkStandard;
+        this.checkGuide = checkGuide;
+        this.checkFrequency = checkFrequency;
+        this.checkValue = checkValue;
+        this.checkResult = checkResult;
+        this.sn = sn;
+    }
 }

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesQcCheckData;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/9 18:00
+ * @desc
+ */
+@Data
+public class QcCheckDataResultModel {
+
+    @ApiParam("是否完成首检")
+    private Integer isFirstCheck;
+
+    @ApiParam("首检结果")
+    private List<MesQcCheckData> firstCheckResult;
+
+    @ApiParam("是否完成巡检")
+    private Integer isOnSiteCheck;
+
+    @ApiParam("巡检结果")
+    private List<MesQcCheckData> onSiteCheckResult;
+
+    @ApiParam("是否完成尾检")
+    private Integer isEndCheck;
+
+    @ApiParam("尾检结果")
+    private List<MesQcCheckData> endCheckResult;
+
+    public QcCheckDataResultModel() {
+    }
+
+    public QcCheckDataResultModel(Integer isFirstCheck, Integer isOnSiteCheck, Integer isEndCheck) {
+        this.isFirstCheck = isFirstCheck;
+        this.isOnSiteCheck = isOnSiteCheck;
+        this.isEndCheck = isEndCheck;
+    }
+}

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Column;
 import javax.persistence.Transient;
 import java.io.Serializable;
 
@@ -74,6 +75,10 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("料架是否已打印")
     private Integer isGroupPrinted;
 
+    @Column(name = "PPT_CODE")
+    @ApiParam("产品类型名称")
+    private String pptCode;
+
     public QueueOrderModel() {
     }
 
@@ -183,8 +188,9 @@ public class QueueOrderModel implements Serializable {
         this.orderNo = orderNo;
     }
 
+    //getWaitQueueOrderModelNoSn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
-                           String partNo, String partNameRdd, String workType, Double finsihQty, Double qty) {
+                           String partNo, String partNameRdd, String workType, Double finsihQty, Double qty,String pptCode) {
         this.serialNumber = serialNumber;
         this.id = id;
         this.queueSeq = queueSeq;
@@ -198,8 +204,9 @@ public class QueueOrderModel implements Serializable {
         this.finsihQty = finsihQty;
         this.qty = qty;
         this.orderNo = orderNo;
+        this.pptCode=pptCode;
     }
-
+    //getAlreadyQueueOrderModelNoSn
     public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String partNo, String partNameRdd, String workType) {
         this.id = id;
@@ -214,6 +221,7 @@ public class QueueOrderModel implements Serializable {
         this.orderNo = orderNo;
         this.serialNumber=serialNumber;
     }
+
     //料架分组队列展示组件
     public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo,
                            Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) {

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

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/9 19:40
+ * @desc
+ */
+@Data
+public class ReworkResultModel {
+
+    @ApiParam("已维修数量")
+    private Integer alreadyRepairCount;
+
+    @ApiParam("未维修数量")
+    private Integer notRepairCount;
+
+    @ApiParam("拆解数量")
+    private Integer dismantleCount;
+}

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/13 17:55
+ * @desc
+ */
+@Data
+@NoArgsConstructor
+public class StateDispatchModel {
+
+    private String statesKey;
+
+    private String firstScanKey;
+
+    private String cellParamKey;
+
+    private String requestBeanKey;
+
+    private String moduleDataMapKey;
+
+    private String scanInfo;
+
+    public StateDispatchModel(String statesKey, String firstScanKey, String cellParamKey, String requestBeanKey, String moduleDataMapKey, String scanInfo) {
+        this.statesKey = statesKey;
+        this.firstScanKey = firstScanKey;
+        this.cellParamKey = cellParamKey;
+        this.requestBeanKey = requestBeanKey;
+        this.moduleDataMapKey = moduleDataMapKey;
+        this.scanInfo = scanInfo;
+    }
+}

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;
 
@@ -105,6 +105,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步列表")
     private List<StepModel> stepList;
 
+    @ApiParam("工位参数")
+    private Map<String, String> wcpcMap;
+
     @ApiParam("生产主队列编号")
     private String orderNo;
 
@@ -123,6 +126,12 @@ public class StationRequestBean implements Serializable {
     @ApiParam("展示组件")
     private Object moduleService;
 
+    @ApiParam("客户工厂代码")
+    private String customerFactoryCode;
+
+    @ApiParam("发运命令")
+    private String shippingCmd;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesWcCheckRecord;
 import io.swagger.annotations.Api;
@@ -36,6 +37,9 @@ public class WcCheckModel {
     @ApiParam("是否通过")
     private Integer isPass;
 
+    @ApiParam("输入框是否可以重选")
+    private Integer isEnable;
+
     @ApiParam("开线信号")
     private Integer onlineSignal;
 
@@ -53,6 +57,7 @@ public class WcCheckModel {
 
     public WcCheckModel initialWcCheckModel() {
         WcCheckModel wcCheckModel = new WcCheckModel();
+        wcCheckModel.setIsEnable(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
         wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue());
         wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue());
         onlineSignalEqu = new MesWcCheckRecord();

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

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.engine.script.EngineScriptPersistence;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+/**
+ * @Description : 脚本引擎持久化类
+ * @Reference :
+ * @Author : Rock.Yu
+ * @CreateDate : 2019-04-16 09:53
+ * @Modify:
+ **/
+public interface IEngineScriptPersistenceRepository extends BaseRepository<EngineScriptPersistence, Long> {
+    /**
+     * 按照工厂代码和脚本编号查询脚本实体对象
+     * @param organizeCode 工厂代码
+     * @param scriptNo 脚本编号
+     * @return 脚本实体对象
+     */
+    EngineScriptPersistence findByOrganizeCodeAndScriptNo(String organizeCode, String scriptNo);
+
+    /**
+     * 按照脚本编号查询脚本实体对象
+     * @param scriptNo 脚本编号
+     * @return 脚本实体对象
+     */
+    EngineScriptPersistence findByScriptNo(String scriptNo);
+
+    /**
+     * 查找所有的脚本语言类型
+     * @return 数据库中已经存在的脚本语言类型
+     */
+    @Query("select t.languageType from EngineScriptPersistence t group by t.organizeCode, t.languageType")
+    List findGroupByLanguageType();
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerRepository.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.IfDismantleRecord;
+import cn.estsh.i3plus.pojo.mes.bean.MesContainer;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:33
+ * @Modify:
+ **/
+public interface MesContainerRepository extends BaseRepository<MesContainer, Long> {
+}

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

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

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-06-28 15:17
+ * @Modify:
+ **/
+@Repository
+public interface MesInterfaceDataMapperRepository extends BaseRepository<MesInterfaceDataMapper,Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingDetailRepository.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.MesQueueShippingDetail;
+
+/**
+ * @Description :发运队列明细
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2020-03-06 10:56 上午
+ * @Modify:
+ **/
+public interface MesQueueShippingDetailRepository extends BaseRepository<MesQueueShippingDetail, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingRepository.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.MesQueueShipping;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2020-03-06 10:56 上午
+ * @Modify:
+ **/
+public interface MesQueueShippingRepository extends BaseRepository<MesQueueShipping, Long> {
+}

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

@@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.*;
+import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
 import org.springframework.util.StringUtils;
 
 /**
@@ -2175,9 +2176,15 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(monitorTaskDetail.getDataObjectNo())) {
             DdlPreparedPack.getStringLikerPack(monitorTaskDetail.getDataObjectNo(), "dataObjectNo", packBean);
         }
+        if (!StringUtils.isEmpty(monitorTaskDetail.getStoreObjectCode())) {
+            DdlPreparedPack.getStringLikerPack(monitorTaskDetail.getStoreObjectCode(), "storeObjectCode", packBean);
+        }
         if (monitorTaskDetail.getIsValid() != null) {
             DdlPreparedPack.getNumEqualPack(monitorTaskDetail.getIsValid(), "isValid", packBean);
         }
+        if (monitorTaskDetail.getCollectType() != null) {
+            DdlPreparedPack.getNumEqualPack(monitorTaskDetail.getCollectType(), "collectType", packBean);
+        }
         return packBean;
     }
 
@@ -2283,4 +2290,114 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 数据预警配置
+     * @param dataWarning
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesDataWarning(MesDataWarning dataWarning, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(dataWarning, organizeCode);
+        if(!StringUtils.isEmpty(dataWarning.getObjectCode())){
+            DdlPreparedPack.getStringLikerPack(dataWarning.getObjectCode(), "objectCode", packBean);
+        }
+        if(!StringUtils.isEmpty(dataWarning.getWarningRule())){
+            DdlPreparedPack.getStringLikerPack(dataWarning.getWarningRule(), "warningRule", packBean);
+        }
+        if(!StringUtils.isEmpty(dataWarning.getWarningItem())){
+            DdlPreparedPack.getStringLikerPack(dataWarning.getWarningItem(), "warningItem", packBean);
+        }
+        if(!StringUtils.isEmpty(dataWarning.getInformMode())){
+            DdlPreparedPack.getNumEqualPack(dataWarning.getInformMode(), "informMode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 接口映射分页查询条件
+     *
+     * @param mesInterfaceDataMapper
+     * @return
+     */
+    public static DdlPackBean packHqlMesInterfaceDataMapper(MesInterfaceDataMapper mesInterfaceDataMapper) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(mesInterfaceDataMapper.getSrcTableName(), "srcTableName", result);
+        DdlPreparedPack.getStringLikerPack(mesInterfaceDataMapper.getDestBeanName(), "destBeanName", result);
+        DdlPreparedPack.getStringLikerPack(mesInterfaceDataMapper.getBusiRoute(), "busiRoute", result);
+        DdlPreparedPack.getStringLikerPack(mesInterfaceDataMapper.getGroupName(), "groupName", result);
+
+        getStringBuilderPack(mesInterfaceDataMapper, result);
+
+        return result;
+    }
+    /**
+     * 封装公用查询参数
+     *
+     * @param bean   实体对象
+     * @param hqlStr 查询语句
+     * @return 封装完成的查询语句
+     */
+    public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) {
+
+        // 判断工厂代码是否为空
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(bean.getOrganizeCode())) {
+            DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
+        }
+
+
+        DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr);
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && org.apache.commons.lang3.StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true);
+        }
+        // 封装有效状态、删除状态、创建人和创建时间
+        DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
+
+        return hqlStr;
+    }
+
+
+
+    /**
+     * 按条件分页查询产品条码补打印数据
+     * @param mesProduceSn
+     * @return
+     */
+    public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) {
+        DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode());
+        if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) {
+            DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
+        }
+        DdlPreparedPack.getNumEqualPack(mesProduceSn.getPrintStatus(), "printStatus", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
+
+        // 时间段查询
+        if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesProduceSn.getCreateDateTimeStart(),
+                    mesProduceSn.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
+        if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesProduceSn.getOutWorkCenterTimeStart(),
+                    mesProduceSn.getOutWorkCenterTimeEnd(),
+                    "outWorkCenterTime", packBean, true);
+        }
+        return packBean;
+    }
 }

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

@@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.*;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -177,6 +178,11 @@ public class MesPcnHqlPack {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean);
         }
 
+        // 工单管理，查询下达，启动，暂停状态
+        if (!CollectionUtils.isEmpty(mesWorkOrder.getStatusList())){
+            DdlPreparedPack.getInPackList(mesWorkOrder.getStatusList(), "workOrderStatus", packBean);
+        }
+
         // 时间段查询
         if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) {
             DdlPreparedPack.timeBuilder(

modules/i3plus-pojo-platform/pom.xml

@@ -13,6 +13,7 @@
     <artifactId>i3plus-pojo-platform</artifactId>
     <packaging>jar</packaging>
 
+
     <dependencies>
         <dependency>
             <groupId>i3plus.pojo</groupId>

modules/i3plus-pojo-ptl/pom.xml

@@ -13,6 +13,7 @@
     <artifactId>i3plus-pojo-ptl</artifactId>
     <packaging>jar</packaging>
 
+
     <dependencies>
         <dependency>
             <groupId>i3plus.pojo</groupId>

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

@@ -0,0 +1,54 @@
+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.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "PTL_ACTION_MODULE_PARAM")
+@EqualsAndHashCode(callSuper = true)
+@Api("组件参数")
+public class PtlActionModuleParam extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1015028092547846989L;
+
+    @Column(name = "AM_CODE")
+    @ApiParam("组件代码")
+    private String amCode;
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_NAME")
+    @ApiParam("参数名称")
+    private String paramName;
+
+    @Column(name = "PARAM_TYPE")
+    @ApiParam("参数类型")
+    private String paramType;
+
+    @Column(name = "DEFAULT_VALUE")
+    @ApiParam("默认值")
+    private String defaultValue;
+
+}

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

@@ -10,6 +10,7 @@ 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;
 
@@ -40,4 +41,9 @@ public class PtlActionRoute extends BaseBean implements Serializable {
     @Column(name = "ROUTE_TYPE")
     @ApiParam("流程类型")
     private Integer routeType;
+
+    @Lob
+    @Column(name = "POSITION")
+    @ApiParam("GOJS位置")
+    private String position;
 }

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

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -37,11 +35,9 @@ public class PtlArea extends BaseBean implements Serializable {
 
     @Column(name = "AREA_NO")
     @ApiParam("区域代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String areaNo;
 
     @Column(name = "AREA_NAME")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("区域名称")
     private String areaName;
 

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

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,26 +32,21 @@ public class PtlAreaActorAction extends BaseBean implements Serializable {
 
     @Column(name = "AREA_NO")
     @ApiParam("区域代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String areaNo;
 
     @Column(name = "ACTOR_CODE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("观察者编码")
     private String actorCode;
 
     @Column(name = "MT_CODE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("消息类型代码")
     private String mtCode;
 
     @Column(name = "OTHER_WHERE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("特定条件")
     private String otherWhere;
 
     @Column(name = "AMG_ID")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("组件集编号")
     private Long amgId;
 }

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

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,31 +32,25 @@ public class PtlAreaRouteModuleParam extends BaseBean implements Serializable {
 
     @Column(name = "AREA_NO")
     @ApiParam("区域代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String areaNo;
 
     @Column(name = "ROUTE_CODE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("流程代码")
     private String routeCode;
 
     @Column(name = "AMG_ID")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("组件集编号")
     private Long amgId;
 
     @Column(name = "AM_CODE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("组件代码")
     private String amCode;
 
     @Column(name = "PARAM_CODE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("参数代码")
     private String paramCode;
 
     @Column(name = "PARAM_VALUE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("参数值")
     private String paramValue;
 

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

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +11,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @author Wynne.Lu
@@ -32,61 +29,49 @@ public class PtlBom extends BaseBean implements Serializable {
 
     @Column(name = "PART_NO")
     @ApiParam("父物料号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partNo;
 
     @Column(name = "PART_NAME", columnDefinition = "varchar(255) default '1'", nullable = false)
     @ApiParam("父物料描述")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partName;
 
     @Column(name = "UNIT")
     @ApiParam("计量单位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String unit;
 
     @Column(name = "QTY")
     @ApiParam("数量")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private Double qty;
 
     @Column(name = "ITEM_PART_NO")
     @ApiParam("子物料号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String itemPartNo;
 
     @Column(name = "ITEM_PART_NAME")
     @ApiParam("子物料描述")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String itemPartName;
 
     @Column(name = "ITEM_UNIT")
     @ApiParam("子计量单位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String itemUnit;
 
     @Column(name = "ITEM_QTY")
     @ApiParam("子用量")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private Integer itemQty;
 
     @Column(name = "BOM_NUM")
     @ApiParam("BOM编号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String bomNum;
 
     @Column(name = "BOM_VERSION")
     @ApiParam("BOM版本号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String bomVersion;
 
     @Column(name = "EFF_START_TIME")
     @ApiParam("有效起始日期")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String effStartTime;
 
     @Column(name = "EFF_END_TIME")
     @ApiParam("有效截止日期")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String effEndTime;
 }

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

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -35,42 +33,34 @@ public class PtlControl extends BaseBean implements Serializable {
 
     @Column(name = "CONTROL_NO")
     @ApiParam("控制器编号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String controlNo;
 
     @Column(name = "CONTROL_NAME")
     @ApiParam("控制器名称")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String controlName;
 
     @Column(name = "CONTROL_TYPE")
     @ApiParam("控制器类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_TYPE")
     private Integer controlType;
 
     @Column(name = "IP")
     @ApiParam("ip地址")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String ip;
 
     @Column(name = "PORT")
     @ApiParam("端口地址")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String port;
 
     @Column(name = "AREA_NO")
     @ApiParam("区域代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String areaNo;
 
     @Column(name = "STATUS")
     @ApiParam("控制器状态")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_STATUS")
     private Integer status;
 
     @Column(name = "FREQUENCY")
     @ApiParam("监听频率")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Integer frequency;
 
     @Version

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

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,26 +32,21 @@ public class PtlIf extends BaseBean implements Serializable {
 
     @Column(name = "IF_CODE")
     @ApiParam("接口代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String ifCode;
 
     @Column(name = "IF_NAME")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("接口名称")
     private String ifName;
 
     @Column(name = "IF_CONNECT_TYPE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @ApiParam("交互方式")
     private String ifConnectType;
 
     @Column(name = "IF_CLASS")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @ApiParam("接口实现类")
     private String ifClass;
 
     @Column(name = "IF_CALL_TYPE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @ApiParam("接口调用方向")
     private String ifCallType;
 }

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

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -33,22 +31,18 @@ public class PtlPart extends BaseBean implements Serializable {
 
     @Column(name = "PART_NO")
     @ApiParam("物料编号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partNo;
 
     @Column(name = "PART_NAME")
     @ApiParam("物料名称")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partName;
 
     @Column(name = "PART_TYPE")
     @ApiParam("物料类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_PART_TYPE")
     private String partType;
 
     @Column(name = "UNIT")
     @ApiParam("单位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String unit;
 
 }

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

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,26 +32,21 @@ public class PtlRfid extends BaseBean implements Serializable {
 
     @Column(name = "RFID_CONTROL_NO")
     @ApiParam("RFID读写器代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String rfidControlNo;
 
     @Column(name = "IP")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("IP")
     private String ip;
 
     @Column(name = "PORT")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("端口号")
     private String port;
 
     @Column(name = "AREA_NO")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @ApiParam("区域代码")
     private String areaNo;
 
     @Column(name = "RFID_VALUE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("rfid内容")
     private String rfidValue;
 }

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

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -35,22 +33,18 @@ public class PtlSection extends BaseBean implements Serializable {
 
     @Column(name = "SECTION_NO")
     @ApiParam("区段编号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String sectionNo;
 
     @Column(name = "SECTION_NAME")
     @ApiParam("区段名称")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String sectionName;
 
     @Column(name = "SECTION_SEQ")
     @ApiParam("区段顺序号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Integer sectionSeq;
 
     @Column(name = "AREA_NO")
     @ApiParam("区域代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String areaNo;
 
     @Transient

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

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,82 +32,66 @@ public class PtlTag extends BaseBean implements Serializable {
 
     @Column(name = "TAG_NO")
     @ApiParam("标签代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Integer tagNo;
 
     @Column(name = "CONTROL_NO")
     @ApiParam("控制器代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String controlNo;
 
     @Column(name = "AREA_NO")
     @ApiParam("区域代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String areaNo;
 
     @Column(name = "SECTION_NO")
     @ApiParam("区段代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String sectionNo;
 
     @Column(name = "PART_NO")
     @ApiParam("物料编号")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partNo;
 
     @Column(name = "BIN_NO")
     @ApiParam("BIN位代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String binNo;
 
     @Column(name = "TAG_TYPE")
     @ApiParam("标签类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_TYPE")
     private Integer tagType;
 
     @Column(name = "LIGHT_STATUS")
     @ApiParam("亮灯状态")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_STATUS")
     private Integer lightStatus;
 
     @Column(name = "TAG_STATUS")
     @ApiParam("标签状态")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_STATUS")
     private Integer tagStatus;
 
     @Column(name = "LIGHT_MODE")
     @ApiParam("亮灯方式")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_MODE")
     private Integer lightMode;
 
     @Column(name = "LIGHT_COLOR")
     @ApiParam("亮灯颜色")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_COLOR")
     private Integer lightColor;
 
     @Column(name = "IS_BUZZING")
     @ApiParam("是否蜂鸣")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_IS_BUZZING")
     private Integer isBuzzing;
 
     @Column(name = "MUSIC_TYPE")
     @ApiParam("音乐类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_MUSIC_TYPE")
     private Integer musicType;
 
     @Column(name = "DISPLAY_CONTEXT")
     @ApiParam("显示内容")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String displayContent;
 
     @Column(name = "ERROR_COUNT")
     @ApiParam("卡键次数")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Integer errorCount;
 
     @Column(name = "CUSTOM_ATTRIBUTE")
     @ApiParam("自定义属性")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String customAttribute;
 
 }

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

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -14,10 +12,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;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @author Wynne.Lu
@@ -37,11 +32,9 @@ public class PtlWindow extends BaseBean implements Serializable {
 
     @Column(name = "WINDOW_NO")
     @ApiParam("界面代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String windowNo;
 
     @Column(name = "WINDOW_NAME")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("界面名称")
     private String windowName;
 }

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

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,11 +32,9 @@ public class PtlWindowElement extends BaseBean implements Serializable {
 
     @Column(name = "WINDOW_NO")
     @ApiParam("界面代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String windowNo;
 
     @Column(name = "ELEMENT_NO")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("元素代码")
     private String elementNo;
 }

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

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.bean;
 
 
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,21 +32,17 @@ public class PtlWindowElementAttribute extends BaseBean implements Serializable
 
     @Column(name = "WINDOW_NO")
     @ApiParam("界面代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String windowNo;
 
     @Column(name = "ELEMENT_NO")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("元素代码")
     private String elementNo;
 
     @Column(name = "ATTRIBUTE_NO")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("属性代码")
     private String attributeNo;
 
     @Column(name = "ATTRIBUTE_VALUE")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("属性值")
     private String attributeValue;
 

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlActionRoute;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+public interface PtlActionRouteRepository extends BaseRepository<PtlActionRoute, Long> {
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java

@@ -306,4 +306,32 @@ public class PtlHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result);
         return result;
     }
+
+    /**
+     * 流程查询条件封装
+     *
+     * @param actionRoute
+     * @return
+     */
+    public static DdlPackBean packHqlPtlActionRoute(PtlActionRoute actionRoute, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(actionRoute, organizeCode);
+        DdlPreparedPack.getStringLikerPack(actionRoute.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(actionRoute.getRouteName(), "routeName", packBean);
+        DdlPreparedPack.getNumEqualPack(actionRoute.getRouteType(), "routeType", packBean);
+        return packBean;
+    }
+
+    /**
+     * 区域流程查询条件封装
+     * @param areaRoute
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean packHqlPtlAreaRoute(PtlAreaRoute areaRoute, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(areaRoute, organizeCode);
+        DdlPreparedPack.getStringLikerPack(areaRoute.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(areaRoute.getAreaNo(), "areaNo", packBean);
+        DdlPreparedPack.getNumEqualPack(areaRoute.getRouteType(), "routeType", packBean);
+        return packBean;
+    }
 }

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java

@@ -235,6 +235,15 @@ public class ReportHqlPack {
         return result;
     }
 
+    public static DdlPackBean packHqlBrPojoView(BrPojoView bean){
+        DdlPackBean result = DdlPackBean.getDdlPackBean(bean);
+
+        DdlPreparedPack.getNumEqualPack(bean.getPojoId(),"pojoId",result);
+        DdlPreparedPack.getNumEqualPack(bean.getViewType(),"viewType",result);
+
+        return result;
+    }
+
     public static DdlPackBean packHqlBrPojoViewAttr(BrPojoViewAttr bean){
         DdlPackBean result = DdlPackBean.getDdlPackBean(bean);
 

modules/i3plus-pojo-sweb/pom.xml

@@ -13,6 +13,7 @@
     <artifactId>i3plus-pojo-sweb</artifactId>
     <packaging>jar</packaging>
 
+
     <dependencies>
         <dependency>
             <groupId>i3plus.pojo</groupId>

modules/i3plus-pojo-wms/pom.xml

@@ -13,6 +13,7 @@
     <artifactId>i3plus-pojo-wms</artifactId>
     <packaging>jar</packaging>
 
+
     <dependencies>
         <dependency>
             <groupId>i3plus.pojo</groupId>

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java

@@ -43,7 +43,6 @@ public class AmpJisRec extends BaseBean {
     public String partNameRdd;
 
     @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
-    @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
     public Double qty;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java

@@ -49,17 +49,17 @@ public class WmsActionGroup extends BaseBean {
     @AnnoOutputColumn
     private String agDescC;
 
-    @Column(name = "INIT_AM_ID", columnDefinition = "bigint(20) default 0")
+    @Column(name = "INIT_AM_ID", columnDefinition = "bigint default 0")
     @ApiParam(value = "初始化组件编号", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long initAmId;
 
-    @Column(name = "DETAILS_AM_ID", columnDefinition = "bigint(20) default 0")
+    @Column(name = "DETAILS_AM_ID", columnDefinition = "bigint default 0")
     @ApiParam(value = "明细处理组件编号", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long detailsAmId;
 
-    @Column(name = "END_AM_ID", columnDefinition = "bigint(20) default 0")
+    @Column(name = "END_AM_ID", columnDefinition = "bigint default 0")
     @ApiParam(value = "结束组件编号", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long endAmId;
@@ -82,7 +82,7 @@ public class WmsActionGroup extends BaseBean {
     private Integer isAutoCommit;
 
     @Lob
-    @Column(name = "POSITION")
+    @Column(name = "POSITION", columnDefinition = "TEXT")
     @ApiParam(value = "GOJS位置")
     private String position;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java

@@ -100,7 +100,7 @@ public class WmsActionGroupDetails extends BaseBean {
     @ApiParam(value = "是否预显示")
     private Integer preShow;
 
-    @Column(name = "SHOW_AM_ID", columnDefinition = "bigint(20) default 0")
+    @Column(name = "SHOW_AM_ID", columnDefinition = "bigint default 0")
     @ApiParam(value = "回显组件方法ID")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long showAmId;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java

@@ -65,17 +65,17 @@ public class WmsActionLogData extends BaseBean {
     private String endTime;
 
     @Lob
-    @Column(name = "IN_PARAMS")
+    @Column(name = "IN_PARAMS", columnDefinition = "TEXT")
     @ApiParam(value = "输入参数")
     private String inParams;
 
     @Lob
-    @Column(name = "OUT_PARAMS")
+    @Column(name = "OUT_PARAMS", columnDefinition = "TEXT")
     @ApiParam(value = "输出参数")
     private String outParams;
 
     @Lob
-    @Column(name = "ERROR_MSG")
+    @Column(name = "ERROR_MSG", columnDefinition = "TEXT")
     @ApiParam(value = "异常信息")
     private String errorMsg;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java

@@ -9,6 +9,7 @@ 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;
 
@@ -49,8 +50,9 @@ public class WmsBom extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String unit;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "数量")
+    @ColumnDefault("0")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double qty;
 
@@ -69,8 +71,9 @@ public class WmsBom extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String itemUnit;
 
-    @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "子用量")
+    @ColumnDefault("0")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double itemQty;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java

@@ -5,6 +5,7 @@ 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;
 
@@ -40,8 +41,9 @@ public class WmsBomTotal extends BaseBean {
     @ApiParam("计量单位")
     private String UNIT;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam("数量")
+    @ColumnDefault("0")
     private Double qty;
 
     @Column(name = "ITEM_PART_NO")
@@ -56,8 +58,9 @@ public class WmsBomTotal extends BaseBean {
     @ApiParam(value = "子计量单位")
     private String itemUnit;
 
-    @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "子用量")
+    @ColumnDefault("0")
     private Double itemQty;
 
     @Column(name = "BOM_NUM")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java

@@ -5,6 +5,7 @@ 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;
 
@@ -53,7 +54,7 @@ public class WmsConfig extends BaseBean {
     private String configValueType;
 
     @Lob
-    @Column(name="CONFIG_VALUE")
+    @Column(name="CONFIG_VALUE", columnDefinition = "TEXT")
     @ApiParam(value ="参数值")
     private String configValue;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java

@@ -53,41 +53,51 @@ public class WmsCsStrategy extends BaseBean implements Serializable {
 
     @Column(name = "CYCLE_RULE")
     @ApiParam(value = "循环规则")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String cycleRule;
 
     @Column(name = "START_DATE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "开始日期", example = "0")
     private String startDate;
 
     @Column(name = "END_DATE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "结束日期", example = "0")
     private String endDate;
 
     @Column(name = "NUM_MAX")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "明细数量上限")
     private Integer numMax;
 
     @Column(name = "COVERAGE_RATE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "抽盘覆盖率")
     private Double coverageRate;
 
     @Column(name = "ZONE_NOS")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "存储区")
     private String zoneNos;
 
     @Column(name = "LOCATES")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "盘点库位")
     private String locates;
 
     @Column(name = "last_run_time")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "上次运行时间")
     private String lastRunTime;
 
     @Column(name = "next_run_time")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "下次运行时间")
     private String nextRunTime;
 
     @Column(name = "REMAKE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam(value = "备注")
     private String remake;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java

@@ -46,6 +46,6 @@ public class WmsDock extends BaseBean {
 
     @Column(name="DOCK_TYPE")
     @ApiParam("道口类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
-    private String dockType;
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_TYPE")
+    private Integer dockType;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 道口预约信息
@@ -69,4 +70,8 @@ public class WmsDockOrderInfo extends BaseBean {
     @ApiParam("单据号")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String orderNo;
+
+    @Transient
+    @ApiParam("库位代码")
+    private Integer masterStatus;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java

@@ -7,6 +7,7 @@ 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;
 
@@ -58,16 +59,19 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam("客户编号")
     public String custNo;
 
-    @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "处理数量", example = "0")
+    @ColumnDefault("0")
     public Double transQty;
 
-    @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "已处理数量", example = "0")
+    @ColumnDefault("0")
     public Double handledQty;
 
-    @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "不合格处理数量", example = "0")
+    @ColumnDefault("0")
     public Double rejectQty;
 
     public Double getRejectQty() {

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java

@@ -68,6 +68,10 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam(value = "车牌号")
     private String carNo;
 
+    @Column(name = "DRIVER_NO")
+    @ApiParam("司机")
+    public String driverNo;
+
     @Column(name = "BUSI_TYPE_CODE")
     @ApiParam(value = "业务类型编码")
     @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java

@@ -84,7 +84,7 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("容器编号")
     public String packAgeNo;
 
-    @Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "源数量", example = "0")
     public Double srcQty;
@@ -121,12 +121,12 @@ public class WmsMoveSn extends BaseBean {
     @Transient
     private Long finishedCounts;
 
-    @Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "目标数量", example = "0")
     public Double destQty;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
     public Double qty;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java

@@ -6,6 +6,7 @@ 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;
 
@@ -65,6 +66,10 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam(value = "车牌号")
     private String carNo;
 
+    @Column(name = "DRIVER_NO")
+    @ApiParam("司机")
+    public String driverNo;
+
     @Column(name="ITEM")
     @ApiParam(value = "行号")
     public String item;
@@ -85,12 +90,14 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("客户编号")
     public String custNo;
 
-    @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "处理数量", example = "0")
+    @ColumnDefault("0")
     public Double transQty;
 
-    @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam(value = "不合格处理数量", example = "0")
+    @ColumnDefault("0")
     public Double rejectQty;
 
     @Column(name="UNIT")
@@ -143,8 +150,9 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("关联单位")
     public String refUnit;
 
-    @Column(name="REF_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name="REF_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam("关联数量")
+    @ColumnDefault("0")
     public Double refQty;
 
     @Column(name = "SRC_AREA_NO")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java

@@ -39,7 +39,7 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam("物料编码")
     private String partNo;
 
-    @Column(name = "BOX_QTY")
+    @Column(name = "BOX_QTY", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "箱数", example = "0")
     private Integer boxQty;
@@ -52,7 +52,7 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam("行号")
     private Integer item;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
     private Double qty;
@@ -69,28 +69,28 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam("订单号")
     private String orderNo;
 
-    @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "条码打印数量", example = "0")
     private Double printQty;
 
     //private Double getPrintQty(){ return this.printQty == null ? new Double(0) : this.printQty; }
 
-    @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "收货数量", example = "0")
     private Double rcQty = 0d;
 
     //private Double getRcQty(){ return this.rcQty == null ? new Double(0) : this.rcQty; }
 
-    @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "质检合格数量", example = "0")
     private Double passQty;
 
     //private Double getPassQty(){ return this.passQty == null ? new Double(0) : this.passQty; }
 
-    @Column(name = "NG_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "NG_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "质检不合格数量", example = "0")
     private Double ngQty;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java

@@ -5,6 +5,7 @@ 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;
 
@@ -41,12 +42,14 @@ public class WmsPackSn extends BaseBean {
     @ApiParam(value = "物料名称")
     private String partNameAdd;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam("数量")
+    @ColumnDefault("0")
     private Double qty;
 
-    @Column(name = "SID", columnDefinition = "decimal(18,8)")
+    @Column(name = "SID", columnDefinition = "decimal(18,8)", nullable = false)
     @ApiParam("SID")
+    @ColumnDefault("0")
     private Double sId;
 
     @Column(name = "COMMIT_DATE")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java

@@ -177,7 +177,8 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "OUT_CLOSE_VENDOR")
     @ApiParam("结算供应商")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
+            searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
     private String outCloseVendor;
 
     @Column(name = "QUALITY_DAYS")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java

@@ -6,6 +6,7 @@ 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;
 
@@ -46,8 +47,9 @@ public class WmsPickCount extends BaseBean {
     @ApiParam(value = "物料号")
     private String partNo;
 
-    @Column(name = "QTY")
+    @Column(name = "QTY", nullable = false)
     @ApiParam(value = "数量")
+    @ColumnDefault("0")
     private Double qty;
 
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java

@@ -51,7 +51,7 @@ public class WmsPoSn extends BaseBean {
     @ApiParam("物料名称")
     public String partNameRdd;
 
-    @Column(name="QTY", columnDefinition = "decimal(18,8)")
+    @Column(name="QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
     public Double qty;
@@ -89,7 +89,7 @@ public class WmsPoSn extends BaseBean {
     @ApiParam("组条码")
     public String groupNo;
 
-    @Column(name="REC_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name="REC_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "收货数量", example = "0")
     public Double recQty;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java

@@ -5,6 +5,7 @@ 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;
 
@@ -46,8 +47,9 @@ public class WmsPullTaskDetails extends BaseBean{
     @ApiParam("库位代码")
     private String locateNo;
 
-    @Column(name="LOCATE_CAPACITY")
+    @Column(name="LOCATE_CAPACITY", nullable = false)
     @ApiParam(value = "库位容量", example = "0")
+    @ColumnDefault("0")
     private Integer locateCapacity = 0;
 
     @Column(name="PART_NO")
@@ -58,52 +60,63 @@ public class WmsPullTaskDetails extends BaseBean{
     @ApiParam("零件名称")
     private String partNameRdd;
 
-    @Column(name="PLAN_PACK_QTY")
+    @Column(name="PLAN_PACK_QTY", nullable = false)
     @ApiParam(value = "计划数量", example = "0d")
+    @ColumnDefault("0")
     private Double planPackQty = 0d;
 
-    @Column(name="PLAN_PACK_COUNT")
+    @Column(name="PLAN_PACK_COUNT", nullable = false)
     @ApiParam(value = "计划容器数", example = "0d")
+    @ColumnDefault("0")
     private Double planPackCount = 0d;
 
-    @Column(name="FIRST_BATCH_QTY")
+    @Column(name="FIRST_BATCH_QTY", nullable = false)
     @ApiParam(value = "首批批量", example = "0d")
+    @ColumnDefault("0")
     private Double firstBatchQty = 0d;
 
-    @Column(name="FIRST_PACK_COUNT")
+    @Column(name="FIRST_PACK_COUNT", nullable = false)
     @ApiParam(value = "首批容器数", example = "0d")
+    @ColumnDefault("0")
     private Double firstPackCount = 0d;
 
-    @Column(name="REQUEST_QTY")
+    @Column(name="REQUEST_QTY", nullable = false)
     @ApiParam(value = "补货批量", example = "0d")
+    @ColumnDefault("0")
     private Double requestQty = 0d;
 
-    @Column(name="REQUEST_PACK_COUNT")
+    @Column(name="REQUEST_PACK_COUNT", nullable = false)
     @ApiParam(value = "补货容器数", example = "0d")
+    @ColumnDefault("0")
     private Double requestPackCount = 0d;
 
-    @Column(name="REQUEST_LOT_NO")
+    @Column(name="REQUEST_LOT_NO", nullable = false)
     @ApiParam(value = "补货批次", example = "0d")
+    @ColumnDefault("0")
     private Double requestLotNo = 0d;
 
-    @Column(name="REQUEST_TOTAL_COUNT")
+    @Column(name="REQUEST_TOTAL_COUNT", nullable = false)
     @ApiParam(value = "补货累加次数", example = "0d")
+    @ColumnDefault("0")
     private Double requestTotalCount = 0d;
 
     @Column(name="LAST_REQUEST_TIME")
     @ApiParam("上一次补货时间")
     private String lastRequestTtime;
 
-    @Column(name="BOOT_QTY")
+    @Column(name="BOOT_QTY", nullable = false)
     @ApiParam(value = "尾箱批量", example = "0d")
+    @ColumnDefault("0")
     private Double bootQty = 0d;
 
-    @Column(name="BOOT_PACK_COUNT")
+    @Column(name="BOOT_PACK_COUNT", nullable = false)
     @ApiParam(value = "尾箱容器数", example = "0d")
+    @ColumnDefault("0")
     private Double bootPackCount = 0d;
 
-    @Column(name="BOOT_LOT_NO")
+    @Column(name="BOOT_LOT_NO", nullable = false)
     @ApiParam(value = "尾箱批次", example = "0d")
+    @ColumnDefault("0")
     private Double bootLotNo = 0d;
 
     @Column(name="ORDER_STATUS")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java

@@ -52,12 +52,12 @@ public class WmsPushConfig extends BaseBean{
 
     @Lob
     @ApiParam("查询Hql")
-    @Column(name = "HQL_STR")
+    @Column(name = "HQL_STR", columnDefinition = "TEXT")
     private String hqlStr;
 
     @Lob
     @ApiParam("查询Sql")
-    @Column(name = "SQL_STR")
+    @Column(name = "SQL_STR", columnDefinition = "TEXT")
     private String sqlStr;
 
     @ApiParam("脚本编号")
@@ -66,12 +66,12 @@ public class WmsPushConfig extends BaseBean{
 
     @Lob
     @ApiParam("标题模板")
-    @Column(name = "TITLE_TEMPLATE")
+    @Column(name = "TITLE_TEMPLATE", columnDefinition = "TEXT")
     private String titleTemplate;
 
     @Lob
     @ApiParam("消息体模板")
-    @Column(name = "CONTENT_TEMPLATE")
+    @Column(name = "CONTENT_TEMPLATE", columnDefinition = "TEXT")
     private String contentTemplate;
 
     @ApiParam("推送类型")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java

@@ -36,7 +36,7 @@ public class WmsPushLog extends BaseBean{
     private String pushTitle;
 
     @Lob
-    @Column(name = "PUSH_CONTENT")
+    @Column(name = "PUSH_CONTENT", columnDefinition = "TEXT")
     @ApiParam("推送内容")
     private String pushContent;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java

@@ -42,7 +42,7 @@ public class WmsQCDetails extends BaseBean {
     @ApiParam("行号")
     public String item;
 
-    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
     public Double qty;
@@ -67,17 +67,17 @@ public class WmsQCDetails extends BaseBean {
     public String remark;
 
 
-    @Column(name = "FACT_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "FACT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "实检数量", example = "0")
     public Double factQty;
 
-    @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "合格数量", example = "0")
     public Double passQty;
 
-    @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)")
+    @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
     @ColumnDefault("0")
     @ApiParam(value = "不合格数量", example = "0")
     public Double rejectQty;