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

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

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

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

@@ -64,19 +64,16 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="ORGANIZE_CODE", nullable = false)
     @ApiParam(value ="组织代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
 //    @AnnoOutputColumn(hidden = true)
     public String organizeCode;
 
     @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)
     @ApiParam(value = "有效性",example = "1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1)
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
     public Integer isValid;    //CommonEnumUtil.IS_VAILD;
 
     @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false)
     @ApiParam(value = "是否已删除",example = "2")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1)
     @AnnoOutputColumn(hidden = true)
     //逻辑删除，软删除
     public Integer isDeleted;    //CommonEnumUtil.TRUE_OR_FALSEA
@@ -135,13 +132,11 @@ public abstract class BaseBean implements Serializable {
     @Transient
     @ApiParam(value = "排序属性")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
     public String orderByParam = "";
 
     @Transient
     @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1)
     //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
     public transient Integer ascOrDesc = 1;
 
@@ -158,5 +153,4 @@ public abstract class BaseBean implements Serializable {
         }
         return result;
     }
-
 }

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().equals(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)
@@ -309,7 +370,7 @@ public class PtlPcnEnumUtil {
 
         public static TAG_LIGHT_COLOR_CMD getByValue(String code) {
             for (TAG_LIGHT_COLOR_CMD tagLightColorCmd : values()) {
-                if (tagLightColorCmd.getCode() == code) {
+                if (tagLightColorCmd.getCode().equals(code)) {
                     return tagLightColorCmd;
                 }
             }
@@ -356,6 +417,15 @@ public class PtlPcnEnumUtil {
             this.description = description;
         }
 
+        public static TAG_LIGHT_TYPE getByValue(int value) {
+            for (TAG_LIGHT_TYPE tagLightType : values()) {
+                if (tagLightType.getValue() == value) {
+                    return tagLightType;
+                }
+            }
+            return null;
+        }
+
         public int getValue() {
             return value;
         }
@@ -396,7 +466,7 @@ public class PtlPcnEnumUtil {
 
         public static FINISH_TAG_LIGHT_MUSIC_CMD getByValue(String code) {
             for (FINISH_TAG_LIGHT_MUSIC_CMD finishTagLightMusicCmd : values()) {
-                if (finishTagLightMusicCmd.getCode() == code) {
+                if (finishTagLightMusicCmd.getCode().equals(code)) {
                     return finishTagLightMusicCmd;
                 }
             }
@@ -459,7 +529,7 @@ public class PtlPcnEnumUtil {
 
         public static FINISH_TAG_LIGHT_VOLUME_CMD getByValue(String code) {
             for (FINISH_TAG_LIGHT_VOLUME_CMD finishTagLightVolumeCmd : values()) {
-                if (finishTagLightVolumeCmd.getCode() == code) {
+                if (finishTagLightVolumeCmd.getCode().equals(code)) {
                     return finishTagLightVolumeCmd;
                 }
             }
@@ -619,21 +689,22 @@ public class PtlPcnEnumUtil {
     }
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MonitorProcessMessageType {
+    public enum MONITOR_PROCESS_MESSAGE_TYPE {
         CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"),
         DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"),
-        EXCEPTION__DISCONNECT_CONTROL_CMD(25, "EXCEPTION_DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"),
+        EXCEPTION_DISCONNECT_CONTROL_CMD(25, "EXCEPTION_DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"),
         LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"),
         LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "lightOffService", "灭灯命令"),
         CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"),
-        INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回");
+        INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回"),
+        REFRESH_CONTROL_CMD(70, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新");
 
         private int value;
         private String code;
         private String callClass;
         private String description;
 
-        MonitorProcessMessageType(int value, String code, String callClass, String description) {
+        MONITOR_PROCESS_MESSAGE_TYPE(int value, String code, String callClass, String description) {
             this.value = value;
             this.code = code;
             this.callClass = callClass;
@@ -656,11 +727,11 @@ public class PtlPcnEnumUtil {
             return description;
         }
 
-        public static MonitorProcessMessageType getTypeByValue(String code) {
+        public static MONITOR_PROCESS_MESSAGE_TYPE getTypeByValue(String code) {
             if (StringUtils.isEmpty(code)) {
                 return null;
             }
-            for (MonitorProcessMessageType enums : MonitorProcessMessageType.values()) {
+            for (MONITOR_PROCESS_MESSAGE_TYPE enums : MONITOR_PROCESS_MESSAGE_TYPE.values()) {
                 if (enums.getCode().equals(code)) {
                     return enums;
                 }
@@ -670,12 +741,13 @@ public class PtlPcnEnumUtil {
     }
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum InterfaceSignalMessageType {
+    public enum INTERFACE_SIGNAL_MESSAGE_TYPE {
         CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"),
         DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"),
         REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"),
         SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"),
-        INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面");
+        INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"),
+        GET_CONTROL_DATA_CONTROL_CMD(60, "GET_CONTROL_DATA_CONTROL_CMD", "getControlDataControlService", "获取控制器数据");
 //        UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"),
 //        LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"),
 //        LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细");
@@ -685,7 +757,7 @@ public class PtlPcnEnumUtil {
         private String callClass;
         private String description;
 
-        InterfaceSignalMessageType(int value, String code, String callClass, String description) {
+        INTERFACE_SIGNAL_MESSAGE_TYPE(int value, String code, String callClass, String description) {
             this.value = value;
             this.code = code;
             this.callClass = callClass;
@@ -708,11 +780,11 @@ public class PtlPcnEnumUtil {
             return description;
         }
 
-        public static InterfaceSignalMessageType getTypeByValue(String code) {
+        public static INTERFACE_SIGNAL_MESSAGE_TYPE getTypeByValue(String code) {
             if (StringUtils.isEmpty(code)) {
                 return null;
             }
-            for (InterfaceSignalMessageType enums : InterfaceSignalMessageType.values()) {
+            for (INTERFACE_SIGNAL_MESSAGE_TYPE enums : INTERFACE_SIGNAL_MESSAGE_TYPE.values()) {
                 if (enums.getCode().equals(code)) {
                     return enums;
                 }
@@ -721,25 +793,33 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 生成任务actor message type
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum WsBusiType {
-        MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"),
-        INTERFACE_PROCESS(10, "INTERFACE_PROCESS", "界面处理");
+    public enum GEN_TASK_MESSAGE_TYPE {
+        GEN_TASK_CMD(10, "GEN_TASK_CMD", "", "生成任务");
 
         private int value;
         private String code;
+        private String callClass;
         private String description;
 
-        WsBusiType(int value, String code, String description) {
+        GEN_TASK_MESSAGE_TYPE(int value, String code, String callClass, String description) {
             this.value = value;
-            this.description = description;
             this.code = code;
+            this.callClass = callClass;
+            this.description = description;
         }
 
         public int getValue() {
             return value;
         }
 
+        public String getCallClass() {
+            return callClass;
+        }
+
         public String getCode() {
             return code;
         }
@@ -747,22 +827,33 @@ public class PtlPcnEnumUtil {
         public String getDescription() {
             return description;
         }
+
+        public static INTERFACE_SIGNAL_MESSAGE_TYPE getTypeByValue(String code) {
+            if (StringUtils.isEmpty(code)) {
+                return null;
+            }
+            for (INTERFACE_SIGNAL_MESSAGE_TYPE enums : INTERFACE_SIGNAL_MESSAGE_TYPE.values()) {
+                if (enums.getCode().equals(code)) {
+                    return enums;
+                }
+            }
+            return null;
+        }
     }
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum WsDataType {
-        TEXT(10, "TEXT", "正常信息"),
-        EXP_TEXT(20, "EXP_TEXT", "异常信息"),
-        TABLE(30, "TABLE", "表格");
+    public enum WsBusiType {
+        MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"),
+        INTERFACE_PROCESS(20, "INTERFACE_PROCESS", "界面处理");
 
         private int value;
         private String code;
         private String description;
 
-        WsDataType(int value, String code, String description) {
+        WsBusiType(int value, String code, String description) {
             this.value = value;
-            this.code = code;
             this.description = description;
+            this.code = code;
         }
 
         public int getValue() {
@@ -779,16 +870,16 @@ public class PtlPcnEnumUtil {
     }
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum STATUS_TYPE {
-        START(10, "START", "开始状态"),
-        FINISH(20, "FINISH", "完成状态"),
-        TERMINATE(30, "TERMINATE", "中断状态");
+    public enum WsDataType {
+        TEXT(10, "TEXT", "正常信息"),
+        EXP_TEXT(20, "EXP_TEXT", "异常信息"),
+        TABLE(30, "TABLE", "表格");
 
         private int value;
         private String code;
         private String description;
 
-        STATUS_TYPE(int value, String code, String description) {
+        WsDataType(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -808,15 +899,16 @@ public class PtlPcnEnumUtil {
     }
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum AREA_SECTION_TASK_DETAIL_STATUS {
-        CREATE(10, "CREATE", "创建"),
-        COMPLETE(20, "COMPLETE", "完成");
+    public enum STATUS_TYPE {
+        START(10, "START", "开始状态"),
+        FINISH(20, "FINISH", "完成状态"),
+        TERMINATE(30, "TERMINATE", "中断状态");
 
         private int value;
         private String code;
         private String description;
 
-        AREA_SECTION_TASK_DETAIL_STATUS(int value, String code, String description) {
+        STATUS_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -835,22 +927,18 @@ public class PtlPcnEnumUtil {
         }
     }
 
-    /**
-     * 生成任务actor message type
-     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum GenTaskMessageType {
-        GEN_TASK_CMD(10, "GEN_TASK_CMD", "", "生成任务");
+    public enum AREA_SECTION_TASK_DETAIL_STATUS {
+        CREATE(10, "CREATE", "创建"),
+        COMPLETE(20, "COMPLETE", "完成");
 
         private int value;
         private String code;
-        private String callClass;
         private String description;
 
-        GenTaskMessageType(int value, String code, String callClass, String description) {
+        AREA_SECTION_TASK_DETAIL_STATUS(int value, String code, String description) {
             this.value = value;
             this.code = code;
-            this.callClass = callClass;
             this.description = description;
         }
 
@@ -858,10 +946,6 @@ public class PtlPcnEnumUtil {
             return value;
         }
 
-        public String getCallClass() {
-            return callClass;
-        }
-
         public String getCode() {
             return code;
         }
@@ -869,18 +953,6 @@ public class PtlPcnEnumUtil {
         public String getDescription() {
             return description;
         }
-
-        public static InterfaceSignalMessageType getTypeByValue(String code) {
-            if (StringUtils.isEmpty(code)) {
-                return null;
-            }
-            for (InterfaceSignalMessageType enums : InterfaceSignalMessageType.values()) {
-                if (enums.getCode().equals(code)) {
-                    return enums;
-                }
-            }
-            return null;
-        }
     }
 
     /**
@@ -1236,4 +1308,443 @@ 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;
+        }
+    }
+
+    /**
+     * 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;
+        }
+    }
+
+    /**
+     * mes-pcn定时任务同步结果状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PTL_PCN_TASK_SYNC_STATUS {
+
+        SUCCESS(1, "ptl主服务定时任务工作清单同步成功"),
+        ERROR(2, "ptl主服务定时任务工作清单同步失败");
+
+        private int value;
+        private String description;
+
+        PTL_PCN_TASK_SYNC_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;
+        }
+    }
+
+    /**
+     * 单据主表类型(ASN,PO,MOVE,QC)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MASTER_ORDER_TYPE {
+        CREATE(10, "NORMAL", "正常");
+
+        private int value;
+        private String code;
+        private String description;
+
+        MASTER_ORDER_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 valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+    /**
+     * 区域任务状态(ASN,PO,MOVE,QC)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MASTER_ORDER_STATUS {
+        CREATE(10, "CREATE", "创建"),
+        RECEIPT(20, "IN_PROGRESS", "处理中"),
+        RECEIPT_FINISH(30, "COMPLETED", "已完成"),
+        CANCELLED(40, "CANCELLED", "已取消");
+
+        private int value;
+        private String code;
+        private String description;
+
+        MASTER_ORDER_STATUS(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 valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+    /**
+     * 区域任务类型(ASN,PO,MOVE,QC)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum AREA_SECTION_TASK_TYPE {
+        CREATE(10, "CREATE", "JIT任务"),
+        RECEIPT(20, "IN_PROGRESS", "单据任务"),
+        RECEIPT_FINISH(30, "COMPLETED", "单点任务");
+
+        private int value;
+        private String code;
+        private String description;
+
+        AREA_SECTION_TASK_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 valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+    /**
+     * 区域任务状态(ASN,PO,MOVE,QC)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum AREA_TASK_STATUS {
+        CREATE(10, "CREATE", "创建"),
+        RECEIPT(20, "IN_PROGRESS", "处理中"),
+        RECEIPT_FINISH(30, "COMPLETED", "已完成");
+
+        private int value;
+        private String code;
+        private String description;
+
+        AREA_TASK_STATUS(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 valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 区域任务类型(ASN,PO,MOVE,QC)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum AREA_TASK_TYPE {
+        CREATE(10, "JIT_TASK", "JIT任务"),
+        RECEIPT(20, "DOCUMENT_TASK", "单据任务"),
+        RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务");
+
+        private int value;
+        private String code;
+        private String description;
+
+        AREA_TASK_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 valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

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

@@ -5030,4 +5030,39 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * 同批次条码-查询范围
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUERY_RANGE_TYPE {
+        LOCATE(10, "库位"), AREA_OWNER(20, "责任区域");
+
+        private int value;
+        private String description;
+
+        QUERY_RANGE_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;
+        }
+    }
 }

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/annotation/ElasticSearch.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.ptl.annotation;
+
+
+import java.lang.annotation.*;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/25 1:45 下午
+ * @Description:
+ **/
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+@Documented
+public @interface ElasticSearch {
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/Json4Es.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.ptl.annotation;
+
+
+import java.lang.annotation.*;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/25 1:45 下午
+ * @Description:
+ **/
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+@Documented
+public @interface Json4Es {
+}

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

@@ -14,7 +14,10 @@ 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
@@ -42,4 +45,16 @@ public class PtlArea extends BaseBean implements Serializable {
     @ApiParam("区域名称")
     private String areaName;
 
+    @Transient
+    @ApiParam("区段集合")
+    private List<PtlSection> ptlSectionList=new ArrayList<>();
+
+    @Transient
+    @ApiParam("区域名称")
+    private String name;
+
+
+    public String getName() {
+        return areaName;
+    }
 }

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

@@ -11,7 +11,10 @@ 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
@@ -84,4 +87,16 @@ public class PtlAreaSectionTask extends BaseBean implements Serializable {
     @Column(name = "STATUS")
     @ApiParam("区段任务状态")
     private Integer status;
+
+    @Column(name = "SEQ")
+    @ApiParam("区段任务顺序号")
+    private Integer seq;
+
+    @Column(name = "qty")
+    @ApiParam("数量")
+    private Integer qty;
+
+    @ApiParam("区域任务明细")
+    @Transient
+    private List<PtlAreaSectionTaskDetail> ptlAreaSectionTaskDetailList=new ArrayList<>();
 }

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

@@ -28,7 +28,7 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @Api("区段亮灯任务明细")
 public class PtlAreaSectionTaskDetail extends BaseBean implements Serializable {
-    private static final long serialVersionUID = -7563481752643393714L;
+    private static final long serialVersionUID = -7563431552643393714L;
 
     @Column(name = "SECTION_TASK_NO")
     @ApiParam("区段任务编号")

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

@@ -31,7 +31,7 @@ public class PtlAreaTask extends BaseBean implements Serializable {
 
     @Column(name = "AREA_TASK_NO")
     @ApiParam("区域任务编号")
-    private Long areaTaskNo;
+    private String areaTaskNo;
 
     @Column(name = "AREA_NO")
     @ApiParam("区域代码")
@@ -88,4 +88,8 @@ public class PtlAreaTask extends BaseBean implements Serializable {
     @Column(name = "STATUS")
     @ApiParam("任务状态")
     private Integer status;
+
+    @Column(name = "qty")
+    @ApiParam("数量")
+    private Integer qty;
 }

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

@@ -25,9 +25,9 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "PTL_PCN_NODE")
+@Table(name = "PTL_PCN")
 @Api("PCN节点")
-public class PtlNode extends BaseBean implements Serializable {
+public class PtlPcn extends BaseBean implements Serializable {
     private static final long serialVersionUID = -9140094723555406392L;
     @Column(name = "PCN_CODE")
     @ApiParam("PCN代码")
@@ -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/PtlPcnConnectLog.java

@@ -0,0 +1,56 @@
+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:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-22-17:20
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "PTL_PCN_CONNECT_LOG")
+@Api("PCN节点连接日志")
+public class PtlPcnConnectLog extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 2756240593256441951L;
+
+    @Column(name = "PCN_CODE")
+    @ApiParam("PCN代码")
+    private String pcnCode;
+
+    @Column(name = "PCN_NAME")
+    @ApiParam("PCN名称")
+    private String pcnName;
+
+    @Column(name = "PCN_VERSION")
+    @ApiParam("PCN版本")
+    private String pcnVersion;
+
+    @Column(name = "CONNECT_IP")
+    @ApiParam("连接IP")
+    private String connectIp;
+
+    @Column(name = "IS_CONNECT")
+    @ApiParam("是否连接")
+    private Integer isConnect;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String Remark;
+}

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

@@ -14,6 +14,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;
 
 /**
@@ -52,4 +53,11 @@ public class PtlSection extends BaseBean implements Serializable {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String areaNo;
 
+    @Transient
+    @ApiParam("区域名称")
+    private String name;
+
+    public String getName() {
+        return sectionName;
+    }
 }

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

@@ -0,0 +1,56 @@
+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.*;
+import java.io.Serializable;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2020/02/15 1:45 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "PTL_SYNC_DEAD_LETTER", indexes = {
+        @Index(name = "idx_object_code_pcn", columnList = "OBJECT_CODE"),
+        @Index(name = "idx_object_code_pcn", columnList = "PCN_CODE")
+})
+@Api("数据同步死信")
+public class PtlSyncDeadLetter extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 1151025992437433734L;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "SYNC_TYPE")
+    @ApiParam("同步类型")
+    private Integer syncType;
+
+    @Column(name = "PCN_CODE")
+    @ApiParam("pcn代码")
+    private String pcnCode;
+
+    @Lob
+    @Column(name = "EX_MSG")
+    @ApiParam("同步数据")
+    private String exMsg;
+
+    @Lob
+    @Column(name = "DATA")
+    @ApiParam("同步数据")
+    private String data;
+
+
+}

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")
@@ -107,4 +107,9 @@ public class PtlTag extends BaseBean implements Serializable {
     @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/model/CommonMsgModel.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.ptl.model;
 
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -29,6 +30,9 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("消息类型")
     private String msgType;
 
+    @ApiModelProperty("是否重试")
+    private Integer isRestart= CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
     @ApiModelProperty("消息数据")
     private Map<String, Object> msgData;
 

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

@@ -1,18 +1,47 @@
 package cn.estsh.i3plus.pojo.ptl.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.ToString;
 
 import java.io.Serializable;
 
 /**
- * @author Wynne.Lu
+ * @author wangjie
  * @date 2020/2/15 15:42
  * @desc
  */
 @Data
-@ToString
+@ApiModel("亮灯model")
 public class LightOnModel implements Serializable {
     private static final long serialVersionUID = -1089361557513425229L;
 
+    @ApiParam("标签地址，范围1~250,设置null即为所有标签")
+    private Integer tagNo;
+
+    @ApiParam("内容：字母，数字，字符")
+    private String content;
+
+    @ApiParam("颜色指令:枚举获取，TAG_LIGHT_COLOR_CMD")
+    private String colorCmd;
+
+    @ApiParam("亮灯方式")
+    private Integer lightType;
+
+    @ApiParam("音乐编号指令:枚举获取，FINISH_TAG_LIGHT_MUSIC_CMD")
+    private String musicCmd;
+
+    @ApiParam("音量值指令:枚举获取，FINISH_TAG_LIGHT_VOLUME_CMD")
+    private String volumeCmd;
+
+    @ApiParam("是否蜂鸣")
+    private Integer buzz;
+
+    @ApiParam("是否熄灯，清除LED显示器")
+    private Integer ledFlag;
+
+    @ApiParam("是否熄灯")
+    private Integer lightFlag;
+
 }

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

@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.ptl.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("产品包装model")
+public class ProductDataModel {
+
+    @ApiParam("字段代码")
+    private String fieldCode;
+
+    @ApiParam("字段名称")
+    private String fieldName;
+
+    @ApiParam("字段值")
+    private String fieldValue;
+}

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

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.ptl.bean.PtlNode;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlPcn;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface PtlNodeRepository extends BaseRepository<PtlNode, Long> {
+public interface PtlNodeRepository extends BaseRepository<PtlPcn, Long> {
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnConnectLogRepository.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.PtlPcnConnectLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-24-17:13
+ * @Modify:
+ **/
+@Repository
+public interface PtlPcnConnectLogRepository extends BaseRepository<PtlPcnConnectLog, Long> {
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnRepository.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.PtlPcn;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-24-17:13
+ * @Modify:
+ **/
+@Repository
+public interface PtlPcnRepository extends BaseRepository<PtlPcn, Long> {
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskLogRepository.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.PtlPcnTaskLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-08-27
+ * @Modify:
+ **/
+@Repository
+public interface PtlPcnTaskLogRepository extends BaseRepository<PtlPcnTaskLog, Long> {
+}

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/repository/PtlSyncDeadLetterRepository.java

@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlSyncDeadLetter;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/2/18 09:19
+ * @desc
+ */
+public interface PtlSyncDeadLetterRepository extends BaseRepository<PtlSyncDeadLetter, 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节点查询条件封装
@@ -132,7 +149,7 @@ public class PtlHqlPack {
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean getPtlPcnByCondition(PtlNode ptlPcn, String organizeCode) {
+    public static DdlPackBean getPtlPcnByCondition(PtlPcn ptlPcn, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
         if (!StringUtils.isEmpty(ptlPcn.getConnectIp())) {
             DdlPreparedPack.getStringLikerPack(ptlPcn.getConnectIp(), "connectIp", packBean);
@@ -183,4 +200,109 @@ 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;
+    }
+
+    /**
+     * 区域任务主表
+     *
+     * @param ptlAreaTask 区域任务主表
+     * @return
+     */
+    public static DdlPackBean packPtlAreaTask(PtlAreaTask ptlAreaTask) {
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskNo(), "taskNo", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaTask.getPartNo(), "partNo", result);
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeStart())
+                && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(ptlAreaTask.getCreateDateTimeStart(), ptlAreaTask.getCreateDateTimeEnd()
+                    , "createDatetime", result, true);
+        }
+        DdlPreparedPack.getNumEqualPack(ptlAreaTask.getStatus(), "status", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskType(), "taskType", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaTask.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getNumEqualPack(ptlAreaTask.getIsValid(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result);
+        return result;
+    }
+
+    /**
+     * 主任务表
+     *
+     * @param ptlMainTask 主任务表
+     * @return
+     */
+    public static DdlPackBean packPtlMainTask(PtlMainTask ptlMainTask) {
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(ptlMainTask.getTaskNo(), "taskNo", result);
+        DdlPreparedPack.getStringEqualPack(ptlMainTask.getPartNo(), "partNo", result);
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeStart())
+                && org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(ptlMainTask.getCreateDateTimeStart(), ptlMainTask.getCreateDateTimeEnd()
+                    , "createDatetime", result, true);
+        }
+        DdlPreparedPack.getNumEqualPack(ptlMainTask.getStatus(), "status", result);
+        DdlPreparedPack.getStringEqualPack(ptlMainTask.getTaskType(), "taskType", result);
+        DdlPreparedPack.getStringEqualPack(ptlMainTask.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getNumEqualPack(ptlMainTask.getIsValid(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result);
+        return result;
+    }
+    /**
+     * 区段
+     *
+     * @param ptlAreaSectionTask 区段任务
+     * @return
+     */
+    public static DdlPackBean packPtlAreaSectionTask(PtlAreaSectionTask ptlAreaSectionTask) {
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaTaskNo(), "areaTaskNo", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getPartNo(), "partNo", result);
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeStart())
+                && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(ptlAreaSectionTask.getCreateDateTimeStart(), ptlAreaSectionTask.getCreateDateTimeEnd()
+                    , "createDatetime", result, true);
+        }
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaNo(), "areaNo", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getSectionNo(), "sectionNo", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getNumEqualPack(ptlAreaSectionTask.getIsValid(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result);
+        return result;
+    }
+
+    /**
+     * 区段任务明细
+     *
+     * @param ptlAreaSectionTaskDetail 区段任务明细
+     * @return
+     */
+    public static DdlPackBean packPtlAreaSectionTaskDetail(PtlAreaSectionTaskDetail ptlAreaSectionTaskDetail) {
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTaskDetail.getSectionTaskNo(), "sectionTaskNo", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTaskDetail.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getNumEqualPack(ptlAreaSectionTaskDetail.getIsValid(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result);
+        return result;
+    }
 }

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

@@ -31,63 +31,63 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api(value = "盘点策略表", description = "盘点策略表")
-public class WmsCsStrategy extends BaseBean  implements Serializable {
+public class WmsCsStrategy extends BaseBean implements Serializable {
 
-	private static final long serialVersionUID = -1692487594678973549L;
+    private static final long serialVersionUID = -1692487594678973549L;
 
-	@Column(name = "STRATEGY_NAME")
-	@ApiParam(value = "策略名称")
-	private String strategyName;
+    @Column(name = "STRATEGY_NAME")
+    @ApiParam(value = "策略名称")
+    private String strategyName;
 
-	@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")
-	private String partType;
+    @Column(name = "part_type")
+    @ApiParam(value = "物料分类")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description")
+    @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")
-	@AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class, refForeignKey = "value", value = "description")
-	private Integer strategyType;
+    @Column(name = "STRATEGY_TYPE")
+    @ApiParam(value = "策略分类", example = "0")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "CS_STRATEGY_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class)
+    private Integer strategyType;
 
-	@Column(name = "CYCLE_RULE")
-	@ApiParam(value = "循环规则")
-	private String cycleRule;
+    @Column(name = "CYCLE_RULE")
+    @ApiParam(value = "循环规则")
+    private String cycleRule;
 
-	@Column(name = "START_DATE")
-	@ApiParam(value = "开始日期", example = "0")
-	private String startDate;
+    @Column(name = "START_DATE")
+    @ApiParam(value = "开始日期", example = "0")
+    private String startDate;
 
-	@Column(name = "END_DATE")
-	@ApiParam(value = "结束日期", example = "0")
-	private String endDate;
+    @Column(name = "END_DATE")
+    @ApiParam(value = "结束日期", example = "0")
+    private String endDate;
 
-	@Column(name = "NUM_MAX")
-	@ApiParam(value = "明细数量上限")
-	private Integer numMax;
+    @Column(name = "NUM_MAX")
+    @ApiParam(value = "明细数量上限")
+    private Integer numMax;
 
-	@Column(name = "COVERAGE_RATE")
-	@ApiParam(value = "抽盘覆盖率")
-	private Double coverageRate;
+    @Column(name = "COVERAGE_RATE")
+    @ApiParam(value = "抽盘覆盖率")
+    private Double coverageRate;
 
-	@Column(name = "ZONE_NOS")
-	@ApiParam(value = "存储区")
-	private String zoneNos;
+    @Column(name = "ZONE_NOS")
+    @ApiParam(value = "存储区")
+    private String zoneNos;
 
-	@Column(name = "LOCATES")
-	@ApiParam(value = "盘点库位")
-	private String locates;
+    @Column(name = "LOCATES")
+    @ApiParam(value = "盘点库位")
+    private String locates;
 
-	@Column(name = "last_run_time")
-	@ApiParam(value = "上次运行时间")
-	private String lastRunTime;
+    @Column(name = "last_run_time")
+    @ApiParam(value = "上次运行时间")
+    private String lastRunTime;
 
-	@Column(name = "next_run_time")
-	@ApiParam(value = "下次运行时间")
-	private String nextRunTime;
+    @Column(name = "next_run_time")
+    @ApiParam(value = "下次运行时间")
+    private String nextRunTime;
 
-	@Column(name = "REMAKE")
-	@ApiParam(value = "备注")
-	private String remake;
+    @Column(name = "REMAKE")
+    @ApiParam(value = "备注")
+    private String remake;
 }

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

@@ -47,17 +47,19 @@ 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")
     @ApiParam(value = "仓库代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WareHouse",
+            searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code")
     private String whNo;
 
     @Column(name = "ZONE_NO")
     @ApiParam(value = "存储区代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
+            searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
     private String zoneNo;
 
     @Column(name = "FURNITURE_NO")
@@ -102,7 +104,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")
@@ -147,7 +147,8 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "IN_LOCATE_NO")
     @ApiParam(value = "默认入库库位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
+            searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     private String inLocateNo;
 
     @Column(name = "PROD_CFG_TYPE_CODE")
@@ -182,7 +183,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 +208,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 +229,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,16 @@ public class WmsFieldInfo extends BaseBean {
     @Column(name = "CONDITION_CONNECTOR")
     @ApiParam(value = "条件连接符:and/or")
     private String conditionConnector;
+
+    @Column(name = "LIST_COLUMN_NAME")
+    @ApiParam(value = "开窗列表显示列名称")
+    private String listColumnName;
+
+    @Column(name = "SEARCH_COLUMN_NAME")
+    @ApiParam(value = "开窗搜索列名称")
+    private String searchColumnName;
+
+    @Column(name = "EXPLICIT_COLUMN_NAME")
+    @ApiParam(value = "回显列名")
+    private String explicitColumnName;
 }