Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo

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

@@ -25,6 +25,8 @@ public @interface DynamicField {
     int sort() default 0;
     // 是否标题字段加粗 是否加粗:默认1-加粗，2-非加粗
     int isWider() default 2;
+    // 是否可选作查询条件:默认1-可选，2-不可选
+    int isQuery() default 1;
     // 是否勾选:默认1-勾选，2-非勾选
     int isSelect() default 1;
     // 是否必选:默认1-必选，2-非必选

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

@@ -65,6 +65,7 @@ public abstract class BaseBean implements Serializable {
     @Column(name="ORGANIZE_CODE", nullable = false)
     @ApiParam(value ="组织代码")
 //    @AnnoOutputColumn(hidden = true)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isQuery = 2, isRequire = 2)
     public String organizeCode;
 
     @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)

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

@@ -17,7 +17,8 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_ACTION_MODULE {
-        WORK_ORDER_LANDED(10, "生产工单下达");
+        WORK_ORDER_LANDED(10, "生产工单下达"),
+        QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达");
 
         private int value;
         private String description;
@@ -1595,11 +1596,11 @@ public class MesEnumUtil {
         MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"),
         MES_DATASOURCE(360, "DB地址清单"),
         MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"),
-        MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"),
-        MES_PLC(390,"PLC地址清单"),
-        MES_PROCESS(400,"工序信息"),
-        MES_KPSN_RULE(410,"关键件条码校验规则"),
-        MES_QUEUE_JIT_ACTUAL(420,"客户JIT生产队列");
+        MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"),
+        MES_PLC(390, "PLC地址清单"),
+        MES_PROCESS(400, "工序信息"),
+        MES_KPSN_RULE(410, "关键件条码校验规则"),
+        MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列");
 
         private int value;
         private String description;
@@ -2915,7 +2916,9 @@ public class MesEnumUtil {
         STANDARD_ORDER(10, "标准工单"),
         BTS_ORDER(20, "BTS工单"),
         ATTEMPT_ORDER(30, "试制工单"),
-        BH_ORDER(40, "B&H工单");
+        BH_ORDER(40, "B&H工单"),
+        JIT_ORDER(50, "JIT工单"),
+        STOCK_ORDER(60, "库存工单");
 
         private int value;
         private String description;
@@ -4068,7 +4071,7 @@ public class MesEnumUtil {
      * 客户JIT生产队列状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_QUEUE_JIT_ACTUAL_STATUS {
+    public enum QUEUE_JIT_ACTUAL_STATUS {
         CREATE(10, "创建"),
         LANDED(20, "下达"),
         CANCEL(30, "取消");
@@ -4076,7 +4079,7 @@ public class MesEnumUtil {
         private int value;
         private String description;
 
-        MES_QUEUE_JIT_ACTUAL_STATUS(int value, String description) {
+        QUEUE_JIT_ACTUAL_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -4104,14 +4107,155 @@ public class MesEnumUtil {
      * 客户JIT生产队列特殊标识
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
+    public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
         NORMAL(10, "正常"),
         EMPTYING(20, "放空");
+        private int value;
+        private String description;
+
+        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;
+        }
+    }
+
+    /**
+     * JIS发运队列状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIS_STATUS {
+        CREATE(10, "创建"),
+        LANDED(20, "下达"),
+        SHIPMENT(30, "已发运");
+
+        private int value;
+        private String description;
+
+        QUEUE_JIS_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 生产队列 队列类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_ORDER_QUEUE_TYPE {
+        PRODUCT_QUEUE(10, "生产队列"),
+        PRELOAD_QUEUE(20, "预装队列");
+
+        private int value;
+        private String description;
+
+        QUEUE_ORDER_QUEUE_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;
+        }
+    }
+
+    /**
+     * JIS发运队列明细 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIS_DETAIL_STATUS {
+        CREATE(10, "创建"),
+        SHIPMENT(20, "已发运");
+
+        private int value;
+        private String description;
+
+        QUEUE_JIS_DETAIL_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 关键件条码校验工步对应的物料分类的值
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_TYPE_THREE {
+
+        MM(10, "MM"),
+        MS(20, "MS");
 
         private int value;
         private String description;
 
-        MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG(int value, String description) {
+        PART_TYPE_THREE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -4134,4 +4278,144 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+
+    /**
+     * 工位监听组件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CELL_MONITOR_TYPE {
+        MONITOR(10, "监听组件"),
+        SHOW(20, "展示组件");
+
+        private int value;
+        private String description;
+
+        WORK_CELL_MONITOR_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 工位监听组件触发类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_MODULE_TRIGGER_TYPE {
+        BY_SN(10, "根据条码加载工步"),
+        BY_PART(20, "根据零件号加载工步");
+
+        private int value;
+        private String description;
+
+        WORK_MODULE_TRIGGER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_MODULE_PARAM_TYPE {
+        NUMBER(10, "数值"),
+        STRING(20, "字符串");
+
+        private int value;
+        private String description;
+
+        WORK_MODULE_PARAM_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 排序校验模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CHECK_PROD_SEQ_FLAG {
+        PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"),
+        CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"),
+        OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"),
+        ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序");
+
+        private int value;
+        private String code;
+        private String description;
+
+        CHECK_PROD_SEQ_FLAG(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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 String codeOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            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/MesPcnEnumUtil.java

@@ -204,8 +204,8 @@ public class MesPcnEnumUtil {
         PCN_LOGOUT(190, "PCN_LOGOUT", ""),
         UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"),
         PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""),
-        PCN_SYS_ALL_LANGUAGE(220,"PCN_SYS_ALL_LANGUAGE","PCN_SYS_ALL_LANGUAGE"),
-        PCN_SYS_RESOURCE_KEY_LANGUAGE(230,"PCN_SYS_RESOURCE_KEY_LANGUAGE","PCN_SYS_RESOURCE_KEY_LANGUAGE");
+        PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"),
+        PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE");
 
         private int value;
         private String code;
@@ -2806,4 +2806,76 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 工位监听组件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CELL_MONITOR_TYPE {
+        MONITOR(10, "监听组件"),
+        SHOW(20, "展示组件");
+
+        private int value;
+        private String description;
+
+        WORK_CELL_MONITOR_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 工位监听组件触发类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_MODULE_TRIGGER_TYPE {
+        BY_SN(10, "根据条码加载工步"),
+        BY_PART(20, "根据零件号加载工步");
+
+        private int value;
+        private String description;
+
+        WORK_MODULE_TRIGGER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_MODULE_PARAM_TYPE {
+        NUMBER(10, "数值"),
+        STRING(20, "字符串");
+
+        private int value;
+        private String description;
+
+        WORK_MODULE_PARAM_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

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

@@ -746,8 +746,7 @@ public class PtlPcnEnumUtil {
         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", "初始化页面"),
-        GET_CONTROL_DATA_CONTROL_CMD(60, "GET_CONTROL_DATA_CONTROL_CMD", "getControlDataControlService", "获取控制器数据");
+        INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面");
 //        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", "亮灯明细");
@@ -927,6 +926,9 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * PTL_区段亮灯任务明细状态
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_SECTION_TASK_DETAIL_STATUS {
         CREATE(10, "CREATE", "创建"),
@@ -956,67 +958,11 @@ public class PtlPcnEnumUtil {
     }
 
     /**
-     * PTL_区段亮灯任务明细状态
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum TASK_DETAIL_STATUS {
-        CREATE(10, "CREATE", "新建"),
-        RECEIPT_FINISH(20, "RECEIPT_FINISH", "已完成");
-
-        private int value;
-        private String code;
-        private String description;
-
-        TASK_DETAIL_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);
-        }
-    }
-
-    /**
-     * PTL_区段、区域亮灯任务状态
+     * PTL_区段亮灯任务状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_SECTION_TASK_STATUS {
         CREATE(10, "CREATE", "新建"),
-        RECEIPT(20, "RECEIPT", "执行中"),
         RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成");
 
         private int value;
@@ -1525,64 +1471,10 @@ public class PtlPcnEnumUtil {
             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 {
@@ -1636,14 +1528,14 @@ public class PtlPcnEnumUtil {
             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", "已完成");
+        RECEIPT_FINISH(30, "COMPLETED", "完成");
 
         private int value;
         private String code;
@@ -1693,7 +1585,7 @@ public class PtlPcnEnumUtil {
     }
 
     /**
-     * 区域任务类型(ASN,PO,MOVE,QC)
+     * 区域任务类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_TASK_TYPE {

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

@@ -3155,10 +3155,21 @@ public class WmsEnumUtil {
             }
             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);
         }
+        public static int descriptionOfValue(String desc) {return descOf(desc);}
+
     }
 
 
@@ -4955,10 +4966,20 @@ public class WmsEnumUtil {
             }
             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);
         }
+        public static int descriptionOfValue(String desc) {return descOf(desc);}
     }
 
     /**
@@ -5066,4 +5087,67 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 交易类型-单据回退类型
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_BACK_TYPE {
+        REC_QTY(10, "REC_QTY", "已收货数量"),
+        PICK_QTY(20, "PICK_QTY", "已拣货数量"),
+        MOVE_QTY(30, "MOVE_QTY", "已移库数量"),
+        OUT_QTY(40, "OUT_QTY", "已出库数量");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ORDER_BACK_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static ORDER_BACK_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
 }

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

@@ -1551,13 +1551,20 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByHqlWhereByClear(DdlPackBean packBean, String dateTime) {
+        LOGGER.info("PTL-PCN数据清除查询");
         StringBuffer queryString = new StringBuffer();
-        queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 and model.createDatetime <= " + dateTime + " ");
+        queryString.append("select model from " + persistentClass.getSimpleName()
+                + " as model where 1=1 and model.modifyDatetime < " + "'" + dateTime + "'" + " ");
 
         if (packBean != null) {
             queryString.append(packBean.getWhereAppend());
         }
 
-        return entityManager.createQuery(queryString.toString()).getResultList();
+        Query query = entityManager.createQuery(queryString.toString());
+        for (String key : packBean.getHqlPreparedMap().keySet()) {
+            query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));
+        }
+
+        return query.getResultList();
     }
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java

@@ -112,6 +112,14 @@ public class BfDataObjectProperty extends BaseBean {
     }
 
     @Transient
+    @ApiParam(value ="是否为数据有效字段")
+    private transient Integer isValidProperty;
+
+    @Transient
+    @ApiParam(value ="是否为弱删除字段")
+    private transient Integer isDeleteWeaklyProperty;
+
+    @Transient
     @ApiParam(value ="元素值")
     private transient Object propertyFormValue;
 

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
-import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -79,6 +78,22 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "是否删除")
     private Integer isObjectDel;
 
+    @Column(name = "IS_OBJECT_DEL_WEAK")
+    @ApiParam(value = "是否弱删除")
+    private Integer isObjectDelWeak;
+
+    @Column(name = "ELEMENT_DEL_WEAK_ATTR_ID")
+    @ApiParam(value = "元素弱删除属性id")
+    private Long elementDelWeakAttrId;
+
+    @Column(name = "IS_OBJECT_VALID")
+    @ApiParam(value = "是否有效")
+    private Integer isObjectValid;
+
+    @Column(name = "ELEMENT_VALID_ATTR_ID")
+    @ApiParam(value = "元素有效属性id")
+    private Long elementValidAttrId;
+
     @Column(name = "IS_OBJECT_EXPORT")
     @ApiParam(value = "是否导出")
     private Integer isObjectExport;

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

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description :散件产品配置明细
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/9 0009 - 17:52
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PROD_SCATTER_CFG_BOM")
+@Api("散件产品配置明细")
+public class MesProdScatterCfgBom extends BaseBean implements Serializable {
+
+    @Column(name = "SP_CFG_CODE")
+    @ApiParam("散件配置编码")
+    private String spCfgCode;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("散件产品代码")
+    private String partNo;
+
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("原材料物料号")
+    private String itemPartNo;
+
+    @Column(name = "QTY")
+    @ApiParam("用量")
+    private BigDecimal qty;
+
+    @Column(name = "IS_KEY_PART")
+    @ApiParam("是否关键件")
+    private Integer isKeyPart ;
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdScatterCfgBom;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/9 0009 - 18:03
+ */
+@Repository
+public interface MesProdScatterCfgBomRepository extends BaseRepository<MesProdScatterCfgBom, Long> {
+
+}

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

@@ -55,6 +55,30 @@ public class MesKpData extends BaseBean implements Serializable {
     @ApiParam("数据下限")
     private Double lowerLimit;
 
+    @Column(name = "TERMINAL_ID")
+    @ApiParam("工位")
+    private Integer terminalId;
+
+    @Column(name = "TORQUE_GROUP")
+    @ApiParam("扭矩组")
+    private String torqueGroup;
+
+    @Column(name = "TORQUE_GROUP_SEQ")
+    @ApiParam("扭矩组顺序")
+    private Integer torqueGroupSeq;
+
+    @Column(name = "TORQUE")
+    @ApiParam("扭矩项")
+    private String torque;
+
+    @Column(name = "TORQUE_SEQ")
+    @ApiParam("扭矩项顺序")
+    private Integer torqueSeq;
+
+    @Column(name = "JOB_ID")
+    @ApiParam("JOB_ID")
+    private Integer jobId;
+
     @Transient
     @ApiParam("扭矩值")
     private Double torqueValue;
@@ -63,6 +87,19 @@ public class MesKpData extends BaseBean implements Serializable {
     @ApiParam("是否在范围之内")
     private Boolean ok;
 
+    @Transient
+    @ApiParam("应采个数")
+    private Integer shouldNum;
+
+    @Transient
+    @ApiParam("实采个数")
+    private Integer actualNum;
+
+    @Transient
+    @ApiParam("记录颜色")
+    private String color;
+
+
     public double getKeyDataCountVal() {
         return this.keyDataCount == null ? 0 : this.keyDataCount;
     }

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

@@ -104,7 +104,27 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("对象代码")
     private String objectCode;
 
+    @Column(name = "OPC_URL")
+    @ApiParam("OPCUA路径")
+    private String opcUrl;
+
+    @Column(name = "NAME_SPACE_INDEX")
+    @ApiParam("空间索引")
+    private Integer nameSpaceIndex = 2;
+
+    @Column(name = "USER_NAME")
+    @ApiParam("用户名")
+    private String userName;
+
+    @Column(name = "PASSWORD")
+    @ApiParam("密码")
+    private String password;
+
     @Transient
     @ApiParam("设备名称")
     private String equipmentName;
+
+    @Transient
+    @ApiParam("OPC值")
+    private String opcValue;
 }

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

@@ -0,0 +1,55 @@
+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;
+import java.math.BigDecimal;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/9 0009 - 17:58
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PROD_SCATTER_CFG_BOM")
+@Api("散件产品配置明细")
+public class MesProdScatterCfgBom extends BaseBean implements Serializable {
+
+    @Column(name = "SP_CFG_CODE")
+    @ApiParam("散件配置编码")
+    private String spCfgCode;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("散件产品代码")
+    private String partNo;
+
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("原材料物料号")
+    private String itemPartNo;
+
+    @Column(name = "QTY")
+    @ApiParam("用量")
+    private BigDecimal qty;
+
+    @Column(name = "IS_KEY_PART")
+    @ApiParam("是否关键件")
+    private Integer isKeyPart ;
+}

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

@@ -0,0 +1,48 @@
+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:
+ * @Author: jokelin
+ * @Date: 2020/3/11 8:59 上午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PROD_SCATTER_DETAIL")
+@Api("MES_散件产品配置关系")
+public class MesProdScatterDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3602480079910597288L;
+
+    @Column(name = "SP_CFG_CODE")
+    @ApiParam("散件配置编码")
+    private String spCfgCode;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @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/MesQueueGroupCount.java

@@ -14,7 +14,7 @@ import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
- * @Description :MES_QUEUE_JIT_ACTUAL_DETAIL
+ * @Description :
  * @Reference :
  * @Author : joke
  * @CreateDate : 2020-03-06 10:16 上午

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

@@ -64,6 +64,14 @@ public class MesQueueJis extends BaseBean implements Serializable {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name = "CUST_PLANT_CODE")
+    @ApiParam("客户产线代码")
+    private String custPlantCode;
+
     @Transient
     @ApiParam("颜色")
     private String color;

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

@@ -59,4 +59,12 @@ public class MesQueueJisDetail extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String serialNumber;
 
+    @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/MesQueueJitActual.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -88,4 +89,20 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("客户需求结束时间")
     private String custPointEndDate;
 
+    @Transient
+    @ApiParam("产品配置名称")
+    private String prodCfgName;
+
+    @Transient
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @Transient
+    @ApiParam("特殊标识名称")
+    private String specialFlagName;
+
+    @Transient
+    @ApiParam(value = "下达按钮编号")
+    public String buttonCode;
+
 }

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

@@ -31,9 +31,9 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 1442091799346314190L;
 
-    @Column(name = "QGR_CODE")
-    @ApiParam("分组规则代码")
-    private String qgrCode;
+    @Column(name = "JIS_ACTUAL_NO")
+    @ApiParam("队列编号")
+    private String jisActualNo;
 
     @Column(name = "PROD_CFG_CODE")
     @ApiParam("配置代码")

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

@@ -72,6 +72,26 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("区域代码")
     private String areaCode;
 
+    @Column(name = "IS_LOCK")
+    @ApiParam("锁定标识")
+    private Integer isLock;
+
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name = "WORK_TYPE")
+    @ApiParam("工单类型")
+    private String workType;
+
+    @Column(name = "QUEUE_TYPE")
+    @ApiParam("队列类型")
+    private Integer queueType;
+
+    @Column(name = "PG_CODE")
+    @ApiParam("生产组代码")
+    private String pgCode;
+
     @Transient
     @ApiParam("起始车号")
     private String custFlagNoStart;
@@ -80,6 +100,18 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("截至车号")
     private String custFlagNoEnd;
 
+    @Transient
+    @ApiParam("工单类型名称")
+    private String workTypeName;
+
+    @Transient
+    @ApiParam("锁定标识名称")
+    private String isLockName;
+
+    @Transient
+    @ApiParam("队列类型名称")
+    private String queueTypeName;
+
     public int getStatusVal() {
         return this.status == null ? 0 : this.status;
     }

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

@@ -72,10 +72,18 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品类型名称")
     private String produceCategoryNameRdd;
 
-    @Column(name = "产品生产类型")
+    @Column(name = "PPT_CODE")
     @ApiParam("产品类型名称")
     private String pptCode;
 
+   @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("组内编号")
+    private Integer groupNo;
+
     @Transient
     @ApiParam("队列序号")
     private Double queueSeq;

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

@@ -0,0 +1,46 @@
+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 : Wynne.Lu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_MODULE")
+@Api("作业程序组件参数")
+public class MesWorkCellModule extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -3537487776977917751L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("组件代码")
+    private String moduleCode;
+
+}

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

@@ -0,0 +1,60 @@
+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.Index;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-03-12 7:45 下午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_MODULE_PARAM", indexes = {
+		@Index(columnList = "CREATE_DATE_TIME")
+})
+@Api("工作单元组件参数配置")
+public class MesWorkCellModuleParam extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 4836155960343256982L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+	@Column(name = "WORK_CELL_CODE")
+	@ApiParam("工作单元代码")
+	private String workCellCode;
+
+	@Column(name = "MODULE_CODE")
+	@ApiParam("组件代码")
+	private String moduleCode;
+
+	@Column(name = "CALL_CLASS")
+	@ApiParam("调用类")
+	private String callClass;
+
+	@Column(name = "PARAM_CODE")
+	@ApiParam("参数代码")
+	private String paramCode;
+
+	@Column(name = "PARAM_VALUE")
+	@ApiParam("参数值")
+	private String paramValue;
+
+}

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

@@ -58,6 +58,10 @@ public class MesWorkCenter extends BaseBean implements Serializable {
     @ApiParam("运行状态")
     private String runningStatus;
 
+    @Column(name = "PRODUCTION_CAPACITY")
+    @ApiParam("产能")
+    private Integer productionCapacity;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesWorkCell> childTreeList;

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

@@ -0,0 +1,55 @@
+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 : Wynne.Lu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_MODULE")
+@Api("作业程序组件")
+public class MesWorkModule extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -4121840589026322086L;
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("组件代码")
+    private String moduleCode;
+
+    @Column(name = "MODULE_NAME")
+    @ApiParam("组件名称")
+    private String moduleName;
+
+    @Column(name = "MODULE_TYPE")
+    @ApiParam("组件类型")
+    private Integer moduleType;
+
+    @Column(name = "CALL_CLASS")
+    @ApiParam("调用类")
+    private String callClass;
+
+    @Column(name = "TRIGGER_TYPE")
+    @ApiParam("触发类型")
+    private Integer triggerType;
+
+
+}

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

@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :工位投料信息
+ * @Reference :
+ * @Author : Wynne.Lu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_MODULE_PARAM")
+@Api("作业程序组件参数")
+public class MesWorkModuleParam extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -3965186392895014717L;
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("组件代码")
+    private String moduleCode;
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_NAME")
+    @ApiParam("参数名称")
+    private String paramName;
+
+    @Column(name = "PARAM_TYPE")
+    @ApiParam("参数类型")
+    private Integer paramType;
+
+
+}

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 import java.util.Map;
@@ -11,27 +13,33 @@ import java.util.Map;
  * @desc
  */
 @Data
-public class ActorMessageModel<T> {
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActorMessageModel {
 
-    private String msgType;
+    private boolean success;
 
-    private String clientInfo;
+    private Object dataObj;
 
-    private String workCellCode;
+    public boolean isSuccess() {
+        return success;
+    }
 
-    private String workCenterCode;
+    public static ActorMessageModel getSuccess() {
+        return new ActorMessageModel(true, null);
+    }
 
-    private String organizeCode;
+    public static ActorMessageModel getFailure() {
+        return new ActorMessageModel(true, null);
+    }
 
-    private String routeCode;
+    public static ActorMessageModel getSuccess(Object data) {
+        return new ActorMessageModel(true, data);
+    }
 
-    private String serialNumber;
+    public static ActorMessageModel getFailure(Object data) {
+        return new ActorMessageModel(false, data);
+    }
 
-    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/MesButtonFlagModel.java

@@ -26,6 +26,9 @@ public class MesButtonFlagModel implements Serializable {
     @ApiParam("按配置修改按钮")
     private boolean updateButtonConfig;
 
+    @ApiParam("按散件修改按钮")
+    private boolean updateButtonScatter;
+
     @ApiParam("下达按钮")
     private boolean transmitButton;
 

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

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellModuleParam;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkModule;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/10 15:24
+ * @desc
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MonitoringModel {
+
+    private String monitorType;
+
+    private Boolean isStop;
+
+    private MesWorkModule workModule;
+
+    private List<MesWorkCellModuleParam> cellModuleParams;
+}

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

@@ -1,11 +1,13 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : 工位请求bean
@@ -67,6 +69,15 @@ public class StationRequestBean implements Serializable {
     @ApiParam("业务类型")
     private String busiType;
 
+    @ApiParam("工位监听类型")
+    private String monitorType;
+
+    @ApiParam("工位监听组件")
+    private String monitorModule;
+
+    @ApiParam("工位监听消息")
+    private String monitorMsg;
+
     @ApiParam("工单号")
     private String workOrderNo;
 
@@ -79,6 +90,12 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步列表")
     private List<StepModel> stepList;
 
+    @ApiParam("生产主队列编号")
+    private String orderNo;
+
+    @ApiParam("数据map")
+    private Map<String, Object> dataMap;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

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

@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/13 17:55
+ * @desc
+ */
+@Data
+@NoArgsConstructor
+public class StepDispatchModel {
+
+    private String stepListKey;
+
+    private String firstScanKey;
+
+    private String cellParamKey;
+
+    private String scanInfo;
+
+    public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String scanInfo) {
+        this.stepListKey = stepListKey;
+        this.firstScanKey = firstScanKey;
+        this.cellParamKey = cellParamKey;
+        this.scanInfo = scanInfo;
+    }
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProdScatterCfgBom;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/9 0009 - 18:56
+ */
+@Repository
+public interface MesProdScatterCfgBomRepository extends BaseRepository<MesProdScatterCfgBom, Long> {
+}

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProdScatterDetail;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/3/11 9:16 上午
+ * @Modify:
+ */
+public interface MesProdScatterDetailRepository extends BaseRepository<MesProdScatterDetail, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleParamRepository.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.MesWorkCellModuleParam;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/18 10:05 AM
+ * @Description:
+ **/
+@Repository
+public interface MesWorkCellModuleParamRepository extends BaseRepository<MesWorkCellModuleParam, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleRepository.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.MesWorkCellModule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/18 10:05 AM
+ * @Description:
+ **/
+@Repository
+public interface MesWorkCellModuleRepository extends BaseRepository<MesWorkCellModule, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkModuleParamRepository.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.MesWorkModuleParam;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/18 10:05 AM
+ * @Description:
+ **/
+@Repository
+public interface MesWorkModuleParamRepository extends BaseRepository<MesWorkModuleParam, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkModuleRepository.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.MesWorkModule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/18 10:05 AM
+ * @Description:
+ **/
+@Repository
+public interface MesWorkModuleRepository extends BaseRepository<MesWorkModule, Long> {
+}

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

@@ -226,15 +226,28 @@ public class MesHqlPack {
             DdlPreparedPack.getNumEqualPack(mesQueueOrder.getIsValid(), "isValid", packBean);
         }
 
+        if (!StringUtils.isEmpty(mesQueueOrder.getWorkType())) {
+            DdlPreparedPack.getStringEqualPack(mesQueueOrder.getWorkType(), "workType", packBean);
+        }
+        if (!StringUtils.isEmpty(mesQueueOrder.getCustProdLineCode())) {
+            DdlPreparedPack.getStringLikePack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesQueueOrder.getPgCode())) {
+            DdlPreparedPack.getStringLikePack(mesQueueOrder.getPgCode(), "pgCode", packBean);
+        }
+        if (mesQueueOrder.getQueueType() != null) {
+            DdlPreparedPack.getNumEqualPack(mesQueueOrder.getQueueType(), "queueType", packBean);
+        }
+
         // 只查询创建状态的队列
         DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean);
 
-        // 时间段查询
-        DdlPreparedPack.timeBuilder(
-                mesQueueOrder.getCreateDateTimeStart(),
-                mesQueueOrder.getCreateDateTimeEnd(),
-                "createDatetime", packBean, true);
-
+        if (!StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesQueueOrder.getCreateDateTimeStart(),
+                    mesQueueOrder.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
         // DdlPreparedPack.getOrderDefault(mesQueueOrder);
         return packBean;
     }
@@ -2206,4 +2219,22 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 生产组
+     *
+     * @param produceGroup
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesProduceGroup(MesProduceGroup produceGroup, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(produceGroup, organizeCode);
+        if (!StringUtils.isEmpty(produceGroup.getPgCode())) {
+            DdlPreparedPack.getStringLikerPack(produceGroup.getPgCode(), "pgCode", packBean);
+        }
+        if (!StringUtils.isEmpty(produceGroup.getPgName())) {
+            DdlPreparedPack.getStringLikerPack(produceGroup.getPgName(), "pgName", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -30,4 +30,7 @@ public class WmsSearchGroupModel {
 
     @ApiParam(value = "有效性")
     public Integer isValid;
+
+    @ApiParam(value = "工厂代码")
+    public String organizeCode;
 }

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsFurniture;
+import cn.estsh.i3plus.pojo.wms.bean.WmsLocate;
+import cn.estsh.i3plus.pojo.wms.bean.WmsZones;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 更改三维坐标MoDel
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2020/3/6 17:57
+ * @Modify
+ */
+@Data
+public class WmsTdChangeModel implements Serializable {
+    private static final long serialVersionUID = -2682858106052506217L;
+
+    private List<WmsZones> wmsZonesList;
+    private List<WmsFurniture> wmsFurnitureList;
+    private List<WmsLocate> wmsLocateList;
+    private String organizeCode;
+}

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

@@ -77,6 +77,26 @@ 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/model/LightOnModel.java

@@ -44,4 +44,7 @@ public class LightOnModel implements Serializable {
     @ApiParam("是否熄灯")
     private Integer lightFlag;
 
+    @ApiParam("状态")
+    private Integer status;
+
 }

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

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.model;
 
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -32,6 +34,12 @@ public class WsResultBean<T> implements Serializable {
     @ApiParam("数据类型")
     private String dataType;
 
+    @ApiParam("是否需要获取数据,默认展示")
+    private Integer isInitData = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+    @ApiParam("执行结果信息是否需要展示,默认展示")
+    private Integer isShow = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+
     @ApiParam("执行结果信息")
     private String message;
 

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

@@ -28,52 +28,63 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_WAREHOUSE")
+@Table(name = "WMS_WAREHOUSE")
 @Api("工厂仓库信息")
 public class WareHouse extends BaseBean {
 
     private static final long serialVersionUID = 7914396535326597148L;
-    @Column(name="CODE")
+    @Column(name = "CODE")
     @ApiParam("仓库代码")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     public String code;
 
-    @Column(name="NAME")
+    @Column(name = "NAME")
     @ApiParam("仓库名称")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     public String name;
 
-    @Column(name="ADDRESS")
+    @Column(name = "ADDRESS")
     @ApiParam("仓库地址")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     public String address;
 
-    @Column(name = "WH_LENGTH", columnDefinition = "decimal(18,8)")
-    @ApiParam(value = "长")
+    @Column(name = "WH_LENGTH")
+    @ApiParam(value = "长(单位：全局设置参数中的基本单元)")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double whLength;
+    private Integer whLength;
 
-    @Column(name = "WH_WIDTH", columnDefinition = "decimal(18,8)")
-    @ApiParam(value = "宽")
+    @Column(name = "WH_WIDTH")
+    @ApiParam(value = "宽(单位：全局设置参数中的基本单元)")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double whWidth;
+    private Integer whWidth;
 
-    @Column(name = "WH_HEIGHT", columnDefinition = "decimal(18,8)")
-    @ApiParam(value = "高")
+    @Column(name = "WH_HEIGHT")
+    @ApiParam(value = "高(单位：全局设置参数中的基本单元)")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double whHeight;
+    private Integer whHeight;
+
+    @Column(name = "BASE_UNIT", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "基本单元（米）")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    private Double baseUnit;
 
     @Transient
-    @ApiParam(value ="存储区列表")
+    @ApiParam(value = "存储区列表")
     private List<WmsZones> zoneList;
 
-    public double getWhLengthVal() {
-        return this.whLength == null ? 0 : this.whLength.doubleValue();
+    public Integer getWhLengthVal() {
+        return this.whLength == null ? 0 : this.whLength.intValue();
+    }
+
+    public Integer getWhWidthVal() {
+        return this.whWidth == null ? 0 : this.whWidth.intValue();
     }
-    public double getWhWidthVal() {
-        return this.whWidth == null ? 0 : this.whWidth.doubleValue();
+
+    public Integer getWhHeightVal() {
+        return this.whHeight == null ? 0 : this.whHeight.intValue();
     }
-    public double getWhHeightVal() {
-        return this.whHeight == null ? 0 : this.whHeight.doubleValue();
+
+    public Double getBaseUnitVal() {
+        return this.baseUnit == null ? 0 : this.baseUnit.doubleValue();
     }
 }

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

@@ -92,10 +92,18 @@ public class WmsCSOrderMaster extends BaseBean {
     public String[] wmsCSParts;
 
     @Transient
+    @ApiParam(value = "盘点物料清单")
+    public String wmsCSPartsStr;
+
+    @Transient
     @ApiParam(value = "盘点存储区清单")
     public String[] wmsCSZones;
 
     @Transient
+    @ApiParam(value = "盘点存储区清单")
+    public String wmsCSZonesStr;
+
+    @Transient
     @ApiParam(value = "盘点库位清单")
     public String[] wmsCSLocates;
 

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

@@ -160,6 +160,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("客户订单号")
     public String custOrderNo;
 
+    @Column(name = "ASSIGN_DATE_CODE")
+    @ApiParam(value = "指定生产日期")
+    private String assignDateCode;
+
     @Transient
     @ApiParam("实际批次")
     private String actualLot;

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

@@ -127,6 +127,11 @@ public class WmsDocMovementSn extends BaseBean {
     @ApiParam("父层级packcode对应的可回用零件号")
     private String parentReturnPart;
 
+
+    @Transient
+    @ApiParam("打印模板")
+    private String templateNo;
+
     @Transient
     @ApiParam("剩余箱数量")
     private Long countBox;

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description 家具实体
@@ -49,7 +50,35 @@ public class WmsFurniture extends BaseBean {
     @ApiParam(value = "是否储物")
     private Integer isSaveGoods;
 
-    public int getIsSaveGoodsVal() {
+    @Column(name = "POSITION")
+    @ApiParam(value = "三维位置")
+    private String position;
+
+    @Transient
+    @ApiParam(value = "层")
+    private Integer storey;
+
+    @Transient
+    @ApiParam(value = "列")
+    private Integer fntCol;
+
+    public WmsFurniture() {
+    }
+
+    public WmsFurniture(String whNo, String zoneNo, String typeCode, String furnitureNo,
+                        Integer isSaveGoods, String position, Integer storey, Integer fntCol) {
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.typeCode = typeCode;
+        this.furnitureNo = furnitureNo;
+        this.isSaveGoods = isSaveGoods;
+        this.position = position;
+        this.storey = storey;
+        this.fntCol = fntCol;
+    }
+
+    public Integer getIsSaveGoodsVal() {
         return this.isSaveGoods == null ? 0 : this.isSaveGoods;
     }
+
 }

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

@@ -37,17 +37,17 @@ public class WmsFurnitureType extends BaseBean {
     @ApiParam(value = "类型名称")
     private String typeName;
 
-    @Column(name = "FNT_LENGTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "FNT_LENGTH")
     @ApiParam(value = "长")
-    private Double fntLength;
+    private Integer fntLength;
 
-    @Column(name = "FNT_WIDTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "FNT_WIDTH")
     @ApiParam(value = "宽")
-    private Double fntWidth;
+    private Integer fntWidth;
 
-    @Column(name = "FNT_HEIGHT", columnDefinition = "decimal(18,8)")
+    @Column(name = "FNT_HEIGHT")
     @ApiParam(value = "高")
-    private Double fntHeight;
+    private Integer fntHeight;
 
     @Column(name = "STOREY")
     @ApiParam(value = "层")
@@ -61,14 +61,28 @@ public class WmsFurnitureType extends BaseBean {
     @ApiParam(value = "是否储物")
     private Integer isSaveGoods;
 
-    public Double getFntLengthVal() {
-        return this.fntLength == null ? 0 : this.fntLength.doubleValue();
+    public Integer getStoreyVal() {
+        return this.storey == null ? 0 : this.storey.intValue();
     }
-    public Double getFntWidthVal() {
-        return this.fntWidth == null ? 0 : this.fntWidth.doubleValue();
+
+    public Integer getFntColVal() {
+        return this.fntCol == null ? 0 : this.fntCol.intValue();
+    }
+
+    public Integer getFntLengthVal() {
+        return this.fntLength == null ? 0 : this.fntLength.intValue();
+    }
+
+    public Integer getFntWidthVal() {
+        return this.fntWidth == null ? 0 : this.fntWidth.intValue();
+    }
+
+    public Integer getFntHeightVal() {
+        return this.fntHeight == null ? 0 : this.fntHeight.intValue();
     }
-    public Double getFntHeightVal() {
-        return this.fntHeight == null ? 0 : this.fntHeight.doubleValue();
+
+    public Integer getIsSaveGoodsVal() {
+        return this.isSaveGoods == null ? 0 : this.isSaveGoods.intValue();
     }
 
 }

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

@@ -47,7 +47,7 @@ public class WmsLocate extends BaseBean {
      */
     @Column(name = "LOCATE_TYPE")
     @ApiParam(value = "库位类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, entityName = "LOCATE_TYPE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "LOCATE_TYPE")
     private Integer locateType;
 
     @Column(name = "WH_NO")
@@ -82,20 +82,20 @@ public class WmsLocate extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer z;
 
-    @Column(name = "LC_LENGTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "LC_LENGTH")
     @ApiParam(value = "长")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
-    private Double lcLength;
+    private Integer lcLength;
 
-    @Column(name = "LC_WIDTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "LC_WIDTH")
     @ApiParam(value = "宽")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
-    private Double lcWidth;
+    private Integer lcWidth;
 
-    @Column(name = "LC_HEIGHT", columnDefinition = "decimal(18,8)")
+    @Column(name = "LC_HEIGHT")
     @ApiParam(value = "高")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
-    private Double lcHeight;
+    private Integer lcHeight;
 
     @Column(name = "SEQ")
     @ApiParam(value = "序号", example = "-1")
@@ -147,6 +147,10 @@ public class WmsLocate extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     private String lastCsTime;
 
+    @Column(name = "POSITION")
+    @ApiParam(value = "三维位置")
+    private String position;
+
     // 导入用
     @ApiParam(value = "工厂")
     @Transient
@@ -240,18 +244,28 @@ public class WmsLocate extends BaseBean {
         return this.locateType== null ? 0 : this.locateType.intValue();
     }
 
-    public Double getLcLengthVal() {
-        return this.lcLength == null ? 0 : this.lcLength.doubleValue();
+    public Integer getFrequencyVal() {
+        return this.frequency == null ? 0 : this.frequency.intValue();
+    }
+
+    public Integer getLcLengthVal() {
+        return this.lcLength == null ? 0 : this.lcLength.intValue();
     }
-    public Double getLcWidthVal() {
-        return this.lcWidth == null ? 0 : this.lcWidth.doubleValue();
+    public Integer getLcWidthVal() {
+        return this.lcWidth == null ? 0 : this.lcWidth.intValue();
     }
-    public Double getLcHeightVal() {
-        return this.lcHeight == null ? 0 : this.lcHeight.doubleValue();
+    public Integer getLcHeightVal() {
+        return this.lcHeight == null ? 0 : this.lcHeight.intValue();
     }
 
-    public Integer getFrequencyVal() {
-        return this.frequency == null ? 0 : this.frequency.intValue();
+    public Integer getXVal() {
+        return this.x == null ? 0 : this.x.intValue();
+    }
+    public Integer getYVal() {
+        return this.y == null ? 0 : this.y.intValue();
+    }
+    public Integer getZVal() {
+        return this.z == null ? 0 : this.z.intValue();
     }
 
 

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

@@ -12,10 +12,7 @@ import org.hibernate.annotations.ColumnDefault;
 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 javax.persistence.*;
 
 /**
  * @Description :物料实体
@@ -29,7 +26,9 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_PART")
+@Table(name = "WMS_PART", indexes = {
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("物料表")
 public class WmsPart extends BaseBean {
     private static final long serialVersionUID = 4849044986767609346L;

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

@@ -33,6 +33,7 @@ public class WmsSnOperateRecord extends BaseBean {
 
     @Column(name = "SN")
     @ApiParam(value = "条码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String sn;
 
     @Column(name = "LINE_CODE")

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

@@ -310,6 +310,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "预计完成时间")
     private String planCompleteTime;
 
+    @Transient
+    @ApiParam(value = "集装箱号")
+    private String containerNo;
+
     public WmsStockSn() {
     }
 
@@ -395,4 +399,12 @@ public class WmsStockSn extends BaseBean {
         this.modifyDatetime = modifyDatetime;
         this.modifyUser = modifyUser;
     }
+
+    public WmsStockSn (String partNo, String packageNo,String locateNo,  String createDatetime, String modifyDatetime) {
+        this.partNo = partNo;
+        this.packageNo =packageNo;
+        this.locateNo = locateNo;
+        this.createDatetime=createDatetime;
+        this.modifyDatetime = modifyDatetime;
+    }
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -70,6 +72,11 @@ public class WmsTransType extends BaseBean {
     @ApiParam(value = "是否发送异常邮件")
     private Integer isSendErrorEmail;
 
+    @Column(name = "ORDER_BACK_TYPE")
+    @ApiParam(value = "单据回退类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_BACK_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer orderBackType;
+
     @Transient
     @ApiParam("菜单URL")
     private String menuUrl;
@@ -78,7 +85,6 @@ public class WmsTransType extends BaseBean {
     @ApiParam("交易处理组件调用类")
     private String callClass;
 
-
     public String getMenuUrl() {
         return "/handle?transTypeCode=" + this.transTypeCode;
     }

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

@@ -103,15 +103,19 @@ public class WmsZones extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
     private Integer checkFifo;
 
-    @Column(name = "ZONE_LENGTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "ZONE_LENGTH")
     @ApiParam(value = "长")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double zoneLength;
+    private Integer zoneLength;
 
-    @Column(name = "ZONE_WIDTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "ZONE_WIDTH")
     @ApiParam(value = "宽")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double zoneWidth;
+    private Integer zoneWidth;
+
+    @Column(name = "POSITION")
+    @ApiParam(value = "三维位置")
+    private String position;
 
     @Transient
     @ApiParam(value = "子存储区列表")
@@ -129,10 +133,10 @@ public class WmsZones extends BaseBean {
     public WmsZones() {
     }
 
-    public double getZoneLengthVal() {
-        return this.zoneLength == null ? 0 : this.zoneLength.doubleValue();
+    public Integer getZoneLengthVal() {
+        return this.zoneLength == null ? 0 : this.zoneLength.intValue();
     }
-    public double getZoneWidthVal() {
-        return this.zoneWidth == null ? 0 : this.zoneWidth.doubleValue();
+    public Integer getZoneWidthVal() {
+        return this.zoneWidth == null ? 0 : this.zoneWidth.intValue();
     }
 }

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

@@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo;
 import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction;
@@ -418,6 +419,7 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getStringRightLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
         DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result);
+        DdlPreparedPack.getNumEqualPack(wmsTransType.getOrderBackType(),"orderBackType",result);
         DdlPreparedPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result);
 
         getStringBuilderPack(wmsTransType, result);
@@ -541,7 +543,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result);
         DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result);
         if (wmsLocate.getZoneNo() != null) {
-            DdlPreparedPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "", result);
+            DdlPreparedPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "zoneNo", result);
         }
         if (wmsLocate.getLocateNoArr() != null) {
             DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "", result);
@@ -1302,6 +1304,12 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result);
+        if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeStart())) {
+            wmsStockSn.setQualityDateTimeStart("");
+        }
+        if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeEnd())) {
+            wmsStockSn.setQualityDateTimeEnd("");
+        }
         DdlPreparedPack.timeBuilder(wmsStockSn.getQualityDateTimeStart()+","+ wmsStockSn.getQualityDateTimeEnd(),
                 "qualityDate", result, false,false);
         if (wmsStockSn.getIsValid() != null) {