Merge branch 'dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java

@@ -34,5 +34,9 @@ public @interface DynamicField {
     // 是否跳过本字段扫描 0-不跳过，1-跳过
     int isSkip() default 0;
     // 下拉枚举名称
-    String enumName() default "";
+    String entityName() default "";
+    // 下拉列表显示列名称,多个列名需要根据逗号分隔
+    String listColumnName() default "";
+    // 下拉搜索列名称,多个列名需要根据逗号分隔
+    String searchColumnName() default "";
 }

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

@@ -547,4 +547,41 @@ public class PtlEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * ptl-pcn定时任务状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PTL_PCN_TASK_STATUS {
+
+        OPEN(1, "开启"),
+        CLOSE(2, "关闭");
+
+        private int value;
+        private String description;
+
+        PTL_PCN_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;
+        }
+    }
+
 }

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

@@ -286,6 +286,67 @@ public class PtlPcnEnumUtil {
     }
 
     /**
+     * 反馈信号子命令(灭灯状态)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SIGNAL_CHILD_CMD {
+        CHILD_CMD_06H("06", 6, "正常"),
+        CHILD_CMD_07H("07", 7, "缺货"),
+        CHILD_CMD_09H("09", 9, "标签自检"),
+        CHILD_CMD_0AH("0A", 10, "亮灯错误"),
+        CHILD_CMD_0BH("0B", 11, "查询设备故障，返回设备故障"),
+        CHILD_CMD_0CH("0C", 12, "设备无法执行命令,用错命令"),
+        CHILD_CMD_0DH("0D", 13, "卡键,按键卡住"),
+        CHILD_CMD_0FH("0F", 15, "返回库存模式下的缺货量"),
+        CHILD_CMD_64H("64", 100, "熄灭情况下返回"),
+        CHILD_CMD_FAH("FA", 250, "设备的 F/W 模型信息"),
+        CHILD_CMD_FCH("FC", 252, "标签产品信息");
+
+        private String code;
+        private Integer value;
+        private String description;
+
+        SIGNAL_CHILD_CMD(String code, Integer value, String description) {
+            this.code = code;
+            this.value = value;
+            this.description = description;
+        }
+
+        public static SIGNAL_CHILD_CMD getByValue(String code) {
+            for (SIGNAL_CHILD_CMD signalChildCmd : values()) {
+                if (signalChildCmd.getCode() == code) {
+                    return signalChildCmd;
+                }
+            }
+            return null;
+        }
+
+        public static Integer codeOfValue(String code) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+
+        public String getCode() {
+            return code;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+    }
+
+    /**
      * 标签显示器亮灯颜色枚举
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -1236,4 +1297,95 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * PCN同步PTL主数据同步类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SYNC_TYPE {
+
+        GET_PTL_DATA(1, "pcn获取Ptl数据"),
+        DATA_TO_PTL(2, "pcn推送数据至ptl");
+
+        private int value;
+        private String description;
+
+        SYNC_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;
+        }
+    }
+
+    /**
+     * PCN同步PTL主数据同步方式枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SYNC_PATTERN {
+
+        UPDATE(1, "修改"),
+        INSERT(2, "新增");
+
+        private int value;
+        private String description;
+
+        SYNC_PATTERN(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/jpa/daoimpl/BaseRepositoryImpl.java

@@ -1,23 +1,21 @@
 package cn.estsh.i3plus.pojo.base.jpa.daoimpl;
 
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
-import cn.estsh.i3plus.pojo.base.util.BeanMapUtils;
-import cn.estsh.i3plus.pojo.base.util.StringCastUtils;
 import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.NonUniqueResultException;
-import org.hibernate.SQLQuery;
-import org.hibernate.transform.Transformers;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
 
-import javax.persistence.*;
+import javax.persistence.EntityManager;
+import javax.persistence.Id;
+import javax.persistence.NoResultException;
+import javax.persistence.Query;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -860,7 +858,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public int findByHqlWhereCount(DdlPackBean packBean) {
         StringBuffer queryString = new StringBuffer();
         queryString.append("select count(distinct model) from " + persistentClass.getSimpleName()
-                + " as model where 1=1 " + packBean.getPackedHql());
+                + " as model where 1=1 " + packBean.getWhereAppend());
 
         Query query = entityManager.createQuery(queryString.toString(), Long.class);
         for (String key : packBean.getHqlPreparedMap().keySet()) {

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

@@ -55,7 +55,7 @@ public class MesCellFeed extends BaseBean implements Serializable {
     private String rawSn;
 
     @Column(name = "RAW_QTY")
-    @ApiParam("特殊批次")
+    @ApiParam("原材料数量")
     private Double rawQty;
 
     @Column(name = "LOT_NO")

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

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/3 13:14
+ * @desc
+ */
+@Data
+public class CellFeedModel {
+
+    private String workCenterCode;
+
+    private String workCellCode;
+
+    private String color;
+
+    private String partNo;
+
+    private String itemPartNo;
+
+    private String qty;
+
+}

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

@@ -124,6 +124,15 @@ public class MesPcnHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getStationBom(String org,String workCenter,String workCell,String partNo) {
+        DdlPackBean packBean = getAllBaseData(org);
+        DdlPreparedPack.getStringEqualPack(workCenter, "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(workCell, "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(partNo, "partNo", packBean);
+        DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean);
+        return packBean;
+    }
+
     /**
      * 生产工单查询条件封装
      *

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

@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : WMS列表搜索model
+ * @Reference :
+ * @Author : silliter
+ * @CreateDate : 2020-01-07 14:33
+ * @Modify:
+ **/
+@Data
+public class WmsListSearchModel {
+
+    @ApiParam(value = "开窗列表查询key")
+    private String searchKey;
+
+    @ApiParam(value = "开窗列表查询value")
+    private String searchValue;
+
+    @ApiParam(value = "排序参数")
+    private String orderByParams;
+
+    @ApiParam(value = "分页组件")
+    private Pager pager;
+
+    @ApiParam(value = "实体类名")
+    private String objClassName;
+
+    @ApiParam(value = "有效性")
+    public Integer isValid;
+}

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

@@ -3,7 +3,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.PtlEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -46,7 +45,7 @@ public class PtlControl extends BaseBean implements Serializable {
 
     @Column(name = "CONTROL_TYPE")
     @ApiParam("控制器类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_CONTROL_TYPE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_TYPE")
     private Integer controlType;
 
     @Column(name = "IP")
@@ -66,7 +65,7 @@ public class PtlControl extends BaseBean implements Serializable {
 
     @Column(name = "STATUS")
     @ApiParam("控制器状态")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_CONTROL_STATUS")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_STATUS")
     private Integer status;
 
     @Column(name = "FREQUENCY")

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

@@ -45,14 +45,6 @@ public class PtlNode extends BaseBean implements Serializable {
     @ApiParam("区域名称")
     private String areaName;
 
-    @Column(name = "WORK_CENTER_CODE")
-    @ApiParam("工作中心")
-    private String workCenterCode;
-
-    @Column(name = "WORK_CENTER_NAME")
-    @ApiParam("工作中心名称")
-    private String workCenterName;
-
     @Column(name = "PCN_VERSION")
     @ApiParam("PCN版本")
     private String pcnVersion;
@@ -74,7 +66,7 @@ public class PtlNode extends BaseBean implements Serializable {
     private String connectTime;
 
     @Column(name = "CODE_SPECIFIC")
-    @ApiParam("PCN特殊字段")
+    @ApiParam("编码规则特殊符")
     private String codeSpecific;
 
     public int getConnectCountVal() {

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

@@ -43,7 +43,7 @@ public class PtlPart extends BaseBean implements Serializable {
 
     @Column(name = "PART_TYPE")
     @ApiParam("物料类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_PART_TYPE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_PART_TYPE")
     private String partType;
 
     @Column(name = "UNIT")

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

@@ -77,26 +77,6 @@ public class PtlPcnSyncCfg extends BaseBean implements Serializable {
     @ApiParam(value = "从数据库抽取的条件限制")
     private String extractCondition;
 
-    @Column(name = "IS_IGNORE_ORG")
-    @ApiParam(value = "同步的时候是否区分工厂")
-    private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
-
-    @Transient
-    @ApiParam("同步方式")
-    private String syncPatternName;
-
-    @Transient
-    @ApiParam("同步类型名称")
-    private String syncTypeName;
-
-    @Transient
-    @ApiParam(value = "同步的时候是否区分工厂")
-    private String isIgnoreOrgName;
-
-    public int getIsIgnoreOrgVal() {
-        return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg;
-    }
-
     public int getSyncFrequencyVal() {
         return this.syncFrequency == null ? 0 : this.syncFrequency;
     }

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

@@ -0,0 +1,90 @@
+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;
+
+/**
+ * @Description :ptl-pcn定时任务工作清单
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-08-26
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "PTL_PCN_TASK")
+@Api("ptl-pcn定时任务工作清单")
+public class PtlPcnTask extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 4129714382965409395L;
+
+    @Column(name = "TASK_CODE")
+    @ApiParam("任务代码")
+    private String taskCode;
+
+    @Column(name = "TASK_NAME")
+    @ApiParam("任务名称")
+    private String taskName;
+
+    @Column(name = "TASK_GROUP_NAME")
+    @ApiParam("任务组名称")
+    private String taskGroupName;
+
+    @Column(name = "TASK_DESCRIPTION")
+    @ApiParam("任务描述")
+    private String taskDescription;
+
+    @Column(name = "TASK_TYPE")
+    @ApiParam("任务类型")
+    private Integer taskType;
+
+    @Column(name = "TASK_MODULE")
+    @ApiParam("任务模块")
+    private String taskModule;
+
+    @Column(name = "TASK_CLASS")
+    @ApiParam("任务类名")
+    private String taskClass;
+
+    @Column(name = "TASK_PACKAGE")
+    @ApiParam("任务包名")
+    private String taskPackage;
+
+    @Column(name = "PCN_NAME")
+    @ApiParam("PCN节点名称")
+    private String pcnName;
+
+    @Column(name = "PCN_CODE")
+    @ApiParam("PCN节点名称代码")
+    private String pcnCode;
+
+    @Column(name = "TASK_CYCLE_EXPS")
+    @ApiParam("任务周期表达式")
+    private String taskCycleExps;
+
+    @Column(name = "TASK_CYCLE_DESCRIPTION")
+    @ApiParam("任务周期描述")
+    private String taskCycleDescription;
+
+    @Column(name = "TASK_PARAM")
+    @ApiParam("任务参数")
+    private String taskParam;
+
+    public int getTaskTypeVal() {
+        return this.taskType == null ? 0 : this.taskType;
+    }
+
+}

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

@@ -0,0 +1,53 @@
+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;
+
+/**
+ * @Description :ptl-pcn定时任务工作清单同步记录
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-08-27
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "PTL_PCN_TASK_LOG")
+@Api("ptl-pcn定时任务工作清单同步记录")
+public class PtlPcnTaskLog extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -784806174962540310L;
+
+    @Column(name = "SYNC_TIME_START")
+    @ApiParam("同步数据开始时间")
+    private String syncTimeStart;
+
+    @Column(name = "SYNC_TIME_END")
+    @ApiParam("同步数据截止时间")
+    private String syncTimeEnd;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_CONTENT")
+    @ApiParam("异常内容")
+    private Long errorContent;
+
+    public int getSyncStatusVal() {
+        return this.syncStatus == null ? 0 : this.syncStatus;
+    }
+}

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

@@ -64,37 +64,37 @@ public class PtlTag extends BaseBean implements Serializable {
 
     @Column(name = "TAG_TYPE")
     @ApiParam("标签类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_TAG_TYPE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_TYPE")
     private Integer tagType;
 
     @Column(name = "LIGHT_STATUS")
     @ApiParam("亮灯状态")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_STATUS")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_STATUS")
     private Integer lightStatus;
 
     @Column(name = "TAG_STATUS")
     @ApiParam("标签状态")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_TAG_STATUS")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_STATUS")
     private Integer tagStatus;
 
     @Column(name = "LIGHT_MODE")
     @ApiParam("亮灯方式")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_MODE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_MODE")
     private Integer lightMode;
 
     @Column(name = "LIGHT_COLOR")
     @ApiParam("亮灯颜色")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_COLOR")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_COLOR")
     private Integer lightColor;
 
     @Column(name = "IS_BUZZING")
     @ApiParam("是否蜂鸣")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_IS_BUZZING")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_IS_BUZZING")
     private Integer isBuzzing;
 
     @Column(name = "MUSIC_TYPE")
     @ApiParam("音乐类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_MUSIC_TYPE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_MUSIC_TYPE")
     private Integer musicType;
 
     @Column(name = "DISPLAY_CONTEXT")

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnTask;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :ptl-pcn定时任务清单
+ * @Reference :
+ * @Author : adair.song
+ * @CreateDate : 2020-03-03
+ * @Modify:
+ **/
+@Repository
+public interface PtlPcnTaskRepository extends BaseRepository<PtlPcnTask, Long> {
+}

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.ptl.sqlpack;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.ptl.bean.*;
@@ -83,9 +84,9 @@ public class PtlHqlPack {
     public static DdlPackBean packHqlPtlPrintingQueueByPrintNo(PtlPrintingQueue ptlPrintingQueue) {
         DdlPackBean result = new DdlPackBean();
 
-        DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ETC_PRINT_STATUS.NOT_HIT.getValue(), "printStatus", result);
+        DdlPreparedPack.getNumEqualPack(PtlPcnEnumUtil.ETC_PRINT_STATUS.NOT_HIT.getValue(), "printStatus", result);
         DdlPreparedPack.getStringLikerPack(ptlPrintingQueue.getPrintNo(), "printNo", result);
-        DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result);
+        DdlPreparedPack.getNumEqualPack(PtlPcnEnumUtil.PRINT_TYPE.PART_NO.getValue(), "printType", result);
 
         getStringBuilderPack(ptlPrintingQueue, result);
 
@@ -124,6 +125,22 @@ public class PtlHqlPack {
         return packBean;
     }
 
+    /**
+     * PTL PCN系统配置信息条件查询
+     *
+     * @param ptlConfig
+     * @return
+     */
+    public static DdlPackBean getPtlSyncConfig(PtlConfig ptlConfig, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        DdlPreparedPack.getStringLikerPack(ptlConfig.getCfgCode(), "cfgCode", packBean);
+        DdlPreparedPack.getStringLikerPack(ptlConfig.getCfgName(), "cfgName", packBean);
+        DdlPreparedPack.getStringEqualPack(ptlConfig.getCfgKey(), "cfgKey", packBean);
+        DdlPreparedPack.getStringEqualPack(ptlConfig.getCfgType(), "cfgType", packBean);
+        DdlPreparedPack.getNumEqualPack(ptlConfig.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
+
 
     /**
      * PTL-PCN节点查询条件封装
@@ -183,4 +200,22 @@ public class PtlHqlPack {
 
         return packBean;
     }
+
+    /**
+     * ptl-pcn定时任务清单
+     *
+     * @param ptlPcnTask
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getPtlPcnTask(PtlPcnTask ptlPcnTask, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(ptlPcnTask, organizeCode);
+        if (!StringUtils.isEmpty(ptlPcnTask.getTaskCode())) {
+            DdlPreparedPack.getStringLikerPack(ptlPcnTask.getTaskCode(), "taskCode", packBean);
+        }
+        if (!StringUtils.isEmpty(ptlPcnTask.getTaskName())) {
+            DdlPreparedPack.getStringLikerPack(ptlPcnTask.getTaskName(), "taskName", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -42,13 +42,13 @@ public class WmsCsStrategy extends BaseBean  implements Serializable {
     @Column(name = "part_type")
     @ApiParam(value = "物料分类")
     @AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description")
-	@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PART_ABC")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_ABC")
     private String partType;
 
     @Column(name = "STRATEGY_TYPE")
     @ApiParam(value = "策略分类", example = "0")
-	@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "CS_STRATEGY_TYPE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "CS_STRATEGY_TYPE")
-	@AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class)
     private Integer strategyType;
 
     @Column(name = "CYCLE_RULE")

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

@@ -47,7 +47,7 @@ public class WmsLocate extends BaseBean {
      */
     @Column(name = "LOCATE_TYPE")
     @ApiParam(value = "库位类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, enumName = "LOCATE_TYPE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, entityName = "LOCATE_TYPE")
     private Integer locateType;
 
     @Column(name = "WH_NO")
@@ -102,7 +102,7 @@ public class WmsLocate extends BaseBean {
 
     @Column(name = "STATUS")
     @ApiParam(value = "库位状态", example = "-1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, enumName = "LOCATE_STATUS")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "LOCATE_STATUS")
     private Integer status;
 
     @Column(name = "MAX_PACKAGE_QTY")

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

@@ -50,7 +50,7 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "PART_TYPE")
     @ApiParam(value = "物料类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "WMS_PART_TYPE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "WMS_PART_TYPE")
     @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description")
     private String partType;
 
@@ -112,7 +112,7 @@ public class WmsPart extends BaseBean {
     @ColumnDefault("2")
     @Column(name = "IQC")
     @ApiParam(value = "是否免检", example = "1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
     private Integer iqc;
 
     @Column(name = "MIN", columnDefinition = "decimal(18,8)")
@@ -137,7 +137,7 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "SN_CONTROL")
     @ApiParam(value = "是否条码管理", example = "1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
     private Integer snControl;
 
     @Column(name = "VENDOR_NO")
@@ -182,7 +182,7 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "IS_REPORT_PARTNO")
     @ApiParam("是否报工零件")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
     private Integer isReportPartNo;
 
     @Column(name = "REPORT_LOCATE_NO")
@@ -207,7 +207,7 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
     @ApiParam(value = "是否贵重")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "IS_VALUABLE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "IS_VALUABLE")
     @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description")
     private Integer isValuable;
 
@@ -228,12 +228,12 @@ public class WmsPart extends BaseBean {
     private Double verbNum;
 
     @Column(name = "IS_PROD_LOT")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
     @ApiParam(value = "是否录入生产批次", example = "1")
     private Integer isProdLot = 2;
 
     @Column(name = "PULL_WAY")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "PULL_WAY_STATUS")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "PULL_WAY_STATUS")
     @ApiParam(value = "拉动方式", example = "0")
     private Integer pullWay = 0;
 

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

@@ -74,7 +74,7 @@ public class WmsSnOperateRecord extends BaseBean {
     @Column(name = "OPERATE_TYPE")
     @ApiParam(value = "操作类型")
     @AnnoOutputColumn(refClass = WmsEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "SN_OPERATE_TYPE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "SN_OPERATE_TYPE")
     private Integer operateType;
 
 	@Column(name = "ref_sn")

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

@@ -60,32 +60,32 @@ public class WmsZones extends BaseBean {
 
     @Column(name = "IS_SON_NODE")
     @ApiParam(value = "是否子节点")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, enumName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "TRUE_OR_FALSE")
     private Integer isSonNode;
 
     @Column(name = "IS_PM")
     @ApiParam(value = "零件级管控", example = "2")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
     private Integer isPm;
 
     @Column(name = "IS_LM")
     @ApiParam(value = "批次级管控", example = "2")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
     private Integer isLm;
 
     @Column(name = "IS_SN")
     @ApiParam(value = "条码级管控", example = "1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
     private Integer isSn;
 
     @Column(name = "IS_MIX")
     @ApiParam(value = "允许混淆", example = "1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
     private Integer isMix;
 
     @Column(name = "IS_SC")
     @ApiParam(value = "库容检查", example = "1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
     private Integer isSc;
 
     @Column(name = "STRATEGY")
@@ -95,12 +95,12 @@ public class WmsZones extends BaseBean {
 
     @Column(name = "IS_NEGATIVE")
     @ApiParam(value = "允许负库存", example = "1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
     private Integer isNegative;
 
     @Column(name = "CHECK_FIFO")
     @ApiParam(value = "校验先进先出", example = "1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
     private Integer checkFifo;
 
     @Column(name = "ZONE_LENGTH", columnDefinition = "decimal(18,8)")

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

@@ -92,4 +92,12 @@ public class WmsFieldInfo extends BaseBean {
     @Column(name = "CONDITION_CONNECTOR")
     @ApiParam(value = "条件连接符:and/or")
     private String conditionConnector;
+
+    @Column(name = "LIST_COLUMNNAME")
+    @ApiParam(value = "开窗列表显示列名称")
+    private String listColumnName;
+
+    @Column(name = "SEARCH_COLUMNNAME")
+    @ApiParam(value = "开窗搜索列名称")
+    private String searchColumnName;
 }