diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index be86c15..e6c5b73 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -17,6 +17,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.util.List; @@ -101,6 +102,16 @@ public class ImportDetail extends BaseAPS { @FieldAnnotation(relation = "Project", property = false) private Long projectId; + @Lob + @Column(name="INNER_FILTER") + @ApiParam(value ="内部对象筛选") + private String innerFilter; + + @Lob + @Column(name="OUTTER_FILTER") + @ApiParam(value ="外部对象筛选") + private String outterFilter; + @FieldAnnotation(property = false) private transient ImportDataModel model; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index cbd5e13..be15e07 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -75,7 +75,7 @@ public class StandOperation extends BaseAPS { @Column(name="TYPE") @ApiParam(value ="工序类型") - private ApsEnumUtil.SANLUX_OPERATION_TYPE type; + private ApsEnumUtil.SANLUX_OPERATION_TYPE type = ApsEnumUtil.SANLUX_OPERATION_TYPE.NORMAL; public WorkShop getWorkShop() { return BeanRelation.get(this, EStandOperation.WorkShop); } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 8eb25cd..e948e9b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -1260,7 +1260,8 @@ public class ApsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SANLUX_OPERATION_TYPE { NORMAL("NORMAL", "正常工序"), - FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"); + FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"), + FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间牵纱"); private String value; private String description;