Merge branch 'test'
commit
19a2f6661e
@ -0,0 +1,57 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.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;
|
||||
|
||||
/**
|
||||
* @Author: Wynne.Lu
|
||||
* @CreateDate: 2019/12/4 1:28 下午
|
||||
* @Description:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_FILE")
|
||||
@Api("文件表")
|
||||
public class MesFile extends BaseBean {
|
||||
|
||||
@Column(name = "FILE_NAME")
|
||||
@ApiParam("文件名称")
|
||||
private String fileName;
|
||||
|
||||
@Column(name = "FILE_URL")
|
||||
@ApiParam("文件URL")
|
||||
private String fileUrl;
|
||||
|
||||
@Column(name = "GROUP_NAME")
|
||||
@ApiParam("组名")
|
||||
private String groupName;
|
||||
|
||||
@Column(name = "FILE_ORIGIN_NAME")
|
||||
@ApiParam("文件原名")
|
||||
private String fileOriginName;
|
||||
|
||||
@Column(name = "FILE_SIZE")
|
||||
@ApiParam("文件大小")
|
||||
private String fileSize;
|
||||
|
||||
@Column(name = "FILE_TYPE")
|
||||
@ApiParam("文件类型名称")
|
||||
private String fileType;
|
||||
|
||||
@Column(name = "SYNC_TAG")
|
||||
@ApiParam("同步标记")
|
||||
private Integer syncTag = 0;
|
||||
}
|
@ -0,0 +1,26 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.model;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile;
|
||||
import io.swagger.annotations.Api;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* @Author: Wynne.Lu
|
||||
* @CreateDate: 2019/12/4 3:09 下午
|
||||
* @Description:
|
||||
**/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Api("FastDfs文件model")
|
||||
public class EsopFileModel {
|
||||
|
||||
private MesEsop esop;
|
||||
|
||||
private MesFile file;
|
||||
|
||||
}
|
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wynne.lu
|
||||
* @CreateDate : 2019-07-30
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesFileRepository extends BaseRepository<MesFile, Long> {
|
||||
}
|
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTypeCfg;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\12\4 10:34
|
||||
* @Modify:
|
||||
**/
|
||||
public interface MesTypeCfgRepository extends BaseRepository<MesTypeCfg, Long> {
|
||||
}
|
@ -0,0 +1,57 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Author: Wynne.Lu
|
||||
* @CreateDate: 2019/12/4 1:28 下午
|
||||
* @Description:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_FILE")
|
||||
@Api("文件表")
|
||||
public class MesFile extends BaseBean {
|
||||
|
||||
@Column(name = "FILE_NAME")
|
||||
@ApiParam("文件名称")
|
||||
private String fileName;
|
||||
|
||||
@Column(name = "FILE_URL")
|
||||
@ApiParam("文件URL")
|
||||
private String fileUrl;
|
||||
|
||||
@Column(name = "GROUP_NAME")
|
||||
@ApiParam("组名")
|
||||
private String groupName;
|
||||
|
||||
@Column(name = "FILE_ORIGIN_NAME")
|
||||
@ApiParam("文件原名")
|
||||
private String fileOriginName;
|
||||
|
||||
@Column(name = "FILE_SIZE")
|
||||
@ApiParam("文件大小")
|
||||
private String fileSize;
|
||||
|
||||
@Column(name = "FILE_TYPE")
|
||||
@ApiParam("文件类型名称")
|
||||
private String fileType;
|
||||
|
||||
@Column(name = "SYNC_TAG")
|
||||
@ApiParam("同步标记")
|
||||
private Integer syncTag = 0;
|
||||
}
|
@ -0,0 +1,26 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesEsop;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesFile;
|
||||
import io.swagger.annotations.Api;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* @Author: Wynne.Lu
|
||||
* @CreateDate: 2019/12/4 3:09 下午
|
||||
* @Description:
|
||||
**/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Api("FastDfs文件model")
|
||||
public class EsopFileModel {
|
||||
|
||||
private MesEsop esop;
|
||||
|
||||
private MesFile file;
|
||||
|
||||
}
|
@ -0,0 +1,60 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\12\4 16:44
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class ProduceCtgyPictureModel {
|
||||
|
||||
private Long id;
|
||||
private String createUser;
|
||||
private String createDatetime;
|
||||
private String modifyUser;
|
||||
private String modifyDatetime;
|
||||
private String organizeCode;
|
||||
private Integer isValid;
|
||||
private Integer isDeleted;
|
||||
|
||||
@ApiParam("产品类型代码")
|
||||
private String produceCtgyCode;
|
||||
|
||||
@ApiParam("面位")
|
||||
private String sideLocation;
|
||||
|
||||
@ApiParam("文件id")
|
||||
private Long fileId;
|
||||
|
||||
@ApiParam("文件原名称")
|
||||
private String fileOriginName;
|
||||
@ApiParam("文件URL")
|
||||
private String fileUrl;
|
||||
@ApiParam("组名")
|
||||
private String groupName;
|
||||
|
||||
public ProduceCtgyPictureModel() {
|
||||
}
|
||||
|
||||
public ProduceCtgyPictureModel(Long id, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, Integer isValid, Integer isDeleted, String produceCtgyCode, String sideLocation, Long fileId, String fileOriginName, String fileUrl, String groupName) {
|
||||
this.id = id;
|
||||
this.createUser = createUser;
|
||||
this.createDatetime = createDatetime;
|
||||
this.modifyUser = modifyUser;
|
||||
this.modifyDatetime = modifyDatetime;
|
||||
this.organizeCode = organizeCode;
|
||||
this.isValid = isValid;
|
||||
this.isDeleted = isDeleted;
|
||||
this.produceCtgyCode = produceCtgyCode;
|
||||
this.sideLocation = sideLocation;
|
||||
this.fileId = fileId;
|
||||
this.fileOriginName = fileOriginName;
|
||||
this.fileUrl = fileUrl;
|
||||
this.groupName = groupName;
|
||||
}
|
||||
}
|
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesFile;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wynne.lu
|
||||
* @CreateDate : 2019-07-30
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesFileRepository extends BaseRepository<MesFile, Long> {
|
||||
}
|
@ -0,0 +1,48 @@
|
||||
package cn.estsh.i3plus.pojo.wms.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;
|
||||
|
||||
/**
|
||||
* @Description : 班次表
|
||||
* @Reference :
|
||||
* @Author : jessica.chen
|
||||
* @CreateDate : 2019-11-05 14:21
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="WMS_SHIFT")
|
||||
@Api("班次信息")
|
||||
public class WmsShift extends BaseBean{
|
||||
|
||||
private static final long serialVersionUID = 9214639813072592714L;
|
||||
|
||||
@Column(name="SHIFT_NO")
|
||||
@ApiParam("班次编码")
|
||||
private String shiftNo;
|
||||
|
||||
@Column(name="SHIFT_NAME")
|
||||
@ApiParam("班次名称")
|
||||
private String shiftName;
|
||||
|
||||
@Column(name="START_TIME")
|
||||
@ApiParam("开始时间")
|
||||
private String startTime;
|
||||
|
||||
@Column(name="END_TIME")
|
||||
@ApiParam("结束时间")
|
||||
private String endTime;
|
||||
}
|
@ -0,0 +1,52 @@
|
||||
package cn.estsh.i3plus.pojo.wms.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;
|
||||
|
||||
/**
|
||||
* @Description : 班休表
|
||||
* @Reference :
|
||||
* @Author : jessica.chen
|
||||
* @CreateDate : 2019-11-05 14:21
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="WMS_SHIFT_REST")
|
||||
@Api("班休信息")
|
||||
public class WmsShiftRest extends BaseBean{
|
||||
|
||||
private static final long serialVersionUID = 9214639813072592715L;
|
||||
|
||||
@Column(name="REST_NO")
|
||||
@ApiParam("班休代码")
|
||||
private String restNo;
|
||||
|
||||
@Column(name="REST_NAME")
|
||||
@ApiParam("班休名称")
|
||||
private String restName;
|
||||
|
||||
@Column(name="SHIFT_NO")
|
||||
@ApiParam("班次编码")
|
||||
private String shiftNo;
|
||||
|
||||
@Column(name="START_REST_TIME")
|
||||
@ApiParam("开始休息时间")
|
||||
private String startRestTime;
|
||||
|
||||
@Column(name="END_REST_TIME")
|
||||
@ApiParam("结束休息时间")
|
||||
private String endRestTime;
|
||||
}
|
@ -0,0 +1,44 @@
|
||||
package cn.estsh.i3plus.pojo.wms.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.UniqueConstraint;
|
||||
|
||||
/**
|
||||
* @Description : 工位表
|
||||
* @Reference :
|
||||
* @Author : jessica.chen
|
||||
* @CreateDate : 2019-12-03 14:21
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="WMS_TERMINAL")
|
||||
@Api("工位信息")
|
||||
public class WmsTerminal extends BaseBean{
|
||||
|
||||
private static final long serialVersionUID = 9214639813072592713L;
|
||||
@Column(name="TERMINAL_NO")
|
||||
@ApiParam("工位代码")
|
||||
private String terminalNo;
|
||||
|
||||
@Column(name="TERMINAL_NAME")
|
||||
@ApiParam("工位名称")
|
||||
private String terminalName;
|
||||
|
||||
@Column(name="PDLINE_NO")
|
||||
@ApiParam("产线代码")
|
||||
private String pdlineNo;
|
||||
}
|
@ -0,0 +1,17 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsShift;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsTerminal;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :班次信息
|
||||
* @Reference :
|
||||
* @Author : jessica.chen
|
||||
* @CreateDate : 2018-12-05 14:49
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsShiftRepository extends BaseRepository<WmsShift, Long> {
|
||||
}
|
@ -0,0 +1,17 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsShift;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsShiftRest;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :班休信息
|
||||
* @Reference :
|
||||
* @Author : jessica.chen
|
||||
* @CreateDate : 2018-12-05 14:49
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsShiftRestRepository extends BaseRepository<WmsShiftRest, Long> {
|
||||
}
|
@ -0,0 +1,17 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsTerminal;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :工位信息
|
||||
* @Reference :
|
||||
* @Author : jessica.chen
|
||||
* @CreateDate : 2018-11-07 14:49
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsTerminalRepository extends BaseRepository<WmsTerminal, Long> {
|
||||
}
|
Loading…
Reference in New Issue