Merge branch 'dev' into test
wynne1005
5 years ago
commit
81753d3260
@ -0,0 +1,58 @@
|
||||
package cn.estsh.i3plus.pojo.andon.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
|
||||
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 : ANDON_上升流程配置
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-05-13 9:53
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name="ANDON_RITE_ROUTE")
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("ANDON_上升流程配置")
|
||||
public class AndonRiteRoute extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 5542314911937418047L;
|
||||
|
||||
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
|
||||
@Column(name = "ALARM_CODE")
|
||||
@ApiParam(value = "安灯类型")
|
||||
private String alarmCode;
|
||||
|
||||
@AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_ACTION_TAG.class,refForeignKey = "code",value = "description")
|
||||
@Column(name = "ANDON_STATUS")
|
||||
@ApiParam(value = "安灯状态")
|
||||
private String andonStatus;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam(value = "工作中心")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "MEMO")
|
||||
@ApiParam(value = "备注")
|
||||
private String memo;
|
||||
|
||||
@AnnoOutputColumn(hidden = true)
|
||||
@Column(name = "WORK_CENTER_NAME_RDD")
|
||||
@ApiParam(value = "工作中心名称")
|
||||
private String workCenterNameRdd;
|
||||
}
|
||||
@ -0,0 +1,58 @@
|
||||
package cn.estsh.i3plus.pojo.andon.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
|
||||
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 : ANDON_上升配置明细
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-05-13 9:53
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name="ANDON_RITE_ROUTE_DETAIL")
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("ANDON_上升配置明细")
|
||||
public class AndonRiteRouteDetail extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 8382210828244626428L;
|
||||
|
||||
@Column(name = "RITE_ROUTE_ID")
|
||||
@ApiParam(value = "上升流程配置ID")
|
||||
private Long riteRouteId;
|
||||
|
||||
@Column(name = "RP_WHERE")
|
||||
@ApiParam(value = "通知时间")
|
||||
private String rpWhere;
|
||||
|
||||
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
|
||||
@Column(name = "RP_CODE")
|
||||
@ApiParam(value = "通知方式代码")
|
||||
private String rpCode;
|
||||
|
||||
@Column(name = "RP_OBJECT_CODE")
|
||||
@ApiParam(value = "通知对象")
|
||||
private String rpObjectCode;
|
||||
|
||||
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_LEVEL.class,refForeignKey = "value",value = "description")
|
||||
@Column(name = "RP_LEVEL")
|
||||
@ApiParam(value = "通知级别")
|
||||
private String rpLevel;
|
||||
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
package cn.estsh.i3plus.pojo.andon.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRouteModuleParam;
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonRouteModuleParam;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 流程明细Model
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2020-04-10 13:27
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("流程明细Model")
|
||||
public class AndonActionModuleGroupModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 2483914575357867288L;
|
||||
|
||||
@ApiParam("组件代码")
|
||||
private String amCode;
|
||||
|
||||
@ApiParam("执行顺序")
|
||||
private Integer seq;
|
||||
|
||||
@ApiParam("流程组件参数集合")
|
||||
private List<AndonRouteModuleParam> routeModuleParamList;
|
||||
|
||||
@ApiParam("区域流程组件参数集合")
|
||||
private List<AndonAlarmRouteModuleParam> alarmRouteModuleParamList;
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
package cn.estsh.i3plus.pojo.andon.model;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 作业流程Model
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2020-04-10 13:27
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("作业流程Model")
|
||||
public class AndonBussinessProcessModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 801986911134685985L;
|
||||
|
||||
@ApiParam("流程代码")
|
||||
private String routeCode;
|
||||
|
||||
@ApiParam("GOJS位置")
|
||||
private String position;
|
||||
|
||||
@ApiParam("流程明细Model集合")
|
||||
private List<AndonProcessDetailModel> processDetailModelList;
|
||||
|
||||
@ApiParam("安灯流程ID")
|
||||
private Long alarmRouteId;
|
||||
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
package cn.estsh.i3plus.pojo.andon.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description: 上升配置明细model
|
||||
* @Reference:
|
||||
* @Author: wangjie
|
||||
* @CreateDate:2019-11-12-10:21
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class AndonRiteRouteDetailModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1993963582174708808L;
|
||||
|
||||
@ApiParam(value = "安灯类型")
|
||||
private String alarmCode;
|
||||
|
||||
@ApiParam(value = "安灯状态")
|
||||
private String andonStatus;
|
||||
|
||||
@ApiParam(value = "工作中心")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam(value = "备注")
|
||||
private String memo;
|
||||
|
||||
@ApiParam(value = "工作中心名称")
|
||||
private String workCenterNameRdd;
|
||||
|
||||
@ApiParam(value = "上升流程配置ID")
|
||||
private Long riteRouteId;
|
||||
|
||||
@ApiParam(value = "通知时间")
|
||||
private String rpWhere;
|
||||
|
||||
@ApiParam(value = "通知方式代码")
|
||||
private String rpCode;
|
||||
|
||||
@ApiParam(value = "通知对象")
|
||||
private String rpObjectCode;
|
||||
|
||||
@ApiParam(value = "通知级别")
|
||||
private String rpLevel;
|
||||
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleGroup;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-05-13 11:07
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonActionModuleGroupRepository extends BaseRepository<AndonActionModuleGroup, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonActionRoute;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-05-13 11:07
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonActionRouteRepository extends BaseRepository<AndonActionRoute, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRoute;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-05-13 11:07
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonAlarmRouteRepository extends BaseRepository<AndonAlarmRoute, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRouteDetail;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonRiteRouteDetailRepository extends BaseRepository<AndonRiteRouteDetail, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRoute;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonRiteRouteRepository extends BaseRepository<AndonRiteRoute, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonRouteModuleParam;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-05-13 11:07
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonRouteModuleParamRepository extends BaseRepository<AndonRouteModuleParam, Long> {
|
||||
}
|
||||
@ -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.*;
|
||||
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 : joke
|
||||
* @CreateDate : 2020-03-06 10:01 上午
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Builder
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_QUEUE_JIT_ACTUAL_BOM")
|
||||
@Api("客户JIT生产队列散件清单")
|
||||
public class MesQueueJitActualBom extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = 1604529847020812472L;
|
||||
|
||||
@Column(name = "JIS_ACTUAL_NO")
|
||||
@ApiParam("队列编号")
|
||||
private String jisActualNo;
|
||||
|
||||
@Column(name = "ASSY_NO")
|
||||
@ApiParam("组件编号")
|
||||
private String assyNo;
|
||||
|
||||
@Column(name = "PRODUCE_CTGY_CODE")
|
||||
@ApiParam("产品位置代码")
|
||||
private String produceCtgyCode;
|
||||
|
||||
@Column(name = "CUST_PART_NO")
|
||||
@ApiParam("客户物料号")
|
||||
private String custPartNo;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam("用量")
|
||||
private Double qty = 0d;
|
||||
|
||||
@Column(name = "PART_COLOR_VALUE")
|
||||
@ApiParam("零件色值")
|
||||
private String partColorValue;
|
||||
}
|
||||
@ -0,0 +1,60 @@
|
||||
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: jessica.chen
|
||||
* @CreateDate: 2019\11\15 10:01
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_QUEUE_ORDER_BOM")
|
||||
@Api("MES_生产队列散件清单")
|
||||
public class MesQueueOrderBom extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -5412635747424111476L;
|
||||
@Column(name = "ORDER_NO")
|
||||
@ApiParam("主队列编号")
|
||||
private String orderNo;
|
||||
|
||||
@Column(name = "VIN_CODE")
|
||||
@ApiParam("Vin")
|
||||
private String vinCode;
|
||||
|
||||
@Column(name = "ASSY_NO")
|
||||
@ApiParam("组件编号")
|
||||
private String assyNo;
|
||||
|
||||
@Column(name = "PRODUCE_CTGY_CODE")
|
||||
@ApiParam("产品位置代码")
|
||||
private String produceCtgyCode;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam("用量")
|
||||
private Double qty = 0d;
|
||||
|
||||
@Column(name = "COLOR_CODE")
|
||||
@ApiParam("颜色代码")
|
||||
private String colorCode;
|
||||
}
|
||||
@ -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.MesQueueJitActualBom;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/5/21 20:17
|
||||
* @desc
|
||||
*/
|
||||
@Repository
|
||||
public interface MesQueueJitActualBomRepository extends BaseRepository<MesQueueJitActualBom, 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.MesQueueOrderBom;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\11\18 10:34
|
||||
* @Modify:
|
||||
**/
|
||||
public interface MesQueueOrderBomRepository extends BaseRepository<MesQueueOrderBom, Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue