Merge remote-tracking branch 'origin/test' into test
commit
93dd90363e
@ -0,0 +1,66 @@
|
||||
package cn.estsh.i3plus.pojo.base.bean;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description : 文件基础信息
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-06-01 20:33
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@ApiModel("文件基础信息")
|
||||
public class ImppFile {
|
||||
|
||||
/******* 文件基础信息 ******/
|
||||
|
||||
@ApiModelProperty("文件名称")
|
||||
private String name; //文件名
|
||||
|
||||
@ApiModelProperty("文件内容")
|
||||
private byte[] content; //内容
|
||||
|
||||
@ApiModelProperty("文件后缀名称")
|
||||
private String ext; //文件类型
|
||||
|
||||
public void setExt(String ext) {
|
||||
if(ext.indexOf(".") != 0){
|
||||
ext ="."+ext;
|
||||
}
|
||||
this.ext = ext;
|
||||
}
|
||||
|
||||
@ApiModelProperty("文件md5")
|
||||
private String md5;
|
||||
|
||||
@ApiModelProperty("文件创建时间")
|
||||
private String createDateTime;
|
||||
|
||||
@ApiModelProperty("文件作者")
|
||||
private String author; //作者
|
||||
|
||||
/******* 文件系统唯一信息 ******/
|
||||
|
||||
@ApiModelProperty("文件系统-组名称")
|
||||
private String dfsGroupName;
|
||||
|
||||
@ApiModelProperty("文件系统-名称")
|
||||
private String dfsFileName;
|
||||
|
||||
@ApiModelProperty("文件系统-唯一键")
|
||||
private String dfsFileKey;
|
||||
|
||||
/******* 构造方法 ******/
|
||||
|
||||
public ImppFile() {
|
||||
}
|
||||
|
||||
public ImppFile(String name, byte[] content, String ext) {
|
||||
this.name = name;
|
||||
this.content = content;
|
||||
this.setExt(ext);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,165 @@
|
||||
package cn.estsh.i3plus.pojo.base.enumutil;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* @Description : Model Pojo 枚举
|
||||
* @Reference :
|
||||
* @Author : Adair Peng
|
||||
* @CreateDate : 2018-11-21 15:50
|
||||
* @Modify:
|
||||
**/
|
||||
public class MdmEnumUtil {
|
||||
|
||||
/**
|
||||
* 操作类型
|
||||
*/
|
||||
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
|
||||
public enum MDM_OPERATE_TYPE {
|
||||
INSERT(1, "新增"),
|
||||
UPDATE(2, "修改");
|
||||
|
||||
private int value;
|
||||
private String description;
|
||||
|
||||
private MDM_OPERATE_TYPE(int value, String description) {
|
||||
this.value = value;
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public int getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public static String valueOfDescription(int val) {
|
||||
String tmp = null;
|
||||
for (int i = 0; i < values().length; i++) {
|
||||
if (values()[i].value == val) {
|
||||
tmp = values()[i].description;
|
||||
}
|
||||
}
|
||||
return tmp;
|
||||
}
|
||||
|
||||
public static MdmEnumUtil.MDM_OPERATE_TYPE valueOf(int val) {
|
||||
String tmp = null;
|
||||
for (int i = 0; i < values().length; i++) {
|
||||
if (values()[i].value == val) {
|
||||
return values()[i];
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* hql实体类型
|
||||
*/
|
||||
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
|
||||
public enum HQL_ENTITY_TYPE {
|
||||
MASTER(1, "master", "主数据"),
|
||||
BUSI(2, "busi", "业务数据");
|
||||
|
||||
private int value;
|
||||
private String alias;
|
||||
private String description;
|
||||
|
||||
private HQL_ENTITY_TYPE(int value, String alias, String description) {
|
||||
this.value = value;
|
||||
this.alias = alias;
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public int getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
public String getAlias() {
|
||||
return alias;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public static String valueOfDescription(int val) {
|
||||
String tmp = null;
|
||||
for (int i = 0; i < values().length; i++) {
|
||||
if (values()[i].value == val) {
|
||||
tmp = values()[i].description;
|
||||
}
|
||||
}
|
||||
return tmp;
|
||||
}
|
||||
|
||||
public static String valueOfAlias(int val) {
|
||||
String tmp = null;
|
||||
for (int i = 0; i < values().length; i++) {
|
||||
if (values()[i].value == val) {
|
||||
tmp = values()[i].alias;
|
||||
}
|
||||
}
|
||||
return tmp;
|
||||
}
|
||||
|
||||
public static MdmEnumUtil.HQL_ENTITY_TYPE valueOf(int val) {
|
||||
String tmp = null;
|
||||
for (int i = 0; i < values().length; i++) {
|
||||
if (values()[i].value == val) {
|
||||
return values()[i];
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* mdm
|
||||
*/
|
||||
public enum MDM_SYNC_TYPE{
|
||||
INSERT(1, "新增"),
|
||||
UPDATE(2, "修改"),
|
||||
DELETE(2, "删除");
|
||||
|
||||
private int value;
|
||||
private String description;
|
||||
|
||||
private MDM_SYNC_TYPE(int value, String description) {
|
||||
this.value = value;
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public int getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public static String valueOfDescription(int val) {
|
||||
String tmp = null;
|
||||
for (int i = 0; i < values().length; i++) {
|
||||
if (values()[i].value == val) {
|
||||
tmp = values()[i].description;
|
||||
}
|
||||
}
|
||||
return tmp;
|
||||
}
|
||||
|
||||
public static MdmEnumUtil.MDM_SYNC_TYPE valueOf(int val) {
|
||||
String tmp = null;
|
||||
for (int i = 0; i < values().length; i++) {
|
||||
if (values()[i].value == val) {
|
||||
return values()[i];
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,56 +0,0 @@
|
||||
//package cn.estsh.i3plus.pojo.form.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 : 2020-03-12 13:36
|
||||
// * @Modify:
|
||||
// **/
|
||||
//@Data
|
||||
//@Entity
|
||||
//@DynamicInsert
|
||||
//@DynamicUpdate
|
||||
//@EqualsAndHashCode(callSuper = true)
|
||||
//@Table(name = "BF_ELEMENT_CONSTRAINT_PROPERTY")
|
||||
//@Api(value = "元素约束属性", description = "元素约束属性")
|
||||
//public class BfElementConstraintProperty extends BaseBean {
|
||||
//
|
||||
// @Column(name = "CONSTRAINT_ID")
|
||||
// @ApiParam(value = "约束ID", example = "-1")
|
||||
// @JsonSerialize(using = ToStringSerializer.class)
|
||||
// private Long constraintId;
|
||||
//
|
||||
// @Column(name = "ELEMENT_PROPERTY_ID")
|
||||
// @ApiParam(value = "元素属性ID", example = "-1")
|
||||
// @JsonSerialize(using = ToStringSerializer.class)
|
||||
// private Long elementPropertyId;
|
||||
//
|
||||
// @Column(name = "DATA_OBJECT_PROPERTY_ID")
|
||||
// @ApiParam(value = "数据对象属性ID", example = "-1")
|
||||
// @JsonSerialize(using = ToStringSerializer.class)
|
||||
// private Long dataObjectPropertyId;
|
||||
//
|
||||
// @Column(name="PROPERTY_NAME")
|
||||
// @ApiParam(value ="元素属性名称")
|
||||
// private String propertyName;
|
||||
//
|
||||
// @Column(name="PROPERTY_CODE_RDD")
|
||||
// @ApiParam(value ="元素属性代码")
|
||||
// private String propertyCodeRdd;
|
||||
//
|
||||
//}
|
||||
@ -0,0 +1,66 @@
|
||||
package cn.estsh.i3plus.pojo.form.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 : 2020-05-27 21:21
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "BF_ELEMENT_PICK_UP_PROPERTY")
|
||||
@Api(value = "表单拾取属性", description = "表单拾取属性")
|
||||
public class BfElementPickUpProperty extends BaseBean {
|
||||
|
||||
@Column(name = "PICK_UP_PROPERTY_ID")
|
||||
@ApiParam(value = "拾取属性id", example = "-1")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long pickUpPropertyId;
|
||||
|
||||
@Column(name = "ELEMENT_ID")
|
||||
@ApiParam(value = "对象元素ID", example = "-1")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long elementId;
|
||||
|
||||
@Column(name="ELEMENT_PROPERTY_ID")
|
||||
@ApiParam(value ="元素属性id")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long elementPropertyId;
|
||||
|
||||
@Column(name="ELEMENT_PROPERTY_NAME")
|
||||
@ApiParam(value ="元素属性名称")
|
||||
private String elementPropertyName;
|
||||
|
||||
@Column(name = "PICK_UP_ELEMENT_ID")
|
||||
@ApiParam(value = "拾取元素ID", example = "-1")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long pickUpElementId;
|
||||
|
||||
@Column(name="PICK_UP_ELEMENT_PROPERTY_ID")
|
||||
@ApiParam(value ="拾取元素属性id")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long pickUpElementPropertyId;
|
||||
|
||||
@Column(name="PICK_UP_ELEMENT_PROPERTY_NAME")
|
||||
@ApiParam(value ="拾取元素属性名称")
|
||||
private String pickUpElementPropertyName;
|
||||
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.form.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.form.bean.BfElementPickUpProperty;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-05-21 15:18
|
||||
* @Modify:
|
||||
**/
|
||||
public interface BfElementPickUpPropertyRepository extends BaseRepository<BfElementPickUpProperty,Long> {
|
||||
}
|
||||
@ -0,0 +1,49 @@
|
||||
package cn.estsh.i3plus.pojo.mdm.bean.base;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
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.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.MappedSuperclass;
|
||||
import javax.persistence.Transient;
|
||||
|
||||
/**
|
||||
* @Description : MDM业务基础bean
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-05-12 17:30
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@MappedSuperclass
|
||||
@ApiModel("MDM业务基础bean")
|
||||
public class BaseMdmBusiExtdBean extends BaseMdmBean {
|
||||
|
||||
private static final long serialVersionUID = 4267453020130810967L;
|
||||
|
||||
@Transient
|
||||
@ApiModelProperty("是否主数据")
|
||||
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
|
||||
public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
|
||||
|
||||
@Transient
|
||||
@ApiModelProperty("主数据Class")
|
||||
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
|
||||
public static Class<BaseMdmBean> mdmMasterClass = BaseMdmBean.class;
|
||||
|
||||
@Transient
|
||||
@ApiModelProperty("软件模块")
|
||||
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
|
||||
public static Integer mdmSoftType;
|
||||
|
||||
@Column(name = "MDM_MASTER_ID")
|
||||
@ApiModelProperty("主数据id")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long mdmMasterId;
|
||||
|
||||
}
|
||||
@ -0,0 +1,64 @@
|
||||
package cn.estsh.i3plus.pojo.mdm.bean.base;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
/**
|
||||
* @Description :MDM模型bean
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-05-18 20:52
|
||||
* @Modify:
|
||||
**/
|
||||
public abstract class BaseMdmBusiModelBean<M extends BaseMdmBean, B extends BaseMdmBusiExtdBean> {
|
||||
|
||||
@ApiModelProperty("主数据")
|
||||
private M mdmMasterBean;
|
||||
|
||||
@ApiModelProperty("业务扩展")
|
||||
private B mdmBusiBean;
|
||||
|
||||
public BaseMdmBusiModelBean() {
|
||||
}
|
||||
|
||||
public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) {
|
||||
this.mdmMasterBean = mdmMasterBean;
|
||||
this.mdmBusiBean = mdmBusiBean;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取主数据m
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public M getMaster() {
|
||||
return mdmMasterBean;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取业务扩展数据
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public B getBusi() {
|
||||
return mdmBusiBean;
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置主数据m
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public void setMaster(M baseMdmBean) {
|
||||
this.mdmMasterBean = baseMdmBean;
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置业务扩展数据
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public void setBusi(B baseMdmBusiExtdBean) {
|
||||
this.mdmBusiBean = baseMdmBusiExtdBean;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,30 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.mdm.bean.base;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Transient;
|
||||
|
||||
/**
|
||||
* @Description : MDM业务基础bean
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-05-12 17:30
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@ApiModel("MDM业务基础bean")
|
||||
public class BaseMdmExtdBean extends BaseMdmBean {
|
||||
|
||||
private static final long serialVersionUID = 4267453020130810967L;
|
||||
|
||||
@Transient
|
||||
@ApiModelProperty("软件模块")
|
||||
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
|
||||
public static Integer mdmSoftType;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,74 @@
|
||||
package cn.estsh.i3plus.pojo.mdm.bean.base;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 数据中心同步数据
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-06-02 16:14
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@ApiModel("数据中心同步数据")
|
||||
public class MdmSyncData implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -1642626000860074060L;
|
||||
|
||||
@ApiModelProperty("同步数据类型")
|
||||
@AnnoOutputColumn(refClass = MdmEnumUtil.MDM_SYNC_TYPE.class)
|
||||
private Integer syncType;
|
||||
|
||||
public int getSyncTypeVal(){
|
||||
return syncType == null ? MdmEnumUtil.MDM_SYNC_TYPE.INSERT.getValue() : syncType;
|
||||
}
|
||||
|
||||
@ApiModelProperty("同步模块")
|
||||
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class)
|
||||
private Integer syncSoftType;
|
||||
|
||||
@ApiModelProperty("是否是主数据")
|
||||
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
|
||||
private Integer isMasterData;
|
||||
|
||||
public int getIsMasterDataVal() {
|
||||
return isMasterData == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isMasterData;
|
||||
}
|
||||
|
||||
@ApiModelProperty("同步数据class")
|
||||
private String syncDataClass;
|
||||
|
||||
public String getSyncDataClassSimpleName(){
|
||||
if(syncDataClass == null){
|
||||
return null;
|
||||
}
|
||||
|
||||
return syncDataClass.trim().substring(syncDataClass.trim().lastIndexOf(".") + 1);
|
||||
}
|
||||
|
||||
@ApiModelProperty("同步数据id")
|
||||
private List<Long> syncDataId;
|
||||
|
||||
@ApiModelProperty("同步数据用户名")
|
||||
private String syncDateUserName;
|
||||
|
||||
@ApiModelProperty("同步时间")
|
||||
private String syncDateTime;
|
||||
|
||||
@ApiModelProperty("同步失败键")
|
||||
private String syncFailKey;
|
||||
|
||||
@ApiModelProperty("同步失败时间")
|
||||
private String syncFailDateTime;
|
||||
|
||||
@ApiModelProperty("同步失败信息")
|
||||
private String syncFailMessage;
|
||||
}
|
||||
@ -0,0 +1,51 @@
|
||||
package cn.estsh.i3plus.pojo.mdm.bean.busi.core;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiExtdBean;
|
||||
import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description : 主数据齿轮-平台扩展
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-05-12 18:09
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MDM_GEAR_CORE_EXTD")
|
||||
@ApiModel("主数据齿轮-平台扩展")
|
||||
public class MdmGearCoreBusiExtd extends BaseMdmBusiExtdBean {
|
||||
|
||||
private static final long serialVersionUID = -3535174942277452194L;
|
||||
|
||||
@Transient
|
||||
@ApiModelProperty("主数据Class")
|
||||
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
|
||||
public static Class mdmMasterClass = MdmGear.class;
|
||||
|
||||
@Transient
|
||||
@ApiModelProperty("软件模块")
|
||||
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
|
||||
public static Integer mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue();
|
||||
|
||||
@Column(name = "CORE_NUM")
|
||||
@ApiModelProperty("核心数量")
|
||||
public String coreNum;
|
||||
|
||||
}
|
||||
@ -1,31 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.mdm.bean.busi.core;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmExtdBean;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description : 主数据齿轮-平台扩展
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-05-12 18:09
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@ApiModel("主数据齿轮-平台扩展")
|
||||
public class MdmGearCoreExtd extends BaseMdmExtdBean {
|
||||
|
||||
private static final long serialVersionUID = -3535174942277452194L;
|
||||
|
||||
// 初始化数据
|
||||
static {
|
||||
isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
|
||||
mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue();
|
||||
}
|
||||
|
||||
@ApiModelProperty("核心数量")
|
||||
public String coreNum;
|
||||
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.mdm.bean.model.core;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreExtd;
|
||||
import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
|
||||
|
||||
/**
|
||||
* @Description : 主数据齿轮-平台model
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-05-12 18:09
|
||||
* @Modify:
|
||||
**/
|
||||
public class MdmGearCoreModel {
|
||||
|
||||
private MdmGear mdmGear;
|
||||
|
||||
private MdmGearCoreExtd mdmGearCoreExtd;
|
||||
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package cn.estsh.i3plus.pojo.mdm.model;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-05-29 10:23
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class MdmPagerQueryModel <T> {
|
||||
|
||||
/**
|
||||
* 实体
|
||||
*/
|
||||
private T bean;
|
||||
|
||||
/**
|
||||
* 分页条件
|
||||
*/
|
||||
private Pager pager;
|
||||
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
package cn.estsh.i3plus.pojo.mdm.model.core;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiModelBean;
|
||||
import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd;
|
||||
import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description : 主数据齿轮-平台model
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-05-12 18:09
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@ApiModel("齿轮平台业务model")
|
||||
public class MdmGearCoreBusiModel extends BaseMdmBusiModelBean<MdmGear,MdmGearCoreBusiExtd> {
|
||||
public MdmGearCoreBusiModel(MdmGear mdmMasterBean, MdmGearCoreBusiExtd mdmBusiBean) {
|
||||
super(mdmMasterBean, mdmBusiBean);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
package cn.estsh.i3plus.pojo.mdm.modelrepository.core;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd;
|
||||
import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
|
||||
import cn.estsh.i3plus.pojo.mdm.jpa.dao.MdmBusiModelRepository;
|
||||
import cn.estsh.i3plus.pojo.mdm.jpa.daoimpl.MdmBusiModelRepositoryImpl;
|
||||
import cn.estsh.i3plus.pojo.mdm.model.core.MdmGearCoreBusiModel;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-05-25 11:42
|
||||
* @Modify:
|
||||
**/
|
||||
@Component
|
||||
public class MdmGearCoreRepository
|
||||
extends MdmBusiModelRepositoryImpl<MdmGearCoreBusiModel, MdmGear, MdmGearCoreBusiExtd>
|
||||
implements MdmBusiModelRepository<MdmGearCoreBusiModel, MdmGear, MdmGearCoreBusiExtd> {
|
||||
}
|
||||
@ -0,0 +1,51 @@
|
||||
package cn.estsh.i3plus.pojo.mdm.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
||||
import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean;
|
||||
import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 主数据中心 HQL 包
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-05-20 15:23
|
||||
* @Modify:
|
||||
**/
|
||||
public class MdmHqlPack {
|
||||
|
||||
public static DdlPackBean getMdmPackBean(BaseMdmBean mdmBean) {
|
||||
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmBean);
|
||||
|
||||
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean);
|
||||
return ddlPackBean;
|
||||
}
|
||||
|
||||
public static DdlPackBean getMdmPackBean() {
|
||||
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
|
||||
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean);
|
||||
return ddlPackBean;
|
||||
}
|
||||
|
||||
|
||||
public static DdlPackBean packHqlIdList(List<Long> idList) {
|
||||
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
|
||||
DdlPreparedPack.getInPackList(idList,"id",ddlPackBean);
|
||||
|
||||
return ddlPackBean;
|
||||
}
|
||||
|
||||
public static DdlPackBean packHqlMdmGear(MdmGear mdmGear) {
|
||||
DdlPackBean ddlPackBean = getMdmPackBean(mdmGear);
|
||||
|
||||
DdlPreparedPack.getNumEqualPack(mdmGear.getId(),"id",ddlPackBean);
|
||||
DdlPreparedPack.getStringLikerPack(mdmGear.getName(),"name",ddlPackBean);
|
||||
DdlPreparedPack.timeBuilder(mdmGear.getCreateDatetime(),"createDatetime",ddlPackBean,false,true);
|
||||
|
||||
return ddlPackBean;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.mdm.repository.busi.core;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-05-15 16:26
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MdmGearCoreBusiModelRepository extends BaseRepository<MdmGearCoreBusiExtd, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.mdm.repository.master;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-05-15 16:26
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MdmGearRepository extends BaseRepository<MdmGear, Long> {
|
||||
}
|
||||
@ -0,0 +1,91 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
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 : MES_看板工位信息
|
||||
* @Reference :
|
||||
* @Author : amy
|
||||
* @CreateDate : 2018-11-07 14:21
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_BOARD_WORK_CELL")
|
||||
@Api("MES_看板工位信息")
|
||||
public class MesBoardWorkCell extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = 6251886604848913685L;
|
||||
|
||||
@Column(name = "BOARD_CODE")
|
||||
@ApiParam("看板代码")
|
||||
private String boardCode;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "X_AXES")
|
||||
@ApiParam("横坐标")
|
||||
private Double xAxes = 0d;
|
||||
|
||||
@Column(name = "Y_AXES")
|
||||
@ApiParam("纵坐标")
|
||||
private Double yAxes = 0d;
|
||||
|
||||
@Column(name = "WORK_CELL_IP")
|
||||
@ApiParam("工位IP")
|
||||
private String workCellIp;
|
||||
|
||||
@Transient
|
||||
@ApiParam("看板工位状态")
|
||||
private Boolean boardWorkCellStatus;
|
||||
|
||||
@JsonProperty("xAxes")
|
||||
public Double getxAxes() {
|
||||
return xAxes;
|
||||
}
|
||||
|
||||
public void setxAxes(Double xAxes) {
|
||||
this.xAxes = xAxes;
|
||||
}
|
||||
|
||||
@JsonProperty("yAxes")
|
||||
public Double getyAxes() {
|
||||
return yAxes;
|
||||
}
|
||||
|
||||
public void setyAxes(Double yAxes) {
|
||||
this.yAxes = yAxes;
|
||||
}
|
||||
|
||||
public double getXAxes() {
|
||||
return this.xAxes == null ? 0.0d : this.xAxes;
|
||||
}
|
||||
|
||||
public double getYAxes() {
|
||||
return this.yAxes == null ? 0.0d : this.yAxes;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/6/7 15:20
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_SUB_PART")
|
||||
@Api("数据同步死信")
|
||||
public class MesSubPart extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = 4636507477301700549L;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("零件号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "SUB_PART_NO")
|
||||
@ApiParam("替代料")
|
||||
private String subPartNo;
|
||||
|
||||
}
|
||||
@ -0,0 +1,89 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2020/6/8 1:22 下午
|
||||
* @Modify:
|
||||
*/
|
||||
@Data
|
||||
public class ScatterPartProdCfgModel {
|
||||
|
||||
private Long id;
|
||||
|
||||
private String organizeCode;
|
||||
|
||||
@ApiParam("配置编号")
|
||||
private String cfgId;
|
||||
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@ApiParam("车型标志值")
|
||||
private String modelFalgValue;
|
||||
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("物料名称")
|
||||
private String partName;
|
||||
|
||||
@ApiParam("等级代码")
|
||||
private String gradeCode;
|
||||
|
||||
@ApiParam("颜色代码")
|
||||
private String colorCode;
|
||||
|
||||
@ApiParam("标志位")
|
||||
private Integer partFlagLocation;
|
||||
|
||||
@ApiParam("标志值")
|
||||
private String partFlagValue;
|
||||
|
||||
@ApiParam("防错码")
|
||||
private String pokeYokeFix;
|
||||
|
||||
@ApiParam("项目代码")
|
||||
private String prodCfgTypeCode;
|
||||
|
||||
@ApiParam("产品位置代码")
|
||||
private String produceCtgyCode;
|
||||
|
||||
@ApiParam("确认扫描次数")
|
||||
private Integer checkScanCount;
|
||||
|
||||
@ApiParam("组合码发送顺序")
|
||||
private Integer sendSeq;
|
||||
|
||||
@ApiParam("黄枪规则")
|
||||
private Integer yellowGunRule;
|
||||
|
||||
@ApiParam("是否截至顺序号")
|
||||
private Integer isEndSeq;
|
||||
|
||||
@ApiParam("多媒体插头数量")
|
||||
private Double multimediaPlusQty;
|
||||
|
||||
public ScatterPartProdCfgModel() {}
|
||||
|
||||
public ScatterPartProdCfgModel(Long id, String workCenterCode, String workCellCode, String partNo, String partName
|
||||
, String gradeCode, String colorCode, String prodCfgTypeCode, String produceCtgyCode, Double multimediaPlusQty) {
|
||||
this.id = id;
|
||||
this.workCenterCode = workCenterCode;
|
||||
this.workCellCode = workCellCode;
|
||||
this.partNo = partNo;
|
||||
this.partName = partName;
|
||||
this.gradeCode = gradeCode;
|
||||
this.colorCode = colorCode;
|
||||
this.prodCfgTypeCode = prodCfgTypeCode;
|
||||
this.produceCtgyCode = produceCtgyCode;
|
||||
this.multimediaPlusQty = multimediaPlusQty;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesBoardWorkCell;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: adair.song
|
||||
* @Date: 2020/06/04 13:23
|
||||
* @Modify:
|
||||
*/
|
||||
@Repository
|
||||
public interface MesBoardWorkCellRepository extends BaseRepository<MesBoardWorkCell, 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.MesSubPart;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/6/7 15:23
|
||||
* @desc
|
||||
*/
|
||||
@Repository
|
||||
public interface MesSubPartRepository extends BaseRepository<MesSubPart, Long> {
|
||||
}
|
||||
@ -0,0 +1,49 @@
|
||||
package cn.estsh.i3plus.pojo.ptl.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;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/2/14 11:18
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@Table(name = "PTL_METHOD")
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("方法清单")
|
||||
public class PtlMethod extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1208980343927922927L;
|
||||
|
||||
@Column(name = "METHOD_CODE")
|
||||
@ApiParam("方法代码")
|
||||
private String methodCode;
|
||||
|
||||
@Column(name = "METHOD_NAME")
|
||||
@ApiParam("方法描述")
|
||||
private String methodName;
|
||||
|
||||
@Column(name = "CALL_CLASS")
|
||||
@ApiParam("实现类")
|
||||
private String callClass;
|
||||
|
||||
@Column(name = "METHOD_TYPE")
|
||||
@ApiParam("方法类型")
|
||||
private Integer methodType;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package cn.estsh.i3plus.pojo.ptl.repository;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaActorAction;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/2/12 17:41
|
||||
* @desc
|
||||
*/
|
||||
|
||||
public interface PtlAreaActorActionRepository extends BaseRepository<PtlAreaActorAction, Long> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package cn.estsh.i3plus.pojo.ptl.repository;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.ptl.bean.PtlMethod;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/2/12 17:41
|
||||
* @desc
|
||||
*/
|
||||
|
||||
public interface PtlMethodRepository extends BaseRepository<PtlMethod, Long> {
|
||||
|
||||
}
|
||||
@ -1,358 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
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.Version;
|
||||
|
||||
/**
|
||||
* @Description : 车辆信息明细
|
||||
* @Reference :
|
||||
* @Author : qianhuasheng
|
||||
* @CreateDate : 2019-12-06 15:58
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="WMS_TMS_SHIPPING_EXT_DETAIL")
|
||||
@Api("装车单信息明细")
|
||||
public class WmsTmsShippingExtDetail extends BaseBean {
|
||||
private static final long serialVersionUID = -4800308354250386102L;
|
||||
|
||||
@Column(name="MOVE_NO")
|
||||
@ApiParam("装车单")
|
||||
public String moveNo;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料编码")
|
||||
public String partNo;
|
||||
|
||||
@Column(name = "PART_NAME_RDD")
|
||||
@ApiParam("物料名称")
|
||||
public String partNameRdd;
|
||||
|
||||
@Column(name = "ITEM")
|
||||
@ApiParam("行号")
|
||||
public String item;
|
||||
|
||||
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "需求数量", example = "0")
|
||||
public Double qty;
|
||||
|
||||
@Column(name = "UNIT")
|
||||
@ApiParam("单位")
|
||||
public String unit;
|
||||
|
||||
@Column(name = "REF_ORDER_NO")
|
||||
@ApiParam("关联单号")
|
||||
private String refOrderNo;
|
||||
|
||||
@Column(name = "SRC_WH_NO")
|
||||
@ApiParam("源仓库代码")
|
||||
public String srcWhNo;
|
||||
|
||||
@Column(name = "SRC_ZONE_NO")
|
||||
@ApiParam("源存储区代码")
|
||||
public String srcZoneNo;
|
||||
|
||||
@Column(name = "SRC_LOCATE_NO")
|
||||
@ApiParam("源库位代码")
|
||||
public String srcLocateNo;
|
||||
|
||||
@Column(name = "DEST_WH_NO")
|
||||
@ApiParam("目标仓库代码")
|
||||
public String destWhNo;
|
||||
|
||||
@Column(name = "DEST_ZONE_NO")
|
||||
@ApiParam("目标存储区代码")
|
||||
public String destZoneNo;
|
||||
|
||||
@Column(name = "DEST_LOCATE_NO")
|
||||
@ApiParam("目标库位代码")
|
||||
public String destLocateNo;
|
||||
|
||||
@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "条码打印数量", example = "1")
|
||||
private Double printQty;
|
||||
|
||||
@Column(name = "PLAN_DATE")
|
||||
@ApiParam(value = "计划日期")
|
||||
private String planDate;
|
||||
|
||||
@Column(name = "PLAN_TIME")
|
||||
@ApiParam(value = "计划时间")
|
||||
private String planTime;
|
||||
|
||||
@Column(name = "SRC_NO")
|
||||
@ApiParam(value = "源单号")
|
||||
private String srcNo;
|
||||
/**
|
||||
* 状态:N=正常,C=行取消
|
||||
*/
|
||||
@Column(name = "ITEM_STATUS")
|
||||
@ApiParam(value = "状态", example = "1")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description")
|
||||
private Integer itemStatus;
|
||||
|
||||
/**
|
||||
* 是否免费:0=计费,1=免费
|
||||
*/
|
||||
@Column(name = "IS_FREE")
|
||||
@ApiParam(value = "是否免费", example = "1")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
|
||||
public Integer isFree;
|
||||
|
||||
@Column(name = "REMARK")
|
||||
@ApiParam(value = "操作原因")
|
||||
private String remark;
|
||||
|
||||
@Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "已拣货数量", example = "1")
|
||||
private Double pickQty;
|
||||
|
||||
@Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "已出库数量", example = "1")
|
||||
private Double outQty;
|
||||
|
||||
@Column(name = "REC_QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "已收货数量", example = "1")
|
||||
private Double recQty;
|
||||
|
||||
@Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "已移库数量", example = "1")
|
||||
private Double moveQty;
|
||||
|
||||
@Column(name = "TASK_GENERATE_QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "任务生成数量", example = "1")
|
||||
private Double taskGenerateQty;
|
||||
|
||||
@Column(name = "SRC_AREA_NO")
|
||||
@ApiParam("源库存地代码")
|
||||
public String srcAreaNo;
|
||||
|
||||
@Column(name = "DEST_AREA_NO")
|
||||
@ApiParam("目的库存地代码")
|
||||
public String destAreaNo;
|
||||
|
||||
@Column(name = "LOT_NO")
|
||||
@ApiParam("批次")
|
||||
public String lotNo;
|
||||
|
||||
@Column(name="SRC_ITEM", columnDefinition="varchar(50) default ''",nullable=false)
|
||||
@ApiParam("源单行号")
|
||||
public String srcItem;
|
||||
|
||||
@Column(name = "CUST_ORDER_NO")
|
||||
@ApiParam("客户订单号")
|
||||
public String custOrderNo;
|
||||
|
||||
@Column(name = "ASSIGN_DATE_CODE")
|
||||
@ApiParam(value = "指定生产日期")
|
||||
private String assignDateCode;
|
||||
|
||||
@Transient
|
||||
@ApiParam("实际批次")
|
||||
private String actualLot;
|
||||
|
||||
@Transient
|
||||
@ApiParam("实际数量")
|
||||
private Double actualQty;
|
||||
|
||||
@Transient
|
||||
@ApiParam("推荐批次")
|
||||
private String recommondLot;
|
||||
|
||||
@Transient
|
||||
@ApiParam("推荐库位")
|
||||
private String recommondLocateNo;
|
||||
|
||||
@Transient
|
||||
@ApiParam("前端表格编辑使用")
|
||||
private Boolean isSet = false;
|
||||
|
||||
@Transient
|
||||
@ApiParam("生产日期")
|
||||
public String dateCode;
|
||||
|
||||
@ApiParam(value = "散件移库输入移库数量")
|
||||
@Transient
|
||||
public Double inputMoveQty;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "标准包装", example = "1")
|
||||
private Double snp;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "条码总数量", example = "1")
|
||||
private Double detailsSnCount;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "余数", example = "1")
|
||||
private Double restQty;
|
||||
|
||||
@Transient
|
||||
@ApiParam("任务状态")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
|
||||
private Integer isTask;
|
||||
|
||||
@Transient
|
||||
@ApiParam("主表单据状态")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
|
||||
private Integer orderMasterStatus;
|
||||
|
||||
@Transient
|
||||
@ApiParam("打印状态")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description")
|
||||
private Integer printStatus;
|
||||
|
||||
@Transient
|
||||
@ApiParam("优先级")
|
||||
private Integer priority;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "汇总需求数量", example = "0")
|
||||
public Double sumQty;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "汇总拣货数量", example = "0")
|
||||
public Double sumPickQty;
|
||||
|
||||
@Transient
|
||||
@ApiParam("执行状态")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description")
|
||||
private Integer executeStatus;
|
||||
|
||||
@Version
|
||||
@Column(name = "LOCK_VERSION")
|
||||
@ApiParam(value = "乐观锁", example = "1")
|
||||
public transient Integer lockVersion;
|
||||
|
||||
@Transient
|
||||
@ApiParam("移动类型")
|
||||
public Integer moveType;
|
||||
|
||||
@Transient
|
||||
@ApiParam("业务类型")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
|
||||
public Integer busiType;
|
||||
|
||||
@Column(name = "IS_SN")
|
||||
@ApiParam(value = "条码生成状态", example = "20")
|
||||
public Integer isSn;
|
||||
|
||||
|
||||
public WmsTmsShippingExtDetail () {
|
||||
|
||||
}
|
||||
|
||||
|
||||
public String getRecommondLot() {
|
||||
return recommondLot == null ? "无" : this.recommondLot;
|
||||
}
|
||||
|
||||
public Double getQty() {
|
||||
return qty == null ? 0D : this.qty.doubleValue();
|
||||
}
|
||||
|
||||
public Double getOutQty() {
|
||||
return outQty == null ? 0D : this.outQty.doubleValue();
|
||||
}
|
||||
|
||||
public Double getPickQty() {
|
||||
return pickQty == null ? 0D : this.pickQty.doubleValue();
|
||||
}
|
||||
|
||||
public Double getActualQty() {
|
||||
return actualQty == null ? 0D : this.actualQty.doubleValue();
|
||||
}
|
||||
|
||||
public Double getRecQty() {
|
||||
return recQty == null ? 0D : this.recQty.doubleValue();
|
||||
}
|
||||
|
||||
public Integer getIsTaskVal() {
|
||||
return isTask == null ? 0 : this.isTask.intValue();
|
||||
}
|
||||
|
||||
public Integer getOrderMasterStatus() {
|
||||
return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue();
|
||||
}
|
||||
|
||||
public WmsTmsShippingExtDetail(WmsDocMovementDetails docMovementDetails,String moveNo) {
|
||||
this.moveNo = moveNo;
|
||||
this.partNo = docMovementDetails.getPartNo();
|
||||
this.partNameRdd = docMovementDetails.getPartNameRdd();
|
||||
this.item = docMovementDetails.getItem();
|
||||
this.qty =docMovementDetails.getQty();
|
||||
this.unit = docMovementDetails.getUnit();
|
||||
this.srcWhNo = docMovementDetails.getSrcWhNo();
|
||||
this.srcZoneNo = docMovementDetails.getSrcZoneNo();
|
||||
this.srcLocateNo = docMovementDetails.getSrcLocateNo();
|
||||
this.destWhNo = docMovementDetails.getDestWhNo();
|
||||
this.destZoneNo = docMovementDetails.getDestZoneNo();
|
||||
this.destLocateNo = docMovementDetails.getDestLocateNo();
|
||||
this.printQty = docMovementDetails.getPrintQty();
|
||||
this.planDate = docMovementDetails.getPlanDate();
|
||||
this.planTime = docMovementDetails.getPlanTime();
|
||||
this.srcNo = docMovementDetails.getSrcNo();
|
||||
this.itemStatus = docMovementDetails.getItemStatus();
|
||||
this.isFree = docMovementDetails.getIsFree();
|
||||
this.remark = docMovementDetails.getRemark();
|
||||
this.pickQty = docMovementDetails.getPickQty();
|
||||
this.outQty = docMovementDetails.getOutQty();
|
||||
this.recQty = docMovementDetails.getRecQty();
|
||||
this.moveQty = docMovementDetails.getMoveQty();
|
||||
this.taskGenerateQty = docMovementDetails.getTaskGenerateQty();
|
||||
this.srcAreaNo = docMovementDetails.getSrcAreaNo();
|
||||
this.destAreaNo = docMovementDetails.getDestAreaNo();
|
||||
this.lotNo = docMovementDetails.getLotNo();
|
||||
this.srcItem = docMovementDetails.getSrcItem();
|
||||
this.refOrderNo = docMovementDetails.getOrderNo();
|
||||
this.custOrderNo = docMovementDetails.getCustOrderNo();
|
||||
this.assignDateCode = docMovementDetails.getAssignDateCode();
|
||||
this.actualLot = docMovementDetails.getActualLot();
|
||||
this.actualQty = docMovementDetails.getActualQty();
|
||||
this.recommondLot = docMovementDetails.getRecommondLot();
|
||||
this.recommondLocateNo = docMovementDetails.getRecommondLocateNo();
|
||||
this.isSet = docMovementDetails.getIsSet();
|
||||
this.dateCode = docMovementDetails.getDateCode();
|
||||
this.inputMoveQty = docMovementDetails.getInputMoveQty();
|
||||
this.snp = docMovementDetails.getSnp();
|
||||
this.detailsSnCount = docMovementDetails.getDetailsSnCount();
|
||||
this.restQty = docMovementDetails.getRestQty();
|
||||
this.isTask = docMovementDetails.getIsTask();
|
||||
this.orderMasterStatus = docMovementDetails.getOrderMasterStatus();
|
||||
this.printStatus = docMovementDetails.getPrintStatus();
|
||||
this.priority = docMovementDetails.getPriority();
|
||||
this.sumQty = docMovementDetails.getSumQty();
|
||||
this.sumPickQty = docMovementDetails.getSumPickQty();
|
||||
this.executeStatus = docMovementDetails.getExecuteStatus();
|
||||
this.lockVersion = docMovementDetails.getLockVersion();
|
||||
this.moveType = docMovementDetails.getMoveType();
|
||||
this.busiType = docMovementDetails.getBusiType();
|
||||
this.isSn = docMovementDetails.getIsSn();
|
||||
}
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExtDetail;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : 装车单明细
|
||||
* @Reference :
|
||||
* @author: qianhuasheng
|
||||
* @date: 2019/9/19 14:22
|
||||
* @Modify:
|
||||
*/
|
||||
|
||||
@Repository
|
||||
public interface IWmsTmsShippingExtDetailRepository extends BaseRepository<WmsTmsShippingExtDetail,Long> {
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExtSn;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : 装车单条码明细
|
||||
* @Reference :
|
||||
* @author: qianhuasheng
|
||||
* @date: 2019/9/19 14:22
|
||||
* @Modify:
|
||||
*/
|
||||
|
||||
@Repository
|
||||
public interface IWmsTmsShippingExtSnRepository extends BaseRepository<WmsTmsShippingExtSn,Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue