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 new file mode 100644 index 0000000..603ff15 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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 java.util.List; + +/** + * @Description : 工站队列 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-22 17:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_POINT") +@Api("工站队列") +public class MesWorkCellPoint extends BaseBean { + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "QUEUE_SEQ") + @ApiParam("队列主表序号") + private String queueSeq; + + @Column(name = "QUEUE_DETAIL_SEQ") + @ApiParam("队列明细表序号") + private String queueDetailSeq; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java new file mode 100644 index 0000000..c3e984f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : JIT队列列表Model + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-22 16:34 + * @Modify: + **/ +@Data +@Api("JIT队列列表Model") +public class QueueOrderModel implements Serializable { + @ApiParam("队列ID") + public Long queueId; + @ApiParam("队列明细ID") + public Long queueDetailId; + @ApiParam("队列序号") + public Integer queueSeq; + @ApiParam("队列明细序号") + public Integer queDetailSeq; + @ApiParam("客户标识号") + public String custFlagNo; + @ApiParam("产品配置名称") + public String prodCfgName; + @ApiParam("产品类型名称") + public String categoryName; + @ApiParam("产品条码") + public String serialNumber; + @ApiParam("物料号") + public String partNo; + @ApiParam("物料ID") + public Long partId; + @ApiParam("条码状态") + public Integer snStatus; + @ApiParam("生产类型") + public String workType; + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 28139af..48c1efe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -10,10 +10,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.*; /** * @Description : 作业流程 @@ -67,6 +64,7 @@ public class WmsActionGroup extends BaseBean { @ApiParam(value = "任务自动初始化", example = "0") private Integer autoInit; + @Lob @Column(name = "POSITION") @ApiParam(value = "GOJS位置") private String position;