允许甘特图页面拖动组炉的工作块。

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -23,11 +24,9 @@ import javax.persistence.Table;
 @Api("取消计划规则")
 public class CancelPlanRule extends BaseRule {
     private static final long serialVersionUID = 2674055522875545446L;
+
+    @Lob
     @Column(name="WORK_FILTERS")
     @ApiParam(value ="工作筛选")
     private String workFilters;
-
-    @Column(name="RECORD_RIGHT_EDGE")
-    @ApiParam(value ="记录工作右边界")
-    private Boolean recordRightEdge;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java

@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -26,6 +27,8 @@ import javax.persistence.Table;
 @Api("动态设置时间")
 public class DynamicSetTime extends BaseAPS {
     private static final long serialVersionUID = -1696499471488104793L;
+
+    @Lob
     @Column(name="RES_CODE")
     @ApiParam(value ="资源代码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java

@@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -36,10 +37,12 @@ public class ExportDetail extends BaseAPS {
     @ApiParam(value ="内部表名")
     private String inName;
 
+    @Lob
     @Column(name="FILTER")
     @ApiParam(value ="筛选")
     private String filter;
 
+    @Lob
     @Column(name="SORT_BY")
     @ApiParam(value ="排序")
     private String sortBy;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java

@@ -30,6 +30,7 @@ import java.util.List;
 @Api("数据导出明细集合")
 public class ExportProject extends BaseAPS {
     private static final long serialVersionUID = -7281303629295174330L;
+
     @Column(name="NAME")
     @ApiParam(value ="标识名")
     private String name;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -36,6 +37,7 @@ public class ExpressionRecord extends BaseAPS {
     @ApiParam(value ="名称")
     private String name;
 
+    @Lob
     @Column(name="EXPRESSION")
     @ApiParam(value ="表达式")
     private String expression;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java

@@ -13,10 +13,7 @@ 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 javax.persistence.*;
 import java.lang.reflect.Method;
 import java.sql.JDBCType;
 
@@ -87,6 +84,7 @@ public class FieldInfo extends BaseAPS {
     @ApiParam(value ="字段提示")
     private String tips;
 
+    @Lob
     @Column(name="EXPRESSION")
     @ApiParam(value ="表达式")
     private String expression;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java

@@ -25,6 +25,7 @@ import javax.persistence.Table;
 @Api("属性赋值规则")
 public class FieldSetRule extends BaseRule {
     private static final long serialVersionUID = 6880145972942618559L;
+
     @Column(name="BEAN")
     @ApiParam(value ="实体名")
     private String bean;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import javax.validation.constraints.Min;
 
@@ -30,8 +31,9 @@ import javax.validation.constraints.Min;
 @Table(name="APS_FURNACE_CAPACITY")
 @Api("炉容量")
 public class FurnaceCapacity extends BaseAPS {
-
     private static final long serialVersionUID = -5657804042629460659L;
+
+    @Lob
     @Column(name="RES_CODES")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java

@@ -46,11 +46,6 @@ public class Inventory extends BaseOrder {
     @FieldAnnotation(modify = false)
     private Double assignCount;
 
-//    @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)")
-//    @ApiParam(value ="多余量")
-//    @FieldAnnotation(modify = false)
-//    private Double excessCount;
-
     @Column(name="SINGLE_SUPPLY_COUNT", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="单次补充数量")
     private Double singleSupplyCount;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java

@@ -100,11 +100,6 @@ public class Material extends BaseAPS {
     @FieldAnnotation(modify = false)
     private Integer level;
 
-    @Column(name="IS_AUTO_FIX_PEGGING")
-    @ApiParam(value ="自动补充标识")
-    @FieldAnnotation(defaultValue = "1")
-    private Boolean autoFixPegging;
-
     @Column(name="MAX_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="最大生产批量")
     private Double maxProductBatch;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java

@@ -29,6 +29,7 @@ import java.util.Date;
 @Api("物料交期承诺")
 public class MaterialDeliveryPromise extends BaseBean {
     private static final long serialVersionUID = 831759543772896829L;
+
     @Column(name="QTY")
     @ApiParam(value ="到货数量")
     private Double count;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java

@@ -30,6 +30,7 @@ import java.util.List;
 @Api("工序")
 public class Operation extends BaseAPS {
     private static final long serialVersionUID = 4394179144091116858L;
+
     @Column(name="NUMBER")
     @ApiParam(value ="工序号")
     @FieldAnnotation(notEmpty = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java

@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.util.Date;
 
@@ -27,6 +28,8 @@ import java.util.Date;
 @Api("加班日历")
 public class OvertimeCalendar extends BaseAPS {
     private static final long serialVersionUID = -501715721073189464L;
+
+    @Lob
     @Column(name="RES_CODES")
     @ApiParam(value ="资源代码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)