Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng
6 years ago
commit
0e79a6cdc9
@ -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;
|
||||
}
|
||||
@ -1,7 +1,5 @@
|
||||
package cn.estsh.i3plus.pojo.model.mes;
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess;
|
||||
import cn.estsh.i3plus.pojo.model.wms.WmsActionGroupDetailsModel;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
@ -1,9 +1,8 @@
|
||||
package cn.estsh.i3plus.pojo.model.mes;
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProdRouteOptParam;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcessStep;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.*;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
@ -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;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesArea;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
|
||||
import javax.persistence.Transient;
|
||||
import java.util.List;
|
||||
|
||||
public class SysOrganizeModel {
|
||||
|
||||
@Transient
|
||||
@ApiParam(value ="父节点")
|
||||
private Long parentId;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value ="名称")
|
||||
private String name;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value ="子集列表")
|
||||
private List<MesArea> childTreeList;
|
||||
|
||||
public List<MesArea> getChildTreeList() {
|
||||
return childTreeList;
|
||||
}
|
||||
|
||||
public void setChildTreeList(List<MesArea> childTreeList) {
|
||||
this.childTreeList = childTreeList;
|
||||
}
|
||||
|
||||
public Long getParentId() {
|
||||
return parentId;
|
||||
}
|
||||
|
||||
public void setParentId(Long parentId) {
|
||||
this.parentId = parentId;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.model.mes;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesArea;
|
||||
import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
|
||||
import javax.persistence.Transient;
|
||||
import java.util.List;
|
||||
|
||||
public class SysOrganizeModel extends SysOrganize{
|
||||
|
||||
@Transient
|
||||
@ApiParam(value ="子集列表")
|
||||
private List<MesArea> childTreeList;
|
||||
|
||||
public List<MesArea> getChildTreeList() {
|
||||
return childTreeList;
|
||||
}
|
||||
|
||||
public void setChildTreeList(List<MesArea> childTreeList) {
|
||||
this.childTreeList = childTreeList;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue