Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -13,6 +13,40 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * 动作-module
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_ACTION_MODULE {
+        WORK_ORDER_LANDED(10, "生产工单下达");
+
+        private int value;
+        private String description;
+
+        MES_ACTION_MODULE(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;
+        }
+    }
+
+    /**
      * JIS发运模式类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -3945,4 +3979,86 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * MesMonitorTask实体对应的status值  监听任务状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MONITOR_TASK_STATUS {
+
+        NORMAL(10, "正常"),
+        CLOSE(20, "关闭");
+
+        private int value;
+        private String description;
+
+        MONITOR_TASK_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 MONITOR_TASK_OBJECT_TYPE {
+
+        PLC(10, "PLC"),
+        DB(20, "DB"),
+        OTHER(30, "其他");
+
+        private int value;
+        private String description;
+
+        MONITOR_TASK_OBJECT_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;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -2685,4 +2685,51 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 监听任务任务对象类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MONITOR_TASK_OBJECT_TYPE {
+
+        PLC(10, "PLC"),
+        DB(20, "DB"),
+        OTHER(30, "其他");
+
+        private int value;
+        private String description;
+
+        MONITOR_TASK_OBJECT_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;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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 : zcg
+ * @Date : 2020/1/8 0008 - 17:11
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_MONITOR_TASK")
+@Api("监听任务")
+public class MesMonitorTask extends BaseBean {
+
+    @Column(name = "TASK_NO")
+    @ApiParam("任务编号")
+    private String taskNo;
+
+    @Column(name = "TASK_NAME")
+    @ApiParam("任务名称")
+    private String taskName;
+
+    @Column(name = "TASK_OBJECT_TYPE")
+    @ApiParam("任务对象类型")
+    private String taskObjectType;
+
+    @Column(name = "TASK_STATUS")
+    @ApiParam("任务状态")
+    private Integer taskStatus;
+
+    @Column(name = "TASK_EXCEPTION_DESC")
+    @ApiParam("异常描述")
+    private String taskExceptionDesc;
+
+}

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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 : zcg
+ * @Date : 2020/1/8 0008 - 17:19
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_MONITOR_TASK_DETAIL")
+@Api("监听任务明细")
+public class MesMonitorTaskDetail extends BaseBean {
+
+    @Column(name = "TASK_NO")
+    @ApiParam("任务编号")
+    private String taskNo;
+
+    @Column(name = "DATA_OBJECT_NO")
+    @ApiParam("数据对象编号")
+    private String dataObjectNo;
+
+//    @Column(name = "STORE_OBJECT_CODE")
+//    @ApiParam("存储对象代码")
+//    private String storeObjectCode;
+//
+//    @Column(name = "STORE_FIELD_CODE")
+//    @ApiParam("存储字段代码")
+//    private String storeFieldCode;
+
+}

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

@@ -100,8 +100,8 @@ public class MesProductData extends BaseBean {
     private String groupNo;
 
     @Lob
-    @Column(name = "TEST_DATA")
-    @ApiParam("测试json数据")
-    private String testData;
+    @Column(name = "LINE_DATA")
+    @ApiParam("生产数据")
+    private String lineData;
 
 }

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMonitorTaskDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/1/8 0008 - 18:42
+ */
+@Repository
+public interface MesMonitorTaskDetailRepository extends BaseRepository<MesMonitorTaskDetail, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMonitorTask;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/1/8 0008 - 18:43
+ */
+@Repository
+public interface MesMonitorTaskRepository extends BaseRepository<MesMonitorTask,Long> {
+}

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

@@ -173,8 +173,6 @@ public class MesHqlPack {
                     mesWorkOrder.getCreateDateTimeEnd(),
                     "createDatetime", packBean, true);
         }
-        DdlPreparedPack.getOrderDefault(mesWorkOrder);
-        DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
         return packBean;
     }
 
@@ -205,9 +203,6 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) {
             DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean);
         }
-
-        DdlPreparedPack.getOrderDefault(mesPart);
-        DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean);
         return packBean;
     }
 

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

@@ -0,0 +1,50 @@
+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 : zcg
+ * @Date : 2020/1/8 0008 - 17:11
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_MONITOR_TASK")
+@Api("监听任务")
+public class MesMonitorTask extends BaseBean {
+
+    @Column(name = "TASK_NO")
+    @ApiParam("任务编号")
+    private String taskNo;
+
+    @Column(name = "TASK_NAME")
+    @ApiParam("任务名称")
+    private String taskName;
+
+    @Column(name = "TASK_OBJECT_TYPE")
+    @ApiParam("任务对象类型")
+    private String taskObjectType;
+
+    @Column(name = "TASK_STATUS")
+    @ApiParam("任务状态")
+    private Integer taskStatus;
+
+    @Column(name = "TASK_EXCEPTION_DESC")
+    @ApiParam("异常描述")
+    private String taskExceptionDesc;
+
+}

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

@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/1/8 0008 - 17:19
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_MONITOR_TASK_DETAIL")
+@Api("监听任务明细")
+public class MesMonitorTaskDetail extends BaseBean {
+
+    @Column(name = "TASK_NO")
+    @ApiParam("任务编号")
+    private String taskNo;
+
+    @Column(name = "DATA_OBJECT_NO")
+    @ApiParam("数据对象编号")
+    private String dataObjectNo;
+
+//    @Column(name = "STORE_OBJECT_CODE")
+//    @ApiParam("存储对象代码")
+//    private String storeObjectCode;
+//
+//    @Column(name = "STORE_FIELD_CODE")
+//    @ApiParam("存储字段代码")
+//    private String storeFieldCode;
+
+    @Transient
+    @ApiParam("任务名称")
+    private String taskName;
+
+}

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

@@ -10,6 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.context.annotation.Lazy;
 
 import javax.persistence.*;
 
@@ -107,9 +108,10 @@ public class MesProductData extends BaseBean {
     private String groupNo;
 
     @Json4Es
-    @Column(name = "TEST_DATA")
-    @ApiParam("测试json数据")
-    private String testData;
+    @Lob
+    @Column(name = "LINE_DATA")
+    @ApiParam("生产数据")
+    private String lineData;
 
     @Lob
     @Transient

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

@@ -32,4 +32,7 @@ public class ActionRequestBean<Obj> implements Serializable {
 
     @ApiParam("Map请求集")
     public Map<String, Object> resultMap;
+
+    @ApiParam("module代码")
+    public Integer moduleCode;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskDetailRepository.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.MesMonitorTaskDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/1/8 0008 - 18:42
+ */
+@Repository
+public interface MesMonitorTaskDetailRepository extends BaseRepository<MesMonitorTaskDetail, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskRepository.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.MesMonitorTask;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/1/8 0008 - 18:43
+ */
+@Repository
+public interface MesMonitorTaskRepository extends BaseRepository<MesMonitorTask,Long> {
+}

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

@@ -2085,6 +2085,7 @@ public class MesHqlPack {
 
     /**
      * JIS发运模式
+     *
      * @param patternJis
      * @param organizeCode
      * @return
@@ -2106,5 +2107,51 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * 监听任务查询条件封装
+     *
+     * @param monitorTask
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesMonitorTask(MesMonitorTask monitorTask, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (!StringUtils.isEmpty(monitorTask.getTaskNo())) {
+            DdlPreparedPack.getStringLikerPack(monitorTask.getTaskNo(), "taskNo", packBean);
+        }
+        if (!StringUtils.isEmpty(monitorTask.getTaskName())) {
+            DdlPreparedPack.getStringLikerPack(monitorTask.getTaskName(), "taskName", packBean);
+        }
+        if (!StringUtils.isEmpty(monitorTask.getTaskObjectType())) {
+            DdlPreparedPack.getStringEqualPack(monitorTask.getTaskObjectType(), "taskObjectType", packBean);
+        }
+        if (!StringUtils.isEmpty(monitorTask.getTaskStatus())) {
+            DdlPreparedPack.getNumEqualPack(monitorTask.getTaskStatus(), "taskStatus", packBean);
+        }
+        if (monitorTask.getIsValid() != null) {
+            DdlPreparedPack.getNumEqualPack(monitorTask.getIsValid(), "isValid", packBean);
+        }
+        return packBean;
+    }
 
+    /**
+     * 监听任务明细查询条件封装
+     *
+     * @param monitorTaskDetail
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesMonitorTaskDetail(MesMonitorTaskDetail monitorTaskDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (!StringUtils.isEmpty(monitorTaskDetail.getTaskNo())) {
+            DdlPreparedPack.getStringLikerPack(monitorTaskDetail.getTaskNo(), "taskNo", packBean);
+        }
+        if (!StringUtils.isEmpty(monitorTaskDetail.getDataObjectNo())) {
+            DdlPreparedPack.getStringLikerPack(monitorTaskDetail.getDataObjectNo(), "dataObjectNo", packBean);
+        }
+        if (monitorTaskDetail.getIsValid() != null) {
+            DdlPreparedPack.getNumEqualPack(monitorTaskDetail.getIsValid(), "isValid", packBean);
+        }
+        return packBean;
+    }
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java

@@ -25,7 +25,7 @@ public class WmsListElementModel extends BaseBean {
     @ApiParam(value = "用户编号")
     private String userCode;
 
-    @ApiParam(value = "是否默认配置")
+    @ApiParam(value = "是否默认配置 1-默认，2-自定义")
     private Integer isDefault;
 
     List<WmsListElement> wmsListElementList;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java

@@ -34,6 +34,9 @@ public class WmsSearchElementModel extends BaseBean {
     @ApiParam(value = "是否共享")
     private Integer isShare;
 
+    @ApiParam(value = "搜索名称")
+    private String searchName;
+
     @ApiParam(value = "Wms查询元素列表")
     private List<WmsSearchElement> searchElementList;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : WMS列表搜索model
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 14:33
+ * @Modify:
+ **/
+@Data
+public class WmsSearchGroupModel {
+
+    @ApiParam(value = "组列表")
+    private List<WmsSearchElementModel> searchElementModelList;
+}

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

@@ -0,0 +1,113 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description : 包材BOM信息
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-01-09 14:40
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="QAD_BOP")
+@Api("包材BOM信息")
+public class QadBop  implements Serializable {
+
+    private static final long serialVersionUID = 4673217061075875734L;
+
+    @Id
+    @GeneratedValue(generator = "IDGenerator")
+    @GenericGenerator(name = "IDGenerator", strategy = "assigned")
+    @Column(name="ID")
+    @ApiParam(value = "主键",example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    public Long id;
+
+    //get单独处理
+    public Long getId() {
+        if(id != null) {
+            return id.longValue();
+        }else{
+            return id;
+        }
+    }
+
+    /**
+     * MonogoDB _id映射
+     * @param id
+     */
+    @JSONField(name="_id")
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="BOP_CODE")
+    @ApiParam("BOP编号")
+    public String bopCode;
+
+    @Column(name="BOP_DESC")
+    @ApiParam("BOP描述")
+    public String bopDesc;
+
+    @Column(name="BOP_DOMAIN")
+    @ApiParam("BOP所属Domain")
+    public String bopDomain;
+
+    @Column(name="PARENT_PART")
+    @ApiParam("父层级packcode对应的qad零件号")
+    public String parentPart;
+
+    @Column(name="PARENT_RETURN_PART")
+    @ApiParam("父层级packcode对应的可回用零件号")
+    public String parentReturnPart;
+
+    @Column(name="BOPDW_QTY")
+    @ApiParam("默认1 不考虑")
+    public String bopdwQty;
+
+    @Column(name="SUB_BOP_CODE")
+    @ApiParam("子层级packcode代码或者是物料零件号")
+    public String subBopCode;
+
+    @Column(name="SUB_BOP_PART")
+    @ApiParam("子层级packcode对应的qad零件号，如果是物料零件这里为空")
+    public String subBopPart;
+
+    @Column(name="SUB_ITEM_PART")
+    @ApiParam("子层级packcode对应的可回用零件号，如果是物料零件这里为空")
+    public String subItemPart;
+
+    @Column(name="SUB_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "该层级在父层级中的个数", example = "0")
+    public String subQty;
+
+    @Column(name="SUB_UNIT")
+    @ApiParam("单位")
+    public String subUnit;
+
+    @Column(name="CREATE_DATE_TIME")
+    @ApiParam("创建时间")
+    public String createDateTime;
+}

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

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description : 零件包装主数据信息
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-01-09 14:04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="QAD_ITEM_PACKING")
+@Api("零件包装主数据信息")
+public class QadItemPacking implements Serializable {
+
+    private static final long serialVersionUID = -9204074690166851001L;
+
+    @Id
+    @GeneratedValue(generator = "IDGenerator")
+    @GenericGenerator(name = "IDGenerator", strategy = "assigned")
+    @Column(name="ID")
+    @ApiParam(value = "主键",example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    public Long id;
+
+    //get单独处理
+    public Long getId() {
+        if(id != null) {
+            return id.longValue();
+        }else{
+            return id;
+        }
+    }
+
+    /**
+     * MonogoDB _id映射
+     * @param id
+     */
+    @JSONField(name="_id")
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="IN_ADDR")
+    @ApiParam("收货时是供应商编号，发运时是客户发往地")
+    public String inAddr;
+
+    @Column(name="IN_BOP_CODE")
+    @ApiParam("BOP编号")
+    public String inBopCode;
+
+    @Column(name="IN_DOMAIN")
+    @ApiParam("所属Domain")
+    public String inDomain;
+
+    @Column(name="IN_PART")
+    @ApiParam("物料代码")
+    public String inPart;
+
+    @Column(name="IN_SITE")
+    @ApiParam("工厂代码")
+    public String inSite;
+
+    @Column(name="IN_TRANS_TYPE")
+    @ApiParam("交易类型")
+    public String inTransType;
+
+    @Column(name="CREATE_DATE_TIME")
+    @ApiParam("创建时间")
+    public String createDateTime;
+}

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

@@ -132,12 +132,12 @@ public class WmsCSFactTrans extends BaseBean {
      * 60=在途,70=已隔离,80=破包,90=冻结,100=作废
      */
     @Transient
-    @AnnoOutputColumn(hidden = true)
     @ApiParam(value = "条码状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     public Integer snStatus;
 
     @Transient
-    @AnnoOutputColumn(hidden = true)
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     @ApiParam(value = "条码状态(冻结时)", example = "1")
     public Integer destSnStatus;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.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;
 
 /**
@@ -33,7 +34,7 @@ public class WmsPushConfig extends BaseBean{
     @Column(name = "PUSH_NAME")
     private String pushName;
 
-    @ApiParam("规则类型")
+    @ApiParam("规则表达式")
     @Column(name = "QUARTZ_CRON")
     private String quartzCron;
 
@@ -61,10 +62,12 @@ public class WmsPushConfig extends BaseBean{
     @Column(name = "SCRIPT_NO")
     private String scriptNo;
 
+    @Lob
     @ApiParam("标题模板")
     @Column(name = "TITLE_TEMPLATE")
     private String titleTemplate;
 
+    @Lob
     @ApiParam("消息体模板")
     @Column(name = "CONTENT_TEMPLATE")
     private String contentTemplate;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.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;
 
 /**
@@ -29,24 +30,23 @@ import javax.persistence.Table;
 public class WmsPushLog extends BaseBean{
 
     private static final long serialVersionUID = -1708833666516164845L;
-    @Column(name = "EXE_HQL")
-    @ApiParam("执行Hql")
-    private String exeHql;
 
     @Column(name = "PUSH_TITLE")
     @ApiParam("推送标题")
     private String pushTitle;
 
+    @Lob
     @Column(name = "PUSH_CONTENT")
     @ApiParam("推送内容")
     private String pushContent;
 
     @Column(name = "PUSH_TYPE")
     @ApiParam("推送类型")
-    private String pushType;
+    private Integer pushType;
+
+    @Column(name = "PATH_URL")
+    @ApiParam("推送地址")
+    private String pathUrl;
 
-    @Column(name = "PUSH_RESULT")
-    @ApiParam("推送结果")
-    private String pushResult;
 
 }

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

@@ -25,8 +25,8 @@ import javax.persistence.Table;
 @Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = {
         @Index(columnList = "FUNCTION_ID"),
         @Index(columnList = "SEARCH_ELEMENT_ID"),
-        @Index(columnList = "IS_SHARE"),
-        @Index(columnList = "USER_CODE")
+        @Index(columnList = "USER_CODE"),
+        @Index(columnList = "SEARCH_NAME")
 })
 @DynamicInsert
 @DynamicUpdate
@@ -56,7 +56,14 @@ public class WmsSearchElementFunction extends BaseBean {
     @ApiParam(value = "用户编号")
     private String userCode;
 
+    /**
+     *  1-共享，2-不共享
+     */
     @Column(name = "IS_SHARE")
     @ApiParam(value = "是否共享")
     private Integer isShare;
+
+    @Column(name = "SEARCH_NAME")
+    @ApiParam(value = "搜索名称")
+    private String searchName;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java

@@ -1,15 +1,16 @@
 package cn.estsh.i3plus.pojo.wms.modelbean;
 
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.List;
 import java.util.Map;
 
 @Data
 public class MailMessageModel extends PushMessageModel {
 
-
-    //附加，value 文件的绝对地址/动态模板数据
-    private Map<String, Object> attachment;
-
+    //推送数据
+    @ApiParam("推送数据集合")
+    List dataList;
 
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.modelbean;
 
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.util.List;
@@ -9,17 +11,23 @@ import java.util.Map;
 public class PushMessageModel {
 
 
-    //标题
+    @ApiParam("标题")
     public String title;
-    //内容
+
+    @ApiParam("内容")
     public String content;
 
-    //推送类型
+    //推送类型-枚举 ：WmsEnumUtil.PUSH_TYPE
+    @ApiParam("推送类型")
     public String pushType;
 
-    //推送地址
+    //推送地址，邮箱以逗号分割
+    @ApiParam("推送地址")
     public String pathUrl;
 
-    //推送数据
-    List<Map<Object,Object>> dataList;
+
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.QadBop;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-01-09 15:06
+ * @Modify:
+ **/
+public interface QadBopRepository extends BaseRepository<QadBop, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadItemPackingRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.QadItemPacking;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-01-09 15:06
+ * @Modify:
+ **/
+public interface QadItemPackingRepository extends BaseRepository<QadItemPacking, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo;
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement;
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElementFunction;
 import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
 import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
 import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
@@ -2727,4 +2729,19 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsFieldInfo, result);
         return result;
     }
+
+    /**
+     * WMS搜索记录查询条件
+     *
+     * @param searchElementFunction
+     * @return
+     */
+    public static DdlPackBean packHqlWmsSearchElementRecord(WmsSearchElementFunction searchElementFunction) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getNumEqualPack(searchElementFunction.getFunctionId(), "functionId", result);
+        DdlPreparedPack.getNumEqualPackOr(searchElementFunction.getIsShare(), "isShare", result);
+        DdlPreparedPack.getStringEqualPack(searchElementFunction.getUserCode(), "userCode", result);
+        getStringBuilderPack(searchElementFunction, result);
+        return result;
+    }
 }