Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
commit
1e41ab2e39
@ -0,0 +1,7 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EParentWork {
|
||||
ProductOrder,
|
||||
Operation,
|
||||
Works
|
||||
}
|
@ -1,5 +1,6 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EProductOrder {
|
||||
ProductRouting
|
||||
ProductRouting,
|
||||
ParentWorks
|
||||
}
|
||||
|
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.ParentWork;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface ParentWorkRepository extends CrudRepository<ParentWork, Long> {
|
||||
}
|
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="ParentWork">
|
||||
<Relation field="Operation" name="Operation" type="MULTI_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
<Relation field="Works" name="Work" reverse="ParentWork" type="ONE_TO_MULTI" owner="true">
|
||||
</Relation>
|
||||
</Class>
|
@ -1,3 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="ProductOrder" extends="BaseOrder">
|
||||
<Relation field="ParentWorks" name="ParentWork" reverse="ProductOrder" type="ONE_TO_MULTI" owner="true">
|
||||
</Relation>
|
||||
</Class>
|
@ -0,0 +1,13 @@
|
||||
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.MesWcEquipment;
|
||||
|
||||
/**
|
||||
* @Author: Wynne.Lu
|
||||
* @CreateDate: 2019/9/28 12:04 PM
|
||||
* @Description:
|
||||
**/
|
||||
public interface MesWcEquipmentRepository extends BaseRepository<MesWcEquipment,Long> {
|
||||
}
|
@ -0,0 +1,37 @@
|
||||
package cn.estsh.i3plus.pojo.model.softswitch;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 2019/10/8 下午1:18
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class SuitParamModel {
|
||||
|
||||
/* 标签名称 */
|
||||
private String tagName;
|
||||
/* 标签 id 属性值 */
|
||||
private String id;
|
||||
/* 标签 name 属性值 */
|
||||
private String name;
|
||||
/* 标签唯一标识 */
|
||||
private String pathKey;
|
||||
/* 标签内容 */
|
||||
private String value;
|
||||
/* 标签类型 Default:PARAM_VALUE_TYPE.STRING */
|
||||
private Integer type; // BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE
|
||||
|
||||
/* 标签属性 */
|
||||
private Map<String,String> attr;
|
||||
/* 父节点 */
|
||||
private SuitParamModel parent;
|
||||
/* 标签子集 */
|
||||
private List<SuitParamModel> childList;
|
||||
}
|
@ -0,0 +1,88 @@
|
||||
package cn.estsh.i3plus.pojo.softswitch.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
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 : yunhao
|
||||
* @CreateDate : 2019-09-25 17:43
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "BS_SUIT_CASE_FTP")
|
||||
@Api(value = "FTP适配器", description = "FTP适配器")
|
||||
public class BsSuitCaseFTP extends BaseBean {
|
||||
|
||||
@Column(name = "SUIT_CASE_ID")
|
||||
@ApiParam(value = "套件id")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long suitCaseId;
|
||||
|
||||
@Column(name = "file_Name")
|
||||
@ApiParam(value = "文件名")
|
||||
private String fileName;
|
||||
|
||||
@Column(name = "ENCODE")
|
||||
@ApiParam(value = "编码")
|
||||
private Integer encode;
|
||||
|
||||
@Column(name = "IS_READ_AND_EMPTY")
|
||||
@ApiParam(value = "读取并清空")
|
||||
private Integer isReadAndEmpty;
|
||||
|
||||
public boolean isReadAndEmpty(){
|
||||
return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndEmpty);
|
||||
}
|
||||
|
||||
@Column(name = "IS_READ_AND_DELETE")
|
||||
@ApiParam(value = "读取并删除")
|
||||
private Integer isReadAndDelete;
|
||||
|
||||
public boolean isReadAndDelete(){
|
||||
return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndDelete);
|
||||
}
|
||||
|
||||
@Column(name = "IS_NEED_TRAVERSAL")
|
||||
@ApiParam(value = "是否需要遍历")
|
||||
private Integer isNeedTraversal;
|
||||
|
||||
public boolean isNeedTraversal(){
|
||||
return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isNeedTraversal);
|
||||
}
|
||||
|
||||
@Column(name = "IS_INCREMENTAL_READ")
|
||||
@ApiParam(value = "是否增量读取")
|
||||
private Integer isIncrementalRead;
|
||||
|
||||
public boolean isIncrementalRead(){
|
||||
return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isIncrementalRead);
|
||||
}
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "是否增量读取")
|
||||
private String tempSuitFilePath;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "适配文件列表")
|
||||
public List<BsSuitFile> bsSuitFileList;
|
||||
|
||||
}
|
@ -0,0 +1,78 @@
|
||||
package cn.estsh.i3plus.pojo.softswitch.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;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2019-09-25 17:42
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "BS_SUIT_FILE")
|
||||
@Api(value = "适配文件信息", description = "适配文件信息")
|
||||
public class BsSuitFile extends BaseBean {
|
||||
|
||||
@Column(name = "SUIT_CASE_ID")
|
||||
@ApiParam(value = "套件id")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long suitCaseId;
|
||||
|
||||
@Column(name = "SUIT_CASE_NAME_RDD")
|
||||
@ApiParam(value = "适配套件名称")
|
||||
private String suitCaseName;
|
||||
|
||||
@Column(name = "SUIT_CASE_CODE")
|
||||
@ApiParam(value = "适配套件代码")
|
||||
private String suitCaseCode;
|
||||
|
||||
@Column(name = "FOLDER_PATH")
|
||||
@ApiParam(value = "文件夹路径")
|
||||
private String folderPath;
|
||||
|
||||
@Column(name = "FILE_ID")
|
||||
@ApiParam(value = "文件id")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long fileId;
|
||||
|
||||
@Column(name = "FILE_NAME")
|
||||
@ApiParam(value = "文件名称")
|
||||
private String fileName;
|
||||
|
||||
@Column(name = "FILE_URL")
|
||||
@ApiParam(value = "文件URL")
|
||||
private String fileURL;
|
||||
|
||||
@Column(name = "FILE_SIZE")
|
||||
@ApiParam(value = "文件大小")
|
||||
private int fileSize;
|
||||
|
||||
@Column(name = "SUIT_DATE_TIME")
|
||||
@ApiParam(value = "适配时间")
|
||||
private String suitDateTime;
|
||||
|
||||
@Column(name = "PROCESS_STATE")
|
||||
@ApiParam(value = "处理状态")
|
||||
private Integer processState;
|
||||
|
||||
@Column(name = "PROCESS_TIME")
|
||||
@ApiParam(value = "处理时间")
|
||||
private String processTime;
|
||||
|
||||
}
|
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.softswitch.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseFTP;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2019-09-27 10:16
|
||||
* @Modify:
|
||||
**/
|
||||
public interface BsSuitCaseFTPRepository extends BaseRepository<BsSuitCaseFTP,Long> {
|
||||
}
|
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.softswitch.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseREST;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2019-09-23 15:39
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface BsSuitCaseRESTRepository extends BaseRepository<BsSuitCaseREST,Long> {
|
||||
}
|
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.softswitch.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2019-09-27 10:17
|
||||
* @Modify:
|
||||
**/
|
||||
public interface BsSuitFileRepository extends BaseRepository<BsSuitFile,Long> {
|
||||
}
|
@ -1,11 +1,18 @@
|
||||
package cn.estsh.i3plus.pojo.model.wms;
|
||||
package cn.estsh.i3plus.pojo.wms.bean.iotio;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class wmsCSOrderDetailsModel implements Serializable {
|
||||
public class WmsCSOrderDetailsModel implements Serializable {
|
||||
|
||||
|
||||
|
||||
/******
|
||||
*
|
||||
* 工厂代码
|
||||
*/
|
||||
public String organizeCode;
|
||||
|
||||
|
||||
/******
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue