diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java similarity index 95% rename from modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java rename to modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java index c35f89e..b7bcac0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java @@ -10,7 +10,7 @@ import lombok.Data; import java.util.Date; @Data -public class ResourceLodaRequest { +public class ResourceLoadRequest { private ApsEnumUtil.RESOURCE_LOAD_SPAN span; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 325ed75..11cf7e3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -13,6 +13,41 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + /** + * 是否解析 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_IS_PARSE { + TRUE(1, "是"), + FALSE(2, "否"); + + private int value; + private String description; + + PLC_IS_PARSE(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; + } + } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CALENDAR_TYPE { DAY(10, "日"), diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java index dd2c7da..5a4c0f1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java @@ -27,6 +27,11 @@ import javax.persistence.Table; @Table(name = "MES_WORK_CELL_POINT") @Api("工站队列") public class MesWorkCellPoint extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java index 19694f1..b7f831b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java @@ -40,6 +40,14 @@ public class QueueOrderModel implements Serializable { @Transient @ApiParam("显示颜色") private String color; + @ApiParam("工厂代码") + private String organizeCode; + @ApiParam("展示行数") + private Integer prodNum; + @ApiParam("产线") + private String workCenterCode; + @ApiParam("工位") + private String workCellCode; public QueueOrderModel() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java index 7343feb..0abb9dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -31,6 +31,11 @@ import java.util.List; @Table(name = "MES_WORK_CELL_POINT") @Api("工站队列") public class MesWorkCellPoint extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index c4550f6..086e420 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; import javax.persistence.Transient; @@ -28,7 +29,11 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_DOC_CS_DETAILS") +@Table(name = "WMS_DOC_CS_DETAILS", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "VENDOR_NO"), + @Index(columnList = "SN") +}) @Api("盘点单冻结信息") public class WmsCSOrderDetails extends BaseBean { private static final long serialVersionUID = 1054153436116196360L;