Merge branch 'test' of i3-IMPP/i3plus-pojo into master

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

@@ -39,4 +39,6 @@ public @interface DynamicField {
     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/MesEnumUtil.java

@@ -1598,7 +1598,8 @@ public class MesEnumUtil {
         MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"),
         MES_PLC(390,"PLC地址清单"),
         MES_PROCESS(400,"工序信息"),
-        MES_KPSN_RULE(410,"关键件条码校验规则");
+        MES_KPSN_RULE(410,"关键件条码校验规则"),
+        MES_QUEUE_JIT_ACTUAL(420,"客户JIT生产队列");
 
         private int value;
         private String description;
@@ -4062,4 +4063,75 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 客户JIT生产队列状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_QUEUE_JIT_ACTUAL_STATUS {
+        CREATE(10, "创建"),
+        LANDED(20, "下达"),
+        CANCEL(30, "取消");
+
+        private int value;
+        private String description;
+
+        MES_QUEUE_JIT_ACTUAL_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;
+        }
+    }
+
+    /**
+     * 客户JIT生产队列特殊标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
+        NORMAL(10, "正常"),
+        EMPTYING(20, "放空");
+
+        private int value;
+        private String description;
+
+        MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG(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/PtlEnumUtil.java

@@ -476,7 +476,7 @@ public class PtlEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SYNC_PATTERN {
 
-        UPDATE(1, "修改"),
+        UPDATE(1, "新增或修改"),
         INSERT(2, "新增");
 
         private int value;

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

@@ -314,7 +314,7 @@ public class PtlPcnEnumUtil {
 
         public static SIGNAL_CHILD_CMD getByValue(String code) {
             for (SIGNAL_CHILD_CMD signalChildCmd : values()) {
-                if (signalChildCmd.getCode() == code) {
+                if (signalChildCmd.getCode().equals(code)) {
                     return signalChildCmd;
                 }
             }
@@ -351,12 +351,12 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TAG_LIGHT_COLOR_CMD {
-        TAG_LIGHT_COLOR_RED("00", 0, "红"),
+        TAG_LIGHT_COLOR_RED("00", 1, "红"),
-        TAG_LIGHT_COLOR_GREEN("01", 1, "绿"),
+        TAG_LIGHT_COLOR_GREEN("01", 2, "绿"),
-        TAG_LIGHT_COLOR_ORANGE("02", 2, "橙"),
+        TAG_LIGHT_COLOR_ORANGE("02", 3, "橙"),
-        TAG_LIGHT_COLOR_BLUE("03", 3, "蓝"),
+        TAG_LIGHT_COLOR_BLUE("03", 4, "蓝"),
-        TAG_LIGHT_COLOR_PINK_RED("04", 4, "粉红"),
+        TAG_LIGHT_COLOR_PINK_RED("04", 5, "粉红"),
-        TAG_LIGHT_COLOR_BLUE_GREEN("05", 5, "蓝绿");
+        TAG_LIGHT_COLOR_BLUE_GREEN("05", 6, "蓝绿");
 
         private String code;
         private Integer value;
@@ -370,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;
                 }
             }
@@ -417,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;
         }
@@ -432,18 +441,18 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FINISH_TAG_LIGHT_MUSIC_CMD {
-        FINISH_TAG_LIGHT_MUSIC_00H("00", 0, "Jingle bells"),
+        FINISH_TAG_LIGHT_MUSIC_00H("00", 1, "Jingle bells"),
-        FINISH_TAG_LIGHT_MUSIC_01H("01", 1, "Carmen"),
+        FINISH_TAG_LIGHT_MUSIC_01H("01", 2, "Carmen"),
-        FINISH_TAG_LIGHT_MUSIC_02H("02", 2, "Happy Chinese new year"),
+        FINISH_TAG_LIGHT_MUSIC_02H("02", 3, "Happy Chinese new year"),
-        FINISH_TAG_LIGHT_MUSIC_03H("03", 3, "Edelweiss"),
+        FINISH_TAG_LIGHT_MUSIC_03H("03", 4, "Edelweiss"),
-        FINISH_TAG_LIGHT_MUSIC_04H("04", 4, "Going home"),
+        FINISH_TAG_LIGHT_MUSIC_04H("04", 5, "Going home"),
-        FINISH_TAG_LIGHT_MUSIC_05H("05", 5, "PAPALA"),
+        FINISH_TAG_LIGHT_MUSIC_05H("05", 6, "PAPALA"),
-        FINISH_TAG_LIGHT_MUSIC_06H("06", 6, "Classical"),
+        FINISH_TAG_LIGHT_MUSIC_06H("06", 7, "Classical"),
-        FINISH_TAG_LIGHT_MUSIC_07H("07", 7, "Listen to the rhythm of the falling rain"),
+        FINISH_TAG_LIGHT_MUSIC_07H("07", 8, "Listen to the rhythm of the falling rain"),
-        FINISH_TAG_LIGHT_MUSIC_08H("08", 8, "Rock and roll"),
+        FINISH_TAG_LIGHT_MUSIC_08H("08", 9, "Rock and roll"),
-        FINISH_TAG_LIGHT_MUSIC_09H("09", 9, "Happy birthday"),
+        FINISH_TAG_LIGHT_MUSIC_09H("09", 10, "Happy birthday"),
-        FINISH_TAG_LIGHT_MUSIC_0AH("0A", 10, "Do Re Me"),
+        FINISH_TAG_LIGHT_MUSIC_0AH("0A", 11, "Do Re Me"),
-        FINISH_TAG_LIGHT_MUSIC_0BH("0B", 11, "Strauss");
+        FINISH_TAG_LIGHT_MUSIC_0BH("0B", 12, "Strauss");
 
         private String code;
         private Integer value;
@@ -457,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;
                 }
             }
@@ -520,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;
                 }
             }
@@ -680,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;
@@ -717,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;
                 }
@@ -731,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", "亮灯明细");
@@ -746,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;
@@ -769,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;
                 }
@@ -782,25 +793,33 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 生成任务actor message type
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum WsBusiType {
+    public enum GEN_TASK_MESSAGE_TYPE {
-        MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"),
+        GEN_TASK_CMD(10, "GEN_TASK_CMD", "", "生成任务");
-        INTERFACE_PROCESS(10, "INTERFACE_PROCESS", "界面处理");
 
         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;
         }
@@ -808,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 {
+    public enum WsBusiType {
-        TEXT(10, "TEXT", "正常信息"),
+        MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"),
-        EXP_TEXT(20, "EXP_TEXT", "异常信息"),
+        INTERFACE_PROCESS(20, "INTERFACE_PROCESS", "界面处理");
-        TABLE(30, "TABLE", "表格");
 
         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() {
@@ -840,16 +870,16 @@ public class PtlPcnEnumUtil {
     }
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum STATUS_TYPE {
+    public enum WsDataType {
-        START(10, "START", "开始状态"),
+        TEXT(10, "TEXT", "正常信息"),
-        FINISH(20, "FINISH", "完成状态"),
+        EXP_TEXT(20, "EXP_TEXT", "异常信息"),
-        TERMINATE(30, "TERMINATE", "中断状态");
+        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;
@@ -869,15 +899,16 @@ public class PtlPcnEnumUtil {
     }
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum AREA_SECTION_TASK_DETAIL_STATUS {
+    public enum STATUS_TYPE {
-        CREATE(10, "CREATE", "创建"),
+        START(10, "START", "开始状态"),
-        COMPLETE(20, "COMPLETE", "完成");
+        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;
@@ -896,22 +927,18 @@ public class PtlPcnEnumUtil {
         }
     }
 
-    /**
-     * 生成任务actor message type
-     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum GenTaskMessageType {
+    public enum AREA_SECTION_TASK_DETAIL_STATUS {
-        GEN_TASK_CMD(10, "GEN_TASK_CMD", "", "生成任务");
+        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;
         }
 
@@ -919,10 +946,6 @@ public class PtlPcnEnumUtil {
             return value;
         }
 
-        public String getCallClass() {
-            return callClass;
-        }
-
         public String getCode() {
             return code;
         }
@@ -930,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;
-        }
     }
 
     /**
@@ -1349,7 +1360,7 @@ public class PtlPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SYNC_PATTERN {
 
-        UPDATE(1, "修改"),
+        UPDATE(1, "新增或修改"),
         INSERT(2, "新增");
 
         private int value;
@@ -1388,4 +1399,402 @@ public class PtlPcnEnumUtil {
             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);
+        }
+    }
+
+    /**
+     * redis过期时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EXPIRE_TIME {
+
+        NEVER(-1, "不过期"),
+        ONE_HOUR(3600, "一小时"),
+        FIVE_MINS(300, "5分钟"),
+        HALF_HOUR(1800, "半小时"),
+        ONE_QUARTER(900, "一刻钟"),
+        ONE_MIN(60, "一分钟");
+
+        private int value;
+        private String description;
+
+        EXPIRE_TIME(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription2(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -3857,7 +3857,8 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PRINT_TYPE {
-        SN(10, "SN");
+        SN(10, "SN"),
+        PACKAGE_NO(20, "PACKAGE_NO");
 
         private int value;
         private String description;
@@ -5030,4 +5031,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/dao/BaseRepository.java

@@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.NoRepositoryBean;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -378,4 +379,7 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
     double findMinByProperty(String sumPropertyName,String groupByName,String propertyName, Object value);
 
     double findMinByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue);
+
+    List<T> findByHqlWhereByClear(DdlPackBean packBean, String dateTime);
+
 }

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

@@ -1548,4 +1548,16 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         }
         return num;
     }
+
+    @Override
+    public List<T> findByHqlWhereByClear(DdlPackBean packBean, String dateTime) {
+        StringBuffer queryString = new StringBuffer();
+        queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 and model.createDatetime <= " + dateTime + " ");
+
+        if (packBean != null) {
+            queryString.append(packBean.getWhereAppend());
+        }
+
+        return entityManager.createQuery(queryString.toString()).getResultList();
+    }
 }

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java

@@ -186,6 +186,8 @@ public class LacHqlPack {
     public static DdlPackBean packHqlCheckLacTaskCheckMasterOnly(LacTaskCheck lacTaskCheck){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(lacTaskCheck);
         DdlPreparedPack.getStringEqualPack(lacTaskCheck.getTaskCheckGroup(),"taskCheckGroup",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(lacTaskCheck.getStepId(),"stepId",ddlPackBean);
+        DdlPreparedPack.getNumNOEqualPack(lacTaskCheck.getId(),"id",ddlPackBean);
         return ddlPackBean;
     }
 }

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

@@ -37,4 +37,12 @@ public class MesCustProdLine extends BaseBean implements Serializable {
     @Column(name = "CUST_PROD_LINE_NAME")
     @ApiParam("客户产线名称")
     private String custProdLineName;
+
+    @Column(name = "PG_CODE")
+    @ApiParam("生产组代码")
+    private String pgCode;
+
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
 }

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

@@ -88,6 +88,10 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("产品编码匹配类型")
     private Integer productMatchType;
 
+    @Column(name = "产品生产类型")
+    @ApiParam("产品类型名称")
+    private String pptCode;
+
     @Transient
     @ApiParam("产品类型名称")
     private String produceCategoryName;

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

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/5 11:54
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PART_PRODUCE_TYPE")
+@Api("产品生产类型")
+public class MesPartProduceType extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 9191695513960958568L;
+
+    @Column(name = "PPT_CODE")
+    @ApiParam("产品生产类型")
+    private String pptCode;
+
+    @Column(name = "PPT_NAME")
+    @ApiParam("产品生产类型名称")
+    private String pptName;
+}

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 9:34 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PRODUCE_GROUP")
+@Api("MES_生产组")
+public class MesProduceGroup extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6926189371427937743L;
+
+    @Column(name = "PG_CODE")
+    @ApiParam("生产组代码")
+    private String pgCode;
+
+    @Column(name = "PG_NAME")
+    @ApiParam("生产组名称")
+    private String pgName;
+
+}

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

@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 9:22 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PRODUCE_GROUP_CFG")
+@Api("MES_生产组配置")
+public class MesProduceGroupCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 82611799819312505L;
+    @Column(name = "PG_CODE")
+    @ApiParam("生产组代码")
+    private String pgCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("生产线")
+    private String workCenterCode;
+}

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

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :MES_QUEUE_JIT_ACTUAL_DETAIL
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 10:16 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_GROUP_COUNT")
+@Api("MES_队列分组计数")
+public class MesQueueGroupCount extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -7799006330177462162L;
+
+    @Column(name = "QGR_CODE")
+    @ApiParam("分组规则代码")
+    private String qgrCode;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "QTY")
+    @ApiParam("分组数量")
+    private Integer qty;
+
+    @Column(name = "CNT_QTY")
+    @ApiParam("累计数")
+    private Integer cntQty;
+}

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

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :MES_QUEUE_GROUP_COUNT
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 10:16 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_GROUP_RULE")
+@Api("MES_队列分组规则")
+public class MesQueueGroupRule extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6857842499743356177L;
+
+    @Column(name = "QGR_CODE")
+    @ApiParam("分组规则代码")
+    private String qgrCode;
+
+    @Column(name = "CUST_PLANT_CODE")
+    @ApiParam("客户产线代码")
+    private String custPlantCode;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "QTY")
+    @ApiParam("分组数量")
+    private Integer qty;
+}

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

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 10:16 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_JIT_ACTUAL")
+@Api("MES_客户JIT生产队列")
+public class MesQueueJitActual extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 655875369308810110L;
+
+    @Column(name = "JIS_ACTUAL_NO")
+    @ApiParam("队列编号")
+    private String jisActualNo;
+
+    @Column(name = "PROD_CFG_CODE")
+    @ApiParam("配置代码")
+    private String prodCfgCode;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("vin")
+    private String vinCode;
+
+    @Column(name = "CUST_FLAG_NO")
+    @ApiParam("客户标识号")
+    private String custFlagNo;
+
+    @Column(name = "SEQ")
+    @ApiParam("排序号")
+    private Double seq;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name = "SPECIAL_FLAG")
+    @ApiParam("特殊标识")
+    private Integer specialFlag;
+
+    @Column(name = "CUST_POINT_DATE")
+    @ApiParam("客户需求时间")
+    private String custPointDate;
+
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name = "CUST_PLANT_CODE")
+    @ApiParam("客户产线代码")
+    private String custPlantCode;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+    @Column(name = "PG_CODE")
+    @ApiParam("生产组代码")
+    private String pgCode;
+
+    @Transient
+    @ApiParam("客户需求开始时间")
+    private String custPointStartDate;
+
+    @Transient
+    @ApiParam("客户需求结束时间")
+    private String custPointEndDate;
+
+}

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

@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :MES_QUEUE_JIT_ACTUAL
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 10:16 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL")
+@Api("MES_客户JIT生产队列明细")
+public class MesQueueJitActualDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1442091799346314190L;
+
+    @Column(name = "QGR_CODE")
+    @ApiParam("分组规则代码")
+    private String qgrCode;
+
+    @Column(name = "PROD_CFG_CODE")
+    @ApiParam("配置代码")
+    private String prodCfgCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("产品名称")
+    private String partName;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("组内编号")
+    private Integer groupNo;
+}

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

@@ -0,0 +1,77 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 9:40 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_JIT_PLAN")
+@Api("MES_客户JIT预装队列")
+public class MesQueueJitPlan extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6613487463796132500L;
+
+    @Column(name = "JIS_PLAN_NO")
+    @ApiParam("队列编号")
+    private String jisPlanNo;
+
+    @Column(name = "PROD_CFG_CODE")
+    @ApiParam("配置代码")
+    private String prodCfgCode;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("vin")
+    private String vinCode;
+
+    @Column(name = "CUST_FLAG_NO")
+    @ApiParam("客户标识号")
+    private String custFlagNo;
+
+    @Column(name = "VEHICLE_CODE")
+    @ApiParam("选配码")
+    private String vehicleCode;
+
+    @Column(name = "SEQ")
+    @ApiParam("计划排序号")
+    private String seq;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name = "PLAN_DATE")
+    @ApiParam("计划上线时间")
+    private String planDate;
+
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name = "CUST_PLANT_CODE")
+    @ApiParam("客户工厂代码")
+    private String custPlantCode;
+
+    @Column(name = "VERSION")
+    @ApiParam("版本号")
+    private String version;
+}

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

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 10:01 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_JIT_PLAN_BOM")
+@Api("MES_客户JIT预装队列BOM")
+public class MesQueueJitPlanBom extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 2037991315471333415L;
+
+    @Column(name = "JIS_PLAN_NO")
+    @ApiParam("队列编号")
+    private String jisPlanNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("原材料物料号")
+    private String itemPartNo;
+
+    @Column(name = "DOCK_NO")
+    @ApiParam("道口")
+    private String dockNo;
+
+    @Column(name = "QTY")
+    @ApiParam("用量")
+    private Double qty;
+}

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

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 9:58 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_JIT_PLAN_DETAIL")
+@Api("MES_客户JIT预装队列明细")
+public class MesQueueJitPlanDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1263996676519565026L;
+
+    @Column(name = "JIS_PLAN_NO")
+    @ApiParam("队列编号")
+    private String jisPlanNo;
+
+    @Column(name = "PROD_CFG_CODE")
+    @ApiParam("配置代码")
+    private String prodCfgCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("产品名称")
+    private String partName;
+}

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

@@ -72,6 +72,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品类型名称")
     private String produceCategoryNameRdd;
 
+    @Column(name = "产品生产类型")
+    @ApiParam("产品类型名称")
+    private String pptCode;
+
     @Transient
     @ApiParam("队列序号")
     private Double queueSeq;

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

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/9 15:35
+ * @desc
+ */
+@Data
+public class ActorMessageModel<T> {
+
+    private String msgType;
+
+    private String clientInfo;
+
+    private String workCellCode;
+
+    private String workCenterCode;
+
+    private String organizeCode;
+
+    private String routeCode;
+
+    private String serialNumber;
+
+    private String productSn;
+
+    private T dataObj;
+
+    private List<? extends T> dataList;
+
+    private Map<String, Object> dataMap;
+}

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

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.model.mes;
+package cn.estsh.i3plus.pojo.mes.model;
 
 
 import io.swagger.annotations.ApiParam;

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

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.model.mes;
+package cn.estsh.i3plus.pojo.mes.model;
 
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

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

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceGroupCfg;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 10:53 上午
+ * @Modify:
+ **/
+public interface MesProduceGroupCfgRepository extends BaseRepository<MesProduceGroupCfg, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceGroup;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 10:52 上午
+ * @Modify:
+ **/
+public interface MesProduceGroupRepository extends BaseRepository<MesProduceGroup, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueGroupCount;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 10:54 上午
+ * @Modify:
+ **/
+public interface MesQueueGroupCountRepository extends BaseRepository<MesQueueGroupCount, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueGroupRule;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 10:55 上午
+ * @Modify:
+ **/
+public interface MesQueueGroupRuleRepository extends BaseRepository<MesQueueGroupRule, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitActualDetail;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 10:57 上午
+ * @Modify:
+ **/
+public interface MesQueueJitActualDetailRepository extends BaseRepository<MesQueueJitActualDetail, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitActual;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 10:56 上午
+ * @Modify:
+ **/
+public interface MesQueueJitActualRepository extends BaseRepository<MesQueueJitActual, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanBom;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 10:58 上午
+ * @Modify:
+ **/
+public interface MesQueueJitPlanBomRepository extends BaseRepository<MesQueueJitPlanBom, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanDetail;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 10:58 上午
+ * @Modify:
+ **/
+public interface MesQueueJitPlanDetailRepository extends BaseRepository<MesQueueJitPlanDetail, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlan;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 10:57 上午
+ * @Modify:
+ **/
+public interface MesQueueJitPlanRepository extends BaseRepository<MesQueueJitPlan, Long> {
+}

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

@@ -2164,4 +2164,46 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 客户JIT生产队列
+     *
+     * @param queueJitActual
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (!StringUtils.isEmpty(queueJitActual.getJisActualNo())) {
+            DdlPreparedPack.getStringLikerPack(queueJitActual.getJisActualNo(), "jisActualNo", packBean);
+        }
+        if (!StringUtils.isEmpty(queueJitActual.getCustPlantCode())) {
+            DdlPreparedPack.getStringLikerPack(queueJitActual.getCustPlantCode(), "custPlantCode", packBean);
+        }
+        if (!StringUtils.isEmpty(queueJitActual.getCustFlagNo())) {
+            DdlPreparedPack.getStringLikerPack(queueJitActual.getCustFlagNo(), "custFlagNo", packBean);
+        }
+        if (!StringUtils.isEmpty(queueJitActual.getVinCode())) {
+            DdlPreparedPack.getStringLikerPack(queueJitActual.getVinCode(), "vinCode", packBean);
+        }
+        if (!StringUtils.isEmpty(queueJitActual.getProdCfgCode())) {
+            DdlPreparedPack.getStringLikerPack(queueJitActual.getProdCfgCode(), "prodCfgCode", packBean);
+        }
+        if (queueJitActual.getStatus() != null) {
+            DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean);
+        }
+        if (!StringUtil.isEmpty(queueJitActual.getCreateDateTimeStart()) || !StringUtil.isEmpty(queueJitActual.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    queueJitActual.getCreateDateTimeStart(),
+                    queueJitActual.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
+        if (!StringUtil.isEmpty(queueJitActual.getCustPointStartDate()) || !StringUtil.isEmpty(queueJitActual.getCustPointEndDate())) {
+            DdlPreparedPack.timeBuilder(
+                    queueJitActual.getCustPointStartDate(),
+                    queueJitActual.getCustPointEndDate(),
+                    "createDatetime", packBean, true);
+        }
+        return packBean;
+    }
 }

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

@@ -82,11 +82,11 @@ public class PtlBom extends BaseBean implements Serializable {
 
     @Column(name = "EFF_START_TIME")
     @ApiParam("有效起始日期")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
-    private Date effStartTime;
+    private String effStartTime;
 
     @Column(name = "EFF_END_TIME")
     @ApiParam("有效截止日期")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
-    private Date effEndTime;
+    private String effEndTime;
 }

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代码")

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

@@ -0,0 +1,58 @@
+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;
+import java.util.Date;
+
+/**
+ * @author adair.song
+ * @date 2020/03/09 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "PTL_PCN_CLEAR")
+@EqualsAndHashCode(callSuper = true)
+@Api("PTL_PCN数据清理")
+public class PtlPcnClear extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -1596443273899197995L;
+
+    @Column(name = "PCN_CODE")
+    @ApiParam("PCN代码")
+    private String pcnCode;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name = "EXTRACT_CONDITION")
+    @ApiParam("获取数据条件")
+    private String extractCondition;
+
+    @Column(name = "ACTION_FREQUENCY")
+    @ApiParam("执行频率")
+    private Integer actionFrequency;
+
+    @Column(name = "LAST_SYNC_TIME")
+    @ApiParam("上一执行时间")
+    private String lastSyncTime;
+
+}

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/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

@@ -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/PtlPcnClearRepository.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.PtlPcnClear;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: adair.song
+ * @CreateDate:2019-04-24-17:13
+ * @Modify:
+ **/
+@Repository
+public interface PtlPcnClearRepository extends BaseRepository<PtlPcnClear, 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/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

@@ -149,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);
@@ -218,4 +218,92 @@ public class PtlHqlPack {
         }
         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.getStringEqualPack(ptlAreaTask.getAreaNo(), "areaNo", result);
+        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/WmsDocMovementSn.java

@@ -126,4 +126,15 @@ public class WmsDocMovementSn extends BaseBean {
     @Transient
     @ApiParam("父层级packcode对应的可回用零件号")
     private String parentReturnPart;
+
+    @Transient
+    @ApiParam("剩余箱数量")
+    private Long countBox;
+
+    public WmsDocMovementSn(){}
+
+    public WmsDocMovementSn(Long countBox,String partNo) {
+        this.countBox = countBox;
+        this.partNo = partNo;
+    }
 }

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

@@ -52,12 +52,14 @@ public class WmsLocate extends BaseBean {
 
     @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")

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

@@ -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")

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

@@ -215,6 +215,10 @@ public class WmsStockSn extends BaseBean {
     @Transient
     public String labelNo;
 
+    @Column(name = "PACKAGE_PART_NO")
+    @ApiParam(value = "包装零件号")
+    private String packagePartNo;
+
     @Transient
     @ApiParam(value = "工厂名称")
     public String organizeName;

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

@@ -93,11 +93,15 @@ public class WmsFieldInfo extends BaseBean {
     @ApiParam(value = "条件连接符:and/or")
     private String conditionConnector;
 
-    @Column(name = "LIST_COLUMNNAME")
+    @Column(name = "LIST_COLUMN_NAME")
     @ApiParam(value = "开窗列表显示列名称")
     private String listColumnName;
 
-    @Column(name = "SEARCH_COLUMNNAME")
+    @Column(name = "SEARCH_COLUMN_NAME")
     @ApiParam(value = "开窗搜索列名称")
     private String searchColumnName;
+
+    @Column(name = "EXPLICIT_COLUMN_NAME")
+    @ApiParam(value = "回显列名")
+    private String explicitColumnName;
 }

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

@@ -1301,6 +1301,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result);
         DdlPreparedPack.timeBuilder(wmsStockSn.getQualityDateTimeStart()+","+ wmsStockSn.getQualityDateTimeEnd(),
                 "qualityDate", result, false,false);
         if (wmsStockSn.getIsValid() != null) {