I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
jiajack 6 years ago
parent aef7f7a948 d0b98f0869
commit f6b06e6b52
266 changed files with 5984 additions and 1187 deletions
Show Stats Download Patch File Download Diff File

14
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java
Unescape Escape View File

@ -13,6 +13,8 @@ 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 : ANDON_自处理配置
@ -51,6 +53,14 @@ public class AndonDisposalCfg extends BaseBean {
@ApiParam(value = "呼叫原因描述")
private String acNameRdd;
@Column(name = "EM_CODE")
@ApiParam(value = "事件方法代码")
private String emCode;
@Column(name = "EM_NAME_RDD")
@ApiParam(value = "事件方法描述")
private String emNameRdd;
@AnnoOutputColumn(refClass = AndonEnumUtil.KNOWLEDGE_AUDIT_STATUS.class,refForeignKey = "value",value = "description")
@Column(name = "FLOW_STATUS")
@ApiParam(value = "审批状态")
@ -59,4 +69,8 @@ public class AndonDisposalCfg extends BaseBean {
@Column(name = "FLOW_MEMO")
@ApiParam(value = "审批意见")
private String flowMemo;
@Transient
@ApiParam(value = "审批意见集合")
private Integer[] flowStatusArray;
}

15
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java
Unescape Escape View File

@ -30,27 +30,12 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Api("Andon自处理维护配置")
public class AndonDisposalMaintenCfg extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam(value = "工作单元代码")
private String workCellCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
private String alarmCode;
@Column(name = "AC_CODE")
@ApiParam(value = "呼叫原因代码")
private String acCode;
@Column(name = "EM_CODE")
@ApiParam(value = "处理措施代码")
private String emCode;
@Column(name = "RP_WHERE")
@ApiParam(value = "有效时长")
private Integer rpWhere;

8
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
Unescape Escape View File

@ -250,6 +250,14 @@ public class AndonManageQueue extends BaseManageQueue {
@ApiParam(value ="规格型号")
private String scale;
@Transient
@ApiParam(value ="当前件数")
private Integer currentProdNum;
@Transient
@ApiParam(value ="生产累计件数")
private Integer totalProdNum;
// 是否转呼
public Integer getIsShiftCall() {
return this.isShiftCall == null ? 0 : this.isShiftCall;

148
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -35,116 +36,38 @@ import javax.persistence.*;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯记录")
public class AndonManageRecord extends BaseBean {
@Column(name = "ANDON_ORDER_NO")
@ApiParam(value = "安灯队列编号")
private String andonOrderNo;
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;
@Column(name = "ACTION_CODE")
@ApiParam(value = "安灯动作代码")
private String actionCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CENTER_NAME_RDD")
@ApiParam(value = "工作中心名称")
private String workCenterNameRdd;
@Column(name = "WORK_CELL_NAME_RDD")
@ApiParam(value = "工作单元名称")
private String workCellNameRdd;
@Column(name = "WORK_CELL_CODE")
@ApiParam(value = "工作单元代码")
private String workCellCode;
@Column(name = "EQUIPMENT_CODE")
@ApiParam(value = "设备代码")
private String equipmentCode;
@Column(name = "EQUIPMENT_NAME_RDD")
@ApiParam(value = "设备名称")
private String equipmentNameRdd;
@Column(name = "SHIFT_CODE")
@ApiParam(value = "班次代码")
private String shiftCode;
@Column(name = "SHIFT_NAME_RDD")
@ApiParam(value = "班次名称")
private String shiftNameRdd;
@Column(name = "STATUS_CODE")
@ApiParam(value = "安灯状态代码")
private String statusCode;
public class AndonManageRecord extends BaseManageQueue {
@Column(name = "SEQ")
@ApiParam(value = "序号", example = "1")
private Double seq;
@Column(name = "PRIORITY_LEVEL")
@ApiParam(value = "优先级别", example = "1")
private Integer priorityLevel;
@Column(name="CALL_TIME",updatable = false)
@ApiParam(value = "呼叫时间")
@AnnoOutputColumn(hidden = true)
public String callTime;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00")
@AnnoOutputColumn(hidden = true)
public String callTimeStr;
@Column(name="CONFIRM_TIME",updatable = false)
@ApiParam(value = "响应时间")
@AnnoOutputColumn(hidden = true)
public String confirmTime;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="响应时间",example = "2018-01-01 01:00:00")
@AnnoOutputColumn(hidden = true)
public String confirmTimeStr;
@Column(name="RESET_TIME",updatable = false)
@ApiParam(value = "解决时间")
@AnnoOutputColumn(hidden = true)
public String resetTime;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="解决时间",example = "2018-01-01 01:00:00")
@AnnoOutputColumn(hidden = true)
public String resetTimeStr;
@Column(name = "CALL_USER")
@ApiParam(value = "呼叫人")
private String callUser;
@Transient
@ApiParam(value = "呼叫人名字")
private String callUserName;
@Column(name = "CONFIRM_USER")
@ApiParam(value = "响应人")
private String confirmUser;
@Transient
@ApiParam(value = "响应人名字")
private String confirmUserName;
@Column(name = "RESET_USER")
@ApiParam(value = "解决人")
private String resetUser;
@Transient
@ApiParam(value = "解决人名字")
@ -177,69 +100,10 @@ public class AndonManageRecord extends BaseBean {
@ApiParam(value = "转呼通知等级")
private String scRpLevel;
@Column(name = "AC_CODE")
@ApiParam(value = "呼叫原因代码")
private String acCode;
@Column(name = "AC_NAME_RDD")
@ApiParam(value = "呼叫原因描述")
private String acNameRdd;
@Column(name = "AC_DESC")
@ApiParam(value = "呼叫具体原因")
private String acDesc;
@Column(name = "EC_CODE")
@ApiParam(value = "事件原因代码")
private String ecCode;
@Column(name = "EC_NAME_RDD")
@ApiParam(value = "事件原因描述")
private String ecNameRdd;
@Column(name = "EC_DESC")
@ApiParam(value = "事件具体原因")
private String ecDesc;
@Column(name = "EM_CODE")
@ApiParam(value = "事件方法代码")
private String emCode;
@Column(name = "EM_NAME_RDD")
@ApiParam(value = "事件方法描述")
private String emNameRdd;
@Column(name = "EM_DESC")
@ApiParam(value = "事件具体方法")
private String emDesc;
@Column(name = "IS_HALT")
@ApiParam(value = "是否停机", example = "1")
private Integer isHalt;
@Column(name = "HALT_CODE")
@ApiParam(value = "停机类型")
private String haltCode;
@Column(name = "HALT_DESC")
@ApiParam(value = "停机具体原因")
private String haltDesc;
@Column(name = "SEND_FLAG")
@ApiParam(value = "发送标志")
private String sendFlag;
/**
* 处理类型：10=标准处理，20=自处理
*/
@Column(name = "DISPOSAL_TYPE")
@ApiParam(value = "处理类型")
private String disposalType;
@Column(name = "ALARM_DETAIL_CODE")
@ApiParam(value = "安灯子类型代码")
private String alarmDetailCode;
@Column(name = "EPM_CODE")
@ApiParam(value = "事件现象代码")
private String epmCode;
@ -321,6 +185,14 @@ public class AndonManageRecord extends BaseBean {
@ApiParam(value ="规格型号")
private String scale;
@Transient
@ApiParam(value ="当前件数")
private Integer currentProdNum;
@Transient
@ApiParam(value ="生产累计件数")
private Integer totalProdNum;
// 是否转呼
public Integer getIsShiftCall() {
return this.isShiftCall == null ? 0 : this.isShiftCall;

8
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java
Unescape Escape View File

@ -92,4 +92,12 @@ public class AndonQueueAttach extends BaseBean {
@ApiParam(value ="规格型号")
private String scale;
@Column(name="CURRENT_PROD_NUM")
@ApiParam(value ="当前件数")
private Integer currentProdNum;
@Column(name="TOTAL_PROD_NUM")
@ApiParam(value ="生产累计件数")
private Integer totalProdNum;
}

4
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java
Unescape Escape View File

@ -62,6 +62,10 @@ public class MesWorkCell extends BaseBean {
@AnnoOutputColumn(hidden = true)
private String name;
@Column(name = "WORK_CELL_TYPE")
@ApiParam("工位类型")
private String workCellType;
public String getName(){
return this.workCellName;
}

8
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
Unescape Escape View File

@ -90,7 +90,7 @@ public class AndonHqlPack {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonBroadCast.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonBroadCast.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonBroadCast.getTargetIds(), "targetIds", packBean);
DdlPreparedPack.getStringLikerPack(andonBroadCast.getTargetIds(), "targetIds", packBean);
DdlPreparedPack.getStringEqualPack(andonBroadCast.getGroupNo(), "groupNo", packBean);
DdlPreparedPack.getStringEqualPack(andonBroadCast.getDeviceDec(), "deviceDec", packBean);
DdlPreparedPack.getNumEqualPack(andonBroadCast.getIsValid(),"isValid",packBean);
@ -120,11 +120,7 @@ public class AndonHqlPack {
public static DdlPackBean getAndonDisposalMaintenCfg(AndonDisposalMaintenCfg andonDisposalMaintenCfg) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAlarmCode(), "alarmCode", packBean);
DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getEmCode(), "emCode", packBean);
DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAcCode(), "acCode", packBean);
DdlPreparedPack.getNumEqualPack(andonDisposalMaintenCfg.getIsValid(),"isValid",packBean);
return packBean;
}
@ -138,7 +134,6 @@ public class AndonHqlPack {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonQueueAttach.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonQueueAttach.getAndonOrderNo(), "andonOrderNo", packBean);
DdlPreparedPack.getStringEqualPack(andonQueueAttach.getPartNo(), "partNo", packBean);
DdlPreparedPack.getNumEqualPack(andonQueueAttach.getIsValid(),"isValid",packBean);
return packBean;
}
@ -393,6 +388,7 @@ public class AndonHqlPack {
DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getWorkCellCode(),"workCellCode", result);
DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAlarmCode(),"alarmCode", result);
DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAcCode(),"acCode", result);
DdlPreparedPack.getInPackArray(andonDisposalCfg.getFlowStatusArray(), "flowStatus", result);
DdlPreparedPack.getNumEqualPack(andonDisposalCfg.getFlowStatus(),"flowStatus", result);
getStringBuilderPack(andonDisposalCfg, result);

48
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java
Unescape Escape View File

@ -0,0 +1,48 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :动态设置时间与副资源相关的配置
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-22
* @Modify:
**/
@Data
@Entity
@Table(name = "APS_ASSIST_RESOURCE_SET_TIME")
@Api("副资源设置时间")
public class AssistResourceSetTime extends BaseAPS {
@Column(name="RES_CODE")
@ApiParam(value ="资源编码")
private String resCode;
@Column(name="TYPE")
@ApiParam(value ="副资源使用类型")
private USE_TYPE type;
@Column(name="PREV_RESOURCE")
@ApiParam(value ="前资源编码")
private String prevResource;
@Column(name="POST_RESOURCE")
@ApiParam(value ="后资源编码")
private String postResource;
@Column(name="TIME")
@ApiParam(value ="设置时间")
private String time;
@Column(name="PRIORITY")
@ApiParam(value ="优先级")
private int priority;
}

57
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java
Unescape Escape View File

@ -0,0 +1,57 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.enums.DYNAMIC_SET_CALC;
import cn.estsh.i3plus.pojo.aps.enums.DYNAMIC_SET_TYPE;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :动态设置时间设置
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-22
* @Modify:
**/
@Data
@Entity
@Table(name = "APS_DYNAMIC_SET_TIME")
@Api("动态设置时间")
public class DynamicSetTime extends BaseAPS {
@Column(name="RES_CODE")
@ApiParam(value ="资源代码")
private String resCode;
@Column(name="TYPE")
@ApiParam(value ="应用工作计划类型")
private DYNAMIC_SET_TYPE type;
@Column(name="CONSIDER_ASS_RES")
@ApiParam(value ="是否启用副资源动态设置时间")
private Boolean considerAssRes;
@Column(name="CONSIDER_MATERIAL")
@ApiParam(value ="是否启用物料动态设置时间")
private Boolean considerMaterial;
@Column(name="ASS_RES_CALC")
@ApiParam(value ="副资源动态设置计算方式")
private DYNAMIC_SET_CALC assResCalc;
@Column(name="MATERIAL_CALC")
@ApiParam(value ="物料动态设置时间计算方式")
private DYNAMIC_SET_CALC materialCalc;
@Column(name="STATIC_CALC")
@ApiParam(value ="与静态设置时间计算方式")
private DYNAMIC_SET_CALC staticCalc;
@Column(name="PRIORITY")
@ApiParam(value ="优先级")
private int priority;
}

28
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java
Unescape Escape View File

@ -0,0 +1,28 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :炉资源计划信息，用来关联组在一起的工作计划
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-10-22
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="APS_FURNACE_PLAN")
@Api("炉资源计划")
public class FurnacePlan extends BaseAPS {
}

43
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java
Unescape Escape View File

@ -0,0 +1,43 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :动态设置时间与物料相关的配置
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-22
* @Modify:
**/
@Data
@Entity
@Table(name = "APS_MATERIAL_SET_TIME")
@Api("物料设置时间")
public class MaterialSetTime extends BaseAPS {
@Column(name="RES_CODE")
@ApiParam(value ="资源编码")
private String resCode;
@Column(name="PREV_MATERIAL")
@ApiParam(value ="前物料编码")
private String prevMaterial;
@Column(name="POST_MATERIAL")
@ApiParam(value ="后物料编码")
private String postMaterial;
@Column(name="TIME")
@ApiParam(value ="设置时间")
private String time;
@Column(name="PRIORITY")
@ApiParam(value ="优先级")
private int priority;
}

8
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java
Unescape Escape View File

@ -35,9 +35,9 @@ public class OperResource extends BaseAPS {
@ApiParam(value ="前设置时间")
private String prevTime;
@Column(name="MANUF_TIME")
@Column(name="PRODUCE_TIME")
@ApiParam(value ="生产时间")
private String manufTime;
private String produceTime;
@Column(name="POST_TIME")
@ApiParam(value ="后设置时间")
@ -47,9 +47,9 @@ public class OperResource extends BaseAPS {
@ApiParam(value ="最大前设置中断时间")
private String maxPrevSdTime;
@Column(name="MAX_MANUF_SD_TIME")
@Column(name="MAX_PRODUCE_SD_TIME")
@ApiParam(value ="最大生产中断时间")
private String maxManufSdTime;
private String maxProduceSdTime;
@Column(name="MAX_POST_SD_TIME")
@ApiParam(value ="最大后设置中断时间")

36
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_CLASS;
import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_LOCK_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.TIME_ROUND_TYPE;
import io.swagger.annotations.Api;
@ -48,37 +49,37 @@ public class Resource extends BaseCode {
@ApiParam(value ="后缓冲时间")
private String postBuffer;
@Column(name="MAX_MANUF_BATCH")
@Column(name="MAX_PRODUCE_BATCH")
@ApiParam(value ="最大生产批量")
private Double maxManufBatch;
private Double maxProduceBatch;
@Column(name="MANUF_ADJ_UNIT_TM")
@ApiParam(value ="生产时间尾数调整")
private String manufAdjUnitTm;
@Column(name="TIME_TAIL_ADJUST")
@ApiParam(value ="时间尾数调整")
private String timeTailAdjust;
@Column(name="MANUF_ADJ_UNIT")
@ApiParam(value ="生产时刻尾数调整")
private String manufAdjUnit;
@Column(name="TIME_ADJUST")
@ApiParam(value ="时间调整")
private String timeAdjust;
@Column(name="MAX_PREV_SD_TIME")
@ApiParam(value ="最大前设置中断时间")
private String maxPrevSdTime;
@Column(name="MAX_MANUF_SD_TIME")
@Column(name="MAX_PRODUCE_SD_TIME")
@ApiParam(value ="最大生产中断时间")
private String maxManufSdTime;
private String maxProduceSdTime;
@Column(name="MAX_POST_SD_TIME")
@ApiParam(value ="最大后设置中断时间")
private String maxPostSdTime;
@Column(name="ROUND_TYPE")
@ApiParam(value ="时间圆整类型")
@ApiParam(value ="时间与时间尾数圆整类型")
private TIME_ROUND_TYPE roundType;
@Column(name="MANUF_EFFECT")
@ApiParam(value ="生产效率影响")
private Integer manufEffect;
@Column(name="EFFICIENCY_EFFECT")
@ApiParam(value ="效率影响类型")
private Integer EfficiencyEffect;
@Column(name="TIME_ROUND")
@ApiParam(value ="时间圆整影响")
@ -88,4 +89,11 @@ public class Resource extends BaseCode {
@ApiParam(value ="时间尾数影响")
private Integer timeTailRound;
@Column(name="LOCK_TYPE")
@ApiParam(value ="锁定类型")
private RESOURCE_LOCK_TYPE lockType;
@Column(name="LOCK_TIME")
@ApiParam(value ="锁定时间长度")
private String lockTime;
}

83
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
Unescape Escape View File

@ -5,14 +5,17 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan;
import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation;
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.util.Date;
import java.util.List;
/**
* @Description :工作计划
@ -29,24 +32,70 @@ import java.util.Date;
@Table(name="APS_WORK_PLAN")
@Api("工作计划")
public class WorkPlan extends BaseAPS {
private Date prevSetStart;
@Column(name="PREV_SET_BEGIN")
@ApiParam(value ="前设置开始时间")
private Date prevSetBegin;
@Column(name="PREV_SET_END")
@ApiParam(value ="前设置结束时间")
private Date prevSetEnd;
private String prevSetTime;
private Date produceStart;
@Column(name="PREV_SET_TIME")
@ApiParam(value ="前设置时间")
private Integer prevSetTime;
@Column(name="PRODUCE_BEGIN")
@ApiParam(value ="生产开始时间")
private Date produceBegin;
@Column(name="PRODUCE_END")
@ApiParam(value ="生产结束时间")
private Date produceEnd;
private String produceTime;
private Date postSetStart;
@Column(name="PRODUCE_TIME")
@ApiParam(value ="生产时间")
private Integer produceTime;
@Column(name="POST_SET_BEGIN")
@ApiParam(value ="后设置开始时间")
private Date postSetBegin;
@Column(name="POST_SET_END")
@ApiParam(value ="后设置结束时间")
private Date postSetEnd;
private String postSetTime;
private Date lockStart;
@Column(name="POST_SET_TIME")
@ApiParam(value ="后设置时间")
private Integer postSetTime;
@Column(name="LOCK_BEGIN")
@ApiParam(value ="锁定开始时间")
private Date lockBegin;
@Column(name="LOCK_END")
@ApiParam(value ="锁定结束时间")
private Date lockEnd;
private String lockTime;
private Date edgeTime;
@Column(name="LOCK_TIME")
@ApiParam(value ="锁定时间")
private Integer lockTime;
@Column(name="WORK_ID")
@ApiParam(value ="工作对象id")
private Long workId;
@Column(name="RESOURCE_ID")
@ApiParam(value ="资源对象id")
private Long resourceId;
@Column(name="WORK_RESOURCE_ID")
@ApiParam(value ="工作资源对象id")
private Long workResourceId;
@Column(name="MAIN_PLAN_ID")
@ApiParam(value ="主计划对象id")
private Long mainPlanId;
public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }
public void setWork(Work work) {
@ -60,4 +109,20 @@ public class WorkPlan extends BaseAPS {
this.resourceId = resource != null ? resource.getId() : 0l;
BeanRelation.set(this, EWorkPlan.Resource, resource);
}
public WorkResource getWorkResource() { return BeanRelation.get(this, EWorkPlan.WorkResource); }
public void setWorkResource(WorkResource workResource) {
this.workResourceId = workResource != null ? workResource.getId() : 0l;
BeanRelation.set(this, EWorkPlan.WorkResource, workResource);
}
public WorkPlan getMainPlan() { return BeanRelation.get(this, EWorkPlan.MainPlan); }
public void setMainPlan(WorkPlan plan) {
this.mainPlanId = plan != null ? plan.getId() : 0l;
BeanRelation.set(this, EWorkPlan.MainPlan, plan);
}
public List<WorkPlan> getAssPlans() { return BeanRelation.list(this, EWorkPlan.AssPlans); }
}

8
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java
Unescape Escape View File

@ -34,9 +34,9 @@ public class WorkResource extends BaseAPS {
@ApiParam(value ="前设置时间")
private Long prevTime;
@Column(name="MANUF_TIME")
@Column(name="PRODUCE_TIME")
@ApiParam(value ="制造时间")
private Long manufTime;
private Long produceTime;
@Column(name="POST_TIME")
@ApiParam(value ="后设置时间")
@ -50,9 +50,9 @@ public class WorkResource extends BaseAPS {
@ApiParam(value ="最大前设置中断时间")
private String maxPrevSdTime;
@Column(name="MAX_MANUF_SD_TIME")
@Column(name="MAX_PRODUCE_SD_TIME")
@ApiParam(value ="最大制造中断时间")
private String maxManufSdTime;
private String maxProduceSdTime;
@Column(name="MAX_POST_SD_TIME")
@ApiParam(value ="最大后设置中断时间")

118
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java
Unescape Escape View File

@ -69,6 +69,13 @@ public class BeanRelation {
return temp;
}
/**
* 获取关联对象
* @param bean 实体对象
* @param holder 关联路径
* @param <T> 返回关联对象的实体类型
* @return 若存在多个关联则只取第一个。
*/
public static <T extends BaseBean> T get(BaseBean bean, Enum<?> holder) {
List<T> beans = (List<T>)get(bean).get(holder);
if (beans == null || beans.isEmpty()) {
@ -77,10 +84,27 @@ public class BeanRelation {
return beans.get(0);
}
/**
* 获取关联对象
* @param bean 实体对象
* @param holder 第一个关联路径
* @param args 后续关联路径
* @param <T> 返回关联对象的实体类型
* @return 若存在多个关联则只取第一个。
*/
public static <T extends BaseBean> T get(BaseBean bean, Enum<?> holder, Enum<?>... args) {
return get(bean, null, holder, args);
}
/**
* 根据筛选条件获取关联对象
* @param bean 实体对象
* @param pred Lambda表达式，用来筛选关联对象，返回true则符合筛选条件
* @param holder 第一个关联路径
* @param args 后续关联路径
* @param <T> 返回关联对象的实体类型
* @return 只找第一个符合筛选条件的关联对象。
*/
public static <T extends BaseBean> T get(BaseBean bean, Predicate<T> pred, Enum<?> holder, Enum<?>... args) {
List<BaseBean> nextBeans = list(bean, holder);
for (BaseBean nextEntity : nextBeans) {
@ -111,6 +135,13 @@ public class BeanRelation {
return null;
}
/**
* 获取关联对象集合
* @param bean 实体对象
* @param holder 关联路径
* @param <T> 返回关联对象的实体类型
* @return 返回的List集合非拷贝的，外界不能对其修改。
*/
public static <T extends BaseBean> List<T> list(BaseBean bean, Enum<?> holder) {
List<T> beans = (List<T>)get(bean).get(holder);
if (beans == null) {
@ -119,10 +150,27 @@ public class BeanRelation {
return beans;
}
/**
* 获取关联对象集合
* @param bean 实体对象
* @param holder 第一个关联路径
* @param args 后续关联路径
* @param <T> 返回关联对象的实体类型
* @return 返回的List集合为拷贝的，外界可以对其修改。
*/
public static <T extends BaseBean> List<T> list(BaseBean bean, Enum<?> holder, Enum<?>... args) {
return list(bean, null, holder, args);
}
/**
* 获取符合筛选条件的关联对象集合
* @param bean 实体对象
* @param pred Lambda筛选表达式，返回true为筛选出来的对象。
* @param holder 第一个关联路径
* @param args 后续关联路径
* @param <T> 返回关联对象的实体类型
* @return 返回的List集合为拷贝的，外界可以对其修改。
*/
public static <T extends BaseBean> List<T> list(BaseBean bean, Predicate<T> pred, Enum<?> holder, Enum<?>... args) {
List<T> result = new ArrayList<>();
List<BaseBean> nextBeans = list(bean, holder);
@ -157,6 +205,38 @@ public class BeanRelation {
}
}
public static <T extends BaseBean> List<T> lastList(BaseBean entity, Enum<?>... args) {
List<T> result = new ArrayList<T>();
lastListImpl(result, entity, null, args, 0);
return result;
}
public static <T extends BaseBean> List<T> lastList(BaseBean entity, Predicate<T> filter, Enum<?>... args) {
List<T> result = new ArrayList<T>();
lastListImpl(result, entity, filter, args, 0);
return result;
}
@SuppressWarnings("unchecked")
private final static <T extends BaseBean> boolean lastListImpl(List<T> result, BaseBean entity, Predicate<T> filter,
Enum<?>[] args, int index) {
if (index >= args.length) {
index = 0;
}
boolean bNotLast = true;
List<BaseBean> relaEntities = list(entity, args[index]);
for (BaseBean relaEntity : relaEntities) {
if (lastListImpl(result, relaEntity, filter, args, index + 1)) {
result.add((T)relaEntity);
bNotLast = false;
}
}
return index == 0 && bNotLast;
}
/**
* 设值两个对象之间的关联
*
@ -282,4 +362,42 @@ public class BeanRelation {
}
}
}
/**
* 按指定路径，递归调用lambda表达式，当lambda表达式返回false或路径存在循环则退出递归。
* @param bean
* @param fun
* @param holders
* @param <T>
*/
public static <T extends BaseBean> void recursion(BaseBean bean, Predicate<T> fun, Enum<?>... holders) {
if (holders.length == 0) {
return;
}
recursionImpl(bean, fun, holders, 0);
}
/**
* 按指定路径，递归调用实现。采用广度优先搜索。
* @param bean
* @param fun
* @param holders
* @param index
* @param <T>
*/
@SuppressWarnings("unchecked")
private final static <T extends BaseBean> void recursionImpl(BaseBean bean, Predicate<T> fun,
Enum<?>[] holders, int index) {
if (index >= holders.length) {
if (!fun.test((T) bean)) {
return;
}
index = 0;
}
List<BaseBean> relaBeans = list(bean, holders[index]);
for (BaseBean relaBean : relaBeans) {
recursionImpl(relaBean, fun, holders, index + 1);
}
}
}

7
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java
Unescape Escape View File

@ -0,0 +1,7 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum DYNAMIC_SET_CALC {
MIN, // 取最小值
MAX, // 取最大值
SUM // 求和
}

7
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java
Unescape Escape View File

@ -0,0 +1,7 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum DYNAMIC_SET_TYPE {
PREV_SET, // 只对前设置影响
POST_SET, // 只对后设置影响
ALL // 对前后设置都产生影响
}

18
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java
Unescape Escape View File

@ -0,0 +1,18 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum EFFICIENCY_EFFECT {
NONE(0),
PREV_SET(1),
PRODUCE(2),
POST_SET(4);
private int _value;
EFFICIENCY_EFFECT(int value){
_value = value;
}
public int value() {
return this._value;
}
}

15
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java
Unescape Escape View File

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :工作计划包含的时间类型
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum PLAN_TYPE {
PREV_SET,
PRODUCE,
POST_SET,
LOCK
}

7
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java
Unescape Escape View File

@ -0,0 +1,7 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum RESOURCE_LOCK_TYPE {
NONE, // 不锁定
PRODUCE_BEGIN, // 与后工序生产开始时刻有关
PRODUCE_END // 与后工序生产结束时刻有关
}

1
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java
Unescape Escape View File

@ -8,7 +8,6 @@ package cn.estsh.i3plus.pojo.aps.enums;
* @Modify:
**/
public enum TIME_ROUND_TYPE {
NONE, // 不圆整
UP, // 向上
DOWN, // 向下
ROUNDING // 四舍五入

1
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java
Unescape Escape View File

@ -15,7 +15,6 @@ public enum WORK_SORT_RULE {
ORDER_COUNT, // 订单数量
ORDER_RECEIVE_DATE,// 订单接单日期
ORDER_LET_SUB_EST,// 订单交货期与订单最早开始时刻之差
ORDER_PRESSURE, // 订单紧迫程度
ORDER_SURPLUS, // 订单余裕度
NOPLAN_OPERATION_SIZE,// 残留工序数
REMAIN_PRODUCE_TIME, // 残留生产时间

5
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java
Unescape Escape View File

@ -0,0 +1,5 @@
package cn.estsh.i3plus.pojo.aps.holders;
public enum EFurnacePlan {
WorkPlans
}

7
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java
Unescape Escape View File

@ -3,5 +3,10 @@ package cn.estsh.i3plus.pojo.aps.holders;
public enum EWorkPlan {
Work,
Resource,
AssPlans // 关联的为副资源的工作计划
WorkResource,
MainPlan, // 关联的为主资源的工作计划
AssPlans, // 关联的为副资源的工作计划
PrevPlan,
PostPlan,
FurnacePlan,
}

26
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java
Unescape Escape View File

@ -3,8 +3,32 @@ package cn.estsh.i3plus.pojo.aps.model;
import cn.estsh.i3plus.pojo.base.common.Pager;
import lombok.Data;
import java.util.List;
@Data
public class APSPager extends Pager {
public static class SortData {
// 排序对象
private String name;
// 排序类型，1为升序，0为降序
private int orderType;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getOrderType() {
return orderType;
}
public void setOrderType(int orderType) {
this.orderType = orderType;
}
}
private String filter;
private String sort;
private List<SortData> sorts;
}

9
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/AssistResourceSetTimeRepository.java
Unescape Escape View File

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.aps.repository;
import cn.estsh.i3plus.pojo.aps.bean.AssistResourceSetTime;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface AssistResourceSetTimeRepository extends CrudRepository<AssistResourceSetTime, Long> {
}

9
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DynamicSetTimeRepository.java
Unescape Escape View File

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.aps.repository;
import cn.estsh.i3plus.pojo.aps.bean.DynamicSetTime;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface DynamicSetTimeRepository extends CrudRepository<DynamicSetTime, Long> {
}

9
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FurnacePlanRepository.java
Unescape Escape View File

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.aps.repository;
import cn.estsh.i3plus.pojo.aps.bean.FurnacePlan;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface FurnacePlanRepository extends CrudRepository<FurnacePlan, Long> {
}

9
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialSetTimeRepository.java
Unescape Escape View File

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.aps.repository;
import cn.estsh.i3plus.pojo.aps.bean.MaterialSetTime;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface MaterialSetTimeRepository extends CrudRepository<MaterialSetTime, Long> {
}

5
modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml
Unescape Escape View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="FurnacePlan">
<Relation field="WorkPlans" name="WorkPlan" reverse="FurnacePlan" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

2
modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml
Unescape Escape View File

@ -12,6 +12,8 @@
</Relation>
<Relation field="Operation" name="Operation" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="WorkPlan" name="WorkPlan" reverse="Work" type="ONE_TO_ONE" owner="true">
</Relation>
<Relation field="PlanFeedbacks" name="PlanFeedback" reverse="Work" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

8
modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml
Unescape Escape View File

@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="WorkPlan">
<Relation field="Work" name="Work" reverse="WorkPlan" type="ONE_TO_ONE" owner="true">
</Relation>
<Relation field="Resource" name="Resource" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="AssPlans" name="WorkPlan" type="ONE_TO_MULTI" owner="false">
<Relation field="WorkResource" name="WorkResource" type="ONE_TO_ONE" owner="false">
</Relation>
<Relation field="AssPlans" name="WorkPlan" reverse="MainPlan" type="ONE_TO_MULTI" owner="false">
</Relation>
<Relation field="PrevPlan" name="WorkPlan" reverse="PostPlan" type="MULTI_TO_MULTI" owner="false">
</Relation>
</Class>

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
Unescape Escape View File

@ -67,7 +67,7 @@ public abstract class BaseBean implements Serializable {
@Column(name="IS_VALID")
@ApiParam(value = "有效性",example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
public Integer isValid; //CommonEnumUtil.IS_VAILD;
@Column(name="IS_DELETED")

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
Unescape Escape View File

@ -31,7 +31,7 @@ public class CommonEnumUtil {
JOBFLOW(23,"block-jobflow","智能作业流"),
SOFTSWITCH(24,"block-softswitch","软件适配器"),
HARDSWITCH(25,"block-hardswitch","硬件适配器"),
LAC(26,"link-connect","连接适配器"),
LAC(26,"lac","连接适配器"),
ANDON(27,"andon","安灯"),
CENTER(99,"icloud-server","注册中心"),
SURFACE(98,"i3surface","对外服务"),

614
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
Unescape Escape View File

@ -11,6 +11,158 @@ import com.fasterxml.jackson.annotation.JsonFormat;
**/
public class MesEnumUtil {
/**
* mes 图片面位
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_SIDE_LOCATION {
A_SIDE(10, "A面"),
B_SIDE(20, "B面"),
C_SIDE(30, "C面"),
D_SIDE(40, "D面");
private int value;
private String description;
MES_SIDE_LOCATION(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;
}
}
/**
* mes缺陷类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_DEFECT_TYPE {
DEFECT_TYPE1(10, "缺陷类型1"),
DEFECT_TYPE2(20, "缺陷类型2"),
DEFECT_TYPE3(30, "缺陷类型3");
private int value;
private String description;
MES_DEFECT_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;
}
}
/**
* mes类型信息，业务类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_TYPE_CFG_BUSIN_TYPE {
BUSIN_TYPE1(10, "业务类型1"),
BUSIN_TYPE2(20, "业务类型2"),
BUSIN_TYPE3(30, "业务类型3");
private int value;
private String description;
MES_TYPE_CFG_BUSIN_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;
}
}
/**
* mes缺陷原因类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_DEFECT_CAUSE_TYPE {
QUALITY_DEFECTS(10, "质量缺陷"),
PROCESS_DEFECTS(20, "工艺缺陷"),
EQUIPMENT_DEFECT(30, "设备缺陷");
private int value;
private String description;
MES_DEFECT_CAUSE_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;
}
}
/**
* mes设备作业任务明细-执行状态
@ -289,7 +441,409 @@ public class MesEnumUtil {
}
/**
* mes设备-作业类型
* mes设备作业通知配置-通知类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_NOTIFY_CFG_TYPE {
TASK_NOTIFY(10, "任务型通知");
private int value;
private String description;
MES_EQU_TASK_NOTIFY_CFG_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;
}
}
/**
* mes设备作业通知配置-通知方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_NOTIFY_CFG_PATTERN {
EMAIL(10, "邮件"),
USERPHONE(20, "手机号");
private int value;
private String description;
MES_EQU_TASK_NOTIFY_CFG_PATTERN(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;
}
}
/**
* mes设备通知对象配置-对象类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_NOTIFY_OBJECT_CFG_TYPE {
CHECK_NOTIFY_OBJECT(10, "点检通知对象"),
MAINTAIN_NOTIFY_OBJECT(20, "保养通知对象"),
REPAIR_NOTIFY_OBJECT(30, "维修通知对象");
private int value;
private String description;
MES_EQU_NOTIFY_OBJECT_CFG_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;
}
}
/**
* mes 工位类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_IS_REPEAT {
REPEATABLE(1, "可重复"),
NOT_REPEAT(2, "不可重复");
private int value;
private String description;
MES_IS_REPEAT(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_IS_REPEAT getByValue(int value) {
for (MES_IS_REPEAT mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
return mesInsertExcel;
}
}
return null;
}
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;
}
}
/**
* mes 工位类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_WORK_CELL_TYPE {
NORMAL(10, "正常"),
REWORK(20, "返修");
private int value;
private String description;
MES_WORK_CELL_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_WORK_CELL_TYPE getByValue(int value) {
for (MES_WORK_CELL_TYPE mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
return mesInsertExcel;
}
}
return null;
}
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;
}
}
/**
* pcn 动作类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_ACTION_TYPE {
BIND(10, "绑定"),
UNTYING(20, "解绑");
private int value;
private String description;
MES_ACTION_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_ACTION_TYPE getByValue(int value) {
for (MES_ACTION_TYPE mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
return mesInsertExcel;
}
}
return null;
}
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;
}
}
/**
* pcn 是否是关键件
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_IS_KEY {
IS_KEY(10, "是"),
NO_KEY(20, "否");
private int value;
private String description;
MES_IS_KEY(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_IS_KEY getByValue(int value) {
for (MES_IS_KEY mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
return mesInsertExcel;
}
}
return null;
}
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;
}
}
/**
* mes 维修状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_REPAIR_STATUS {
REPAIRED(10, "已维修"),
NO_REPAIR(20, "待维修");
private int value;
private String description;
MES_REPAIR_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_REPAIR_STATUS getByValue(int value) {
for (MES_REPAIR_STATUS mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
return mesInsertExcel;
}
}
return null;
}
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;
}
}
/**
* mes 操作类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_OPERATE_TYPE {
WORKSTATION_SCAN(10, "工位扫描"),
QUALITY_JUDGEMENT(20, "质量判定"),
MATERIAL_DISMANTLING(30, "物料拆解"),
REWORK(40, "返修作业"),
WORKSTATION_MONITORING(50, "工位监控");
private int value;
private String description;
MES_OPERATE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_OPERATE_TYPE getByValue(int value) {
for (MES_OPERATE_TYPE mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
return mesInsertExcel;
}
}
return null;
}
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;
}
}
/**
* mes设备作业要求-作业类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_TYPE {
@ -1081,7 +1635,8 @@ public class MesEnumUtil {
STANDARD_ORDER(10, "标准工单"),
BTS_ORDER(20, "BTS工单"),
ATTEMPT_ORDER(30, "试制工单");
ATTEMPT_ORDER(30, "试制工单"),
BH_ORDER(40, "B&H工单");;
private int value;
private String description;
@ -1314,6 +1869,7 @@ public class MesEnumUtil {
CREATE(10, "创建"),
PROCESS(20, "加工"),
OFFLINE(30, "下线"),
PACKAGE_SCAN(35, "打包扫描"),
INSTOCKED(40, "入库"),
SHIPING(50, "发运"),
CLOSE(90, "关闭"),
@ -1391,7 +1947,8 @@ public class MesEnumUtil {
QUALIFIED(10, "合格"),
DEFECTED(20, "不合格"),
SCRAPED(30, "报废");
SCRAPED(30, "报废"),
DISMANTLED(40, "已拆解");
private int value;
private String description;
@ -1469,7 +2026,7 @@ public class MesEnumUtil {
CUSTOM_COMPONENT("customComponent", "定制内容"),
TASK_COMPLETE("taskComplete", "整个扫描完成"),
STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
RUNNING_INFO("runningInfo", "运行信息"),
RUNNING_INFO("runningInfo", "执行信息"),
RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");
@ -1699,7 +2256,8 @@ public class MesEnumUtil {
UPDATE_SYNC_TIME(50, "UPDATE_SYNC_TIME"),
PCN_PULL(60, "PCN_PULL"),
PCN_PUSH(70, "PCN_PUSH"),
FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD");
FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"),
REWORK_REPAIR(90, "REWORK_REPAIR");
private int value;
private String description;
@ -1848,4 +2406,50 @@ public class MesEnumUtil {
}
}
/**
* MesRoute 流程的类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTE_TYPE {
SCAN(10, "扫描流程"),
MONITOR(20, "监控流程");
private int value;
private String description;
ROUTE_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 String valueOfDescription2(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
}
}
return tmp;
}
}
}

366
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

@ -13,6 +13,168 @@ import org.apache.commons.lang3.StringUtils;
public class MesPcnEnumUtil {
/**
* mes缺陷原因类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_DEFECT_CAUSE_TYPE {
QUALITY_DEFECTS(10, "质量缺陷"),
PROCESS_DEFECTS(20, "工艺缺陷"),
EQUIPMENT_DEFECT(30, "设备缺陷");
private int value;
private String description;
MES_DEFECT_CAUSE_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;
}
}
/**
* mes 图片面位
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_SIDE_LOCATION {
A_SIDE(10, "A面"),
B_SIDE(20, "B面"),
C_SIDE(30, "C面"),
D_SIDE(40, "D面");
private int value;
private String description;
MES_SIDE_LOCATION(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;
}
}
/**
* mes 维修状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_REPAIR_STATUS {
REPAIRED(10, "已维修"),
NO_REPAIR(20, "待维修");
private int value;
private String description;
MES_REPAIR_STATUS(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;
}
}
/**
* mes过程质量检测类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_QC_CHECK_TYPE {
FIRST_CHECK(10, "首检"),
ON_SITE_CHECK(20, "巡检"),
END_CHECK(30, "尾检");
private int value;
private String description;
MES_QC_CHECK_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 Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* mes-pcn定时任务状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -351,20 +513,20 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_CENTER_RUNNING_STATUS {
RUNNING(1, "start", "开线"),
STOPPED(2, "stop", "停线");
RUNNING("Y", "start", "开线"),
STOPPED("N", "stop", "停线");
private int value;
private String value;
private String code;
private String description;
WORK_CENTER_RUNNING_STATUS(int value, String code, String description) {
WORK_CENTER_RUNNING_STATUS(String value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
public String getValue() {
return value;
}
@ -376,20 +538,20 @@ public class MesPcnEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfCode(int val) {
public static String valueOfCode(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
if (values()[i].value.equals(val)) {
tmp = values()[i].code;
}
}
@ -855,7 +1017,8 @@ public class MesPcnEnumUtil {
STANDARD_ORDER(10, "标准工单"),
BTS_ORDER(20, "BTS工单"),
ATTEMPT_ORDER(30, "试制工单");
ATTEMPT_ORDER(30, "试制工单"),
BH_ORDER(40, "B&H工单");
private int value;
private String description;
@ -1405,4 +1568,187 @@ public class MesPcnEnumUtil {
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRODUCE_SN_STATUS {
CREATE(10, "创建"),
PROCESS(20, "加工"),
OFFLINE(30, "下线"),
PACKAGE_SCAN(35, "打包扫描"),
INSTOCKED(40, "入库"),
SHIPING(50, "发运"),
CLOSE(90, "关闭"),
;
private int value;
private String description;
PRODUCE_SN_STATUS(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;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PACKAGE_IS_SEALED {
UNSEALED(1, "未封箱"),
SEALED(2, "已封箱");
private int value;
private String description;
PACKAGE_IS_SEALED(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;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PACKAGE_OP_TYPE {
PACK(10, "打包"),
UNPACK(20, "拆包");
private int value;
private String description;
PACKAGE_OP_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;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PACKAGE_PRINT_STATUS {
UNPRINTED(10, "未打印"),
PRINTED(20, "打印");
private int value;
private String description;
PACKAGE_PRINT_STATUS(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;
}
}
/**
* 工位程序交互时的业务类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STATION_BUSI_TYPE {
MESSAGE("message", "返回信息"),
STEP_LIST("stepList", "工步列表"),
STEP_CONTENT("stepContent", "工步内容"),
MODULE_CONTENT("moduleContent", "组件内容"),
CUSTOM_COMPONENT("customComponent", "定制内容"),
TASK_COMPLETE("taskComplete", "整个扫描完成"),
STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
RUNNING_INFO("runningInfo", "执行信息"),
RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");
private String value;
private String description;
STATION_BUSI_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (val.equals(values()[i].value)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

4
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -797,7 +797,9 @@ public class WmsEnumUtil {
VDAREPORT("VDAREPORT", "VDA生产报工"),
VDA_FINISH_GOODS("VDA_FINISH_GOODS", "VDA生产快速入库"),
VDA_PICKING_GOODS("VDA_PICKING_GOODS", "VDA生产领料"),
VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料");
VDA_NC_FREEZE("VDA_NC_FREEZE", "VDA_NC冻结"),
VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"),
VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻");
private String value;
private String description;

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -636,7 +636,7 @@ public class DdlPreparedPack {
if (basisType == CommonEnumUtil.BASIS_TYPE.INT.getValue()) {
name = " cast(" + name + " as integer)";
} else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()) {
name = " cast(" + name + " as double)";
name = " cast(" + name + " as decimal)";
} else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()) {
name = " cast(" + name + " as long)";
}

6
modules/i3plus-pojo-lac/pom.xml
Unescape Escape View File

@ -13,5 +13,11 @@
<artifactId>i3plus-pojo-lac</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-base</artifactId>
</dependency>
</dependencies>
</project>

95
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java
Unescape Escape View File

@ -0,0 +1,95 @@
package cn.estsh.i3plus.pojo.lac.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.Lob;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-18 下午6:04
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="LAC_COMMAND_STACK_RECORD")
@Api(value="适配记录",description = "适配记录")
public class LacCommandStackRecord extends BaseBean {
private static final long serialVersionUID = -2775980024345181459L;
@Column(name="commandStackId")
@ApiParam(value ="指令集ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackId;
@Column(name="COMMAND_STACK_NAME_RDD")
@ApiParam(value ="指令集名称")
private String commandStackNameRdd;
@Column(name="COMMAND_STACK_CODE_RDD")
@ApiParam(value ="指令集代码")
private String commandStackCodeRdd;
@Column(name="COMMAND_STACK_TYPE_ID")
@ApiParam(value ="指令集类型")
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackTypeId;
@Column(name="STEP_INDEX")
@ApiParam(value ="当前步骤")
private Integer stepIndex;
@Column(name="STEP_NUM")
@ApiParam(value ="步骤总数")
private Integer stepNum;
@Column(name="TASK_COMPLETE_NUM")
@ApiParam(value ="任务完成数量")
private Integer taskCompleteNum;
@Column(name="TASK_NUM")
@ApiParam(value ="任务总数")
private Integer taskNum;
@Lob
@Column(name="INPUT_PARAMETER")
@ApiParam(value ="执行入参")
private String inputParameter;
@Column(name="STACK_START_TIME")
@ApiParam(value ="执行开始时间")
private String stackStartTime;
@Column(name="STACK_END_TIME")
@ApiParam(value ="执行结束时间")
private String stackEndTime;
@Column(name="STACK_SPEND")
@ApiParam(value ="执行耗时")
private Integer stackSpend;
@Column(name="STACK_STATUS")
@ApiParam(value ="执行状态")
private Integer stackStatus;
@Column(name="EXECUTION_DESCRIPTION")
@ApiParam(value ="执行说明")
private String executionDescription;
}

44
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java
Unescape Escape View File

@ -0,0 +1,44 @@
package cn.estsh.i3plus.pojo.lac.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 : wei.peng
* @CreateDate : 19-10-22 下午3:29
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="LAC_COMMAND_STACK_TYPE")
@Api(value="指令集类型",description = "指令集类型")
public class LacCommandStackType extends BaseBean {
@Column(name="TYPE_NAME")
@ApiParam(value ="类型名称")
private String typeName;
@Column(name="TYPE_REF_NUM")
@ApiParam(value ="适配器使用数量")
private Integer typeRefNum;
@Column(name="TYPE_DESCRIPTION")
@ApiParam(value ="类型描述")
private String typeDescription;
}

106
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java
Unescape Escape View File

@ -0,0 +1,106 @@
package cn.estsh.i3plus.pojo.lac.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.Lob;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-18 下午6:04
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="LAC_LOG_TASK")
@Api(value="适配任务记录",description = "适配任务记录")
public class LacLogTask extends BaseBean {
private static final long serialVersionUID = 674009105885048131L;
@Column(name="commandStackId")
@ApiParam(value ="指令集ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackId;
@Column(name="COMMAND_STACK_NAME_RDD")
@ApiParam(value ="指令集名称")
private String commandStackNameRdd;
@Column(name="COMMAND_STACK_CODE_RDD")
@ApiParam(value ="指令集代码")
private String commandStackCodeRdd;
@Column(name="COMMAND_STACK_TYPE_ID")
@ApiParam(value ="指令集类型")
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackTypeId;
@Column(name="STEP_ID")
@ApiParam(value ="步骤ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long stepId;
@Column(name="STEP_NAME_RDD")
@ApiParam(value ="步骤名称")
private String stepNameRdd;
@Column(name="STEP_SEQUENCE")
@ApiParam(value ="步骤顺序")
private String stepSequence;
@Column(name="TASK_ID")
@ApiParam(value ="任务ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskId;
@Column(name="TASK_NAME_RDD")
@ApiParam(value ="任务名称")
private String taskNameRdd;
@Column(name="TASK_NAME_TYPE")
@ApiParam(value ="任务类型")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskNameType;
@Column(name="adapterId")
@ApiParam(value ="适配器ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long adapterId;
@Lob
@Column(name="INPUT_PARAMETER")
@ApiParam(value ="任务入参")
private String inputParameter;
@Column(name="TASK_START_TIME")
@ApiParam(value ="任务开始时间")
private String taskStartTime;
@Column(name="TASK_END_TIME")
@ApiParam(value ="任务结束时间")
private String taskEndTime;
@Column(name="TASK_SPEND")
@ApiParam(value ="任务耗时")
private Integer taskSpend;
@Column(name="TASK_STATUS")
@ApiParam(value ="任务状态")
private Integer taskStatus;
}

94
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java
Unescape Escape View File

@ -0,0 +1,94 @@
package cn.estsh.i3plus.pojo.lac.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.Lob;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-18 下午6:04
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="LAC_LOG_TASK_DETAIL")
@Api(value="适配任务记录明细",description = "适配任务记录明细")
public class LacLogTaskDetail extends BaseBean {
private static final long serialVersionUID = -4918694502072594064L;
@Column(name="commandStackId")
@ApiParam(value ="指令集ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackId;
@Column(name="COMMAND_STACK_TYPE_ID")
@ApiParam(value ="指令集类型")
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackTypeId;
@Column(name="STEP_ID")
@ApiParam(value ="步骤ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long stepId;
@Column(name="TASK_ID")
@ApiParam(value ="任务ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskId;
@Column(name="TASK_NAME_TYPE")
@ApiParam(value ="任务类型")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskNameType;
@Column(name="adapterId")
@ApiParam(value ="适配器ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long adapterId;
@Column(name="TASK_START_TIME")
@ApiParam(value ="任务开始时间")
private String taskStartTime;
@Column(name="TASK_END_TIME")
@ApiParam(value ="任务结束时间")
private String taskEndTime;
@Lob
@Column(name="INPUT_PARAMETER")
@ApiParam(value ="任务入参")
private String inputParameter;
@Lob
@Column(name="INPUT_PARAMETER_BODY")
@ApiParam(value ="任务入参处理完成后")
private String inputParameterBody;
@Lob
@Column(name="OUTPUT_PARAMETER")
@ApiParam(value ="任务出参")
private String outputParameter;
@Lob
@Column(name="OUTPUT_PARAMETER_BODY")
@ApiParam(value ="任务出参处理后")
private String outputParameterBody;
}

42
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java
Unescape Escape View File

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.lac.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 : wei.peng
* @CreateDate : 19-10-22 下午3:32
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="LAC_TASK_TYPE")
@Api(value="任务类型",description = "任务类型")
public class LacTaskType extends BaseBean {
@Column(name="TYPE_NAME")
@ApiParam(value ="类型名称")
private String typeName;
@Column(name="TYPE_REF_NUM")
@ApiParam(value ="适配器使用数量")
private Integer typeRefNum;
@Column(name="TYPE_DESCRIPTION")
@ApiParam(value ="类型描述")
private String typeDescription;
}

14
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackRecordRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.lac.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-22 下午5:19
* @Modify:
**/
public interface LacCommandStackRecordRepository extends BaseRepository<LacCommandStackRecord, Long> {
}

15
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTypeRepository.java
Unescape Escape View File

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.lac.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackType;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-22 下午5:19
* @Modify:
**/
public interface LacCommandStackTypeRepository extends BaseRepository<LacCommandStackType, Long> {
}

15
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskDetailRepository.java
Unescape Escape View File

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.lac.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.lac.bean.LacLogTaskDetail;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-22 下午5:19
* @Modify:
**/
public interface LacLogTaskDetailRepository extends BaseRepository<LacLogTaskDetail, Long> {
}

15
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskRepository.java
Unescape Escape View File

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.lac.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.lac.bean.LacLogTask;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-22 下午5:19
* @Modify:
**/
public interface LacLogTaskRepository extends BaseRepository<LacLogTask, Long> {
}

15
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskTypeRepository.java
Unescape Escape View File

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.lac.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.lac.bean.LacTaskType;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-22 下午5:19
* @Modify:
**/
public interface LacTaskTypeRepository extends BaseRepository<LacTaskType, Long> {
}

47
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
Unescape Escape View File

@ -0,0 +1,47 @@
package cn.estsh.i3plus.pojo.lac.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.lac.bean.*;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-22 下午5:34
* @Modify:
**/
public class LacHqlPack {
private LacHqlPack() {
}
public static DdlPackBean packHqlLacTaskType(LacTaskType bean){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
public static DdlPackBean packHqlLacLogTask(LacLogTask bean){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
public static DdlPackBean packHqlLacCommandStackType(LacCommandStackType bean){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
}

6
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java
Unescape Escape View File

@ -25,14 +25,14 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_AREA")
@Table(name = "MES_AREA")
@Api("生产区域")
public class MesArea extends BaseBean {
@Column(name="AREA_CODE")
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name="AREA_NAME")
@Column(name = "AREA_NAME")
@ApiParam("区域名称")
private String areaName;
}

14
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java
Unescape Escape View File

@ -27,14 +27,14 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_BOM")
@Table(name = "MES_BOM")
@Api("BOM清单")
public class MesBom extends BaseBean {
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("父零件号")
private String partNo;
@Column(name="PART_NAME")
@Column(name = "PART_NAME")
@ApiParam("父零件名称")
private String partName;
@ -47,11 +47,11 @@ public class MesBom extends BaseBean {
@ApiParam(value = "数量", example = "0")
private Double qty;
@Column(name="ITEM_PART_NO")
@Column(name = "ITEM_PART_NO")
@ApiParam("子零件")
private String itemPartNo;
@Column(name="ITEM_PART_NAME")
@Column(name = "ITEM_PART_NAME")
@ApiParam("子零件名称")
private String itemPartName;
@ -70,12 +70,12 @@ public class MesBom extends BaseBean {
@Column(name = "EFF_START_TIME")
@ApiParam(value = "生效时间")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String effStartTime;
@Column(name = "EFF_END_TIME")
@ApiParam(value = "失效时间")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String effEndTime;
public double getQtyVal() {

14
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java
Unescape Escape View File

@ -25,30 +25,30 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_CONFIG")
@Table(name = "MES_CONFIG")
@Api("mes配置表")
public class MesConfig extends BaseBean {
@Column(name="CFG_CODE")
@Column(name = "CFG_CODE")
@ApiParam("配置代码")
private String cfgCode;
@Column(name="CFG_NAME")
@Column(name = "CFG_NAME")
@ApiParam("配置名称")
private String cfgName;
@Column(name="CFG_TYPE")
@Column(name = "CFG_TYPE")
@ApiParam("配置类型")
private String cfgType;
@Column(name="CFG_KEY")
@Column(name = "CFG_KEY")
@ApiParam("配置key")
private String cfgkey;
@Column(name="CFG_VALUE")
@Column(name = "CFG_VALUE")
@ApiParam("配置value")
private String cfgValue;
@Column(name="CFG_VAULE_DESC")
@Column(name = "CFG_VAULE_DESC")
@ApiParam("配置value描述")
private String cfgValueDesc;
}

6
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java
Unescape Escape View File

@ -25,14 +25,14 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_CUST_PROD_LINE")
@Table(name = "MES_CUST_PROD_LINE")
@Api("客户产线代码")
public class MesCustProdLine extends BaseBean {
@Column(name="CUST_PROD_LINE_CODE")
@Column(name = "CUST_PROD_LINE_CODE")
@ApiParam("客户产线代码")
private String custProdLineCode;
@Column(name="CUST_PROD_LINE_NAME")
@Column(name = "CUST_PROD_LINE_NAME")
@ApiParam("客户产线名称")
private String custProdLineName;
}

14
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java
Unescape Escape View File

@ -25,30 +25,30 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_CUSTOMER")
@Table(name = "MES_CUSTOMER")
@Api("客户信息")
public class MesCustomer extends BaseBean {
@Column(name="CUSTOMER_CODE")
@Column(name = "CUSTOMER_CODE")
@ApiParam("客户代码")
private String customerCode;
@Column(name="CUSTOMER_NAME")
@Column(name = "CUSTOMER_NAME")
@ApiParam("客户名称")
private String customerName;
@Column(name="BRIEF_TEXT")
@Column(name = "BRIEF_TEXT")
@ApiParam("客户简称")
private String briefText;
@Column(name="ADDRESS")
@Column(name = "ADDRESS")
@ApiParam("客户地址")
private String address;
@Column(name="CONTACT")
@Column(name = "CONTACT")
@ApiParam("客户联系人")
private String contact;
@Column(name="TELEPHONE")
@Column(name = "TELEPHONE")
@ApiParam("客户电话")
private String telephone;
}

8
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java
Unescape Escape View File

@ -27,20 +27,20 @@ import javax.persistence.Table;
@Api("数据对象")
public class MesDataObject extends BaseBean {
@Column(name="OBJECT_CODE")
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@Column(name="OBJECT_NAME")
@Column(name = "OBJECT_NAME")
@ApiParam("对象名称")
private String objectName;
@Column(name="DS_CODE")
@Column(name = "DS_CODE")
@ApiParam("数据源代码")
private String dsCode;
@Column(name="OPERATE_TYPE")
@Column(name = "OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;
}

16
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java
Unescape Escape View File

@ -27,31 +27,31 @@ import javax.persistence.Table;
@Api("地址清单")
public class MesDatasource extends BaseBean {
@Column(name="DS_CODE")
@Column(name = "DS_CODE")
@ApiParam("数据源代码")
private String dsCode;
@Column(name="DS_NAME")
@Column(name = "DS_NAME")
@ApiParam("数据源名称")
private String dsName;
@Column(name="DS_TYPE")
@Column(name = "DS_TYPE")
@ApiParam("数据源类型")
private String dsType;
@Column(name="DS_HOST")
@Column(name = "DS_HOST")
@ApiParam("主机")
private String dsHost;
@Column(name="DS_PORT")
@Column(name = "DS_PORT")
@ApiParam("端口")
private Integer dsPort;
@Column(name="DS_USER")
@Column(name = "DS_USER")
@ApiParam("用户名")
private String dsUser;
@Column(name="DS_PASSWORD")
@Column(name = "DS_PASSWORD")
@ApiParam("密码")
private String dsPassword;
@ -59,7 +59,7 @@ public class MesDatasource extends BaseBean {
@ApiParam("数据库名称")
private String dsDbName;
@Column(name="EQUIPMENT_CODE")
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;

52
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java
Unescape Escape View File

@ -0,0 +1,52 @@
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;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 14:25
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DEFECT")
@Api("缺陷表")
public class MesDefect extends BaseBean {
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "DEFECT_NAME")
@ApiParam("缺陷名称")
private String defectName;
@Column(name = "DEFECT_TYPE")
@ApiParam("缺陷类型")
private String defectType;
@Transient
@ApiParam("缺陷位置")
private String defectLocation;
@Transient
@ApiParam("缺陷类型子集")
private List<MesDefect> mesDefectList;
}

42
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java
Unescape Escape View File

@ -0,0 +1,42 @@
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;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 14:28
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DEFECT_CAUSE")
@Api("缺陷原因表")
public class MesDefectCause extends BaseBean {
@Column(name = "DC_CODE")
@ApiParam("缺陷原因代码")
private String dcCode;
@Column(name = "DC_NAME")
@ApiParam("缺陷原因名称")
private String dcName;
@Column(name = "DC_TYPE")
@ApiParam("缺陷原因类型")
private String dcType;
}

74
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java
Unescape Escape View File

@ -0,0 +1,74 @@
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;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 19:53
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_DEFECT_RECORD")
@Api("不良信息记录表")
public class MesDefectRecord extends BaseBean {
@Column(name="SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name="PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name="DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name="DEFECT_NAME")
@ApiParam("缺陷名称")
private String defectName;
@Column(name="DEFECT_LOCATION")
@ApiParam("缺陷位置")
private String defectLocation;
@Column(name="REPAIR_STATUS")
@ApiParam("维修状态")
private Integer repairStatus;
@Column(name="WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="MEMO")
@ApiParam("备注")
private String memo;
@Transient
private List<MesDefect> mesDefectList;
}

86
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java
Unescape Escape View File

@ -0,0 +1,86 @@
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;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 15:03
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DISMANTLE_RECORD")
@Api("物料拆解记录表")
public class MesDismantleRecord extends BaseBean {
@Column(name = "DISMANTLE_ID")
@ApiParam("拆解编号")
private String dismantleId;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "PARENT_PART_NO")
@ApiParam("产品物料编码")
private String parentPartNo;
@Column(name = "PARENT_PART_NAME")
@ApiParam("产品物料名称")
private String parentPartName;
@Column(name = "SN")
@ApiParam("产品条码")
private String sn;
@Column(name = "QTY")
@ApiParam("产品数量")
private Integer qty;
@Column(name = "DISMANTLE_QTY")
@ApiParam("拆解数")
private Integer dismantleQty;
@Column(name = "ITEM_PART_NO")
@ApiParam("子物料编码")
private String itemPartNo;
@Column(name = "ITEM_PART_NAME")
@ApiParam("子物料名称")
private String itemPartName;
@Column(name = "OK_QTY")
@ApiParam("合格数")
private Integer okQty;
@Column(name = "MISS_QTY")
@ApiParam("缺失数")
private Integer missQty;
@Column(name = "SCRAP_QTY")
@ApiParam("报废数")
private Integer scrapQty;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
}

32
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java
Unescape Escape View File

@ -23,27 +23,27 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_ESOP")
@Table(name = "MES_ESOP")
@Api("作业指导书信息表(ODS)")
public class MesESOP extends BaseBean {
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="WORK_CELL_CODE")
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="ROUTE_CODE")
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name="PROCESS_CODE")
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@ -55,35 +55,35 @@ public class MesESOP extends BaseBean {
@ApiParam("工步序号")
private Integer stepSeq;
@Column(name="SOP_NAME")
@Column(name = "SOP_NAME")
@ApiParam("SOP名称")
private String sopName;
@Column(name="SOP_URL")
@Column(name = "SOP_URL")
@ApiParam("SOP_URL")
private String sopUrl;
private String sopUrl;
@Column(name="GROUP_NAME")
@Column(name = "GROUP_NAME")
@ApiParam("GROUP_NAME")
private String groupName;
@Column(name="FILE_ORIGIN_NAME")
@Column(name = "FILE_ORIGIN_NAME")
@ApiParam("FILE_ORIGIN_NAME")
private String fileOriginName;
@Column(name="FILE_SIZE")
@Column(name = "FILE_SIZE")
@ApiParam("FILE_SIZE")
private String fileSize;
@Column(name="FILE_TYPE_ID")
@Column(name = "FILE_TYPE_ID")
@ApiParam("FILE_TYPE_ID")
private String fileTypeId;
@Column(name="FILE_TYPE_NAME")
@Column(name = "FILE_TYPE_NAME")
@ApiParam("FILE_TYPE_NAME")
private String fileTypeName;
@Column(name="SYNC_TAG")
@Column(name = "SYNC_TAG")
@ApiParam("SYNC_TAG")
private Integer syncTag=0;
private Integer syncTag = 0;
}

32
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java
Unescape Escape View File

@ -28,68 +28,68 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_EQUIPMENT")
@Table(name = "MES_EQUIPMENT")
@Api("生产设备")
public class MesEquipment extends BaseBean {
@Column(name="EQUIPMENT_CODE")
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;
@Column(name="EQUIPMENT_NAME")
@Column(name = "EQUIPMENT_NAME")
@ApiParam("设备名称")
private String equipmentName;
@Column(name="STATUS")
@Column(name = "STATUS")
@ApiParam("设备状态")
private Integer status;
@Column(name="EQUIPMENT_TYPE")
@Column(name = "EQUIPMENT_TYPE")
@ApiParam("设备类型")
private Integer equipmentType;
@Column(name="EQUIPMENT_CATEGORY")
@Column(name = "EQUIPMENT_CATEGORY")
@ApiParam("设备类别")
private String equipmentCategory;
@Column(name="EQUIPMENT_MODEL")
@Column(name = "EQUIPMENT_MODEL")
@ApiParam("型号")
private String equipmentModel;
@Column(name="EQUIPMENT_SPEC")
@Column(name = "EQUIPMENT_SPEC")
@ApiParam("规格")
private String equipmentSpec;
@Column(name="EQUIPMENT_MAKER")
@Column(name = "EQUIPMENT_MAKER")
@ApiParam("制造商")
private String equipmentMaker;
@Column(name="RELEASE_DATE")
@Column(name = "RELEASE_DATE")
@ApiParam("出厂日期")
private String releaseDate;
@Column(name="RECEIVE_DATE")
@Column(name = "RECEIVE_DATE")
@ApiParam("接收日期")
private String receiveDate;
@Column(name="ENABLE_DATE")
@Column(name = "ENABLE_DATE")
@ApiParam("启用日期")
private String enableDate;
@Column(name="CONNECT_TYPE")
@Column(name = "CONNECT_TYPE")
@ApiParam("连接类型")
private Integer connectType;
@Column(name="MEMO")
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Transient
@ApiParam(value ="名称")
@ApiParam(value = "名称")
private String name;
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
@ApiParam(value = "父节点", access = "父节点", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
}

8
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java
Unescape Escape View File

@ -27,19 +27,19 @@ import javax.persistence.Table;
@Api("首检件配置")
public class MesFiCfg extends BaseBean {
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="CUST_CODE")
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name="FI_QTY")
@Column(name = "FI_QTY")
@ApiParam("首检数量")
private String fiQty;
}

14
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java
Unescape Escape View File

@ -26,30 +26,30 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_KP_DATA")
@Table(name = "MES_KP_DATA")
@Api("生产区域")
public class MesKpData extends BaseBean {
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="KEY_DATA_CODE")
@Column(name = "KEY_DATA_CODE")
@ApiParam("关键数据代码")
private String keyDataCode;
@Column(name="KEY_DATA_NAME")
@Column(name = "KEY_DATA_NAME")
@ApiParam("关键数据名称")
private String keyDataName;
@Column(name="KEY_DATA_COUNT")
@Column(name = "KEY_DATA_COUNT")
@ApiParam("关键数据数量")
private Integer keyDataCount;
@Column(name="UPPER_LIMIT")
@Column(name = "UPPER_LIMIT")
@ApiParam("数据上限")
private Double upperLimit;
@Column(name="LOWER_LIMIT")
@Column(name = "LOWER_LIMIT")
@ApiParam("数据下限")
private Double lowerLimit;

24
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java
Unescape Escape View File

@ -24,50 +24,50 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_KPSN_RULE")
@Table(name = "MES_KPSN_RULE")
@Api("关键件条码校验规则")
public class MesKpsnRule extends BaseBean {
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="LENGTH")
@Column(name = "LENGTH")
@ApiParam("长度")
private Integer length;
@Column(name="FROM1")
@Column(name = "FROM1")
@ApiParam("起始1")
private Integer from1;
@Column(name="TO1")
@Column(name = "TO1")
@ApiParam("至1")
private Integer to1;
@Column(name="FIX1")
@Column(name = "FIX1")
@ApiParam("内容1")
private String fix1;
@Column(name="FROM2")
@Column(name = "FROM2")
@ApiParam("起始2")
private Integer from2;
@Column(name="TO2")
@Column(name = "TO2")
@ApiParam("至2")
private Integer to2;
@Column(name="FIX2")
@Column(name = "FIX2")
@ApiParam("内容2")
private String fix2;
@Column(name="TYPE")
@Column(name = "TYPE")
@ApiParam("类型")
private String type;
@Column(name="BIND_RULE")
@Column(name = "BIND_RULE")
@ApiParam("绑定规则")
private Integer bandRule;
@Column(name="SUPPLIER_CODE")
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商代码")
private String supplierCode;

20
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java
Unescape Escape View File

@ -23,30 +23,30 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_LABEL_TEMPLATE")
@Api(value="打印模板",description = "打印模板")
@Table(name = "MES_LABEL_TEMPLATE")
@Api(value = "打印模板", description = "打印模板")
public class MesLabelTemplate extends BaseBean {
private static final long serialVersionUID = 5371856566557305323L;
@Column(name="TEMPLATE_CODE")
@ApiParam(value ="模板代码")
@Column(name = "TEMPLATE_CODE")
@ApiParam(value = "模板代码")
private String templateCode;
@Column(name="TEMPLATE_NAME")
@ApiParam(value ="模板名称")
@Column(name = "TEMPLATE_NAME")
@ApiParam(value = "模板名称")
private String templateName;
@Lob
@Column(name="TEMPLATE_CONTENT")
@ApiParam(value ="模板内容")
@Column(name = "TEMPLATE_CONTENT")
@ApiParam(value = "模板内容")
private String templateContent;
// 参数拼接，多参数都好分隔，后台在做处理
@ApiParam(value ="模板参数拼接")
@ApiParam(value = "模板参数拼接")
@Transient
private String paramsPack;
@Transient
@ApiParam(value ="模板id对应的模板参数")
@ApiParam(value = "模板id对应的模板参数")
private List<MesLabelTemplateParam> labelTemplateParamList;
}

22
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java
Unescape Escape View File

@ -24,31 +24,31 @@ import javax.persistence.*;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_LABEL_TEMPLATE_PARAM")
@Api(value="打印模板参数",description = "打印模板参数")
@Table(name = "MES_LABEL_TEMPLATE_PARAM")
@Api(value = "打印模板参数", description = "打印模板参数")
public class MesLabelTemplateParam extends BaseBean {
private static final long serialVersionUID = 6476163540527157643L;
@Column(name="TEMPLATE_ID")
@ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1")
@Column(name = "TEMPLATE_ID")
@ApiParam(value = "模板ID", access = "模板ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long templateId;
@Column(name="TEMPLATE_CODE")
@ApiParam(value ="模板代码")
@Column(name = "TEMPLATE_CODE")
@ApiParam(value = "模板代码")
private String templateCode;
@Column(name="TEMPLATE_PARAM")
@ApiParam(value ="模板参数")
@Column(name = "TEMPLATE_PARAM")
@ApiParam(value = "模板参数")
private String templateParam;
@Lob
@Column(name="TEMPLATE_PARAM_TEXT")
@ApiParam(value ="模板参数描述")
@Column(name = "TEMPLATE_PARAM_TEXT")
@ApiParam(value = "模板参数描述")
private String templateParamText;
// 参数拼接，多参数都好分隔，后台在做处理
@ApiParam(value ="模板参数值")
@ApiParam(value = "模板参数值")
@Transient
private String templateParamValue;
}

10
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java
Unescape Escape View File

@ -52,7 +52,15 @@ public class MesObjectCfg extends BaseBean {
@ApiParam("主键标记")
private String fieldPk;
@Column(name="POJO_ATTR")
@Column(name = "FEED_FIELD")
@ApiParam("反馈字段")
private String feedField;
@Column(name = "FEED_VALUE")
@ApiParam("反馈值")
private String feedValue;
@Column(name = "POJO_ATTR")
@ApiParam("对应的pojo属性")
private String pojoAttr;

16
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java
Unescape Escape View File

@ -25,34 +25,34 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PLC_CONFIGURE")
@Table(name = "MES_PLC_CONFIGURE")
@Api("PLC设备信息配置表")
public class MesPLCConfigure extends BaseBean {
@Column(name="IP")
@Column(name = "IP")
@ApiParam("设备ip")
private String ipAddress;
@Column(name="CHANNEL_NAME")
@Column(name = "CHANNEL_NAME")
@ApiParam("通道名称")
private String channelName;
@Column(name="DEVICE_NAME")
@Column(name = "DEVICE_NAME")
@ApiParam("设备地址")
private String deviceName;
@Column(name="TAG_NAME")
@Column(name = "TAG_NAME")
@ApiParam("标签地址")
private String tagName;
@Column(name="AREA_CODE")
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name="WORK_CELL_CODE")
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;

97
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java
Unescape Escape View File

@ -0,0 +1,97 @@
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.ColumnDefault;
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 : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACK_SPEC")
@Api("包装规格")
public class MesPackSpec extends BaseBean {
@Column(name = "SPEC_CODE")
@ApiParam("包装规格代码")
private String specCode;
@Column(name = "SPEC_NAME")
@ApiParam("包装规格名称")
private String specName;
@Column(name = "QTY")
@ColumnDefault("0")
@ApiParam(value = "包装数量", example = "0")
private Double qty;
@Column(name = "QTY2")
@ColumnDefault("0")
@ApiParam(value = "包装数量2", example = "0")
private Double qty2;
@Column(name = "QTY3")
@ColumnDefault("0")
@ApiParam(value = "包装数量3", example = "0")
private Double qty3;
@Column(name = "QTY4")
@ColumnDefault("0")
@ApiParam(value = "包装数量4", example = "0")
private Double qty4;
@Column(name = "IS_MIXED")
@ApiParam("是否混包")
private Integer isMixed;
@Column(name = "IS_MIXED2")
@ApiParam("是否混包2")
private Integer isMixed2;
@Column(name = "IS_MIXED3")
@ApiParam("是否混包3")
private Integer isMixed3;
@Column(name = "IS_MIXED4")
@ApiParam("是否混包4")
private Integer isMixed4;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
public int getIsMixedVal() {
return this.isMixed == null ? 0 : this.isMixed;
}
public int getIsMixed2Val() {
return this.isMixed2 == null ? 0 : this.isMixed2;
}
public int getIsMixed3Val() {
return this.isMixed3 == null ? 0 : this.isMixed3;
}
public int getIsMixed4Val() {
return this.isMixed4 == null ? 0 : this.isMixed4;
}
}

92
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
Unescape Escape View File

@ -0,0 +1,92 @@
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/10/18 1:26 下午
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE")
@Api("包装规格")
public class MesPackage extends BaseBean {
@Column(name = "PACKAGE_NO")
@ApiParam("包装编号")
private String packageNo;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name = "PACK_SPEC_QTY")
@ApiParam("包装规格数量")
private Double packSpecQty;
@Column(name = "NUIT")
@ApiParam("包装规格数量")
private String nuit;
@Column(name = "LOT_NO")
@ApiParam("批号")
private String lotNo;
@Column(name = "PACK_SPEC")
@ApiParam("包装规格")
private String packSpec;
@Column(name = "IS_SEALED")
@ApiParam("是否封箱")
private Integer isSealed;
@Column(name = "PRINT_STATUS")
@ApiParam("打印状态10：未打印 20：已打印")
private Integer printStatus;
@Column(name = "PACK_LEVEL")
@ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层")
private Integer packLevel;
@Column(name = "WORK_ORDER_NO")
@ApiParam("生产工单号")
private String workOrderNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) {
this.packageNo = packageNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.qty = qty;
this.packSpecQty = packSpecQty;
}
}

59
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java
Unescape Escape View File

@ -0,0 +1,59 @@
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/10/18 2:55 下午
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE")
@Api("包装规格")
public class MesPackageDetail extends BaseBean {
@Column(name = "PACKAGE_NO")
@ApiParam("包装编码")
private String packageNo;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("产品条码")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("产品条码")
private String partNameRdd;
@Column(name = "PACKAGE_NO2")
@ApiParam("包装编码2")
private String packageNo2;
@Column(name = "PACKAGE_NO3")
@ApiParam("包装编码3")
private String packageNo3;
@Column(name = "PACKAGE_NO4")
@ApiParam("包装编码4")
private String packageNo4;
}

55
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java
Unescape Escape View File

@ -0,0 +1,55 @@
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/10/18 3:23 下午
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE_TRAVEL")
@Api("包装履历表")
public class MesPackageTravel extends BaseBean {
@Column(name = "PACKAGE_NO")
@ApiParam("包装编码")
private String packageNo;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "OP_TYPE")
@ApiParam("操作类型")
private Integer opType;
@Column(name = "PACKAGE_NO2")
@ApiParam("包装编码2")
private String packageNo2;
@Column(name = "PACKAGE_NO3")
@ApiParam("包装编码3")
private String packageNo3;
@Column(name = "PACKAGE_NO4")
@ApiParam("包装编码4")
private String packageNo4;
}

26
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java
Unescape Escape View File

@ -26,52 +26,52 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PART")
@Table(name = "MES_PART")
@Api("物料信息")
public class MesPart extends BaseBean {
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name="PART_NAME")
@Column(name = "PART_NAME")
@ApiParam("零件名称")
private String partName;
@Column(name="BRIEF_TEXT")
@Column(name = "BRIEF_TEXT")
@ApiParam("零件简称")
private String briefText;
@Column(name="PART_SPEC")
@Column(name = "PART_SPEC")
@ApiParam("零件规格")
private String partSpec;
@Column(name="CATEGORY_CODE1")
@Column(name = "CATEGORY_CODE1")
@ApiParam("分类1")
private String categoryCode1;
@Column(name="CATEGORY_CODE2")
@Column(name = "CATEGORY_CODE2")
@ApiParam("分类2")
private String categoryCode2;
@Column(name="CATEGORY_CODE3")
@Column(name = "CATEGORY_CODE3")
@ApiParam("分类3")
private String categoryCode3;
@Column(name="UNIT")
@Column(name = "UNIT")
@ApiParam("单位")
private String unit;
@Column(name="PACK_SPEC_CODE")
@Column(name = "PACK_SPEC_CODE")
@ApiParam("包装规格代码")
private String packSpecCode;
@Column(name="DEFAULT_WORK_CENTER")
@Column(name = "DEFAULT_WORK_CENTER")
@ApiParam("默认工作中心")
private String defaultWorkCenter;
@Column(name="PRODUCE_CATEGORY")
@Column(name = "PRODUCE_CATEGORY")
@ApiParam("产品类型")
private String produceCategory;
private String produceCategory;
@Transient
@ApiParam("分类名称")

8
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java
Unescape Escape View File

@ -25,18 +25,18 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PART_CATEGORY")
@Table(name = "MES_PART_CATEGORY")
@Api("零件种类")
public class MesPartCategory extends BaseBean {
@Column(name="CATEGORY_CODE")
@Column(name = "CATEGORY_CODE")
@ApiParam("分类代码")
private String categoryCode;
@Column(name="CATEGORY_NAME")
@Column(name = "CATEGORY_NAME")
@ApiParam("分类名称")
private String categoryName;
@Column(name="CATEGORY_TYPE")
@Column(name = "CATEGORY_TYPE")
@ApiParam("分类类型")
private String categoryType;
}

20
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java
Unescape Escape View File

@ -24,42 +24,42 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PCN")
@Table(name = "MES_PCN")
@Api("PCN节点")
public class MesPcn extends BaseBean {
@Column(name="PCN_CODE")
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;
@Column(name="PCN_NAME")
@Column(name = "PCN_NAME")
@ApiParam("PCN名称")
private String pcnName;
@Column(name="AREA_CODE")
@Column(name = "AREA_CODE")
@ApiParam("区域")
private String areaCode;
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name="PCN_VERSION")
@Column(name = "PCN_VERSION")
@ApiParam("PCN版本")
private String pcnVersion;
@Column(name="CONNECT_IP")
@Column(name = "CONNECT_IP")
@ApiParam("连接IP")
private String connectIp;
@Column(name="CONNECT_COUNT")
@Column(name = "CONNECT_COUNT")
@ApiParam("连接次数")
private Integer connectCount;
@Column(name="IS_CONNECT")
@Column(name = "IS_CONNECT")
@ApiParam("是否连接")
private Integer isConnect;
@Column(name="CONNECT_TIME")
@Column(name = "CONNECT_TIME")
@ApiParam("连接时间")
private String connectTime;

14
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java
Unescape Escape View File

@ -24,30 +24,30 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PCN_CONNECT_LOG")
@Table(name = "MES_PCN_CONNECT_LOG")
@Api("PCN节点连接日志")
public class MesPcnConnectLog extends BaseBean {
@Column(name="PCN_CODE")
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;
@Column(name="PCN_NAME")
@Column(name = "PCN_NAME")
@ApiParam("PCN名称")
private String pcnName;
@Column(name="PCN_VERSION")
@Column(name = "PCN_VERSION")
@ApiParam("PCN版本")
private String pcnVersion;
@Column(name="CONNECT_IP")
@Column(name = "CONNECT_IP")
@ApiParam("连接IP")
private String connectIp;
@Column(name="IS_CONNECT")
@Column(name = "IS_CONNECT")
@ApiParam("是否连接")
private Integer isConnect;
@Column(name="REMARK")
@Column(name = "REMARK")
@ApiParam("备注")
private String Remark;
}

32
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java
Unescape Escape View File

@ -25,53 +25,53 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PCN_SYNC_CFG")
@Table(name = "MES_PCN_SYNC_CFG")
@Api("MES_PCN_同步配置")
public class MesPcnSyncCfg extends BaseBean {
@Column(name="PCN_CODE")
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;
@Column(name="OBJECT_CODE")
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@Column(name="OBJECT_NAME")
@Column(name = "OBJECT_NAME")
@ApiParam("对象名称")
private String objectName;
@Column(name="OBJECT_KEY")
@Column(name = "OBJECT_KEY")
@ApiParam("对象主键")
private String objectKey;
@Column(name="SYNC_FREQUENCY")
@Column(name = "SYNC_FREQUENCY")
@ApiParam("同步频率")
private Integer syncFrequency;
@Column(name="SYNC_TIME")
@Column(name = "SYNC_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value ="同步时间")
@ApiParam(value = "同步时间")
private String syncTime;
@Column(name="SYNC_PATTERN")//2.新增 1.修改
@Column(name = "SYNC_PATTERN")//2.新增 1.修改
@ApiParam("同步方式")
private Integer syncPattern;
@Column(name="SYNC_TYPE")//1.pcn获取mes数据 2.pcn推送数据至mes
@Column(name = "SYNC_TYPE")//1.pcn获取mes数据 2.pcn推送数据至mes
@ApiParam("同步类型")
private Integer syncType;
@Column(name="LAST_SYNC_TIME")
@Column(name = "LAST_SYNC_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value ="上一同步时间")
@ApiParam(value = "上一同步时间")
private String lastSyncTime;
@Column(name="EXTRACT_GAP")
@ApiParam(value="从数据库抽取的最大值 目前为分钟为限制")
@Column(name = "EXTRACT_GAP")
@ApiParam(value = "从数据库抽取的最大值 目前为分钟为限制")
private Integer extractGap;
@Column(name="EXTRACT_CONDITION")
@ApiParam(value="从数据库抽取的条件限制")
@Column(name = "EXTRACT_CONDITION")
@ApiParam(value = "从数据库抽取的条件限制")
private String extractCondition;
public int getSyncFrequencyVal() {

12
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java
Unescape Escape View File

@ -24,26 +24,26 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PCN_SYNC_ERRORLOG")
@Table(name = "MES_PCN_SYNC_ERRORLOG")
@Api("MES_PCN同步异常日志")
public class MesPcnSyncErrorLog extends BaseBean {
@Column(name="PCN_CODE")
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;
@Column(name="OBJECT_CODE")
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@Column(name="OBJECT_NAME")
@Column(name = "OBJECT_NAME")
@ApiParam("对象名称")
private String objectName;
@Column(name="ERROR_SPOT")
@Column(name = "ERROR_SPOT")
@ApiParam("异常位置")
private String errorSpot;
@Column(name="ERROR_CONTENT")
@Column(name = "ERROR_CONTENT")
@ApiParam("异常内容")
private String errorContent;

12
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java
Unescape Escape View File

@ -28,8 +28,8 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PCN_SYS_USER_OFFLINE")
@Api(value="账号离线登陆表",description = "账号离线登陆表。")
@Table(name = "MES_PCN_SYS_USER_OFFLINE")
@Api(value = "账号离线登陆表", description = "账号离线登陆表。")
public class MesPcnSysUserOffline extends BaseBean {
@Column(name = "USER_ID")
@ -49,13 +49,13 @@ public class MesPcnSysUserOffline extends BaseBean {
@ApiParam(value = "登陆名称", access = "登陆名称")
private String loginName;
@Column(name="ORGANIZE_ID")
@ApiParam(value ="部门ID" , example ="-1")
@Column(name = "ORGANIZE_ID")
@ApiParam(value = "部门ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long organizeId;
@Column(name="ORGANIZE_NAME")
@ApiParam(value ="部门名称" , access ="部门名称")
@Column(name = "ORGANIZE_NAME")
@ApiParam(value = "部门名称", access = "部门名称")
private String organizeName;
}

28
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java
Unescape Escape View File

@ -25,59 +25,59 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PCN_TASK")
@Table(name = "MES_PCN_TASK")
@Api("mes-pcn定时任务工作清单")
public class MesPcnTask extends BaseBean {
@Column(name="TASK_CODE")
@Column(name = "TASK_CODE")
@ApiParam("任务代码")
private String taskCode;
@Column(name="TASK_NAME")
@Column(name = "TASK_NAME")
@ApiParam("任务名称")
private String taskName;
@Column(name="TASK_GROUP_NAME")
@Column(name = "TASK_GROUP_NAME")
@ApiParam("任务组名称")
private String taskGroupName;
@Column(name="TASK_DESCRIPTION")
@Column(name = "TASK_DESCRIPTION")
@ApiParam("任务描述")
private String taskDescription;
@Column(name="TASK_TYPE")
@Column(name = "TASK_TYPE")
@ApiParam("任务类型")
private Integer taskType;
@Column(name="TASK_MODULE")
@Column(name = "TASK_MODULE")
@ApiParam("任务模块")
private String taskModule;
@Column(name="TASK_CLASS")
@Column(name = "TASK_CLASS")
@ApiParam("任务类名")
private String taskClass;
@Column(name="TASK_PACKAGE")
@Column(name = "TASK_PACKAGE")
@ApiParam("任务包名")
private String taskPackage;
@Column(name="PCN_NAME")
@Column(name = "PCN_NAME")
@ApiParam("PCN节点名称")
private String pcnName;
@Column(name="PCN_CODE")
@Column(name = "PCN_CODE")
@ApiParam("PCN节点名称代码")
private String pcnCode;
@Column(name="TASK_CYCLE_EXPS")
@Column(name = "TASK_CYCLE_EXPS")
@ApiParam("任务周期表达式")
private String taskCycleExps;
@Column(name="TASK_CYCLE_DESCRIPTION")
@Column(name = "TASK_CYCLE_DESCRIPTION")
@ApiParam("任务周期描述")
private String taskCycleDescription;
@Column(name="TASK_PARAM")
@Column(name = "TASK_PARAM")
@ApiParam("任务参数")
private String taskParam;

10
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java
Unescape Escape View File

@ -25,23 +25,23 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PCN_TASK_LOG")
@Table(name = "MES_PCN_TASK_LOG")
@Api("mes-pcn定时任务工作清单同步记录")
public class MesPcnTaskLog extends BaseBean {
@Column(name="SYNC_TIME_START")
@Column(name = "SYNC_TIME_START")
@ApiParam("同步数据开始时间")
private String syncTimeStart;
@Column(name="SYNC_TIME_END")
@Column(name = "SYNC_TIME_END")
@ApiParam("同步数据截止时间")
private String syncTimeEnd;
@Column(name="SYNC_STATUS")
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Column(name="ERROR_CONTENT")
@Column(name = "ERROR_CONTENT")
@ApiParam("异常内容")
private Long errorContent;

44
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java
Unescape Escape View File

@ -26,101 +26,101 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PLAN_ORDER")
@Table(name = "MES_PLAN_ORDER")
@Api("生产主计划")
public class MesPlanOrder extends BaseBean {
@Column(name="ORDER_NO")
@Column(name = "ORDER_NO")
@ApiParam("生产计划单号")
private String orderNo;
@Column(name="PO_TYPE")
@Column(name = "PO_TYPE")
@ApiParam("计划类型")
private Integer planType;
@Column(name="PROD_CFG_CODE")
@Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME_RDD")
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name="PLAN_QTY")
@Column(name = "PLAN_QTY")
@ApiParam("计划数量")
private Double planQty;
@Column(name="DECOMPOSE_QTY")
@Column(name = "DECOMPOSE_QTY")
@ApiParam("分解数量")
private Double decomposeQty;
@Column(name="STATUS")
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name="START_TIME")
@Column(name = "START_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam("计划开始时间")
private String startTime;
@Column(name="END_TIME")
@Column(name = "END_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam("计划结束时间")
private String endTime;
@Column(name="DELIVERY_DATE")
@Column(name = "DELIVERY_DATE")
@ApiParam("交货日期")
private String deliveryDate;
@Column(name="CUST_CODE")
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name="CUST_ORDER_NO")
@Column(name = "CUST_ORDER_NO")
@ApiParam("客户订单号")
private String custOrderNo;
@Column(name="SOURCE")
@Column(name = "SOURCE")
@ApiParam("计划来源")
private String source;
@Column(name="MEMO")
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
/********************** 冗余字段 *********************************/
@Transient
@ApiParam(value="区域")
@ApiParam(value = "区域")
public String areaCode;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
@ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59")
public String startTimeStart;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
@ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59")
public String startTimeEnd;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
@ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59")
public String endTimeStart;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
@ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59")
public String endTimeEnd;
public double getPlanQtyVal() {

6
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java
Unescape Escape View File

@ -68,7 +68,7 @@ public class MesProcessBom extends BaseBean {
private Double qty;
@Column(name = "IS_REPEAT")
@ApiParam(value = "是否可重复")
@ApiParam(value = "是否可重复")
private Integer isRepeat;
@Column(name = "IS_CHECK")
@ -83,6 +83,10 @@ public class MesProcessBom extends BaseBean {
@ApiParam(value = "是否绑定关键件")
private Integer isBindKey;
@Column(name = "IS_KEY")
@ApiParam(value = "是否关键件")
private Integer isKey;
@Transient
@ApiParam("是否已绑定")
private Boolean isBind;

8
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java
Unescape Escape View File

@ -85,6 +85,14 @@ public class MesProdBindRecord extends BaseBean {
@ApiParam(value = "结果")
private String result;
@Column(name = "IS_KEY")
@ApiParam(value = "是否关键件")
private Integer isKey;
@Column(name = "ACTION_TYPE")
@ApiParam(value = "动作类型")
private Integer actionType;
public int getIsFeedVal() {
return this.isFeed == null ? 0 : this.isFeed;
}

8
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java
Unescape Escape View File

@ -25,18 +25,18 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PROD_CFG")
@Table(name = "MES_PROD_CFG")
@Api("产品配置")
public class MesProdCfg extends BaseBean {
@Column(name="PROD_CFG_CODE")
@Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;
@Column(name="PROD_CFG_NAME")
@Column(name = "PROD_CFG_NAME")
@ApiParam("产品配置名称")
private String prodCfgName;
@Column(name="PROD_CFG_Type_CODE")
@Column(name = "PROD_CFG_Type_CODE")
@ApiParam("产品配置类型代码")
private String prodCfgTypeCode;
}

63
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java
Unescape Escape View File

@ -0,0 +1,63 @@
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/10/18 3:25 下午
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_PACK")
@Api("产品包装关系")
public class MesProdPack extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "CUSTOMER_CODE")
@ApiParam("客户代码")
private String customerCode;
@Column(name = "PACK_SPEC")
@ApiParam("包装规格")
private String packSpec;
@Column(name = "PROD_LABEL_TEMPLATE")
@ApiParam("产品标签模板")
private String prodLabelTemplate;
@Column(name = "PACK_LABEL_TEMPLATE2")
@ApiParam("包装标签模板2")
private String packLabelTemplate2;
@Column(name = "PACK_LABEL_TEMPLATE3")
@ApiParam("包装标签模板3")
private String packLabelTemplate3;
@Column(name = "PACK_LABEL_TEMPLATE4")
@ApiParam("包装标签模板4")
private String packLabelTemplate4;
@Column(name = "PROD_CFG_TYPE")
@ApiParam("项目")
private String prodCfgType;
}

46
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java
Unescape Escape View File

@ -0,0 +1,46 @@
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;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 14:17
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_CTGY_PICTURE")
@Api("产品类型图片表")
public class MesProduceCtgyPicture extends BaseBean {
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型代码")
private String produceCtgyCode;
@Column(name = "SIDE_LOCATION")
@ApiParam("面位")
private String sideLocation;
@Column(name = "PICTURE_URL")
@ApiParam("图片URL")
private String pictureUrl;
@Column(name = "PICTURE_NAME")
@ApiParam("图片名称")
private String pictureName;
}

50
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
Unescape Escape View File

@ -25,87 +25,91 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PRODUCE_SN")
@Table(name = "MES_PRODUCE_SN")
@Api("产品条码表")
public class MesProduceSn extends BaseBean {
@Column(name="SERIAL_NUMBER")
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME_RDD")
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name="QTY")
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name="QC_STATUS")
@Column(name = "QC_STATUS")
@ApiParam("质量状态")
private Integer qcStatus;
@Column(name="SN_STATUS")
@Column(name = "SN_STATUS")
@ApiParam("条码状态")
private Integer snStatus;
@Column(name="PRINT_COUNT")
@Column(name = "PRINT_COUNT")
@ApiParam("打印次数")
private Integer printCount;
@Column(name="PRINT_STATUS")
@Column(name = "PRINT_STATUS")
@ApiParam("打印状态")
private Integer printStatus;
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="WORK_CELL_CODE")
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="ROUTE_CODE")
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name="PROCESS_CODE")
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name="NEXT_PROCESS_CODE")
@Column(name = "NEXT_PROCESS_CODE")
@ApiParam("下一工序代码")
private String nextProcessCode;
@Column(name="IN_WC_TIME")
@Column(name = "IN_WC_TIME")
@ApiParam("进产线时间")
private String inWorkCenterTime;
@Column(name="OUT_WC_TIME")
@Column(name = "OUT_WC_TIME")
@ApiParam("出产线时间")
private String outWorkCenterTime;
@Column(name="SHIPPING_TIME")
@Column(name = "SHIPPING_TIME")
@ApiParam("发运时间")
private String shippingTime;
@Column(name="WORK_ORDER_NO")
@Column(name = "WORK_ORDER_NO")
@ApiParam("生产工单号")
private String workOrderNo;
@Column(name="CUST_SN")
@Column(name = "CUST_SN")
@ApiParam("客户条码")
private String custSn;
@Column(name="CUST_PART_NO")
@Column(name = "CUST_PART_NO")
@ApiParam("客户零件号")
private String custPartNo;
@Column(name="PACKAGE_SN")
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name = "PACKAGE_SN")
@ApiParam("包装条码")
private String packageSn;
@ -121,6 +125,10 @@ public class MesProduceSn extends BaseBean {
@ApiParam("返回信息")
private String resultMsg;
@Column(name="OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

54
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java
Unescape Escape View File

@ -14,97 +14,97 @@ import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description : 产品条码履历实体类
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-05-29 16:22
* @Modify:
**/
* @Description : 产品条码履历实体类
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-05-29 16:22
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PRODUCE_SN_TRAVEL")
@Table(name = "MES_PRODUCE_SN_TRAVEL")
@Api("产品条码履历表")
public class MesProduceSnTravel extends BaseBean {
@Column(name="SERIAL_NUMBER")
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME_RDD")
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name="QTY")
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name="QC_STATUS")
@Column(name = "QC_STATUS")
@ApiParam("质量状态")
private Integer qcStatus;
@Column(name="SN_STATUS")
@Column(name = "SN_STATUS")
@ApiParam("条码状态")
private Integer snStatus;
@Column(name="PRINT_COUNT")
@Column(name = "PRINT_COUNT")
@ApiParam("打印次数")
private Integer printCount;
@Column(name="PRINT_STATUS")
@Column(name = "PRINT_STATUS")
@ApiParam("打印状态")
private Integer printStatus;
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="WORK_CELL_CODE")
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="ROUTE_CODE")
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name="PROCESS_CODE")
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name="NEXT_PROCESS_CODE")
@Column(name = "NEXT_PROCESS_CODE")
@ApiParam("下一工序代码")
private String nextProcessCode;
@Column(name="IN_WC_TIME")
@Column(name = "IN_WC_TIME")
@ApiParam("进产线时间")
private String inWorkCenterTime;
@Column(name="OUT_WC_TIME")
@Column(name = "OUT_WC_TIME")
@ApiParam("出产线时间")
private String outWorkCenterTime;
@Column(name="SHIPPING_TIME")
@Column(name = "SHIPPING_TIME")
@ApiParam("发运时间")
private String shippingTime;
@Column(name="WORK_ORDER_NO")
@Column(name = "WORK_ORDER_NO")
@ApiParam("生产工单号")
private String workOrderNo;
@Column(name="CUST_SN")
@Column(name = "CUST_SN")
@ApiParam("客户条码")
private String custSn;
@Column(name="CUST_PART_NO")
@Column(name = "CUST_PART_NO")
@ApiParam("客户零件号")
private String custPartNo;
@Column(name="PACKAGE_SN")
@Column(name = "PACKAGE_SN")
@ApiParam("包装条码")
private String packageSn;

2
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java
Unescape Escape View File

@ -44,7 +44,7 @@ public class MesProductData extends BaseBean {
@ApiParam("工作单元名称")
private String workCellName;
@Column(name="SERIAL_NUMBER")
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java
Unescape Escape View File

@ -26,7 +26,7 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_QC_CHECK_DATA")
@Table(name = "MES_QC_CHECK_DATA")
@Api("质量过程检测数据")
public class MesQcCheckData extends BaseBean {
@ -80,7 +80,7 @@ public class MesQcCheckData extends BaseBean {
@Column(name = "QTY")
@ApiParam("产品数量")
private String qty;
private Integer qty;
@Column(name = "MEMO")
@ApiParam("备注")

2
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java
Unescape Escape View File

@ -25,7 +25,7 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_QC_CHECK_STANDARD")
@Table(name = "MES_QC_CHECK_STANDARD")
@Api("质量检测标准")
public class MesQcCheckStandard extends BaseBean {

22
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java
Unescape Escape View File

@ -25,46 +25,46 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_QUEUE_ORDER")
@Table(name = "MES_QUEUE_ORDER")
@Api("生产队列主表")
public class MesQueueOrder extends BaseBean {
@Column(name="ORDER_NO")
@Column(name = "ORDER_NO")
@ApiParam("主队列编号")
private String orderNo;
@Column(name="VIN_CODE")
@Column(name = "VIN_CODE")
@ApiParam("Vin")
private String vinCode;
@Column(name="CUST_FLAG_NO")
@Column(name = "CUST_FLAG_NO")
@ApiParam("客户标识号")
private String custFlagNo;
@Column(name="PROD_CFG_CODE")
@Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;
@Column(name="PROD_CFG_NAME_RDD")
@Column(name = "PROD_CFG_NAME_RDD")
@ApiParam("产品配置名称")
private String prodCfgNameRdd;
@Column(name="SEQ")
@Column(name = "SEQ")
@ApiParam("排序")
private Double seq;
@Column(name="WORK_ORDER_NO")
@Column(name = "WORK_ORDER_NO")
@ApiParam("生产工单号")
private String workOrderNo;
@Column(name="STATUS")
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name="CUST_PROD_LINE_CODE")
@Column(name = "CUST_PROD_LINE_CODE")
@ApiParam("客户产线代码")
private String custProdLineCode;
@Column(name="AREA_CODE")
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;

10
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java
Unescape Escape View File

@ -25,18 +25,18 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_REPAIR")
@Table(name = "MES_REPAIR")
@Api("维修")
public class MesRepair extends BaseBean {
@Column(name="REPAIR_CODE")
@Column(name = "REPAIR_CODE")
@ApiParam("维修代码")
private String repairCode;
@Column(name="REPAIR_NAME")
@Column(name = "REPAIR_NAME")
@ApiParam("维修名称")
private String repariName;
private String repairName;
@Column(name="REPAIR_TYPE")
@Column(name = "REPAIR_TYPE")
@ApiParam("维修类型")
private Integer repairType;
}

100
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java
Unescape Escape View File

@ -0,0 +1,100 @@
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;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 14:33
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_REPAIR_RECORD")
@Api("维修信息记录表")
public class MesRepairRecord extends BaseBean {
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("产品物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "DEFECT_NAME")
@ApiParam("缺陷名称")
private String defectName;
@Column(name = "SIDE_LOCATION")
@ApiParam("产品面位")
private String sideLocation;
@Column(name = "DEFECT_LOCATION")
@ApiParam("缺陷位置")
private String defectLocation;
@Column(name = "REPAIR_CODE")
@ApiParam("维修代码")
private String repairCode;
@Column(name = "REPAIR_NAME")
@ApiParam("维修名称")
private String repairName;
@Column(name = "DC_CODE")
@ApiParam("缺陷原因代码")
private String dcCode;
@Column(name = "DC_NAME")
@ApiParam("缺陷原因描述")
private String dcName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("生产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Transient
@ApiParam("备注")
private String spareMemo;
@Transient
@ApiParam("不良记录id")
private Long defectRecordId;
@Transient
@ApiParam("缺陷集合")
private List<MesDefect> mesDefectList;
}

6
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java
Unescape Escape View File

@ -25,14 +25,14 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_SCRAP")
@Table(name = "MES_SCRAP")
@Api("报废原因")
public class MesScrap extends BaseBean {
@Column(name="SCRAP_CODE")
@Column(name = "SCRAP_CODE")
@ApiParam("报废代码")
private String scrapCode;
@Column(name="SCRAP_NAME")
@Column(name = "SCRAP_NAME")
@ApiParam("报废名称")
private String scrapName;

70
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java
Unescape Escape View File

@ -0,0 +1,70 @@
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;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 14:42
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_SCRAP_RECORD")
@Api("报废信息记录表")
public class MesScrapRecord extends BaseBean {
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("产品物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "SCRAP_CODE")
@ApiParam("报废代码")
private String scrapCode;
@Column(name = "SCRAP_NAME")
@ApiParam("报废名称")
private String scrapName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("生产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
@Column(name = "SCRAP_REASON")
@ApiParam("报废原因")
private String scrapReason;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
}

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save