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

# Conflicts:
#	modules/i3plus-pojo-andon/pom.xml
#	modules/i3plus-pojo-aps/pom.xml
#	modules/i3plus-pojo-base/pom.xml
#	modules/i3plus-pojo-form/pom.xml
#	modules/i3plus-pojo-hardswitch/pom.xml
#	modules/i3plus-pojo-jobflow/pom.xml
#	modules/i3plus-pojo-lac/pom.xml
#	modules/i3plus-pojo-mes-pcn/pom.xml
#	modules/i3plus-pojo-mes/pom.xml
#	modules/i3plus-pojo-model/pom.xml
#	modules/i3plus-pojo-platform/pom.xml
#	modules/i3plus-pojo-ptl/pom.xml
#	modules/i3plus-pojo-report/pom.xml
#	modules/i3plus-pojo-softswitch/pom.xml
#	modules/i3plus-pojo-sweb/pom.xml
#	modules/i3plus-pojo-wms/pom.xml
#	modules/i3plus-pojo-workflow/pom.xml
#	pom.xml

modules/i3plus-pojo-andon/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-andon</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-aps/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-aps</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-base/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-base</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

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

@@ -2133,4 +2133,51 @@ public class BlockFormEnumUtil {
         }
     }
 
+
+    /**
+     * 操作触发来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FORM_TRIGGER_SOURCE {
+        INTERCEPTOR(10,  "拦截器"),
+        BUTTON(20,  "按钮");
+
+        private int value;
+        private String description;
+
+        private FORM_TRIGGER_SOURCE (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 FORM_TRIGGER_SOURCE valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
+
 }

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

@@ -785,20 +785,20 @@ public class BlockReportEnumUtil {
 
     /**
      * 报表排版枚举
-     * ELEMENT(1,"元素"),TEMPLATE(2,"模板");
+     * ELEMENT(1,"元素"),TEMPLATE(2,"对象视图");
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum REPORT_TYPESET_TYPE{
+    public enum REPORT_REF_TYPE{
 
-        ELEMENT(1,"元素"),TEMPLATE(2,"模板");
+        ELEMENT(1,"元素"),TEMPLATE(2,"对象视图");
 
         private int value;
         private String description;
 
-        REPORT_TYPESET_TYPE() {
+        REPORT_REF_TYPE() {
         }
 
-        REPORT_TYPESET_TYPE(int value, String description) {
+        REPORT_REF_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }

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

@@ -1483,6 +1483,50 @@ public class CommonEnumUtil {
     }
 
     /**
+     * 缺失资源来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MiSS_RESOURCE_SOURCE {
+        WEB(10, "网页端"),
+        SERVER(20, "服务端");
+
+        private int value;
+        private String description;
+
+        private MiSS_RESOURCE_SOURCE(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 MiSS_RESOURCE_SOURCE valueOf(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
      * 属性类型信息(属性转换器)
      * <per>
      * <br/>    Form 核心转换器
@@ -1871,4 +1915,50 @@ public class CommonEnumUtil {
         }
     }
 
+    /**
+     * 变量类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum  LICENSE_SOURCE {
+        LOCAL_SYSTEM_FILE(1, "本地文件"),
+        NETWORK_ESTSH(2, "网络-官方授权"),
+        SENSE_HARDWARE_USB_LOCK(3, "硬件锁"),
+        SENSE_SOFTWARE_CODE_LOCK(4, "软锁");
+
+        private int value;
+        private String description;
+
+        private LICENSE_SOURCE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        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;
+        }
+    }
 }

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

@@ -4600,4 +4600,49 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 容器使用状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_CONTAINER_STATUS {
+        FREE(10, "空闲"),
+        OCCUPY(20, "占用");
+
+        private int value;
+        private String description;
+
+        MES_CONTAINER_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;
+        }
+
+        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/MesPcnEnumUtil.java

@@ -13,6 +13,41 @@ import org.apache.commons.lang3.StringUtils;
 public class MesPcnEnumUtil {
 
     /**
+     * 监听任务明细-采集数据方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MONITOR_TASK_DETAIL_COLLECT_TYPE {
+        SELF_ADDITION(10, "自增列"),
+        FEED_FIELD(20, "反馈字段");
+
+        private int value;
+        private String description;
+
+        MONITOR_TASK_DETAIL_COLLECT_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)
@@ -3091,7 +3126,7 @@ public class MesPcnEnumUtil {
     }
 
     /**
-         * mes_设备工装类型
+     * mes_设备工装类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum EQUIPMENT_TOOLING_TOOLING_TYPE {
@@ -3234,4 +3269,151 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FSM_EVENT {
+        TRIGGER(10, "trigger", "触发"),
+        ENTRY(20, "entry", "进入状态"),
+        EXIT(30, "exit", "离开状态");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private FSM_EVENT(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getCode() {
+            return this.code;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FSM_STATE_TYPE {
+        BEGIN(10, "begin", "开始状态点"),
+        END(20, "end", "结束状态点");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private FSM_STATE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getCode() {
+            return this.code;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TRIGGER_TYPE {
+        INNER_TRIGGER(10, "内部触发"),
+        OUTER_TRIGGER(20, "外部触发");
+
+        private int value;
+        private String description;
+
+        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 STATION_REQUEST_BEAN_CMD {
+        JUMP_STATUS(10, "跳过状态点"),
+        FORCE_DO_SPEC_STATUS(20, "强制执行制定的状态点");
+
+        private int value;
+        private String description;
+
+        STATION_REQUEST_BEAN_CMD(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 MES_CONTAINER_STATUS {
+        FREE(10, "空闲"),
+        OCCUPY(20, "占用");
+
+        private int value;
+        private String description;
+
+        MES_CONTAINER_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;
+        }
+
+        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

@@ -5366,24 +5366,36 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WAVE_MERGE_RULE {
-        IS_SAME_CUSTOMER("同客户", "isSameCustomer", "2", 10),
-        IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", "2", 10),
-        IS_SAME_PRIORITY("同优先级", "isSamePriority", "1", 10),
-        IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", "2", 10),
-        IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", "2", 10),
-        IS_SAME_PART("同物料", "isSamePart", "2", 10),
-        IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", "2", 10),
-        IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", "2", 10),
-        IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", "1", 10),
-        IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", "1", 10),
-        IS_CROSS_AREA("允许跨区", "isCrossArea", "2", 10),
-        IS_COLLECTION("物料整箱归集", "isCollection", "2", 10);
-
-        private String chName;
-
-        private String enName;
-
-        private int waveMergeType;
+        IS_SAME_CUSTOMER("同客户", "isSameCustomer", "2", 10,
+                0, "isSameCustomer", "同客户"),
+        IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", "2", 10,
+                0, "isSameWareHouse", "同仓库"),
+        IS_SAME_PRIORITY("同优先级", "isSamePriority", "1", 10,
+                0, "isSamePriority", "同优先级"),
+        IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", "2", 10,
+                0, "isSameSrcZone", "同来源存储区"),
+        IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", "2", 10,
+                0, "isSameDestZone", "同目标存储区"),
+        IS_SAME_PART("同物料", "isSamePart", "2", 10,
+                0, "isSamePart", "同物料"),
+        IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", "2", 10,
+                0, "isSamePartGroup", "同物料组"),
+        IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", "2", 10,
+                0, "isSameDeliveryTime", "同发货时间"),
+        IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", "1", 10,
+                0, "isSameBusiType", "同业务类型"),
+        IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", "1", 10,
+                0, "isSameOrderStatus", "同单据状态"),
+        IS_CROSS_AREA("允许跨区", "isCrossArea", "2", 10,
+                0, "isCrossArea", "允许跨区"),
+        IS_COLLECTION("物料整箱归集", "isCollection", "2", 10,
+                0, "isCollection", "物料整箱归集");
+
+        private String fieldChName;
+
+        private String fieldEnName;
+
+        private int mergeOperatorType;
 
         private String fieldValue;
 
@@ -5393,27 +5405,31 @@ public class WmsEnumUtil {
 
         private String description;
 
-        WAVE_MERGE_RULE(String chName, String enName, String fieldValue, int waveMergeType) {
-            this.chName = chName;
-            this.enName = enName;
+        WAVE_MERGE_RULE(String fieldChName, String fieldEnName, String fieldValue, int mergeOperatorType, int value,
+                        String code, String description) {
+            this.fieldChName = fieldChName;
+            this.fieldEnName = fieldEnName;
             this.fieldValue = fieldValue;
-            this.waveMergeType = waveMergeType;
+            this.mergeOperatorType = mergeOperatorType;
+            this.value = value;
+            this.description = description;
+            this.code = code;
         }
 
-        public String getChName() {
-            return chName;
+        public String getFieldChName() {
+            return fieldChName;
         }
 
-        public String getEnName() {
-            return enName;
+        public String getFieldEnName() {
+            return fieldEnName;
         }
 
         public String getFieldValue() {
             return fieldValue;
         }
 
-        public int getWaveMergeType() {
-            return waveMergeType;
+        public int getMergeOperatorType() {
+            return mergeOperatorType;
         }
 
         public String getDescription() {
@@ -5436,33 +5452,34 @@ public class WmsEnumUtil {
     public enum WAVE_MERGE_RANGE {
         CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
                 "custNo,custName", "custNo,custName", "custNo",
-                20, ""),
+                20, "", "custNo", 0, "客户代码"),
         WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse",
                 "code,name", "code,name", "code",
-                20, ""),
+                20, "", "srcWhNo", 0, "仓库代码"),
         PRIORITY("优先级", "priority", "PRIORITY_NEW", "",
-                "", "", 20, ""),
+                "", "", 20, "",
+                "priority", 0, "优先级"),
         SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
                 "zoneNo,zoneName", "zoneNo", "zoneNo",
-                20, ""),
+                20, "", "srcZoneNo", 0, "来源存储区代码"),
         DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
                 "zoneNo,zoneName", "zoneNo", "zoneNo",
-                20, ""),
+                20, "", "destZoneNo", 0, "目标存储区代码"),
         PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
                 "partNo,partName", "partNo", "partNo",
-                20, ""),
+                20, "", "partNo", 0, "物料号"),
         PART_GROUP_NO("物料组代码", "partGroupNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup",
                 "partGroupNo,partGroupName", "partGroupNo",
-                "partGroupNo", 20, ""),
+                "partGroupNo", 20, "", "partGroupNo", 0, "物料组代码"),
         BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "",
-                "", "", 20, ""),
+                "", "", 20, "", "busiType", 0, "业务类型"),
         ORDER_STATUS("单据状态", "orderStatus", "MASTER_ORDER_STATUS", "",
-                "", "", 20, "");
+                "", "", 20, "", "orderStatus", 0, "单据状态");
 
         // 中文名称
-        String chName;
+        String fieldChName;
         // 英文名称
-        String enName;
+        String fieldEnName;
         // 下拉枚举名称
         String entityName;
         // 下拉列表显示列名称,多个列名需要根据逗号分隔
@@ -5472,7 +5489,7 @@ public class WmsEnumUtil {
         // 回显列名
         String explicitColumnName;
         // 合并操作类型
-        private int waveMergeType;
+        private int mergeOperatorType;
 
         private String fieldValue;
 
@@ -5482,24 +5499,28 @@ public class WmsEnumUtil {
 
         private String description;
 
-        WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName,
-                         String searchColumnName, String explicitColumnName, int waveMergeType, String fieldValue) {
-            this.chName = chName;
-            this.enName = enName;
+        WAVE_MERGE_RANGE(String fieldChName, String fieldEnName, String entityName, String listColumnName,
+                         String searchColumnName, String explicitColumnName, int mergeOperatorType, String fieldValue,
+                         String code, int value, String description) {
+            this.fieldChName = fieldChName;
+            this.fieldEnName = fieldEnName;
             this.entityName = entityName;
             this.listColumnName = listColumnName;
             this.searchColumnName = searchColumnName;
             this.explicitColumnName = explicitColumnName;
-            this.waveMergeType = waveMergeType;
+            this.mergeOperatorType = mergeOperatorType;
             this.fieldValue = fieldValue;
+            this.code = code;
+            this.value = value;
+            this.description = description;
         }
 
-        public String getChName() {
-            return chName;
+        public String getFieldEnName() {
+            return fieldEnName;
         }
 
-        public String getEnName() {
-            return enName;
+        public String getFieldChName() {
+            return fieldChName;
         }
 
         public String getEntityName() {
@@ -5518,8 +5539,8 @@ public class WmsEnumUtil {
             return explicitColumnName;
         }
 
-        public int getWaveMergeType() {
-            return waveMergeType;
+        public int getMergeOperatorType() {
+            return mergeOperatorType;
         }
 
         public String getFieldValue() {
@@ -5531,7 +5552,7 @@ public class WmsEnumUtil {
         }
 
         public String getDescription() {
-            return description;
+            return "description";
         }
 
         public String getCode() {

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java

@@ -6,6 +6,7 @@ import com.mongodb.Block;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.model.Filters;
 import com.mongodb.client.model.Sorts;
+import org.apache.commons.lang3.StringUtils;
 import org.bson.Document;
 import org.bson.conversions.Bson;
 import org.springframework.data.mongodb.core.MongoOperations;
@@ -14,6 +15,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Pattern;
 
 /**
@@ -248,6 +250,25 @@ public class BsonPackTool {
     }
 
     /**
+     * 查询方位分装
+     * @param columnName    列名称
+     * @param bson
+     * @param startTime     开始值
+     * @param endTime       结束之
+     * @return
+     */
+    public static Bson timeBuilder(String columnName, Bson bson, String startTime,String endTime) {
+        if( Objects.nonNull(bson) && StringUtils.isNotBlank(columnName) &&StringUtils.isNotBlank(startTime)&& StringUtils.isNotBlank(endTime)){
+            bson = Filters.and(
+                    bson,
+                    Filters.gte(columnName, startTime),  //大于等于开始日期
+                    Filters.lte(columnName, endTime)     //小于等于结束日期
+            );
+        }
+        return bson;
+    }
+
+    /**
      * 大于日期
      * @param dateTime 日期
      * @param columnName HQL里对应的时间字段

modules/i3plus-pojo-form/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-form</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
 

modules/i3plus-pojo-hardswitch/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-hardswitch</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
 
     <profiles>
         <profile>

modules/i3plus-pojo-jobflow/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-jobflow</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
 
     <profiles>
         <profile>

modules/i3plus-pojo-lac/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-lac</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-mes-pcn</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-mes/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-mes</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

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

@@ -70,6 +70,14 @@ public class MesDataObject extends BaseBean implements Serializable {
     @ApiParam("自增列值")
     private Long selfAdditionValue;
 
+    @Column(name = "ORDER_BY_FIELD")
+    @ApiParam("采集排序字段")
+    private String orderbyField;
+
+    @Column(name = "ORDER_BY_VALUE")
+    @ApiParam("采集排序值")
+    private Integer orderbyValue;
+
     @Transient
     @ApiParam("操作类型名称")
     private String operateTypeName;

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

@@ -42,6 +42,10 @@ public class MesMonitorTaskDetail extends BaseBean implements Serializable {
     @ApiParam("存储对象代码")
     private String storeObjectCode;
 
+    @Column(name = "COLLECT_TYPE")
+    @ApiParam("采集数据方式")
+    private Integer collectType;
+
     @Transient
     @ApiParam("任务名称")
     private String taskName;

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

@@ -106,6 +106,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("打印缓存id")
     private String printId;
 
+    @Column(name = "CT_NO")
+    @ApiParam("容器编号")
+    private String ctNo;
+
     public MesPackage() {
     }
 

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

@@ -132,4 +132,10 @@ public class MesPlc extends BaseBean implements Serializable {
     @Column(name = "TOOLING_CODE ")
     @ApiParam("工装代码")
     private String toolingCode;
+
+
+    @Transient
+    @ApiParam("标签数据")
+    private String tableValue;
+
 }

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

@@ -0,0 +1,43 @@
+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_SCATTER_CFG_DETAIL")
+@Api("MES_散件配置报文关系")
+public class MesScatterCfgDetail extends BaseBean implements Serializable {
+
+    @Column(name = "SP_CFG_CODE")
+    @ApiParam("散件配置编码")
+    private String spCfgCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("散件产品代码")
+    private String partNo;
+
+    @Column(name = "QTY")
+    @ApiParam("用量")
+    private BigDecimal qty;
+}

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

@@ -10,8 +10,8 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Lob;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -57,19 +57,31 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
     @ApiParam("触发条件")
     private String triggerWhere;
 
-    @Column(name = "ACTION_AMG_ID")
+    @Column(name = "TRIGGER_AMG_ID")
     @ApiParam("触发调用")
-    private Integer actionAmgId;
+    private Long triggerAmgId;
 
     @Column(name = "IN_AMG_ID")
     @ApiParam("进入调用")
-    private Integer inAmgId;
+    private Long inAmgId;
 
     @Column(name = "OUT_AMG_ID")
     @ApiParam("离开调用")
-    private Integer outAmgId;
+    private Long outAmgId;
 
     @Column(name = "STATUS_TYPE", columnDefinition = "tinyint default 0")
     @ApiParam("状态类型 10=初始化状态")
     private Integer statusType;
+
+    @Transient
+    @ApiParam("状态点是否完成")
+    private boolean isComplete;
+
+    @Transient
+    @ApiParam("状态点是否完成")
+    private boolean isJump;
+
+    @Transient
+    @ApiParam("前端显示颜色")
+    private String color;
 }

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

@@ -23,18 +23,18 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_ACTION_MODULE_GROUP")
+@Table(name = "MES_STEP_GROUP")
 @Api("工步集")
-public class MesActionModuleGroup extends BaseBean implements Serializable {
+public class MesStepGroup extends BaseBean implements Serializable {
     private static final long serialVersionUID = 1876053661752102998L;
 
     @Column(name = "AMG_ID")
     @ApiParam("组件集编号")
     private Long amgId;
 
-    @Column(name = "AM_CODE")
+    @Column(name = "STEP_CODE")
     @ApiParam("组件集代码")
-    private String amCode;
+    private String stepCode;
 
     @Column(name = "SEQ")
     @ApiParam("执行顺序")

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

@@ -0,0 +1,56 @@
+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工装明细
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2020-03-19
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_TOOLING_DETAIL")
+@Api("MES_工装明细")
+public class MesToolingDetail extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -5033127912653649665L;
+
+    @Column(name = "TOOLING_NO")
+    @ApiParam("工装编号")
+    private String toolingNo;
+
+    @Column(name = "TOOLING_CODE ")
+    @ApiParam("工装代码")
+    private String toolingCode ;
+
+    @Column(name = "TOOLING_NAME")
+    @ApiParam("工装名称")
+    private String toolingName;
+
+    @Column(name = "TOOLING_TYPE")
+    @ApiParam("工装类型")
+    private Integer toolingType;
+
+    @Column(name = "USE_COUNT")
+    @ApiParam("使用次数")
+    private Integer useCount;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+}

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

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/30 22:18
+ * @desc
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FsmStatusModel {
+
+    private String from;
+
+    private String to;
+
+    private String event;
+
+    private Object context;
+
+    private String status;
+
+}

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

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 产品流程配置Model
+ * @Reference :
+ * @Author : adair
+ * @CreateDate : 2020-4-2
+ * @Modify:
+ **/
+@Data
+public class MesRouteCfgModel {
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("产品生产类型")
+    private String pptCode;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("流程代码")
+    private String routeCode;
+}

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

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 产品流程配置参数Model
+ * @Reference :
+ * @Author : adair
+ * @CreateDate : 2020-4-2
+ * @Modify:
+ **/
+@Data
+public class MesRouteCfgParamModel {
+
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @ApiParam("是否执行 1=是 2=否")
+    private Integer isActive;
+
+    List<MesRouteCfgStepModel> stepModelList;
+}

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

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 产品流程配置Model
+ * @Reference :
+ * @Author : adair
+ * @CreateDate : 2020-4-2
+ * @Modify:
+ **/
+@Data
+public class MesRouteCfgStepModel {
+
+    @ApiParam("工步代码")
+    private String stepCode;
+
+    List<MesRouteCfgModel> routeCfgModelList;
+}

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.model;
 
 
 import cn.estsh.i3plus.pojo.mes.bean.MesRouteStatus;
+import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -63,11 +64,20 @@ public class StationRequestBean implements Serializable {
     @ApiParam("按钮编号")
     private String buttonCode;
 
+    @ApiParam("状态代码")
+    private String statusCode;
+
     @ApiParam("工步代码")
     private String stepCode;
 
+    @ApiParam("工步序号")
+    private Integer stepSeq;
+
     @ApiParam("强制执行工步代码")
     private String forceSpecStepCode;
+
+    @ApiParam("强制执行状态点代码")
+    private String forceSpecStatusCode;
     /**
      * doScan-扫描，doModule-处理组件,initModule-初始化组件
      */
@@ -102,13 +112,13 @@ public class StationRequestBean implements Serializable {
     private String queueGroupNo;
 
     @ApiParam("数据map")
-    private Map<String, Object> dataMap=new HashMap<>();
+    private Map<String, Object> dataMap = new HashMap<>();
 
     @ApiParam("流程状态集合")
-    private List<MesRouteStatus> routeStatusList;
+    private List<MesStateMachineStatus> fsmStates;
 
     @ApiParam("当前流程状态")
-    private MesRouteStatus curRouteStatus;
+    private MesStateMachineStatus curFsmState;
 
     @ApiParam("展示组件")
     private Object moduleService;

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/31 18:41
+ * @desc
+ */
+@Data
+public class StationRequestCmdBean {
+
+    private StationRequestBean requestBean;
+
+    private MesPcnEnumUtil.STATION_REQUEST_BEAN_CMD cmd;
+}

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

@@ -66,11 +66,13 @@ public class StepModel implements Serializable {
      */
     @ApiParam("工步是否跳过")
     private boolean isJump;
+
     /**
      * 参数代码
      */
     @ApiParam("参数代码")
     private String paramCode;
+
     /**
      * 工作单元代码
      */

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

@@ -18,26 +18,52 @@ public class StepResult<T> {
 
     private String msg;
 
-    public static StepResult getSuccessComplete() {
-        return new StepResult(true,"");
-    }
+    private StationRequestBean stationRequestBean;
 
     public static StepResult getNonComplete() {
-        return new StepResult(false,"");
+        return new StepResult(false, "");
     }
 
-    public static StepResult getSuccessComplete(String msg) {
-        return new StepResult(true, msg);
+    public static StepResult getNonComplete(StationRequestBean requestBean) {
+        return new StepResult(false, "");
+    }
+
+    public static <T> StepResult getNonCompleteData(T data, String msg) {
+        return new StepResult(false, data, msg);
+    }
+
+    public static <T> StepResult getNonCompleteReqBean(StationRequestBean reqBean) {
+        return new StepResult(false, reqBean);
+    }
+
+    public static <T> StepResult getNonCompleteData(T data) {
+        return new StepResult(false, data, "");
     }
 
     public static StepResult getNonComplete(String msg) {
         return new StepResult(false, msg);
     }
 
+    public static StepResult getSuccessComplete(String msg) {
+        return new StepResult(true, msg);
+    }
+
+    public static StepResult getSuccessComplete() {
+        return new StepResult(true, "");
+    }
+
+    public static <T> StepResult getSuccessCompleteReqBean(StationRequestBean reqBean) {
+        return new StepResult(true, reqBean);
+    }
+
     public static <T> StepResult<T> getSuccessData(T data, String msg) {
         return new StepResult<>(true, data, msg);
     }
 
+    public static <T> StepResult<T> getSuccessData(T data) {
+        return new StepResult<>(true, data, "");
+    }
+
     public static <T> StepResult<T> getSuccessData(Collection<T> data, String msg) {
         return new StepResult<T>(true, data, msg);
     }
@@ -54,6 +80,12 @@ public class StepResult<T> {
         this.msg = msg;
     }
 
+
+    public StepResult(boolean isCompleted, StationRequestBean stationRequestBean) {
+        this.isCompleted = isCompleted;
+        this.stationRequestBean = stationRequestBean;
+    }
+
     public StepResult(boolean isCompleted, T data, String msg) {
         this.isCompleted = isCompleted;
         this.data = data;
@@ -66,4 +98,11 @@ public class StepResult<T> {
         this.msg = msg;
     }
 
+    public StepResult(boolean isCompleted, T data, Collection<T> dataCollection, String msg, StationRequestBean stationRequestBean) {
+        this.isCompleted = isCompleted;
+        this.data = data;
+        this.dataCollection = dataCollection;
+        this.msg = msg;
+        this.stationRequestBean = stationRequestBean;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStatusRepository.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.MesStateMachineStatus;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate:2019\10\9
+ * @Modify:
+ **/
+public interface MesStateMachineStatusRepository extends BaseRepository<MesStateMachineStatus, Long> {
+}

modules/i3plus-pojo-model/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-model</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.model.form;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 表单操作数据模型
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-02 10:22
+ * @Modify:
+ **/
+@Data
+@ApiModel("表单操作数据模型")
+@NoArgsConstructor
+public class FormOperateDataModel {
+
+    @ApiModelProperty("元素代码")
+    private Long refId;
+
+    @ApiModelProperty("元素名称")
+    private String refName;
+
+    @ApiModelProperty("操作来源")
+    @AnnoOutputColumn(refClass = BlockFormEnumUtil.FORM_TRIGGER_SOURCE.class)
+    private String triggerSource;
+
+    @ApiModelProperty("来源名称")
+    private String sourceName;
+
+    @ApiModelProperty("操作数据集合")
+    private List<Map<String,String>> operateDataList;
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : 缺失资源
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-01 09:31
+ * @Modify:
+ **/
+@Data
+public class MissResourceModel implements Serializable {
+
+    private static final long serialVersionUID = 677360677490162891L;
+
+    @ApiParam(value = "主键")
+    @AnnoOutputColumn
+    private String key;
+
+    @ApiParam(value = "产品类型", example = "0", access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, required = false)
+    private Integer softType;
+
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.class)
+    @ApiParam(value = "资源类型", example = "1", access = "使用枚举：CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE")
+    private Integer resourceType;
+
+    @ApiParam(value = "语言编码", example = "浏览器语言编码")
+    @AnnoOutputColumn
+    private String languageCode;
+
+    @ApiParam(value = "资源KEY")
+    @AnnoOutputColumn
+    private String resourceKey;
+
+    @ApiParam(value = "资源Value")
+    @AnnoOutputColumn
+    private String resourceValue;
+
+    @ApiParam(value = "数据来源")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.MiSS_RESOURCE_SOURCE.class)
+    private Integer resourceSource;
+
+    @ApiParam(value = "数据来源")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.IS_VAILD.class)
+    private Integer isValid;
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.model.report;
+
+import cn.estsh.i3plus.pojo.report.bean.BrElement;
+import cn.estsh.i3plus.pojo.report.bean.BrLayout;
+import cn.estsh.i3plus.pojo.report.bean.BrRefReport;
+import cn.estsh.i3plus.pojo.report.bean.BrReport;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-3-24 下午3:28
+ * @Modify:
+ **/
+@Data
+public class BrDynamicPageModel {
+
+    @ApiParam(value ="报表信息")
+    private BrReport report;
+
+    @ApiParam(value ="布局信息")
+    private BrLayout layout;
+
+    @ApiParam(value = "报表排版关系")
+    private List<BrRefReport> refReportList;
+
+    @ApiParam(value ="页面元素内容")
+    private List<BrElement> elementList;
+
+    @ApiParam(value ="页面元素内容")
+    private List<TemplateModel> templateModelList;
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java

@@ -70,7 +70,7 @@ public class TemplateModel implements Serializable {
     private List<Map<String, Object>> rows;
 
     @ApiParam(value = "跨服务调用解析后数据")
-    private Object option;
+    private String option;
 
     @ApiParam(value = "分页参数")
     private Pager pager;

modules/i3plus-pojo-platform/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-platform</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java

@@ -1,12 +1,15 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 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;
@@ -43,6 +46,7 @@ public class SysConfig extends BaseBean {
     // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP
     @Column(name="CONFIG_GROUP")
     @ApiParam(value ="参数组")
+    @AnnoOutputColumn(refClass = ImppEnumUtil.SYS_CONFIG_GROUP.class)
     private Integer configGroup;
 
     // 枚举 ImppEnumUtil.SYS_VALUE_TYPE

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java

@@ -37,9 +37,6 @@ public class SysLocaleResource  extends BaseBean {
     private Integer resourceType;
 
     @Transient
-    private String resourceTypes;
-
-    @Transient
     private String resourceTypeTxt;
 
     public String getResourceTypeTxt(){
@@ -87,4 +84,10 @@ public class SysLocaleResource  extends BaseBean {
     @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     private Integer isSystem;
 
+    /**
+     * 检索条件
+     */
+    @Transient
+    private String resourceTypes;
+
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java

@@ -54,6 +54,10 @@ public class SysLogOperate extends BaseBean {
     @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description")
     private Integer operateType;
 
+    public String getOperateTypeName(){
+        return ImppEnumUtil.OPERATE_TYPE.valueOfCode(operateType);
+    }
+
     @Column(name="OPERATE_MESSAGE")
     @ApiParam(value ="操作信息" , access ="操作信息")
     private String operateMessage;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java

@@ -91,4 +91,5 @@ public class SysLogSystem extends BaseBean {
     @ApiParam(value ="执行耗时")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long executeTime;
+
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java

@@ -1,116 +0,0 @@
-package cn.estsh.i3plus.pojo.platform.sqlpack;
-
-import cn.estsh.i3plus.pojo.base.tool.BsonPackTool;
-import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
-import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
-import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
-import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
-import com.mongodb.BasicDBObject;
-import org.bson.conversions.Bson;
-
-/**
- * @Description : Bson对象封装
- * @Reference :
- * @Author : yunhao
- * @CreateDate : 2018-11-08 13:15
- * @Modify:
- **/
-public class CoreBsonPack {
-
-    /**
-     * 日志复杂查询
-     *
-     * @param logSystem
-     * @return
-     */
-    public static Bson packBsonByLogSystem(SysLogSystem logSystem) {
-        Bson bson = new BasicDBObject();
-
-        bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(), "logLevel", bson);
-        bson = BsonPackTool.getNumEqualPack(logSystem.getLogModuleId(), "logModuleId", bson);
-        bson = BsonPackTool.timeBuilder(logSystem.getCreateDatetime(), "createDatetime", bson, false, false);
-        bson = BsonPackTool.getStringLikerPack(logSystem.getRemoteIp(), "remoteIp", bson);
-        bson = BsonPackTool.getStringLikerPack(logSystem.getRequestUrl(), "requestUrl", bson);
-        bson = BsonPackTool.getStringLikerPack(logSystem.getLogMethod(), "logMethod", bson);
-
-        return bson;
-    }
-
-    /**
-     * 系统操作日志
-     *
-     * @param logOperate
-     * @return
-     */
-    public static Bson packBsonByLogOperate(SysLogOperate logOperate) {
-        Bson bson = new BasicDBObject();
-
-        bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(), "operateType", bson);
-        bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(), "operateModule", bson);
-        bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(), "createDatetime", bson, false, false);
-        bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(), "remoteIp", bson);
-        bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(), "operateMessage", bson);
-        bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(), "createUser", bson);
-
-        return bson;
-    }
-
-    /**
-     * 系统异常日志复杂查询
-     *
-     * @param sysLogException
-     * @return
-     */
-    public static Bson packBsonBySysLogException(SysLogException sysLogException) {
-        Bson bson = new BasicDBObject();
-
-        bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(), "excModule", bson);
-        bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(), "excMessage", bson);
-        bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(), "createDatetime", bson, false, false);
-
-        return bson;
-    }
-
-    /**
-     * 定时任务日志复杂查询
-     *
-     * @param sysLogTaskTime
-     * @return
-     */
-    public static Bson packBsonByLogTaskTime(SysLogTaskTime sysLogTaskTime) {
-        Bson bson = new BasicDBObject();
-
-        bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getName(), "name", bson);
-        bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getGroupName(), "groupName", bson);
-        bson = BsonPackTool.timeBuilder(sysLogTaskTime.getCreateDatetime(), "createDatetime", bson, false, false);
-
-        return bson;
-    }
-
-    /**
-     * 区间
-     *
-     * @param colName
-     * @param min
-     * @param max
-     * @return
-     */
-    public static Bson packBsonByInterval(String colName, Object min, Object max) {
-        Bson bson = new BasicDBObject();
-
-        bson = BsonPackTool.getNumBiggerPack(min, colName, bson);
-        bson = BsonPackTool.getNumSmallerPack(max, colName, bson);
-
-        return bson;
-    }
-
-    /**
-     * 指定日期之后
-     * @param dateTime 日期
-     * @return
-     */
-    public static Bson packBsonByDateTimeAfter(String dateTime){
-        return BsonPackTool.timeLess(dateTime, "createDatetime", null, true);
-    }
-}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -754,7 +754,7 @@ public class CoreHqlPack {
         DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
         DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result);
         if (orderNoRule.getSerialNo() != null) {
-            DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "orderNoRuleCode", result);
+            DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "serialNo", result);
         }
 
         // 添加默认排序

modules/i3plus-pojo-ptl/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-ptl</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-report/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-report</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
 

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java

@@ -29,6 +29,7 @@ import java.util.List;
 @Api(value="数据元素",description = "数据元素绑定对应的列")
 public class BrElement extends BaseBean {
 
+    private static final long serialVersionUID = -4332881435058594175L;
     @Column(name="ELEMENT_NAME")
     @ApiParam(value ="元素名称")
     private String elementName;

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java

@@ -28,41 +28,16 @@ import java.util.List;
 @Api(value="自定义报表布局",description = "单独进行管理，生成报表是使用。报表实例 * -》 1")
 public class BrLayout extends BaseBean {
 
+    private static final long serialVersionUID = -3790563562881742852L;
     @Column(name="LAYOUT_NAME")
-    @ApiParam(value ="名称")
+    @ApiParam(value ="布局名称")
     private String layoutName;
 
-    @Column(name="LAYOUT_WIDTH")
-    @ApiParam(value ="布局宽度")
-    private Double layoutWidth;
-
-    @Column(name="LAYOUT_HEIGHT")
-    @ApiParam(value ="布局高度")
-    private Double layoutHeight;
-
-    @Column(name="LAYOUT_ROW_COUNT")
-    @ApiParam(value ="行数")
-    private Integer layoutRowCount;
-
-    @Column(name="LAYOUT_COLUMN_COUNT")
-    @ApiParam(value ="列数")
-    private Integer layoutColumnCount;
-
-    @Column(name="LAYOUT_REPORT_COUNT")
-    @ApiParam(value ="引用报表数量")
-    private Integer layoutReportCount;
-
-//    @Lob
-//    @Column(name="LAYOUT_HTML")
-//    @ApiParam(value ="布局html")
-//    private String layoutHtml;
-//
-//    @Lob
     @Column(name = "LAYOUT_DESCRIPTION")
     @ApiParam(value ="布局描述")
     private String layoutDescription;
 
     @Transient
-    @ApiParam(value ="模板行列表")
-    private List<BrLayoutRow> brLayoutRows;
+    @ApiParam(value ="行所包含的元素")
+    private List<BrLayoutElement> elementList;
 }

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java

@@ -1,80 +1,80 @@
-package cn.estsh.i3plus.pojo.report.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-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 org.hibernate.annotations.Type;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * @Description : 自定义报表布局
- * @Reference :
- * @Author : alwaysfrin
- * @CreateDate : 2018-12-25 19:54
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Table(name="BR_LAYOUT_COLUMN")
-@Api(value="自定义报表布局-列",description = "一行包含多列")
-public class BrLayoutColumn extends BaseBean {
-
-    @Column(name="LAYOUT_ID")
-    @ApiParam(value ="布局主键")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long layoutId;
-
-    @Column(name="LAYOUT_ROW_ID")
-    @ApiParam(value ="行主键")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long layoutRowId;
-
-    @Column(name="COLUMN_COLSPAN")
-    @ApiParam(value ="跨列数")
-    private Integer columnColspan;
-
-    @Column(name="COLUMN_ROWSPAN")
-    @ApiParam(value ="跨行数")
-    private Integer columnRowspan;
-
-    @Column(name="COLUMN_WIDTH")
-    @ApiParam(value ="列宽")
-    private Integer columnWidth;
-
-    @Column(name="COLUMN_HEIGHT")
-    @ApiParam(value ="列高")
-    private Integer columnHeight;
-
-    @Column(name="COLUMN_STYLE")
-    @ApiParam(value ="列样式")
-    private String columnStyle;
-
-    @Column(name="COLUMN_SEQ")
-    @ApiParam(value ="序列")
-    private Integer columnSeq;
-
-    @Column(name="COLUMN_SORT")
-    @ApiParam(value ="排序，降序")
-    private Integer columnSort;
-
-//    @Lob
-    @Column(name = "COLUMN_DESCRIPTION")
-    @ApiParam(value ="列描述")
-    private String columnDescription;
-
-//    @Lob
-//    @Column(name="COLUMN_HTML")
-//    @ApiParam(value ="列html")
-//    private String columnHtml;
-}
+//package cn.estsh.i3plus.pojo.report.bean;
+//
+//import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+//import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+//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 org.hibernate.annotations.Type;
+//
+//import javax.persistence.*;
+//import java.util.List;
+//
+///**
+// * @Description : 自定义报表布局
+// * @Reference :
+// * @Author : alwaysfrin
+// * @CreateDate : 2018-12-25 19:54
+// * @Modify:
+// **/
+//@Data
+//@Entity
+//@DynamicInsert
+//@DynamicUpdate
+//@EqualsAndHashCode(callSuper = true)
+//@Table(name="BR_LAYOUT_COLUMN")
+//@Api(value="自定义报表布局-列",description = "一行包含多列")
+//public class BrLayoutColumn extends BaseBean {
+//
+//    @Column(name="LAYOUT_ID")
+//    @ApiParam(value ="布局主键")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long layoutId;
+//
+//    @Column(name="LAYOUT_ROW_ID")
+//    @ApiParam(value ="行主键")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long layoutRowId;
+//
+//    @Column(name="COLUMN_COLSPAN")
+//    @ApiParam(value ="跨列数")
+//    private Integer columnColspan;
+//
+//    @Column(name="COLUMN_ROWSPAN")
+//    @ApiParam(value ="跨行数")
+//    private Integer columnRowspan;
+//
+//    @Column(name="COLUMN_WIDTH")
+//    @ApiParam(value ="列宽")
+//    private Integer columnWidth;
+//
+//    @Column(name="COLUMN_HEIGHT")
+//    @ApiParam(value ="列高")
+//    private Integer columnHeight;
+//
+//    @Column(name="COLUMN_STYLE")
+//    @ApiParam(value ="列样式")
+//    private String columnStyle;
+//
+//    @Column(name="COLUMN_SEQ")
+//    @ApiParam(value ="序列")
+//    private Integer columnSeq;
+//
+//    @Column(name="COLUMN_SORT")
+//    @ApiParam(value ="排序，降序")
+//    private Integer columnSort;
+//
+////    @Lob
+//    @Column(name = "COLUMN_DESCRIPTION")
+//    @ApiParam(value ="列描述")
+//    private String columnDescription;
+//
+////    @Lob
+////    @Column(name="COLUMN_HTML")
+////    @ApiParam(value ="列html")
+////    private String columnHtml;
+//}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java

@@ -0,0 +1,77 @@
+package cn.estsh.i3plus.pojo.report.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-3-24 下午2:39
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BR_LAYOUT_ELEMENT")
+@Api(value = "自定义报表布局元素")
+public class BrLayoutElement extends BaseBean {
+
+    private static final long serialVersionUID = 3684811659039862857L;
+    @Column(name = "LAYOUT_ID")
+    @ApiParam(value = "布局主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long layoutId;
+
+    @Column(name = "PARENT_ID")
+    @ApiParam(value = "父节点主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
+
+    @Column(name = "ELEMENT_TEXT")
+    @ApiParam(value ="元素描述")
+    private String elementText;
+
+    @Column(name="ELEMENT_SEQ")
+    @ApiParam(value ="序列")
+    private Integer elementSeq = 0;
+
+    @Column(name="ELEMENT_WIDTH")
+    @ApiParam(value ="列宽")
+    private Integer elementWidth;
+
+    @Column(name="ELEMENT_HEIGHT")
+    @ApiParam(value ="列高")
+    private Integer elementHeight;
+
+    @Column(name="ELEMENT_STYLE")
+    @ApiParam(value ="列样式")
+    private String elementStyle;
+
+    @Column(name="ELEMENT_CSS_CLASS")
+    @ApiParam(value ="列样式")
+    private String elementCssClass;
+
+    @Column(name = "ELEMENT_DESCRIPTION")
+    @ApiParam(value ="元素描述")
+    private String elementDescription;
+
+    @Transient
+    @ApiParam(value ="行所包含的元素")
+    private List<BrLayoutElement> elementList;
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java

@@ -1,67 +1,67 @@
-package cn.estsh.i3plus.pojo.report.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-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 org.hibernate.annotations.Type;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * @Description : 自定义报表布局
- * @Reference :
- * @Author : alwaysfrin
- * @CreateDate : 2018-12-25 19:54
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Table(name="BR_LAYOUT_ROW")
-@Api(value="自定义报表布局-行",description = "一个布局包含多行，一行包含多列")
-public class BrLayoutRow extends BaseBean {
-
-    @Column(name="LAYOUT_ID")
-    @ApiParam(value ="布局主键")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long layoutId;
-
-    @Column(name="ROW_WIDTH")
-    @ApiParam(value ="行宽")
-    private Integer rowWidth;
-
-    @Column(name="ROW_HEIGHT")
-    @ApiParam(value ="行高")
-    private Integer rowHeight;
-
-    @Column(name="ROW_SORT")
-    @ApiParam(value ="排序")
-    private Integer rowSort;
-
-    @Lob
-    @Column(name="ROW_STYLE")
-    @ApiParam(value ="行样式")
-    private String rowStyle;
-
-    @Column(name="ROW_COL_NUM")
-    @ApiParam(value ="行所关联列数")
-    private Integer rowColNum;
-
+//package cn.estsh.i3plus.pojo.report.bean;
+//
+//import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+//import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+//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 org.hibernate.annotations.Type;
+//
+//import javax.persistence.*;
+//import java.util.List;
+//
+///**
+// * @Description : 自定义报表布局
+// * @Reference :
+// * @Author : alwaysfrin
+// * @CreateDate : 2018-12-25 19:54
+// * @Modify:
+// **/
+//@Data
+//@Entity
+//@DynamicInsert
+//@DynamicUpdate
+//@EqualsAndHashCode(callSuper = true)
+//@Table(name="BR_LAYOUT_ROW")
+//@Api(value="自定义报表布局-行",description = "一个布局包含多行，一行包含多列")
+//public class BrLayoutRow extends BaseBean {
+//
+//    @Column(name="LAYOUT_ID")
+//    @ApiParam(value ="布局主键")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long layoutId;
+//
+//    @Column(name="ROW_WIDTH")
+//    @ApiParam(value ="行宽")
+//    private Integer rowWidth;
+//
+//    @Column(name="ROW_HEIGHT")
+//    @ApiParam(value ="行高")
+//    private Integer rowHeight;
+//
+//    @Column(name="ROW_SORT")
+//    @ApiParam(value ="排序")
+//    private Integer rowSort;
+//
 //    @Lob
-//    @Column(name="ROW_HTML")
-//    @ApiParam(value ="行html")
-//    private String rowHtml;
-
-    @Transient
-    @ApiParam(value ="行所包含的列")
-    private List<BrLayoutColumn> brLayoutColumns;
-}
+//    @Column(name="ROW_STYLE")
+//    @ApiParam(value ="行样式")
+//    private String rowStyle;
+//
+//    @Column(name="ROW_COL_NUM")
+//    @ApiParam(value ="行所关联列数")
+//    private Integer rowColNum;
+//
+////    @Lob
+////    @Column(name="ROW_HTML")
+////    @ApiParam(value ="行html")
+////    private String rowHtml;
+//
+//    @Transient
+//    @ApiParam(value ="行所包含的列")
+//    private List<BrLayoutColumn> brLayoutColumns;
+//}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrMenu.java

@@ -33,6 +33,7 @@ import java.util.List;
 @Api(value="报表目录",description = "报表目录")
 public class BrMenu extends BaseBean {
 
+    private static final long serialVersionUID = -247488761545602540L;
     @Column(name="NAME")
     @ApiParam(value ="功能名称")
     private String name;

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java

@@ -34,6 +34,7 @@ import java.util.List;
 @Api(value="报表对象",description = "报表对象")
 public class BrPojo extends BaseBean {
 
+    private static final long serialVersionUID = -8490788183629516155L;
     @Column(name="MASTER_ID")
     @ApiParam(value ="主对象ID")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value="对象属性",description = "对象属性")
 public class BrPojoAttr extends BaseBean {
 
+    private static final long serialVersionUID = -9025365832485707583L;
     @Column(name="TEMPLATE_ID")
     @ApiParam(value ="模板编号" ,example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value="对象筛选器",description = "对象筛选器")
 public class BrPojoFilter extends BaseBean {
 
+    private static final long serialVersionUID = -6375751397050043457L;
     @Column(name="MASTER_ID")
     @ApiParam(value ="主对象ID")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java

@@ -33,6 +33,7 @@ import javax.persistence.Transient;
 @Api(value="对象筛选器",description = "对象筛选器")
 public class BrPojoFilterAttr extends BaseBean {
 
+    private static final long serialVersionUID = 7949763397771577851L;
     @Column(name="FILTER_ID")
     @ApiParam(value ="筛选器ID")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java

@@ -34,6 +34,7 @@ import java.util.List;
 @Api(value="对象视图",description = "对象视图")
 public class BrPojoView extends BaseBean {
 
+    private static final long serialVersionUID = 3796940669579576121L;
     @Column(name="POJO_ID")
     @ApiParam(value ="主对象ID")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java

@@ -32,6 +32,7 @@ import javax.persistence.Transient;
 @Api(value = "对象视图", description = "对象视图")
 public class BrPojoViewAttr extends BaseBean {
 
+    private static final long serialVersionUID = -3080081514595597936L;
     @Column(name = "VIEW_ID")
     @ApiParam(value = "视图ID")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReport.java

@@ -12,8 +12,9 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Lob;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 元素和报表关联表，多对多
@@ -27,46 +28,41 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="BR_REF_REPORT_TYPESET")
+@Table(name="BR_REF_REPORT")
 @Api(value="元素&模板&报表",description = "报表，元素和模板的关联表 * -》 *")
-public class BrRefReportTypeset extends BaseBean {
+public class BrRefReport extends BaseBean {
 
+    private static final long serialVersionUID = 7860212457391123584L;
     @Column(name = "REPORT_ID")
     @ApiParam(value = "报表主键")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long reportId;
 
-    @Column(name = "REPORT_NAME_RDD")
-    @ApiParam(value = "报表名称")
-    private String reportNameRdd;
-
-    @Column(name = "REPORT_TYPESET_TYPE")
-    @ApiParam(value = "报表列类型")
-    private Integer reportTypesetType;
+    @Column(name="LAYOUT_ID")
+    @ApiParam(value ="布局主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long layoutId;
 
-    @Column(name = "LAYOUT_COLUMN_ID")
-    @ApiParam(value = "布局列主键")
+    @Column(name = "LAYOUT_ELEMENT_ID")
+    @ApiParam(value = "布局元素主键")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long layoutColumnId;
+    private Long layoutElementId;
+
+    @Column(name="REF_TYPE_ID")
+    @ApiParam(value ="序列")
+    private Integer refTypeId;
 
-    /**
-     * 关联id，元素或模板id
-     */
     @Column(name = "REF_ID")
     @ApiParam(value = "关联id")
     @JsonSerialize (using = ToStringSerializer.class)
     private Long refId;
 
-//    /**
-//     * 关联元素或模板html
-//     */
-//    @Lob
-//    @Column(name = "REF_HTML")
-//    @ApiParam(value = "关联对象html")
-//    private String refHtml;
+    @Column(name = "REF_NAME_RDD")
+    @ApiParam(value = "关联对象名称")
+    private String refNameRdd;
+
+    @Transient
+    @ApiParam(value = "关联对象")
+    private Object refObject;
 
-    @Lob
-    @Column(name = "TYPESET_DESCRIPTION")
-    @ApiParam(value ="排版描述")
-    private String typesetDescription;
 }

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value="关系-角色目录",description = "关系-角色目录")
 public class BrRefRoleMenu extends BaseBean {
 
+    private static final long serialVersionUID = 4474890758490483265L;
     @Column(name="MENU_ID")
     @ApiParam(value ="菜单ID" ,example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java

@@ -10,7 +10,10 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -29,6 +32,7 @@ import java.util.List;
 @Api(value="自定义报表",description = "所有报表实例，生成最后的报表")
 public class BrReport extends BaseBean {
 
+    private static final long serialVersionUID = 1987404021291348713L;
     @Column(name="REPORT_NAME")
     @ApiParam(value ="报表名称")
     private String reportName;
@@ -38,46 +42,19 @@ public class BrReport extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long layoutId;
 
-    //get单独处理
-    public Long getLayoutId() {
-        if(layoutId != null) {
-            return layoutId.longValue();
-        }else{
-            return layoutId;
-        }
-    }
-
     @Column(name="LAYOUT_NAME_RDD")
     @ApiParam(value ="布局名称")
     private String layoutNameRdd;
 
-    @Lob
-    @Column(name="LAYOUT_HTML")
-    @ApiParam(value ="报表html")
-    private String reportHtml;
-
-    @Column(name="SEQ")
-    @ApiParam(value ="排序")
-    private Integer seq;
-
-    @Column(name="TEMPLATE_NUM")
-    @ApiParam(value ="模板数量")
-    private Integer templateNum;
-
-    @Column(name="ELEMENT_NUM")
-    @ApiParam(value ="元素数量")
-    private Integer elementNum;
-
-    @Lob
     @Column(name = "REPORT_DESCRIPTION")
     @ApiParam(value ="报表描述")
     private String reportDescription;
 
     @Transient
-    @ApiParam(value = "报表关联布局对象")
-    private BrLayout brLayout;
+    @ApiParam(value = "报表排版关系")
+    private BrLayout layout;
 
     @Transient
     @ApiParam(value = "报表排版关系")
-    private List<BrRefReportTypeset> brRefReportTypesetList;
+    private List<BrRefReport> brRefReportList;
 }

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java

@@ -48,7 +48,7 @@
 //
 //    @Transient
 //    @ApiParam(value ="报表模板列表")
-//    private List<BrRefReportTypeset> brRefReportTypesetList;
+//    private List<BrRefReport> brRefReportList;
 //
 //    @Transient
 //    @ApiParam(value ="元素所在的列")

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java

@@ -1,14 +1,14 @@
-package cn.estsh.i3plus.pojo.report.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.report.bean.BrLayoutColumn;
-
-/**
- * @Description :
- * @Reference :
- * @Author : alwaysfrin
- * @CreateDate : 2018-12-26 20:23
- * @Modify:
- **/
-public interface BrLayoutColumnRepository extends BaseRepository<BrLayoutColumn,Long> {
-}
+//package cn.estsh.i3plus.pojo.report.repository;
+//
+//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+//import cn.estsh.i3plus.pojo.report.bean.BrLayoutColumn;
+//
+///**
+// * @Description :
+// * @Reference :
+// * @Author : alwaysfrin
+// * @CreateDate : 2018-12-26 20:23
+// * @Modify:
+// **/
+//public interface BrLayoutColumnRepository extends BaseRepository<BrLayoutColumn,Long> {
+//}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutElementRepository.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.report.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.report.bean.BrRefReportTypeset;
+import cn.estsh.i3plus.pojo.report.bean.BrLayoutElement;
 
 /**
  * @Description :
@@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.report.bean.BrRefReportTypeset;
  * @CreateDate : 2018-12-26 20:23
  * @Modify:
  **/
-public interface BrRefReportTypesetRepository extends BaseRepository<BrRefReportTypeset,Long> {
+public interface BrLayoutElementRepository extends BaseRepository<BrLayoutElement,Long> {
 }

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutRowRepository.java

@@ -1,14 +1,14 @@
-package cn.estsh.i3plus.pojo.report.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.report.bean.BrLayoutRow;
-
-/**
- * @Description :
- * @Reference :
- * @Author : alwaysfrin
- * @CreateDate : 2018-12-26 20:23
- * @Modify:
- **/
-public interface BrLayoutRowRepository extends BaseRepository<BrLayoutRow,Long> {
-}
+//package cn.estsh.i3plus.pojo.report.repository;
+//
+//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+//import cn.estsh.i3plus.pojo.report.bean.BrLayoutRow;
+//
+///**
+// * @Description :
+// * @Reference :
+// * @Author : alwaysfrin
+// * @CreateDate : 2018-12-26 20:23
+// * @Modify:
+// **/
+//public interface BrLayoutRowRepository extends BaseRepository<BrLayoutRow,Long> {
+//}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.report.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.report.bean.BrRefReport;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-26 20:23
+ * @Modify:
+ **/
+public interface BrRefReportRepository extends BaseRepository<BrRefReport,Long> {
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java

@@ -99,14 +99,14 @@ public class ReportHqlPack {
      * @param brElement
      * @return
      */
-    public static String packHqlBrElement(BrElement brElement){
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlBrElement(BrElement brElement){
+        DdlPackBean result = DdlPackBean.getDdlPackBean(brElement);
 
         // 查询参数封装
-        HqlPack.getNumEqualPack(brElement.getElementType(),"elementType",result);
-        HqlPack.getStringLikerPack(brElement.getElementName(),"elementName",result);
+        DdlPreparedPack.getNumEqualPack(brElement.getElementType(),"elementType",result);
+        DdlPreparedPack.getStringLikerPack(brElement.getElementName(),"elementName",result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -158,14 +158,32 @@ public class ReportHqlPack {
      * @param brReport
      * @return
      */
-    public static String packHqlBrReport(BrReport brReport){
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlBrReport(BrReport brReport){
+        DdlPackBean result = DdlPackBean.getDdlPackBean(brReport);
 
         // 查询参数封装
-        HqlPack.getStringLikerPack(brReport.getReportName(),"reportName",result);
-        HqlPack.getNumEqualPack(brReport.getLayoutId(),"layoutId",result);
+        DdlPreparedPack.getStringLikerPack(brReport.getReportName(),"reportName",result);
+        DdlPreparedPack.getNumEqualPack(brReport.getLayoutId(),"layoutId",result);
 
-        return result.toString();
+        return result;
+    }
+
+    /**
+     * 报表查询
+     * @param refReport
+     * @return
+     */
+    public static DdlPackBean packHqlBrRefReport(BrRefReport refReport){
+        DdlPackBean result = DdlPackBean.getDdlPackBean(refReport);
+
+        // 查询参数封装
+        DdlPreparedPack.getNumEqualPack(refReport.getReportId(),"reportId",result);
+        DdlPreparedPack.getNumEqualPack(refReport.getLayoutId(),"layoutId",result);
+        DdlPreparedPack.getNumEqualPack(refReport.getLayoutElementId(),"layoutElementId",result);
+        DdlPreparedPack.getNumEqualPack(refReport.getRefTypeId(),"refTypeId",result);
+        DdlPreparedPack.getNumEqualPack(refReport.getRefId(),"refId",result);
+
+        return result;
     }
 
     /**
@@ -225,4 +243,12 @@ public class ReportHqlPack {
 
         return result;
     }
+
+    public static DdlPackBean packHqlBrLayoutElement(BrLayoutElement bean){
+        DdlPackBean result = DdlPackBean.getDdlPackBean(bean);
+
+        DdlPreparedPack.getNumEqualPack(bean.getLayoutId(),"layoutId",result);
+
+        return result;
+    }
 }

modules/i3plus-pojo-softswitch/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-softswitch</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
 

modules/i3plus-pojo-sweb/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-sweb</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-wms/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-wms</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

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

@@ -49,7 +49,7 @@ public class WmsBusiType extends BaseBean {
     public Integer moveType;
 
     /**
-     * 是否启用波次计划 10-是，20-否
+     * 是否启用波次计划 1-是，2-否
      */
     @Column(name = "IS_ENABLE_WAVE")
     @ApiParam("是否启用波次计划")

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

@@ -28,10 +28,10 @@ import java.math.BigDecimal;
         @Index(columnList = "ORDER_NO"),
         @Index(columnList = "PART_NO"),
         @Index(columnList = "ITEM_STATUS")
-}, uniqueConstraints = {@UniqueConstraint(columnNames = {"REF_SRC", "ITEM", "TRANS_TYPE_CODE_RDD"})})
+})
+// uniqueConstraints = {@UniqueConstraint(columnNames = {"REF_SRC", "ITEM", "TRANS_TYPE_CODE_RDD"})}
 @Api("作业任务明细信息")
 public class WmsTaskDetails extends BaseBean {
-
     private static final long serialVersionUID = 2938720878619662102L;
     @Column(name = "ORDER_NO")
     @ApiParam(value = "单号")

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

@@ -50,6 +50,22 @@ public class WmsWaveRuleDetails extends BaseBean {
     @ApiParam(value = "字段值")
     public String fieldValue;
 
+    @Column(name = "ENTITY_NAME")
+    @ApiParam(value = "实例类名")
+    public String entityName;
+
+    @Column(name = "LIST_COLUMN_NAME")
+    @ApiParam(value = "列表列名")
+    public String listColumnName;
+
+    @Column(name = "SEARCH_COLUMN_NAME")
+    @ApiParam(value = "搜索列名")
+    public String searchColumnName;
+
+    @Column(name = "EXPLICIT_COLUMN_NAME")
+    @ApiParam(value = "回显列名")
+    public String explicitColumnName;
+
     public Long getRuleId() {
         return ruleId == null ? 0L : ruleId.longValue();
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.ColumnDefault;
 
 /**
@@ -14,6 +15,7 @@ import org.hibernate.annotations.ColumnDefault;
  * @Modify:
  **/
 @Data
+@NoArgsConstructor
 @AllArgsConstructor
 @Api("移库单数据模型")
 public class WmsDocMovementModel {
@@ -43,7 +45,7 @@ public class WmsDocMovementModel {
     private String partGroupNo;
 
     @ApiParam("订单状态")
-    private String orderStatus;
+    private Integer orderStatus;
 
     @ApiParam(value = "优先级", example = "1")
     public Integer priority;

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

@@ -2901,6 +2901,7 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsWaveRule(WmsWaveRule rule) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(rule.getRuleCode(), "ruleCode", result);
+        DdlPreparedPack.getStringEqualPack(rule.getRuleDesc(), "ruleDesc", result);
         DdlPreparedPack.getStringBiggerPack(rule.getStartEffectDate(), "startEffectDate", result);
         DdlPreparedPack.getStringSmallerPack(rule.getEndEffectDate(), "endEffectDate", result);
         getStringBuilderPack(rule, result);

modules/i3plus-pojo-workflow/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-workflow</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
 
     <profiles>
         <profile>

pom.xml

@@ -142,7 +142,7 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <!-- spring-json转换 -->
+            <!-- spring-json转杢 -->
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
@@ -179,7 +179,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
-    <!-- 私有仓库引用配置 -->
+    <!-- 秝有仓库引用酝置 -->
     <repositories>
         <repository>
             <id>nexus</id>
@@ -187,7 +187,7 @@
         </repository>
     </repositories>
 
-    <!-- 私有仓库Jar 包更新配置 -->
+    <!-- 秝有仓库Jar 包更新酝置 -->
     <distributionManagement>
         <repository>
             <id>maven-releases</id>
@@ -208,7 +208,7 @@
     <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
     <!--</plugin>-->
 
-    <!--&lt;!&ndash;  添加编译插件 &ndash;&gt;-->
+    <!--&lt;!&ndash;  添加编译杒件 &ndash;&gt;-->
     <!--<plugin>-->
     <!--<groupId>org.apache.maven.plugins</groupId>-->
     <!--<artifactId>maven-compiler-plugin</artifactId>-->