Merge remote-tracking branch 'remotes/origin/test' into dev
# Conflicts: # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.javayun-zuoyi
Dominic_Xiao
5 years ago
commit
8e3943b306
@ -0,0 +1,53 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2020/4/20 5:16 下午
|
||||
* @Modify:
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_FURNACE_LOCATION")
|
||||
@Api("MES_炉内模式位置信息")
|
||||
public class MesFurnaceLocation extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 3681747818263404126L;
|
||||
|
||||
@Column(name = "MODEL_NO")
|
||||
@ApiParam("模式编号")
|
||||
private String modelNo;
|
||||
|
||||
@Column(name = "FN_LOCATION_NO")
|
||||
@ApiParam("炉内位置代码")
|
||||
private String fnLocationNo;
|
||||
|
||||
@Column(name = "MODEL_IMG_URL")
|
||||
@ApiParam("模式图片路径")
|
||||
private String modelImgUrl;
|
||||
|
||||
@Column(name = "SEQ")
|
||||
@ApiParam("推荐顺序")
|
||||
private Integer seq;
|
||||
|
||||
@Transient
|
||||
@ApiParam("容器编号")
|
||||
private String ctNo;
|
||||
}
|
||||
@ -0,0 +1,52 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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 java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2020/4/20 5:16 下午
|
||||
* @Modify:
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_FURNACE_LOCATION_DETAIL")
|
||||
@Api("MES_炉内占位信息")
|
||||
public class MesFurnaceLocationDetail extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 3681747818212133126L;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "MODEL_NO")
|
||||
@ApiParam("模式编号")
|
||||
private String modelNo;
|
||||
|
||||
@Column(name = "FN_LOCATION_NO")
|
||||
@ApiParam("炉内位置代码")
|
||||
private String fnLocationNo;
|
||||
|
||||
@Column(name = "CT_NO")
|
||||
@ApiParam("容器编号")
|
||||
private String ctNo;
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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 java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2020/4/20 5:16 下午
|
||||
* @Modify:
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_PART_FURNACE")
|
||||
@Api("MES_物料上炉模式")
|
||||
public class MesPartFurnace extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 3681747818263404111L;
|
||||
|
||||
@Column(name = "MODEL_NO")
|
||||
@ApiParam("模式编号")
|
||||
private String modelNo;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料编码")
|
||||
private String partNo;
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesFurnaceLocationDetail;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\11\18 10:34
|
||||
* @Modify:
|
||||
**/
|
||||
public interface MesFurnaceLocationDetailRepository extends BaseRepository<MesFurnaceLocationDetail, Long> {
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesFurnaceLocation;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\11\18 10:34
|
||||
* @Modify:
|
||||
**/
|
||||
public interface MesFurnaceLocationRepository extends BaseRepository<MesFurnaceLocation, Long> {
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesPartFurnace;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\11\18 10:34
|
||||
* @Modify:
|
||||
**/
|
||||
public interface MesPartFurnaceRepository extends BaseRepository<MesPartFurnace, Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue