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

@@ -3979,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/MesPatternJis.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -37,6 +38,7 @@ public class MesPatternJis extends BaseBean {
     @ApiParam("模式名称")
     private String patternName;
 
+    @Lob
     @Column(name = "RULE")
     @ApiParam("规则")
     private String rule;

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/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/MesEquipmentModel.java

@@ -102,6 +102,7 @@ public class MesEquipmentModel implements Serializable {
 
     }
 
+    //根据条件查询设备所有有效数据-设备作业任务下拉框 queryMesEquipmentListByParams
     public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory) {
         this.id = id;
         this.equipmentCode = equipmentCode;
@@ -111,6 +112,8 @@ public class MesEquipmentModel implements Serializable {
         this.equipmentCategory = equipmentCategory;
     }
 
+    //根据生产线，工位获取设备集合 findMesEquipmentList
+    //获取设备分页数据-组织模型 queryMesEquipmentByPagerOrg
     public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode) {
         this.wcId = wcId;
         this.id = id;
@@ -122,6 +125,7 @@ public class MesEquipmentModel implements Serializable {
         this.areaCode = areaCode;
     }
 
+    //根据条件查询设备所有有效数据-组织模型下拉框及联 queryMesEquipmentList
     public MesEquipmentModel(Long id, String equipmentNameAndworkCellName, String equipmentCode, String equipmentName, Integer status, String areaCode, String workCenterCode, String workCellCode) {
         this.id = id;
         this.equipmentNameAndworkCellName = equipmentNameAndworkCellName;
@@ -134,13 +138,13 @@ public class MesEquipmentModel implements Serializable {
 
     }
 
-    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+    //获取设备分页数据 queryMesEquipmentByPager
+    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
         this.status = status;
         this.workCenterCode = workCenterCode;
-        this.workCellCode = workCellCode;
         this.areaCode = areaCode;
         this.equipmentType = equipmentType;
         this.equipmentCategory = equipmentCategory;

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-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/WmsMoveMaster.java

@@ -159,7 +159,7 @@ public class WmsMoveMaster extends BaseBean {
 
     @Transient
     @ApiParam("总行数")
-    private Integer itemQty;
+    private Long itemQty;
 
 //    @Version
 //    @Column(name = "LOCK_VERSION")
@@ -225,10 +225,10 @@ public class WmsMoveMaster extends BaseBean {
         this.modifyDatetime = modifyDatetime;
     }
 
-    public WmsMoveMaster(Integer itemQty , String transTypeCode , Integer itemStatus){
+    public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){
         this.itemQty = itemQty;
         this.transTypeCode = transTypeCode;
-        this.itemStatus = itemStatus;
+        this.orderStatus = orderStatus;
     }
 
     public Double getTransQty() {

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