Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java

@@ -10,10 +10,8 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
+import java.util.List;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 安灯队列
@@ -24,7 +22,16 @@ import javax.persistence.Transient;
  **/
 @Data
 @Entity
-@Table(name="ANDON_MANAGE_QUEUE")
+@Table(name="ANDON_MANAGE_QUEUE", indexes = {
+        @Index(columnList = "WORK_CENTER_CODE", name = "ANDON_INDEX_WORK_CENTER_CODE"),
+        @Index(columnList = "WORK_CELL_CODE", name = "ANDON_INDEX_WORK_CELL_CODE"),
+        @Index(columnList = "ORGANIZE_CODE", name = "ANDON_INDEX_ORGANIZE_CODE"),
+        @Index(columnList = "ANDON_ORDER_NO", name = "ANDON_INDEX_ANDON_ORDER_NO"),
+        @Index(columnList = "ALARM_CODE", name = "ANDON_INDEX_ALARM_CODE"),
+        @Index(columnList = "STATUS_CODE", name = "ANDON_INDEX_STATUS_CODE"),
+        @Index(columnList = "ACTION_CODE", name = "ANDON_INDEX_ACTION_CODE"),
+        @Index(columnList = "EQUIPMENT_CODE", name = "ANDON_INDEX_EQUIPMENT_CODE")
+})
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
@@ -87,76 +94,67 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "优先级别", example = "1")
     private Integer priorityLevel;
 
-    @Column(name="CALL_TIME",updatable = false)
+    @Column(name="CALL_TIME")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value = "呼叫时间")
+    @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00")
     @AnnoOutputColumn(hidden = true)
     public String callTime;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="呼叫时间，查询开始时间")
+    @ApiParam(value="呼叫时间，查询开始时间", example = "2018-01-01 01:00:00")
     public String callTimeStart;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="呼叫时间，查询结束时间")
+    @ApiParam(value="呼叫时间，查询结束时间", example = "2018-01-01 01:00:00")
     public String callTimeEnd;
 
-    @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00")
+    @Column(name="CONFIRM_TIME")
-    @AnnoOutputColumn(hidden = true)
+    @ApiParam(value = "响应时间", example = "2018-01-01 01:00:00")
-    public String callTimeStr;
-
-    @Column(name="CONFIRM_TIME",updatable = false)
-    @ApiParam(value = "响应时间")
     @AnnoOutputColumn(hidden = true)
     public String confirmTime;
 
-    @Transient
+    @Column(name="RESET_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="响应时间",example = "2018-01-01 01:00:00")
-    @AnnoOutputColumn(hidden = true)
-    public String confirmTimeStr;
-
-    @Column(name="RESET_TIME",updatable = false)
-    @ApiParam(value = "解决时间")
-    @AnnoOutputColumn(hidden = true)
-    public String resetTime;
-
-    @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="解决时间",example = "2018-01-01 01:00:00")
     @AnnoOutputColumn(hidden = true)
-    public String resetTimeStr;
+    public String resetTime;
 
     @Column(name = "CALL_USER")
     @ApiParam(value = "呼叫人")
     private String callUser;
 
+    @Transient
+    @ApiParam(value = "呼叫人名字")
+    private String callUserName;
+
     @Column(name = "CONFIRM_USER")
     @ApiParam(value = "响应人")
     private String confirmUser;
 
+    @Transient
+    @ApiParam(value = "响应人名字")
+    private String confirmUserName;
+
     @Column(name = "RESET_USER")
     @ApiParam(value = "解决人")
     private String resetUser;
 
+    @Transient
+    @ApiParam(value = "解决人名字")
+    private String resetUserName;
+
     @Column(name = "IS_SHIFT_CALL")
     @ApiParam(value = "是否转呼", example = "1")
     private Integer isShiftCall;
 
-    @Column(name="SHIFT_CALL_TIME",updatable = false)
+    @Column(name="SHIFT_CALL_TIME")
-    @ApiParam(value = "转呼时间")
-    @AnnoOutputColumn(hidden = true)
-    public String shiftCallTime;
-
-    @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="转呼时间",example = "2018-01-01 01:00:00")
     @AnnoOutputColumn(hidden = true)
-    public String shiftCallTimeStr;
+    public String shiftCallTime;
 
     @Column(name = "RP_OBJECT_CODE")
     @ApiParam(value = "转呼对象代码")
@@ -226,6 +224,26 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "响应时长", example = "0")
     private Long signTime;
 
+    @Transient
+    @ApiParam(value = "ANDON次数（用于报表统计）", example = "0")
+    private Integer andonCount;
+
+    @Transient
+    @ApiParam(value = "平均响应时长", example = "0")
+    private Long avgSignTime;
+
+    @Transient
+    @ApiParam(value = "平均解决时长", example = "0")
+    private Long avgResolveTime;
+
+    @Transient
+    @ApiParam(value = "查询条件：ANDON状态")
+    private List<Object> statusList;
+
+    @Transient
+    @ApiParam(value = "比例", example = "0")
+    private Double proportion;
+
     @Column(name = "SEND_FLAG")
     @ApiParam(value = "发送标志")
     private String sendFlag;

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java

@@ -10,10 +10,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 安灯记录
@@ -24,7 +21,16 @@ import javax.persistence.Transient;
  **/
 @Data
 @Entity
-@Table(name="ANDON_MANAGE_RECORD")
+@Table(name="ANDON_MANAGE_RECORD", indexes = {
+        @Index(columnList = "WORK_CENTER_CODE", name = "ANDON_INDEX_WORK_CENTER_CODE"),
+        @Index(columnList = "WORK_CELL_CODE", name = "ANDON_INDEX_WORK_CELL_CODE"),
+        @Index(columnList = "ORGANIZE_CODE", name = "ANDON_INDEX_ORGANIZE_CODE"),
+        @Index(columnList = "ANDON_ORDER_NO", name = "ANDON_INDEX_ANDON_ORDER_NO"),
+        @Index(columnList = "ALARM_CODE", name = "ANDON_INDEX_ALARM_CODE"),
+        @Index(columnList = "STATUS_CODE", name = "ANDON_INDEX_STATUS_CODE"),
+        @Index(columnList = "ACTION_CODE", name = "ANDON_INDEX_ACTION_CODE"),
+        @Index(columnList = "EQUIPMENT_CODE", name = "ANDON_INDEX_EQUIPMENT_CODE")
+})
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -21,7 +22,14 @@ import javax.persistence.Table;
  **/
 @Data
 @Entity
-@Table(name="ANDON_PLC_RECORD")
+@Table(name="ANDON_PLC_RECORD", indexes = {
+        @Index(columnList = "WORK_CENTER_CODE", name = "ANDON_INDEX_WORK_CENTER_CODE"),
+        @Index(columnList = "WORK_CELL_CODE", name = "ANDON_INDEX_WORK_CELL_CODE"),
+        @Index(columnList = "ORGANIZE_CODE", name = "ANDON_INDEX_ORGANIZE_CODE"),
+        @Index(columnList = "CHANNEL_NAME", name = "ANDON_INDEX_CHANNEL_NAME"),
+        @Index(columnList = "TAG_ADDRESS", name = "ANDON_INDEX_TAG_ADDRESS"),
+        @Index(columnList = "GROUP_NO", name = "ANDON_INDEX_GROUP_NO")
+})
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/model/SysOrganizeModel.java

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import cn.estsh.i3plus.pojo.andon.bean.MesArea;
+import io.swagger.annotations.ApiParam;
+
+import javax.persistence.Transient;
+import java.util.List;
+
+public class SysOrganizeModel{
+
+    @Transient
+    @ApiParam(value ="父节点")
+    private Long parentId;
+
+    @Transient
+    @ApiParam(value ="名称")
+    private String name;
+
+    @Transient
+    @ApiParam(value ="子集列表")
+    private List<MesArea> childTreeList;
+
+    public List<MesArea> getChildTreeList() {
+        return childTreeList;
+    }
+
+    public void setChildTreeList(List<MesArea> childTreeList) {
+        this.childTreeList = childTreeList;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java

@@ -172,6 +172,8 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getActionCode(), "actionCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getAndonOrderNo(), "andonOrderNo", result);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getShiftCode(), "shiftCode", result);
         DdlPreparedPack.getInPackArray(obj, "statusCode", result);
 
         getStringBuilderPack(andonManageQueue, result);
@@ -309,6 +311,26 @@ public class AndonHqlPack {
     }
 
     /**
+     * MES班次信息查询条件封装
+     * @param shift
+     * @return
+     */
+    public static DdlPackBean getMesShift(MesShift shift, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode);
+        if (StringUtils.isNotEmpty(shift.getShiftCode())){
+            DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(shift.getShiftName())){
+            DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean);
+        }
+        if (StringUtils.isNotEmpty(shift.getWorkCenterCode())){
+            DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
      * 通知配置信息封装
      * @param responseCfg
      * @return

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

@@ -83,7 +83,7 @@ public class AndonEnumUtil {
     public enum ALARM_FLAG{
 
         CALL(1,"10","呼叫"),
-        SIGN(2,"20","签到"),
+        SIGN(2,"20","响应"),
         RESOLVE(3,"30","解决"),
         CANCEL(4,"40", "撤销");
 

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

@@ -608,5 +608,40 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+    /**
+     * 工步参数类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STEP_PARAM_TYPE{
+
+        QUALIFIED(10,"数字"),
+        DEFECTED(20,"字符串"),
+        SCRAPED(30,"可选值");
+
+        private int value;
+        private String description;
+
+        STEP_PARAM_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
 
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val ) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java

@@ -132,6 +132,51 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
     int updateByProperties(String[] conditionName, Object[] conditionValue, String[] propertyName, Object[] propertyValue);
 
     /**
+     * 通过多单属性进行单个值更新(eg： price = price + :price)
+     * @param conditionName
+     * @param conditionValue
+     * @param propertyName
+     * @param propertyValue
+     */
+    int updateByPropertiesWithVal(String conditionName, Object conditionValue, String propertyName, Object propertyValue);
+
+    /**
+     * 通过单个属性进行多个值更新(eg： price = price + :price)
+     * @param conditionName
+     * @param conditionValue
+     * @param propertyName
+     * @param propertyValue
+     */
+    int updateByPropertiesWithVal(String conditionName, Object conditionValue, String[] propertyName, Object[] propertyValue);
+
+    /**
+     * 通过属性进行多个值更新(eg： price = price + :price)
+     * @param propertyName
+     * @param propertyValue
+     */
+    int updateByPropertiesWithVal(String propertyName, Object propertyValue,DdlPackBean packBean);
+    int updateByPropertiesWithVal(String[] propertyName, Object[] propertyValue,DdlPackBean packBean);
+
+
+    /**
+     * 通过多个属性进行单个值更新(eg： price = price + :price)
+     * @param conditionName
+     * @param conditionValue
+     * @param propertyName
+     * @param propertyValue
+     */
+    int updateByPropertiesWithVal(String[] conditionName, Object[] conditionValue, String propertyName, Object propertyValue);
+
+    /**
+     * 通过多个属性进行多个值更新(eg： price = price + :price)
+     * @param conditionName 查询属性名称
+     * @param conditionValue 查询属性值
+     * @param propertyName 更新属性名称
+     * @param propertyValue 更新属性值
+     */
+    int updateByPropertiesWithVal(String[] conditionName, Object[] conditionValue, String[] propertyName, Object[] propertyValue);
+
+    /**
      * 根据 hqlWhere 批量修改制定字段
      * @param hqlWhere
      * @param propertyName  修改的字段名称

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

@@ -11,10 +11,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
 
-import javax.persistence.EntityManager;
+import javax.persistence.*;
-import javax.persistence.Id;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
@@ -196,6 +193,42 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public int updateByProperties(String[] conditionName, Object[] conditionValue, String[] propertyName, Object[] propertyValue) {
+        return updateByPropertiesMain(conditionName, conditionValue, propertyName, propertyValue,true);
+    }
+
+    @Override
+    public int updateByPropertiesWithVal(String conditionName, Object conditionValue, String propertyName, Object propertyValue) {
+        return updateByPropertiesWithVal(new String[] { conditionName }, new Object[] { conditionValue }, new String[] { propertyName }, new Object[] { propertyValue });
+    }
+
+    @Override
+    public int updateByPropertiesWithVal(String conditionName, Object conditionValue, String[] propertyName, Object[] propertyValue) {
+        return updateByPropertiesWithVal(new String[] { conditionName }, new Object[] { conditionValue }, propertyName, propertyValue);
+    }
+
+    @Override
+    public int updateByPropertiesWithVal(String[] conditionName, Object[] conditionValue, String propertyName, Object propertyValue) {
+        return updateByPropertiesWithVal(conditionName, conditionValue, new String[] { propertyName }, new Object[] { propertyValue });
+    }
+
+    @Override
+    public int updateByPropertiesWithVal(String[] conditionName, Object[] conditionValue, String[] propertyName, Object[] propertyValue) {
+        return updateByPropertiesMain(conditionName, conditionValue, propertyName, propertyValue,false);
+    }
+
+    /**
+     * 更新参数汇总方法
+     * @param conditionName 条件属性名
+     * @param conditionValue 条件属性值
+     * @param propertyName  更新属性名
+     * @param propertyValue 更新属性值
+     * @param valWithSimple   是否简单赋值
+     *                        true为正常eg： price = :price
+     *                        false为自身添加eg： price = price + :price
+     * @return
+     */
+    private int updateByPropertiesMain(String[] conditionName, Object[] conditionValue,
+                                       String[] propertyName, Object[] propertyValue,boolean valWithSimple) {
         if ((propertyName != null) && (propertyName.length > 0) && (propertyValue != null)
                 && (propertyValue.length > 0) && (propertyName.length == propertyValue.length)
                 && (conditionValue != null) && (conditionValue.length > 0)) {
@@ -203,7 +236,11 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
             sb.append("update " + persistentClass.getName() + " model set ");
             for (int i = 0; i < propertyName.length; i++) {
-                sb.append(propertyName[i] + " = :p_" + propertyName[i] + ",");
+                if(valWithSimple) {
+                    sb.append(propertyName[i] + " = :p_" + propertyName[i] + ",");
+                }else{
+                    sb.append(propertyName[i] + " = " + propertyName[i] + " + :p_" + propertyName[i] + ",");
+                }
             }
             sb.deleteCharAt(sb.length() - 1);
 
@@ -229,13 +266,32 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public int updateByProperties(String[] propertyName, Object[] propertyValue,DdlPackBean packBean) {
+        return updateByPropertiesDdlPack(propertyName, propertyValue,packBean,true);
+    }
+
+    @Override
+    public int updateByPropertiesWithVal(String propertyName, Object propertyValue,DdlPackBean packBean) {
+        return updateByPropertiesWithVal(new String[] { propertyName }, new Object[] { propertyValue },packBean);
+    }
+
+    @Override
+    public int updateByPropertiesWithVal(String[] propertyName, Object[] propertyValue,DdlPackBean packBean) {
+        return updateByPropertiesDdlPack(propertyName, propertyValue,packBean,false);
+    }
+
+    private int updateByPropertiesDdlPack(String[] propertyName, Object[] propertyValue,
+                                          DdlPackBean packBean,boolean valWithSimple) {
         if ((propertyName != null) && (propertyName.length > 0) && (propertyValue != null)
                 && (propertyValue.length > 0) && (propertyName.length == propertyValue.length)) {
             StringBuffer sb = new StringBuffer();
 
             sb.append("update " + persistentClass.getName() + " model set ");
             for (int i = 0; i < propertyName.length; i++) {
-                sb.append(propertyName[i] + " = :p_" + propertyName[i] + ",");
+                if(valWithSimple) {
+                    sb.append(propertyName[i] + " = :p_" + propertyName[i] + ",");
+                }else{
+                    sb.append(propertyName[i] + " = " + propertyName[i] + " + :p_" + propertyName[i] + ",");
+                }
             }
             sb.deleteCharAt(sb.length() - 1);
             sb.append(" where 1=1 " + packBean.getWhereAppend());
@@ -297,7 +353,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> list() {
-        return this.findAll();
+        List<T> l = this.findAll();
+        this.flush();
+        return l;
     }
 
     @Override
@@ -1349,7 +1407,11 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) {
             StringBuffer sb = new StringBuffer("select sum(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 ");
             appendQL(sb, paramName, paramValue);
-            sb.append(" group by model." + groupByName);
+
+            if(StringUtils.isNotBlank(groupByName)) {
+                sb.append(" group by model." + groupByName);
+            }
+
             Query query = entityManager.createQuery(sb.toString());
             setParameter(query,paramName,paramValue);
 
@@ -1374,7 +1436,10 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) {
             StringBuffer sb = new StringBuffer("select avg(model."+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 ");
             appendQL(sb,paramName,paramValue);
-            sb.append(" group by model." + groupByName);
+
+            if(StringUtils.isNotBlank(groupByName)) {
+                sb.append(" group by model." + groupByName);
+            }
 
             Query query = entityManager.createQuery(sb.toString());
             setParameter(query,paramName,paramValue);
@@ -1400,7 +1465,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) {
             StringBuffer sb = new StringBuffer("select max(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 ");
             appendQL(sb, paramName, paramValue);
-            if(!StringUtils.isEmpty(groupByName)){
+            if(StringUtils.isNotBlank(groupByName)){
                 sb.append(" group by model." + groupByName);
             }
 
@@ -1428,7 +1493,10 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) {
             StringBuffer sb = new StringBuffer("select min(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 ");
             appendQL(sb, paramName, paramValue);
-            sb.append(" group by model." + groupByName);
+
+            if(StringUtils.isNotBlank(groupByName)) {
+                sb.append(" group by model." + groupByName);
+            }
 
             Query query = entityManager.createQuery(sb.toString());
             setParameter(query,paramName,paramValue);

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

@@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -43,7 +40,8 @@ public class BfDataObject extends BaseBean {
     @ApiParam(value ="数据表名")
     private String objectTableName;
 
-    @Column(name="OBJECT_CONTENT",columnDefinition="TEXT")
+    @Lob
+    @Column(name="OBJECT_CONTENT")
     @ApiParam(value ="数据内容")
     private String objectContent;
 

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

@@ -7,10 +7,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import javax.persistence.Column;
+import org.hibernate.annotations.Type;
-import javax.persistence.Entity;
+
-import javax.persistence.Table;
+import javax.persistence.*;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -60,7 +59,8 @@ public class BfLayout extends BaseBean {
     @ApiParam(value = "引用报表数量")
     private Integer layoutReportCount;
 
-    @Column(name = "LAYOUT_DESCRIPTION", columnDefinition = "TEXT")
+    @Lob
+    @Column(name = "LAYOUT_DESCRIPTION")
     @ApiParam(value = "布局描述")
     private String layoutDescription;
 

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -59,7 +60,8 @@ public class BfLayoutColumn extends BaseBean {
     @ApiParam(value = "排序，降序")
     private Integer columnSort;
 
-    @Column(name = "COLUMN_DESCRIPTION", columnDefinition = "TEXT")
+    @Lob
+    @Column(name = "COLUMN_DESCRIPTION")
     @ApiParam(value = "列描述")
     private String columnDescription;
 }

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

@@ -9,10 +9,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import javax.persistence.Column;
+import org.hibernate.annotations.Type;
-import javax.persistence.Entity;
+
-import javax.persistence.Table;
+import javax.persistence.*;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -44,7 +43,8 @@ public class BfLayoutRow extends BaseBean {
     @ApiParam(value = "排序")
     private Integer rowSort;
 
-    @Column(name = "ROW_STYLE", columnDefinition = "TEXT")
+    @Lob
+    @Column(name = "ROW_STYLE")
     @ApiParam(value = "行样式")
     private String rowStyle;
 

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

@@ -10,6 +10,7 @@ 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;
@@ -61,7 +62,8 @@ public class BfMenu extends BaseBean {
     @ApiParam(value ="菜单图标")
     private String menuIcon;
 
-    @Column(name="MENU_STYLE", columnDefinition = "TEXT")
+    @Lob
+    @Column(name="MENU_STYLE")
     @ApiParam(value ="菜单样式")
     private String menuStyle;
 

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

@@ -0,0 +1,63 @@
+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 javax.persistence.Transient;
+
+/**
+ * @Description :物料关键数据
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-05-15
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_KP_DATA")
+@Api("生产区域")
+public class MesKpData extends BaseBean {
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="KEY_DATA_CODE")
+    @ApiParam("关键数据代码")
+    private String keyDataCode;
+
+    @Column(name="KEY_DATA_NAME")
+    @ApiParam("关键数据名称")
+    private String keyDataName;
+
+    @Column(name="KEY_DATA_COUNT")
+    @ApiParam("关键数据数量")
+    private Integer keyDataCount;
+
+    @Column(name="UPPER_LIMIT")
+    @ApiParam("数据上限")
+    private Double upperLimit;
+
+    @Column(name="LOWER_LIMIT")
+    @ApiParam("数据下限")
+    private Double lowerLimit;
+
+    @Transient
+    @ApiParam("扭矩值")
+    private Double torqueValue;
+
+    @Transient
+    @ApiParam("是否在范围之内")
+    private Boolean ok;
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.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;
+
+/**
+ * @Description :PLC设备信息配置表
+ * @Reference :
+ * @Author : Crish
+ * @CreateDate : 2019-05-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PLC_CONFIGURE")
+@Api("PLC设备信息配置表")
+public class MesPLCConfigure extends BaseBean {
+    @Column(name="IP")
+    @ApiParam("设备ip")
+    private String ipAddress;
+
+    @Column(name="DEVICE_NAME")
+    @ApiParam("设备地址")
+    private String deviceName;
+
+    @Column(name="TAG_NAME")
+    @ApiParam("标签地址")
+    private String tagName;
+
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.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:
@@ -104,6 +105,10 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("包装条码")
     private String packageSn;
 
+    @Transient
+    @ApiParam("返回信息")
+    private String resultMsg;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -0,0 +1,82 @@
+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;
+
+/**
+ * @Description :扭矩信息记录表
+ * @Reference :
+ * @Author : Crish
+ * @CreateDate : 2019-05-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_TORQUE_DETAIL")
+@Api("扭矩信息记录表")
+public class MesTorqueDetail extends BaseBean {
+    @Column(name="SN")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name="UPPER_LIMIT")
+    @ApiParam("最大值")
+    private Double upperLimit;
+
+    @Column(name="LOWER_LIMIT")
+    @ApiParam("最小值")
+    private Double lowerLimit;
+
+    @Column(name="TORQUE_DETAIL_VALUE")
+    @ApiParam("扭矩值")
+    private Double torqueValue;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name="ok")
+    @ApiParam("扭矩是否合格")
+    private String ok;
+
+    @Column(name="PART_NO")
+    @ApiParam("扭矩是否合格")
+    private String partNO;
+
+    @Column(name="p_set")
+    @ApiParam("螺丝枪PSET设置值")
+    private String deviceSetValue;
+
+    @Column(name="MAXANGLE")
+    @ApiParam("最大扭矩")
+    private String maxAngle;
+
+    @Column(name="MINANGLE")
+    @ApiParam("最小扭矩")
+    private String minAngel;
+
+    @Column(name="FINALANGLE")
+    @ApiParam("最终扭矩")
+    private Integer finalAngle;
+}

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

@@ -49,6 +49,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("按钮编号")
     private String buttonCode;
 
+    @ApiParam("工步代码")
+    private String stepCode;
+
     /**
      * doScan-扫描，doModule-处理组件,initModule-初始化组件
      */

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

@@ -0,0 +1,17 @@
+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.MesArea;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesKpData;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-05-15
+ * @Modify:
+ **/
+@Repository
+public interface MesKpDataRepository extends BaseRepository<MesKpData, Long> {
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.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.MesPLCConfigure;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesPLCConfigureRepository extends BaseRepository<MesPLCConfigure, Long> {
+}

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

@@ -0,0 +1,17 @@
+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.MesArea;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTorqueDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesTorqueDetailRepository extends BaseRepository<MesTorqueDetail, Long> {
+}

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

@@ -30,25 +30,25 @@ import javax.persistence.Table;
 public class MesCustomer extends BaseBean {
     @Column(name="CUSTOMER_CODE")
     @ApiParam("客户代码")
-    private String CUSTOMER_CODE;
+    private String customerCode;
 
     @Column(name="CUSTOMER_NAME")
     @ApiParam("客户名称")
-    private String CUSTOMER_NAME;
+    private String customerName;
 
     @Column(name="BRIEF_TEXT")
     @ApiParam("客户简称")
-    private String BRIEF_TEXT;
+    private String briefText;
 
     @Column(name="ADDRESS")
     @ApiParam("客户地址")
-    private String ADDRESS;
+    private String address;
 
     @Column(name="CONTACT")
     @ApiParam("客户联系人")
-    private String CONTACT;
+    private String contact;
 
     @Column(name="TELEPHONE")
     @ApiParam("客户电话")
-    private String TELEPHONE;
+    private String telephone;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.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;
+
+/**
+ * @Description :mes客户表
+ * @Reference :
+ * @Author : yiming.gu
+ * @CreateDate : 2019-05-20
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_CUSTOMER_PART")
+@Api("客户零件关系")
+public class MesCustomerPart extends BaseBean {
+    @Column(name="CUSTOMER_CODE")
+    @ApiParam("客户代码")
+    private String customerCode;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="CUSTOMER_PART_NO")
+    @ApiParam("客户零件号")
+    private String customerPartNo;
+
+}

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

@@ -33,7 +33,7 @@ public class MesKeyData extends BaseBean {
 
     @Column(name="KEY_DATA_NAME")
     @ApiParam("关键数据名称")
-    private Integer keyDataName;
+    private String keyDataName;
 
     @Column(name="UPPER_LIMIT")
     @ApiParam("数据上限")

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

@@ -0,0 +1,65 @@
+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;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-05-21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_KP_DATA")
+@Api("物料关键数据关系")
+public class MesKpData extends BaseBean {
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="KEY_DATA_CODE")
+    @ApiParam("关键数据代码")
+    private String keyDataCode;
+
+    @Column(name="KEY_DATA_NAME")
+    @ApiParam("关键数据名称")
+    private String keyDataName;
+
+    @Column(name="KEY_DATA_COUNT")
+    @ApiParam("关键数据数量")
+    private Integer keyDataCount;
+
+    @Column(name="UPPER_LIMIT")
+    @ApiParam("数据上限")
+    private Double upperLimit;
+
+    @Column(name="LOWER_LIMIT")
+    @ApiParam("数据下限")
+    private Double lowerLimit;
+
+    public double getKeyDataCountVal() {
+        return this.keyDataCount == null ? 0 : this.keyDataCount;
+    }
+
+    public double getUpperLimitVal() {
+        return this.upperLimit == null ? 0.0d : this.upperLimit;
+    }
+
+    public double getLowerLimitVal() {
+        return this.lowerLimit == null ? 0.0d : this.lowerLimit;
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.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 :产品流程配置操作参数表
@@ -51,10 +52,19 @@ public class MesProdRouteOptParam extends BaseBean {
     @ApiParam("工步参数代码")
     private String paramCode;
 
+    @Column(name = "PARAM_TYPE")
+    @ApiParam("工步参数类型")
+    private Integer paramType;
+
     @Column(name = "PARAM_VALUE")
     @ApiParam("工步参数值")
     private String paramValue;
 
+    @Transient
+    @Column(name = "PARAM_ATTRIBUTE")
+    @ApiParam("参数属性")
+    private String paramAttribute;
+
     public long getProdRouteCfgIdVal() {
         return this.prodRouteCfgId == null ? 0l : this.prodRouteCfgId;
     }
@@ -62,4 +72,8 @@ public class MesProdRouteOptParam extends BaseBean {
     public int getStepSeq() {
         return this.stepSeq == null ? 0 : this.stepSeq;
     }
+
+    public int getParamTypeVal() {
+        return this.paramType == null ? 0 : this.paramType;
+    }
 }

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

@@ -34,4 +34,8 @@ public class MesRoute extends BaseBean {
     @Column(name = "ROUTE_NAME")
     @ApiParam("流程名称")
     private String routeName;
+
+    @Column(name = "POSITION")
+    @ApiParam("GOJS位置")
+    private String position;
 }

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

@@ -38,4 +38,9 @@ public class MesRouteProcessCell extends BaseBean {
     @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.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 :流程工序工步关系
@@ -39,19 +40,32 @@ public class MesRouteProcessStep extends BaseBean {
     @ApiParam("工步代码")
     private String stepCode;
 
-    @Column(name = "STEP_SEQ")
+    @Column(name = "SEQ")
-    @ApiParam("工步顺序")
+    @ApiParam("顺序")
-    private Integer stepSeq;
+    private Integer seq;
 
     @Column(name = "PARAM_CODE")
     @ApiParam("工步参数代码")
     private String paramCode;
 
+    @Column(name = "PARAM_TYPE")
+    @ApiParam("工步参数类型")
+    private Integer paramType;
+
     @Column(name = "PARAM_VALUE")
     @ApiParam("工步参数值")
     private String paramValue;
 
+    @Transient
+    @Column(name = "PARAM_ATTRIBUTE")
+    @ApiParam("参数属性")
+    private String paramAttribute;
+
     public int getStepSeqVal() {
-        return this.stepSeq == null ? 0 : this.stepSeq;
+        return this.seq == null ? 0 : this.seq;
+    }
+
+    public int getParamTypeVal() {
+        return this.paramType == null ? 0 : this.paramType;
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.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;
+
+/**
+ * @Description :mes系统业务动作
+ * @Reference :
+ * @Author : yiming.gu
+ * @CreateDate : 2019-05-20
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_SHIFT_REST")
+@Api("班次休息信息")
+public class MesShiftRest extends BaseBean {
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name="START_TIME")
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @Column(name="REST_TIMES")
+    @ApiParam("休息时长")
+    private Double restTimes;
+}

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

@@ -31,6 +31,10 @@ public class MesStepParam extends BaseBean {
     @ApiParam("工步代码")
     private String stepCode;
 
+    @Column(name = "PARAM_TYPE")
+    @ApiParam("参数类型")
+    private Integer paramType;
+
     @Column(name = "PARAM_CODE")
     @ApiParam("参数代码")
     private String paramCode;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java

@@ -7,10 +7,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import javax.script.CompiledScript;
 
 /**
@@ -41,7 +38,8 @@ public class EngineScriptPersistence extends BaseBean {
     @Column(name = "LANGUAGE_TYPE")
     private int languageType;
     // 脚本的具体内容
-    @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT")
+    @Lob
+    @Column(name = "SCRIPT_CONTENT")
     private String scriptContent;
     // 脚本的描述，包含脚本的用法，参数说明等
     @Column(name = "SCRIPT_REMARK", length = 2000)

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-05-20
+ * @Modify:
+ **/
+@Repository
+public interface MesCustomerPartRepository extends BaseRepository<MesCustomerPart, Long> {
+
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesKpData;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-05-21
+ * @Modify:
+ **/
+@Repository
+public interface MesKpDataRepository extends BaseRepository<MesKpData, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesShiftRest;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-05-20
+ * @Modify:
+ **/
+@Repository
+public interface MesShiftRestRepository extends BaseRepository<MesShiftRest, Long> {
+}

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

@@ -19,6 +19,7 @@ public class MesHqlPack {
 
     /**
      * 通用查询条件
+     *
      * @param organizeCode
      * @return
      */
@@ -32,6 +33,7 @@ public class MesHqlPack {
 
     /**
      * 生产计划查询条件封装
+     *
      * @param mesPlanOrder
      * @return
      */
@@ -72,13 +74,14 @@ public class MesHqlPack {
                 "createDatetime", packBean, true);
 
         // 排序
-         DdlPreparedPack.getOrderDefault(mesPlanOrder);
+        DdlPreparedPack.getOrderDefault(mesPlanOrder);
-         DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesPlanOrder.getOrderByParam()} , packBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPlanOrder.getOrderByParam()}, packBean);
         return packBean;
     }
 
     /**
      * 物料信息查询条件封装
+     *
      * @param mesPart
      * @return
      */
@@ -105,12 +108,13 @@ public class MesHqlPack {
         }
 
         DdlPreparedPack.getOrderDefault(mesPart);
-        DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesPart.getOrderByParam()} , packBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean);
         return packBean;
     }
 
     /**
      * 生产工单查询条件封装
+     *
      * @param mesWorkOrder
      * @return
      */
@@ -151,12 +155,13 @@ public class MesHqlPack {
 //                mesWorkOrder.getEndTimeEnd(),
 //                "endTime", packBean, true);
         DdlPreparedPack.getOrderDefault(mesWorkOrder);
-        DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesWorkOrder.getOrderByParam()} , packBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
         return packBean;
     }
 
     /**
      * 生产队列查询条件封装
+     *
      * @param mesQueueOrder
      * @return
      */
@@ -185,12 +190,13 @@ public class MesHqlPack {
 
         // DdlPreparedPack.getOrderDefault(mesQueueOrder);
         // 按照队列序列号倒序
-        DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{"seq"} , packBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{"seq"}, packBean);
         return packBean;
     }
 
     /**
      * 通用查询条件
+     *
      * @param organizeCode
      * @return
      */
@@ -204,6 +210,7 @@ public class MesHqlPack {
 
     /**
      * MES区域信息查询条件封装
+     *
      * @param mesArea
      * @return
      */
@@ -218,6 +225,7 @@ public class MesHqlPack {
 
     /**
      * MES工作中心信息查询条件封装
+     *
      * @param mesWorkCenter
      * @return
      */
@@ -226,7 +234,7 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesWorkCenter.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())){
+        if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())) {
             DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
         }
 
@@ -235,6 +243,7 @@ public class MesHqlPack {
 
     /**
      * MES工作单元信息查询条件封装
+     *
      * @param mesWorkCell
      * @return
      */
@@ -243,10 +252,10 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesWorkCell.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkCell.getAreaCode())){
+        if (StringUtils.isNotEmpty(mesWorkCell.getAreaCode())) {
             DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkCell.getWorkCellCode())){
+        if (StringUtils.isNotEmpty(mesWorkCell.getWorkCellCode())) {
             DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
         }
 
@@ -271,6 +280,35 @@ public class MesHqlPack {
     }
 
     /**
+     * 流程查询条件封装
+     *
+     * @param mesRoute
+     * @return
+     */
+    public static DdlPackBean packHqlMesRoute(MesRoute mesRoute, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesRoute, organizeCode);
+        DdlPreparedPack.getStringLikerPack(mesRoute.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesRoute.getRouteName(), "routeName", packBean);
+        packBean.setOrderByStr(mesRoute.orderBy());
+        return packBean;
+    }
+    /**
+     * 产品流程配置查询条件封装
+     *
+     * @param mesProdRouteCfg
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean packHqlMesProdRouteCfg(MesProdRouteCfg mesProdRouteCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdRouteCfg, organizeCode);
+        DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean);
+        packBean.setOrderByStr(mesProdRouteCfg.orderBy());
+        return packBean;
+    }
+
+    /**
      * MES班次信息查询条件封装
      * @param shift
      * @return
@@ -291,6 +329,23 @@ public class MesHqlPack {
     }
 
     /**
+     * MES班次休息信息查询条件封装
+     * @param shiftRest
+     * @return
+     */
+    public static DdlPackBean getMesShiftRest(MesShiftRest shiftRest, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(shiftRest, organizeCode);
+        if (StringUtils.isNotEmpty(shiftRest.getWorkCenterCode())){
+            DdlPreparedPack.getStringEqualPack(shiftRest.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(shiftRest.getShiftCode())){
+            DdlPreparedPack.getStringEqualPack(shiftRest.getShiftCode(), "shiftCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
      * MES工序信息查询条件封装
      * @param process
      * @return
@@ -320,6 +375,9 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(step.getStepName())){
             DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean);
         }
+        if (StringUtils.isNotEmpty(step.getStepType())){
+            DdlPreparedPack.getStringLikerPack(step.getStepType(), "stepType", packBean);
+        }
 
         return packBean;
     }
@@ -343,4 +401,235 @@ public class MesHqlPack {
 
         return packBean;
     }
+
+    /**
+     * MES工序工作单元对应关系查询条件封装
+     * @param routeProcessCell
+     * @return
+     */
+    public static DdlPackBean getMesRouteProcessCell(MesRouteProcessCell routeProcessCell, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(routeProcessCell, organizeCode);
+        if (StringUtils.isNotEmpty(routeProcessCell.getRouteCode())){
+            DdlPreparedPack.getStringEqualPack(routeProcessCell.getRouteCode(), "routeCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(routeProcessCell.getProcessCode())){
+            DdlPreparedPack.getStringEqualPack(routeProcessCell.getProcessCode(), "processCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(routeProcessCell.getWorkCellCode())){
+            DdlPreparedPack.getStringEqualPack(routeProcessCell.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(routeProcessCell.getWorkCenterCode())){
+            DdlPreparedPack.getStringEqualPack(routeProcessCell.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES BOM信息查询条件封装
+     * @param bom
+     * @return
+     */
+    public static DdlPackBean getMesBom(MesBom bom, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(bom, organizeCode);
+        if (StringUtils.isNotEmpty(bom.getPartNo())){
+            DdlPreparedPack.getStringEqualPack(bom.getPartNo(), "partNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(bom.getItemPartNo())){
+            DdlPreparedPack.getStringEqualPack(bom.getItemPartNo(), "itemPartNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(bom.getBomVersion())){
+            DdlPreparedPack.getStringEqualPack(bom.getBomVersion(), "bomVersion", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES工序BOM信息查询条件封装
+     * @param processBom
+     * @return
+     */
+    public static DdlPackBean getMesProcessBom(MesProcessBom processBom, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(processBom, organizeCode);
+        if (StringUtils.isNotEmpty(processBom.getPartNo())){
+            DdlPreparedPack.getStringEqualPack(processBom.getPartNo(), "partNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(processBom.getItemPartNo())){
+            DdlPreparedPack.getStringEqualPack(processBom.getItemPartNo(), "itemPartNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(processBom.getProcessCode())){
+            DdlPreparedPack.getStringEqualPack(processBom.getProcessCode(), "processCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 客户信息查询条件封装
+     * @param customer
+     * @return
+     */
+    public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode);
+        if (StringUtils.isNotEmpty(customer.getCustomerCode())){
+            DdlPreparedPack.getStringEqualPack(customer.getCustomerCode(), "customerCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(customer.getCustomerName())){
+            DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 客户产线信息查询条件封装
+     * @param custProdLine
+     * @return
+     */
+    public static DdlPackBean getMesCustProdLine(MesCustProdLine custProdLine, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(custProdLine, organizeCode);
+        if (StringUtils.isNotEmpty(custProdLine.getCustProdLineCode())){
+            DdlPreparedPack.getStringEqualPack(custProdLine.getCustProdLineCode(), "custProdLineCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(custProdLine.getCustProdLineName())){
+            DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineName(), "custProdLineName", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 客户零件关系信息查询条件封装
+     * @param customerPart
+     * @return
+     */
+    public static DdlPackBean getMesCustomerPart(MesCustomerPart customerPart, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(customerPart, organizeCode);
+        if (StringUtils.isNotEmpty(customerPart.getCustomerCode())){
+            DdlPreparedPack.getStringEqualPack(customerPart.getCustomerCode(), "customerCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(customerPart.getPartNo())){
+            DdlPreparedPack.getStringEqualPack(customerPart.getPartNo(), "partNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(customerPart.getCustomerPartNo())){
+            DdlPreparedPack.getStringEqualPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 设备关键数据信息查询条件封装
+     * @param keyData
+     * @return
+     */
+    public static DdlPackBean getMesKeyData(MesKeyData keyData, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode);
+        if (StringUtils.isNotEmpty(keyData.getKeyDataCode())){
+            DdlPreparedPack.getStringEqualPack(keyData.getKeyDataCode(), "keyDataCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(keyData.getKeyDataName())){
+            DdlPreparedPack.getStringEqualPack(keyData.getKeyDataName(), "keyDataName", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 物料关键数据关系信息查询条件封装
+     * @param kpData
+     * @return
+     */
+    public static DdlPackBean getMesKpData(MesKpData kpData, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(kpData, organizeCode);
+        if (StringUtils.isNotEmpty(kpData.getPartNo())){
+            DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "partNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(kpData.getKeyDataCode())){
+            DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "keyDataCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 产品配置类型信息查询条件封装
+     * @param prodCfgType
+     * @return
+     */
+    public static DdlPackBean getMesProdCfgType(MesProdCfgType prodCfgType, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgType, organizeCode);
+        if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeCode())){
+            DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeName())){
+            DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 产品配置信息查询条件封装
+     * @param prodCfg
+     * @return
+     */
+    public static DdlPackBean getMesProdCfg(MesProdCfg prodCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfg, organizeCode);
+        if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())){
+            DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(prodCfg.getProdCfgName())){
+            DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgName(), "prodCfgName", packBean);
+        }
+        if (StringUtils.isNotEmpty(prodCfg.getProdCfgTypeCode())){
+            DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 产品配置关系信息查询条件封装
+     * @param prodCfgDetail
+     * @return
+     */
+    public static DdlPackBean getMesProdCfgDetail(MesProdCfgDetail prodCfgDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgDetail, organizeCode);
+        if (StringUtils.isNotEmpty(prodCfgDetail.getProdCfgCode())){
+            DdlPreparedPack.getStringEqualPack(prodCfgDetail.getProdCfgCode(), "prodCfgCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(prodCfgDetail.getPartNo())){
+            DdlPreparedPack.getStringEqualPack(prodCfgDetail.getPartNo(), "partNo", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 物料信息查询条件封装
+     * @param part
+     * @return
+     */
+    public static DdlPackBean getMesPart(MesPart part, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode);
+        if (StringUtils.isNotEmpty(part.getPartNo())){
+            DdlPreparedPack.getStringEqualPack(part.getPartNo(), "partNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(part.getPartName())){
+            DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean);
+        }
+        if (StringUtils.isNotEmpty(part.getCategoryCode1())){
+            DdlPreparedPack.getStringEqualPack(part.getCategoryCode1(), "categoryCode1", packBean);
+        }
+        if (StringUtils.isNotEmpty(part.getCategoryCode2())){
+            DdlPreparedPack.getStringEqualPack(part.getCategoryCode2(), "categoryCode2", packBean);
+        }
+        if (StringUtils.isNotEmpty(part.getCategoryCode3())){
+            DdlPreparedPack.getStringEqualPack(part.getCategoryCode3(), "categoryCode3", packBean);
+        }
+
+        return packBean;
+    }
 }

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

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.model.mes;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess;
+import cn.estsh.i3plus.pojo.model.wms.WmsActionGroupDetailsModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : 流程Model
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-05-15 13:27
+ * @Modify:
+ **/
+@Data
+@Api("流程Model")
+public class MesRouteModel implements Serializable {
+    @ApiParam("流程代码")
+    public String routeCode;
+    @ApiParam("GOJS位置")
+    public String position;
+    @ApiParam("流程明细Model集合")
+    public List<MesRouteProcessModel> mesRouteProcessModelList;
+}

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

@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.model.mes;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesProdRouteOptParam;
+import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess;
+import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcessStep;
+import cn.estsh.i3plus.pojo.wms.bean.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 流程工序Model
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-04-29 15:39
+ * @Modify:
+ **/
+@Data
+@Api("流程工序Model")
+public class MesRouteProcessModel {
+    @ApiParam("流程工序")
+    public MesRouteProcess mesRouteProcess;
+    @ApiParam("流程工步参数配置表(根据Seq分组)")
+    public Map<String, List<MesRouteProcessStep>> mesRouteProcessStepMap;
+    @ApiParam("产品流程参数配置表(根据Seq分组)")
+    public Map<String, List<MesProdRouteOptParam>> mesProdRouteOptParamMap;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.model.test;
+
+import cn.estsh.i3plus.pojo.platform.bean.TestTransUser;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.aspectj.weaver.ast.Test;
+
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2019-05-19 18:15
+ * @Modify:
+ **/
+@Getter
+@Setter
+@ToString
+public class TestConstructModel {
+
+    private long id;
+
+    private TestTransUser user;
+
+    private List<TestTransUser> userList;
+}

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

@@ -7,11 +7,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 打印模板
@@ -37,7 +35,8 @@ public class SysLabelTemplate extends BaseBean {
     @ApiParam(value ="模板名称")
     private String templateName;
 
-    @Column(name="TEMPLATE_CONTENT", columnDefinition = "TEXT")
+    @Lob
+    @Column(name="TEMPLATE_CONTENT")
     @ApiParam(value ="模板内容")
     private String templateContent;
 

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

@@ -9,11 +9,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 打印模板参数
@@ -44,7 +42,8 @@ public class SysLabelTemplateParam extends BaseBean {
     @ApiParam(value ="模板参数")
     private String templateParam;
 
-    @Column(name="TEMPLATE_PARAM_TEXT", columnDefinition = "TEXT")
+    @Lob
+    @Column(name="TEMPLATE_PARAM_TEXT")
     @ApiParam(value ="模板参数描述")
     private String templateParamText;
 

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

@@ -26,7 +26,6 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-//@Table(name="SYS_MENU",indexes = {@Index(name="索引名称",columnList = "列名1,列名2")})
 @Table(name="SYS_MENU",indexes = {
         @Index(name="index_sys_menu_parent_id",columnList = "PARENT_ID"),
 })
@@ -46,7 +45,7 @@ public class SysMenu extends BaseBean {
     private String menuCode;
 
     @Column(name="MENU_TYPE")
-    @ApiParam(value ="功能类型（枚举：1.模块，2.菜单，3.按钮）" , example ="-1")
+    @ApiParam(value ="功能类型" , example ="-1" ,access = "枚举：1.模块，2.菜单，3.按钮")
     private Integer menuType;
 
     // 根节点-1
@@ -88,7 +87,7 @@ public class SysMenu extends BaseBean {
     private String menuDescription;
 
     @Column(name="MENU_STATUS")
-    @ApiParam(value ="功能状态（1.正常，2.禁用）" , example ="1" , access ="功能状态（1.正常，2.禁用）",defaultValue="1")
+    @ApiParam(value ="功能状态" , example ="1" , access ="功能状态（1.正常，2.禁用）",defaultValue="1")
     private Integer menuStatus;
 
     @Transient

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

@@ -12,10 +12,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.Subselect;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -58,7 +55,8 @@ public class SysMessage extends BaseBean {
     @ApiParam(value = "消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)", example = "-1")
     private Integer messageContentType;
 
-    @Column(name = "MESSAGE_CONTENT", columnDefinition = "TEXT")
+    @Lob
+    @Column(name = "MESSAGE_CONTENT")
     @ApiParam(value = "消息内容", access = "消息内容")
     private String messageContent;
 

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

@@ -9,9 +9,11 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -63,7 +65,8 @@ public class SysRole extends BaseBean {
     @ApiParam(value ="权限功能数量" , example ="0" , access ="权限功能数量")
     private Integer menuNumber;
 
-    @Column(name="MENU_NAMES_RDD",columnDefinition="TEXT")
+    @Lob
+    @Column(name="MENU_NAMES_RDD")
     @ApiParam(value ="权限功能名称" , access ="权限功能名称")
     private String menuNamesRdd;
 

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

@@ -9,8 +9,11 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -124,7 +127,8 @@ public class SysTaskPlan extends BaseBean {
     @ApiParam(value = "通知方式", example = "1")
     private Integer noticeMethod;
 
-    @Column(name = "NOTICE_CHANNEL", columnDefinition = "TEXT")
+    @Lob
+    @Column(name = "NOTICE_CHANNEL")
     @ApiParam(value = "通知渠道")
     private String noticeChannel;
 }

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

@@ -9,11 +9,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -104,15 +102,18 @@ public class SysUser extends BaseBean {
     @ApiParam(value ="组织名称" , access ="组织名称")
     private String organizeNameRdd;
 
-    @Column(name="ROLE_NAMES_RDD",columnDefinition = "TEXT")
+    @Lob
+    @Column(name="ROLE_NAMES_RDD")
     @ApiParam(value ="角色名称集合")
     private String roleNamesRdd;
 
-    @Column(name="DEPARTMENT_NAMES_RDD",columnDefinition = "TEXT")
+    @Lob
+    @Column(name="DEPARTMENT_NAMES_RDD")
     @ApiParam(value ="部门名称集合")
     private String departmentNamesRdd;
 
-    @Column(name="ORGANIZE_NAMES_RDD",columnDefinition = "TEXT")
+    @Lob
+    @Column(name="ORGANIZE_NAMES_RDD")
     @ApiParam(value ="组织名称集合")
     private String organizeNamesRdd;
 
@@ -133,7 +134,7 @@ public class SysUser extends BaseBean {
     @Transient
     @ApiParam(value ="账号所有操作部门 Id 集合")
     private List<String> departmentIdList;
-    
+
     @Transient
     @ApiParam(value ="账号所有操作部门信息")
     private List<SysDepartment> departmentList;
@@ -147,7 +148,7 @@ public class SysUser extends BaseBean {
     @ApiParam(value ="角色ID集合" , example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private List<String> roleIdList;
-    
+
     @Transient
     @ApiParam(value ="账号所有角色信息")
     private List<SysRole> roleList;
@@ -156,4 +157,14 @@ public class SysUser extends BaseBean {
     @ApiParam(value ="账号所有操作权限信息")
     private List<SysMenu> menuList;
 
+    /*** test ***/
+//    @Lob
+//    @Basic(fetch=FetchType.LAZY)
+//    @Column(name = "CONTENT", columnDefinition = "BLOB")
+//    private byte[] content;
+//
+//    @Lob
+//    @Basic(fetch=FetchType.LAZY)
+//    @Column(name="REMARK", columnDefinition="CLOB")
+//    private String remark;
 }

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.platform.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;
+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.Version;
+
+/**
+ * @Description : 测试类，用来测试事务
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2019-05-14 12:51
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="TEST_TRANS_USER")
+@Api(value="测试用户类",description = "测试事务信息")
+public class TestTransUser extends BaseBean {
+
+    @Column(name="NAME")
+    @ApiParam(value ="名称" , access ="名称")
+    private String name;
+
+    @Column(name="SALARY")
+    @ApiParam(value ="金额" , access ="金额")
+    private Double salary;
+
+    /*@Version
+    @ApiParam(value ="版本控制" , access ="乐观锁")
+    private int version;*/
+}

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

@@ -10,9 +10,11 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -62,15 +64,18 @@ public class WmsActionLogData extends BaseBean {
     @ApiParam(value="结束执行时间",example = "2000-01-01 01:00:00")
     private String endTime;
 
-    @Column(name = "IN_PARAMS", columnDefinition = "TEXT")
+    @Lob
+    @Column(name = "IN_PARAMS")
     @ApiParam(value = "输入参数")
     private String inParams;
 
-    @Column(name = "OUT_PARAMS", columnDefinition = "TEXT")
+    @Lob
+    @Column(name = "OUT_PARAMS")
     @ApiParam(value = "输出参数")
     private String outParams;
 
-    @Column(name = "OUT_RESULT", columnDefinition = "TEXT")
+    @Lob
+    @Column(name = "OUT_RESULT")
     @ApiParam(value = "执行结果")
     private String outResult;
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TestTransUserRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.platform.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
+import cn.estsh.i3plus.pojo.platform.bean.TestTransUser;
+
+/**
+ * @Description : 测试事务用户
+ * @Reference   :
+ * @Author      : frin
+ * @Date        : 2019-5-14
+ * @Modify      :
+ **/
+public interface TestTransUserRepository extends BaseRepository<TestTransUser, Long> {
+}

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

@@ -9,11 +9,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -57,7 +55,8 @@ public class BrElement extends BaseBean {
     @ApiParam(value ="元素样式css")
     private String elementStyle;
 
-    @Column(name="ELEMENT_HTML",columnDefinition = "TEXT")
+    @Lob
+    @Column(name="ELEMENT_HTML")
     @ApiParam(value ="元素html")
     private String elementHtml;
 }

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

@@ -7,11 +7,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -54,11 +52,13 @@ public class BrLayout extends BaseBean {
     @ApiParam(value ="引用报表数量")
     private Integer layoutReportCount;
 
-    @Column(name="LAYOUT_HTML",columnDefinition = "TEXT")
+    @Lob
+    @Column(name="LAYOUT_HTML")
     @ApiParam(value ="布局html")
     private String layoutHtml;
 
-    @Column(name = "LAYOUT_DESCRIPTION",columnDefinition = "TEXT")
+    @Lob
+    @Column(name = "LAYOUT_DESCRIPTION")
     @ApiParam(value ="布局描述")
     private String layoutDescription;
 

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

@@ -9,11 +9,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -70,11 +68,13 @@ public class BrLayoutColumn extends BaseBean {
     @ApiParam(value ="排序，降序")
     private Integer columnSort;
 
-    @Column(name = "COLUMN_DESCRIPTION",columnDefinition = "TEXT")
+    @Lob
+    @Column(name = "COLUMN_DESCRIPTION")
     @ApiParam(value ="列描述")
     private String columnDescription;
 
-    @Column(name="COLUMN_HTML",columnDefinition = "TEXT")
+    @Lob
+    @Column(name="COLUMN_HTML")
     @ApiParam(value ="列html")
     private String columnHtml;
 }

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

@@ -9,11 +9,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -49,7 +47,8 @@ public class BrLayoutRow extends BaseBean {
     @ApiParam(value ="排序")
     private Integer rowSort;
 
-    @Column(name="ROW_STYLE",columnDefinition = "TEXT")
+    @Lob
+    @Column(name="ROW_STYLE")
     @ApiParam(value ="行样式")
     private String rowStyle;
 
@@ -57,7 +56,8 @@ public class BrLayoutRow extends BaseBean {
     @ApiParam(value ="行所关联列数")
     private Integer rowColNum;
 
-    @Column(name="ROW_HTML",columnDefinition = "TEXT")
+    @Lob
+    @Column(name="ROW_HTML")
     @ApiParam(value ="行html")
     private String rowHtml;
 

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

@@ -9,9 +9,11 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -59,11 +61,13 @@ public class BrRefReportTypeset extends BaseBean {
     /**
      * 关联元素或模板html
      */
-    @Column(name = "REF_HTML",columnDefinition = "TEXT")
+    @Lob
+    @Column(name = "REF_HTML")
     @ApiParam(value = "关联对象html")
     private String refHtml;
 
-    @Column(name = "TYPESET_DESCRIPTION",columnDefinition = "TEXT")
+    @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

@@ -26,7 +26,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="SYS_REF_ROLE_MENU")
+@Table(name="BR_REF_ROLE_MENU")
 @Api(value="关系-角色目录",description = "关系-角色目录")
 public class BrRefRoleMenu extends BaseBean {
 

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

@@ -10,11 +10,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -55,7 +53,8 @@ public class BrReport extends BaseBean {
     @ApiParam(value ="布局名称")
     private String layoutNameRdd;
 
-    @Column(name="LAYOUT_HTML",columnDefinition = "TEXT")
+    @Lob
+    @Column(name="LAYOUT_HTML")
     @ApiParam(value ="报表html")
     private String reportHtml;
 
@@ -71,7 +70,8 @@ public class BrReport extends BaseBean {
     @ApiParam(value ="元素数量")
     private Integer elementNum;
 
-    @Column(name = "REPORT_DESCRIPTION",columnDefinition = "TEXT")
+    @Lob
+    @Column(name = "REPORT_DESCRIPTION")
     @ApiParam(value ="报表描述")
     private String reportDescription;
 

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

@@ -7,11 +7,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -47,7 +45,8 @@ public class BrTemplate extends BaseBean {
     @ApiParam(value ="对象数量" , example ="0" , access ="对象数量")
     private Integer numPojo;
 
-    @Column(name="TEMPLATE_POJO_NAMES_RDD",columnDefinition = "TEXT")
+    @Lob
+    @Column(name="TEMPLATE_POJO_NAMES_RDD")
     @ApiParam(value ="对象名称" , access ="对象名称")
     private String templatePojoNamesRdd;
 
@@ -55,11 +54,13 @@ public class BrTemplate extends BaseBean {
     @ApiParam(value ="对象数量" , example ="0" , access ="对象数量")
     private Integer numServer;
 
-    @Column(name="TEMPLATE_SERVER_ID_LIST",columnDefinition = "TEXT")
+    @Lob
+    @Column(name="TEMPLATE_SERVER_ID_LIST")
     @ApiParam(value ="数据服务ID集合" , access ="服务名称")
     private String templateServerIdList;
 
-    @Column(name="TEMPLATE_SERVER_NAMES_RDD",columnDefinition = "TEXT")
+    @Lob
+    @Column(name="TEMPLATE_SERVER_NAMES_RDD")
     @ApiParam(value ="服务名称" , access ="服务名称")
     private String templateServerNamesRdd;
 
@@ -67,7 +68,8 @@ public class BrTemplate extends BaseBean {
     @ApiParam(value ="对象数量" , example ="0" , access ="对象数量")
     private Integer numTemplateAttrFilter;
 
-    @Column(name="template_attr_filter_list",columnDefinition = "TEXT")
+    @Lob
+    @Column(name="template_attr_filter_list")
     @ApiParam(value ="模板查询条件" , access ="模板查询条件")
     private String templateAttrFilterList;
 
@@ -75,7 +77,8 @@ public class BrTemplate extends BaseBean {
     @ApiParam(value ="对象数量" , example ="0" , access ="对象数量")
     private Integer numTemplateAttrFilterGroup;
 
-    @Column(name="TEMPLATE_ATTR_FILTER_GROUP_LIST",columnDefinition = "TEXT")
+    @Lob
+    @Column(name="TEMPLATE_ATTR_FILTER_GROUP_LIST")
     @ApiParam(value ="模板分组条件" , access ="模板分組条件")
     private String templateAttrFilterGroupList;
 
@@ -83,7 +86,8 @@ public class BrTemplate extends BaseBean {
     @ApiParam(value ="对象数量" , example ="0" , access ="对象数量")
     private Integer numTemplateAttrShow;
 
-    @Column(name="TEMPLATE_ATTR_SHOW_LIST",columnDefinition = "TEXT")
+    @Lob
+    @Column(name="TEMPLATE_ATTR_SHOW_LIST")
     @ApiParam(value ="模板显示属性" , access ="模板显示属性")
     private String templateAttrShowList;
 
@@ -91,7 +95,8 @@ public class BrTemplate extends BaseBean {
     @ApiParam(value ="对象聚集数量" , example ="0" , access ="对象聚集数量")
     private Integer numTemplateAggregation;
 
-    @Column(name="TEMPLATE_ATTR_AGGREGATION_LIST",columnDefinition = "TEXT")
+    @Lob
+    @Column(name="TEMPLATE_ATTR_AGGREGATION_LIST")
     @ApiParam(value ="模板聚集属性" , access ="模板聚集属性")
     private String templateAttrAggregationList;
 
@@ -99,11 +104,13 @@ public class BrTemplate extends BaseBean {
     @ApiParam(value ="模板描述" , access ="模板描述")
     private String templateDescription;
 
-    @Column(name="TEMPLATE_HQL",columnDefinition = "TEXT")
+    @Lob
+    @Column(name="TEMPLATE_HQL")
     @ApiParam(value ="模板执行HQL" , access ="模板执行HQL")
     private String templateHql;
 
-    @Column(name="TEMPLATE_HTML",columnDefinition = "TEXT")
+    @Lob
+    @Column(name="TEMPLATE_HTML")
     @ApiParam(value ="模板HTML" , access ="模板HTML")
     private String templateHtml;
 

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

@@ -9,9 +9,11 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -39,7 +41,8 @@ public class BrTemplateCustomHql extends BaseBean {
     @ApiParam(value ="自定义类型" , example ="-1")
     private Integer dataType;
 
-    @Column(name="CUSTOM_CONTENT",columnDefinition="TEXT")
+    @Lob
+    @Column(name="CUSTOM_CONTENT")
     @ApiParam(value ="自定义语句内容" , access ="自定义语句内容")
     private String customContent;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java

@@ -12,6 +12,7 @@ import org.springframework.data.annotation.Transient;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -37,7 +38,8 @@ public class EngineRulePersistence extends BaseBean {
     @Column(name = "RULE_NAME", length = 50)
     private String ruleName;
     // 规则的具体内容
-    @Column(name = "RULE_CONTENT", columnDefinition = "TEXT")
+    @Lob
+    @Column(name = "RULE_CONTENT")
     private String ruleContent;
     // 规则的描述，包含规则的用法，参数说明等
     @Column(name = "RULE_REMARK", length = 2000)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 import javax.script.CompiledScript;
@@ -47,7 +48,8 @@ public class EngineScriptPersistence extends BaseBean {
     private Integer languageType;
 
     // 脚本的具体内容
-    @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT")
+    @Lob
+    @Column(name = "SCRIPT_CONTENT")
     private String scriptContent;
 
     // 脚本的描述，包含脚本的用法，参数说明等