Merge remote-tracking branch 'origin/dev' into dev
袁津哲
5 years ago
commit
ffbd512b89
@ -0,0 +1,42 @@
|
||||
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/3/30 11:28
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_ACTION_MODULE_GROUP")
|
||||
@Api("工步集")
|
||||
public class MesActionModuleGroup extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = 1876053661752102998L;
|
||||
|
||||
@Column(name = "AMG_ID")
|
||||
@ApiParam("组件集编号")
|
||||
private Long amgId;
|
||||
|
||||
@Column(name = "AM_CODE")
|
||||
@ApiParam("组件集代码")
|
||||
private String amCode;
|
||||
|
||||
@Column(name = "SEQ")
|
||||
@ApiParam("执行顺序")
|
||||
private Integer seq;
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description : MES_容器
|
||||
* @Reference :
|
||||
* @Author : jimmy.zeng
|
||||
* @CreateDate : 2020-03-27 14:29
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_CONTAINER")
|
||||
@Api("MES_容器类型")
|
||||
public class MesContainer extends BaseBean {
|
||||
private static final long serialVersionUID = -3843389042411645111L;
|
||||
|
||||
@Column(name = "CT_NO")
|
||||
@ApiParam(value = "容器编号")
|
||||
private String ctNo;
|
||||
|
||||
@Column(name = "CT_CODE")
|
||||
@ApiParam(value = "容器类型代码")
|
||||
private String ctCode;
|
||||
|
||||
@Column(name = "USE_STATUS")
|
||||
@ApiParam(value = "使用状态")
|
||||
private String useStatus;
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
package cn.estsh.i3plus.pojo.mes.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.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description : MES_容器类型
|
||||
* @Reference :
|
||||
* @Author : jimmy.zeng
|
||||
* @CreateDate : 2020-03-27 14:24
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_CONTAINER_TYPE")
|
||||
@Api("MES_容器类型")
|
||||
public class MesContainerType extends BaseBean {
|
||||
|
||||
private static final long serialVersionUID = 2831600566482383573L;
|
||||
|
||||
@Column(name = "CT_CODE")
|
||||
@ApiParam(value = "容器类型代码")
|
||||
private String ctCode;
|
||||
|
||||
@Column(name = "CT_NAME")
|
||||
@ApiParam(value = "容器类型名称")
|
||||
private String ctName;
|
||||
|
||||
@Column(name = "USE_LIMIT")
|
||||
@ApiParam(value = "使用期限")
|
||||
private Integer useLimit;
|
||||
|
||||
@Column(name = "IS_RECYCLE")
|
||||
@ApiParam(value = "是否回收")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
|
||||
private Integer isRecycle;
|
||||
|
||||
@Column(name = "LIMIT_UOM")
|
||||
@ApiParam(value = "期限单位")
|
||||
private String limitUom;
|
||||
}
|
||||
@ -0,0 +1,62 @@
|
||||
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/3/30 11:48
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_SM_ROUTE_OPT_PARAM")
|
||||
@Api("产品流程状态机配置操作参数表")
|
||||
public class MesSmRouteOptParam extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = -5466013923105175070L;
|
||||
|
||||
@Column(name = "PROD_ROUTE_CFG_ID")
|
||||
@ApiParam("产品流程Id")
|
||||
private Integer prodRouteCfgId;
|
||||
|
||||
@Column(name="ROUTE_CODE")
|
||||
@ApiParam("流程代码")
|
||||
private String routeCode;
|
||||
|
||||
@Column(name="PROCESS_CODE")
|
||||
@ApiParam("工序代码")
|
||||
private String processCode;
|
||||
|
||||
@Column(name="STEP_CODE")
|
||||
@ApiParam("工步代码")
|
||||
private String stepCode;
|
||||
|
||||
@Column(name="STEP_SEQ")
|
||||
@ApiParam("工步顺序")
|
||||
private Integer stepSeq;
|
||||
|
||||
@Column(name="PARAM_TYPE")
|
||||
private Integer paramType;
|
||||
|
||||
@Column(name="PARAM_CODE")
|
||||
private String paramCode;
|
||||
|
||||
@Column(name="PARAM_VALUE")
|
||||
private String paramValue;
|
||||
|
||||
@Column(name="IS_ACTION")
|
||||
private Integer isAction;
|
||||
}
|
||||
@ -0,0 +1,48 @@
|
||||
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.Lob;
|
||||
import javax.persistence.Table;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/3/30 11:12
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_STATE_MACHINE")
|
||||
@Api("MES状态机")
|
||||
public class MesStateMachine extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = 6093522587973076640L;
|
||||
|
||||
@Column(name = "SM_CODE")
|
||||
@ApiParam("状态机代码")
|
||||
private String smCode;
|
||||
|
||||
@Column(name = "SM_NAME")
|
||||
@ApiParam("状态机名称")
|
||||
private String smName;
|
||||
|
||||
@Column(name = "SM_TYPE")
|
||||
@ApiParam("状态机类型")
|
||||
private String smType;
|
||||
|
||||
@Lob
|
||||
@Column(name = "POSITION")
|
||||
@ApiParam("GOJS的位置")
|
||||
private String position;
|
||||
}
|
||||
@ -0,0 +1,75 @@
|
||||
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.Lob;
|
||||
import javax.persistence.Table;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/3/30 11:12
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_STATE_MACHINE_STATUS")
|
||||
@Api("MES状态机步骤")
|
||||
public class MesStateMachineStatus extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = 6093522587973076640L;
|
||||
|
||||
@Column(name = "SM_CODE")
|
||||
@ApiParam("状态机代码")
|
||||
private String smCode;
|
||||
|
||||
@Column(name = "STATUS_CODE")
|
||||
@ApiParam("状态代码")
|
||||
private String statusCode;
|
||||
|
||||
@Column(name = "NEXT_STATUS")
|
||||
@ApiParam("下一状态")
|
||||
private String nextStatus;
|
||||
|
||||
@Column(name = "STATUS_NAME")
|
||||
@ApiParam("状态名称")
|
||||
private String statusName;
|
||||
|
||||
@Column(name = "TRIGGER_TYPE")
|
||||
@ApiParam("触发类型 10=内部触发 20=外部触发")
|
||||
private Integer triggerType;
|
||||
|
||||
@Column(name = "TRIGGER_EVENT")
|
||||
@ApiParam("触发事件")
|
||||
private String triggerEvent;
|
||||
|
||||
@Column(name = "TRIGGER_WHERE")
|
||||
@ApiParam("触发条件")
|
||||
private String triggerWhere;
|
||||
|
||||
@Column(name = "ACTION_AMG_ID")
|
||||
@ApiParam("触发调用")
|
||||
private Integer actionAmgId;
|
||||
|
||||
@Column(name = "IN_AMG_ID")
|
||||
@ApiParam("进入调用")
|
||||
private Integer inAmgId;
|
||||
|
||||
@Column(name = "OUT_AMG_ID")
|
||||
@ApiParam("离开调用")
|
||||
private Integer outAmgId;
|
||||
|
||||
@Column(name = "STATUS_TYPE", columnDefinition = "tinyint default 0")
|
||||
@ApiParam("状态类型 10=初始化状态")
|
||||
private Integer statusType;
|
||||
}
|
||||
@ -0,0 +1,45 @@
|
||||
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 :
|
||||
* @Reference :
|
||||
* @Author : zcg
|
||||
* @Date : 2020/3/20 0020 - 16:21
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_WINDOW_MODULE")
|
||||
@Api("MES_界面组件配置")
|
||||
public class MesWindowModule extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -634938009999201410L;
|
||||
|
||||
@Column(name = "WINDOW_NO")
|
||||
@ApiParam("菜单编号")
|
||||
private String windowNo;
|
||||
|
||||
@Column(name = "MODULE_CODE")
|
||||
@ApiParam("按钮组件代码")
|
||||
private String moduleCode;
|
||||
|
||||
@Column(name = "WINDOW_MODULE_BACK")
|
||||
@ApiParam("回调界面方法")
|
||||
private String windowModuleBack;
|
||||
|
||||
}
|
||||
@ -0,0 +1,47 @@
|
||||
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 :
|
||||
* @Reference :
|
||||
* @Author : zcg
|
||||
* @Date : 2020/3/20 0020 - 16:25
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_WINDOW_MODULE_PARAM")
|
||||
@Api("MES_界面组件参数配置")
|
||||
public class MesWindowModuleParam extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = -5834883080240684524L;
|
||||
|
||||
@Column(name = "WINDOW_NO")
|
||||
@ApiParam("界面编号")
|
||||
private String windowNo;
|
||||
|
||||
@Column(name = "MODULE_CODE")
|
||||
@ApiParam("组件代码")
|
||||
private String moduleCode;
|
||||
|
||||
@Column(name = "PARAM_CODE")
|
||||
@ApiParam("参数代码")
|
||||
private String paramCode;
|
||||
|
||||
@Column(name = "PARAM_VALUE")
|
||||
@ApiParam("参数值")
|
||||
private String paramValue;
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : zcg
|
||||
* @Date : 2020/3/25 0025 - 19:41
|
||||
*/
|
||||
@Data
|
||||
@Api("按钮组件传输响应Model")
|
||||
public class ButtonComponentResultModel {
|
||||
|
||||
@ApiParam("成功信号")
|
||||
private boolean isSuccess;
|
||||
|
||||
@ApiParam("提示信息")
|
||||
private String msg;
|
||||
|
||||
@ApiParam("动态按钮组")
|
||||
private List<ButtonModel> buttonModels;
|
||||
|
||||
@ApiParam("过程条码")
|
||||
private String serialNumber;
|
||||
|
||||
@ApiParam("产品条码信息")
|
||||
private MesProduceSn produceSn;
|
||||
|
||||
@ApiParam("主队列编号")
|
||||
private String orderNo;
|
||||
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* @Description : 按钮model
|
||||
* @Reference :
|
||||
* @Author : zcg
|
||||
* @Date : 2020/3/25 0025 - 5:02
|
||||
*/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Api("按钮组件")
|
||||
public class ButtonModel {
|
||||
@ApiParam("组件代码")
|
||||
private String moduleCode;
|
||||
|
||||
@ApiParam("组件名称")
|
||||
private String moduleName;
|
||||
|
||||
@ApiParam("界面回调方法")
|
||||
private String windowModuleBack;
|
||||
}
|
||||
@ -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.MesWindowModuleParam;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : zcg
|
||||
* @Date : 2020/3/20 0020 - 16:37
|
||||
*/
|
||||
@Repository
|
||||
public interface MesWindowModuleParamRepository extends BaseRepository<MesWindowModuleParam,Long> {
|
||||
}
|
||||
@ -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.MesWindowModule;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : zcg
|
||||
* @Date : 2020/3/20 0020 - 16:36
|
||||
*/
|
||||
@Repository
|
||||
public interface MesWindowModuleRepository extends BaseRepository<MesWindowModule,Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue