From 93b26c8dfd0f225bf814c380b078a71eefe664c1 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 13 Sep 2021 14:50:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=81=E8=AE=B8=E7=94=98=E7=89=B9=E5=9B=BE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8B=96=E5=8A=A8=E7=BB=84=E7=82=89=E7=9A=84?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=9D=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java | 7 +++---- .../main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java | 1 + .../main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 6 ++---- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java | 1 + .../main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java | 5 ----- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java | 5 ----- .../cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java | 1 + .../main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java | 3 +++ 13 files changed, 23 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java index f4f3b4d..60d2e84 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java +++ b/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; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java index ea42942..ed30351 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java +++ b/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) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java index e859fe8..3a905d3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java +++ b/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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index bf6ca40..98bc0d9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java index cff475c..7d7c3e8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java +++ b/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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index 49cf675..d7d9033 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java index ee8ddc3..b476159 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java +++ b/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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java index 57deab2..5191d3d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java +++ b/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) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index 25594d0..46955d4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index e00c22a..4f1acff 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java index 1e7ca3b..7724a6c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java +++ b/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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 36eceaa..5ead088 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/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) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java index 2c394a3..ef65b38 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java +++ b/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)