diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index b55bde9..3a4ff36 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1229,7 +1229,9 @@ public class WmsEnumUtil { PICKED(50, "配料"), OUT_STOCK(60, "出库"), SCRAP(70, "报废"), - COMMING(80, "在途"); + COMMING(80, "在途"), + INSPECTION(90,"待检验"), + HAS_INSPECTION(100,"已检验"); private int value; private String description; @@ -1396,8 +1398,8 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_QC_STATUS { NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), - ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废"); - + ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废"), + REWORK(50,"REWORK","返工"); private int value; private String code; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java index ddec01b..3482ee6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java @@ -4,17 +4,12 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; 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; +import javax.persistence.*; import java.io.Serializable; /** @@ -30,7 +25,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "IF_PACKAGE") +@Table(name = "IF_PACKAGE", indexes = { + @Index(columnList = "PACKAGE_NO"), + @Index(columnList = "MODIFY_DATE_TIME")}) @Api("包装条码接口表") public class IfPackage extends BaseBean implements Serializable {