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

Merge branch 'test'

Browse Source
yun-zuoyi
crish 6 years ago
parent 40321ed7ec cd74f5336f
commit 0526da8ee3
300 changed files with 8014 additions and 1397 deletions
Show Stats Download Patch File Download Diff File

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

@ -25,13 +25,17 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="ANDON_BRODCAST")
@Table(name="ANDON_BROADCAST")
@Api("安灯广播")
public class AndonBroadCast extends BaseBean {
@Column(name="DEVICE_NUM")
@ApiParam("广播设备编号")
private String targetIds;
@Column(name="GROUP_NO")
@ApiParam("分组号")
private String groupNo;
@Column(name="WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@ -71,6 +75,4 @@ public class AndonBroadCast extends BaseBean {
@Column(name="PLAY_TIME")
@ApiParam("播放循环次数")
private Integer playTime = 1;
}

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

@ -28,18 +28,22 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="ANDON_BRODCAST_CFG")
@Table(name="ANDON_BROADCAST_CFG")
@Api("生产区域")
public class AndonBroadCastCfg extends BaseBean {
@Column(name="ALARM_CODE")
@ApiParam("安灯类型代码")
private String alarmCode;
@Column(name="DEVICE_NUM")
@ApiParam("广播设备编号")
private String targetIds;
// @Column(name="DEVICE_NUM")
// @ApiParam("广播设备编号")
// private String targetIds;
@Column(name="WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name="GROUP_NO")
@ApiParam("分组号")
private String groupNo;
}

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

@ -51,8 +51,20 @@ public class AndonDisposalCfg extends BaseBean {
@ApiParam(value = "呼叫原因描述")
private String acNameRdd;
@AnnoOutputColumn(refClass = AndonEnumUtil.APPROVAL_STATUS.class,refForeignKey = "value",value = "description")
@Column(name = "APPROVAL_STATUS")
@Column(name = "EC_CODE")
@ApiParam(value = "事件方法代码")
private String ecCode;
@Column(name = "EC_NAME_RDD")
@ApiParam(value = "事件方法描述")
private String ecNameRdd;
@AnnoOutputColumn(refClass = AndonEnumUtil.KNOWLEDGE_AUDIT_STATUS.class,refForeignKey = "value",value = "description")
@Column(name = "FLOW_STATUS")
@ApiParam(value = "审批状态")
private String approvalStatus;
private Integer flowStatus;
@Column(name = "FLOW_MEMO")
@ApiParam(value = "审批意见")
private String flowMemo;
}

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

@ -0,0 +1,50 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.BaseModelBean;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description: 自处理维护配置
* @Reference:
* @Author: Crish
* @CreateDate:2019-10-19-14:56
* @Modify:
**/
@Data
@Entity
@Table(name="ANDON_DISPOSAL_MAINTEN_CFG")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("Andon自处理维护配置")
public class AndonDisposalMaintenCfg extends BaseBean {
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
private String alarmCode;
@Column(name = "RP_WHERE")
@ApiParam(value = "有效时长")
private Integer rpWhere;
@Column(name = "FAIL_TIME")
@ApiParam(value = "失败次数")
private Integer failTime;
@Column(name = "SUCCESS_TIME")
@ApiParam(value = "成功次数")
private Integer successTime;
}

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

@ -0,0 +1,38 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue;
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: Crish
* @CreateDate:2019-10-18-9:13
* @Modify:
**/
@Data
@Entity
@Table(name="ANDON_KNOWLEDGE_BASE")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON知识库")
public class AndonKnowledgeBase extends BaseManageQueue {
@Column(name = "FLOW_STATUS")
@ApiParam(value = "审批状态")
private Integer flowStatus;
@Column(name = "FLOW_MEMO")
@ApiParam(value = "审批意见")
private String flowMemo;
}

224
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.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 cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
@ -40,77 +41,11 @@ import java.util.List;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯队列")
public class AndonManageQueue extends BaseBean {
@Column(name = "ANDON_ORDER_NO")
@ApiParam(value = "安灯队列编号")
private String andonOrderNo;
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
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 AndonManageQueue 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")
@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 callTime;
@Column(name="CLOSE_TIME")
@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 closeTime;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="呼叫时间，查询开始时间", example = "2018-01-01 01:00:00")
@ -121,42 +56,14 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value="呼叫时间，查询结束时间", example = "2018-01-01 01:00:00")
public String callTimeEnd;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name="CONFIRM_TIME")
@ApiParam(value = "响应时间", example = "2018-01-01 01:00:00")
@AnnoOutputColumn(hidden = true)
public String confirmTime;
@Column(name="RESET_TIME")
@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 resetTime;
@Column(name = "CALL_USER")
@ApiParam(value = "呼叫人")
private String callUser;
@Column(name = "CLOSE_USER")
@ApiParam(value = "撤销人")
private String closeUser;
@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;
@Column(name = "SOURCE_TYPE")
@ApiParam(value = "安灯来源类型")
private String sourceType = AndonEnumUtil.ALARM_SOURCE_TYPE.SOFT.getValue();
@ -187,58 +94,6 @@ public class AndonManageQueue 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 = "CLOSE_CAUSE")
@ApiParam(value = "撤销原因")
private String closeCause;
@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;
@Transient
@ApiParam(value = "异常时长", example = "0")
private Long execptionTime;
@ -288,23 +143,12 @@ public class AndonManageQueue extends BaseBean {
private String signSendFlag;
/**
* 处理类型：10=标准处理，20=自处理
*/
@Column(name = "DISPOSAL_TYPE")
@ApiParam(value = "处理类型")
private String disposalType;
/**
* 1 = 是，2 = 否
*/
@Transient
@ApiParam(value = "是否勾选加入自处理问题库", example = "2")
private Integer isDisposal;
@Column(name = "ALARM_DETAIL_CODE")
@ApiParam(value = "安灯子类型代码")
private String alarmDetailCode;
@Column(name = "ALARM_DETAIL_NAME_RDD")
@ApiParam(value = "安灯子类型名称")
private String alarmDetailNameRdd;
@ -353,6 +197,67 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value = "事件统计报表该事件描述的总次数")
private int acCodeTime;
@ApiParam(value = "操作来源")
@Transient
private String operationFlag;
// 安灯附属表
@Transient
@ApiParam(value ="临时/纠正措施")
private String tempCorrectMethod;
@Transient
@ApiParam(value ="预防/纠正措施")
private String preCorrectMethod;
@Transient
@ApiParam(value ="客户")
private String customer;
@Transient
@ApiParam(value ="零件号")
private String partNo;
@Transient
@ApiParam(value ="零件名称")
private String partName;
@Transient
@ApiParam(value ="报废数量")
private Double scrapNum;
@Transient
@ApiParam(value ="批次")
private String lot;
@Transient
@ApiParam(value ="零件数量")
private Double partNum;
@Transient
@ApiParam(value ="设备名称")
private String deviceName;
@Transient
@ApiParam(value ="是否更换备件")
private Integer isChangeBackup;
@Transient
@ApiParam(value ="备件名称")
private String backupPartName;
@Transient
@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;
@ -474,9 +379,6 @@ public class AndonManageQueue extends BaseBean {
try {
List ds = new ArrayList();
ds.add(new AndonManageQueue());
System.out.println(BeanUtils.describe(ds));
} catch (IllegalAccessException e) {
e.printStackTrace();

197
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;
@ -272,6 +136,63 @@ public class AndonManageRecord extends BaseBean {
@ApiParam(value = "响应已通知标识")
private String signSendFlag;
// 安灯附属表
@Transient
@ApiParam(value ="临时/纠正措施")
private String tempCorrectMethod;
@Transient
@ApiParam(value ="预防/纠正措施")
private String preCorrectMethod;
@Transient
@ApiParam(value ="客户")
private String customer;
@Transient
@ApiParam(value ="零件号")
private String partNo;
@Transient
@ApiParam(value ="零件名称")
private String partName;
@Transient
@ApiParam(value ="报废数量")
private Double scrapNum;
@Transient
@ApiParam(value ="批次")
private String lot;
@Transient
@ApiParam(value ="零件数量")
private Double partNum;
@Transient
@ApiParam(value ="设备名称")
private String deviceName;
@Transient
@ApiParam(value ="是否更换备件")
private Integer isChangeBackup;
@Transient
@ApiParam(value ="备件名称")
private String backupPartName;
@Transient
@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;

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

@ -40,7 +40,64 @@ public class AndonQueueAttach extends BaseBean {
@ApiParam(value ="安灯任务编号")
private String andonOrderNo;
@Column(name="STATUS_CODE")
@ApiParam(value ="安灯状态")
private String statusCode;
// @Column(name="STATUS_CODE")
// @ApiParam(value ="安灯状态")
// private String statusCode;
@Column(name="TEMP_CORT_METHOD")
@ApiParam(value ="临时/纠正措施")
private String tempCorrectMethod;
@Column(name="PRE_CORT_METHOD")
@ApiParam(value ="预防/纠正措施")
private String preCorrectMethod;
@Column(name="CUSTOMER")
@ApiParam(value ="客户")
private String customer;
@Column(name="PART_NO")
@ApiParam(value ="零件号")
private String partNo;
@Column(name="PART_NAME")
@ApiParam(value ="零件名称")
private String partName;
@Column(name="SCRAP_NUM")
@ApiParam(value ="报废数量")
private Double scrapNum;
@Column(name="LOT")
@ApiParam(value ="批次")
private String lot;
@Column(name="PART_NUM")
@ApiParam(value ="零件数量")
private Double partNum;
@Column(name="DEVICE_NAME")
@ApiParam(value ="设备名称")
private String deviceName;
@Column(name="IS_CHANGE_BACKUP")
@ApiParam(value ="是否更换备件")
private Integer isChangeBackup;
@Column(name="BACKUP_PART_NAME")
@ApiParam(value ="备件名称")
private String backupPartName;
@Column(name="SCALE")
@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;
}

180
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java
Unescape Escape View File

@ -0,0 +1,180 @@
package cn.estsh.i3plus.pojo.andon.model;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-10-18-8:36
* @Modify:
**/
@Data
@MappedSuperclass
public class BaseManageQueue extends BaseBean {
@Column(name = "ANDON_ORDER_NO")
@ApiParam(value = "安灯队列编号")
public String andonOrderNo;
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
public String alarmCode;
@Column(name = "ACTION_CODE")
@ApiParam(value = "安灯动作代码")
public String actionCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
public String workCenterCode;
@Column(name = "WORK_CENTER_NAME_RDD")
@ApiParam(value = "工作中心名称")
public String workCenterNameRdd;
@Column(name = "WORK_CELL_NAME_RDD")
@ApiParam(value = "工作单元名称")
public String workCellNameRdd;
@Column(name = "WORK_CELL_CODE")
@ApiParam(value = "工作单元代码")
public String workCellCode;
@Column(name = "EQUIPMENT_CODE")
@ApiParam(value = "设备代码")
public String equipmentCode;
@Column(name = "EQUIPMENT_NAME_RDD")
@ApiParam(value = "设备名称")
public String equipmentNameRdd;
@Column(name = "SHIFT_CODE")
@ApiParam(value = "班次代码")
public String shiftCode;
@Column(name = "SHIFT_NAME_RDD")
@ApiParam(value = "班次名称")
public String shiftNameRdd;
@Column(name = "STATUS_CODE")
@ApiParam(value = "安灯状态代码")
public String statusCode;
@Column(name = "PRIORITY_LEVEL")
@ApiParam(value = "优先级别", example = "1")
public Integer priorityLevel;
@Column(name="CALL_TIME")
@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 callTime;
@Column(name="CLOSE_TIME")
@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 closeTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name="CONFIRM_TIME")
@ApiParam(value = "响应时间", example = "2018-01-01 01:00:00")
@AnnoOutputColumn(hidden = true)
public String confirmTime;
@Column(name="RESET_TIME")
@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 resetTime;
@Column(name = "CALL_USER")
@ApiParam(value = "呼叫人")
public String callUser;
@Column(name = "CLOSE_USER")
@ApiParam(value = "撤销人")
public String closeUser;
@Column(name = "CONFIRM_USER")
@ApiParam(value = "响应人")
public String confirmUser;
@Column(name = "RESET_USER")
@ApiParam(value = "解决人")
public String resetUser;
@Column(name = "CLOSE_CAUSE")
@ApiParam(value = "撤销原因")
public String closeCause;
@Column(name = "AC_CODE")
@ApiParam(value = "呼叫原因代码")
public String acCode;
@Column(name = "AC_NAME_RDD")
@ApiParam(value = "呼叫原因描述")
public String acNameRdd;
@Column(name = "AC_DESC")
@ApiParam(value = "呼叫具体原因")
public String acDesc;
@Column(name = "EC_CODE")
@ApiParam(value = "事件原因代码")
public String ecCode;
@Column(name = "EC_NAME_RDD")
@ApiParam(value = "事件原因描述")
public String ecNameRdd;
@Column(name = "EC_DESC")
@ApiParam(value = "事件具体原因")
public String ecDesc;
@Column(name = "EM_CODE")
@ApiParam(value = "事件方法代码")
public String emCode;
@Column(name = "EM_NAME_RDD")
@ApiParam(value = "事件方法描述")
public String emNameRdd;
@Column(name = "EM_DESC")
@ApiParam(value = "事件具体方法")
public String emDesc;
@Column(name = "IS_HALT")
@ApiParam(value = "是否停机", example = "1")
public Integer isHalt;
@Column(name = "HALT_CODE")
@ApiParam(value = "停机类型")
public String haltCode;
@Column(name = "HALT_DESC")
@ApiParam(value = "停机具体原因")
public String haltDesc;
/**
* 处理类型：10=标准处理，20=自处理
*/
@Column(name = "DISPOSAL_TYPE")
@ApiParam(value = "处理类型")
public String disposalType;
@Column(name = "ALARM_DETAIL_CODE")
@ApiParam(value = "安灯子类型代码")
public String alarmDetailCode;
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalMaintenCfg;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
/**
* @Description: 自处理维护配置
* @Reference:
* @Author: Crish
* @CreateDate:2019-10-19-15:02
* @Modify:
**/
public interface IAndonDisposalMaintenCfgRepository extends BaseRepository<AndonDisposalMaintenCfg, Long> {
}

16
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonKnowledgeBaseRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonKnowledgeBase;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description: 知识库管理
* @Reference:
* @Author: Crish
* @CreateDate:2019-10-18-9:16
* @Modify:
**/
@Repository
public interface IAndonKnowledgeBaseRepository extends BaseRepository<AndonKnowledgeBase, Long> {
}

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

@ -90,7 +90,8 @@ 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);
return packBean;
@ -106,10 +107,36 @@ public class AndonHqlPack {
DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getAlarmCode(), "alarmCode", packBean);
DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getTargetIds(), "targetIds", packBean);
DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getGroupNo(), "groupNo", packBean);
DdlPreparedPack.getNumEqualPack(andonBroadCastCfg.getIsValid(),"isValid",packBean);
return packBean;
}
/**
* 自处理维护配置
* @param andonDisposalMaintenCfg
* @return
*/
public static DdlPackBean getAndonDisposalMaintenCfg(AndonDisposalMaintenCfg andonDisposalMaintenCfg) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAlarmCode(), "alarmCode", packBean);
DdlPreparedPack.getNumEqualPack(andonDisposalMaintenCfg.getIsValid(),"isValid",packBean);
return packBean;
}
/**
* 安灯附属表
* @param andonQueueAttach
* @return
*/
public static DdlPackBean getAndonQueueAttach(AndonQueueAttach andonQueueAttach) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonQueueAttach.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonQueueAttach.getAndonOrderNo(), "andonOrderNo", packBean);
DdlPreparedPack.getNumEqualPack(andonQueueAttach.getIsValid(),"isValid",packBean);
return packBean;
}
/***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 End ************/
@ -291,6 +318,32 @@ public class AndonHqlPack {
}
/**
* 按条件查询安灯知识库
* @param andonKnowledgeBase
* @return
*/
public static DdlPackBean packAndonKnowlegeBase(AndonKnowledgeBase andonKnowledgeBase){
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getAndonOrderNo(), "andonOrderNo", packBean);
DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getAlarmCode(), "alarmCode", packBean);
DdlPreparedPack.getNumEqualPack(andonKnowledgeBase.getFlowStatus(), "flowStatus", packBean);
DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getAcCode(), "acCode", packBean);
DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEcCode(), "ecCode", packBean);
DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEmCode(), "emCode", packBean);
if(StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeEnd())){
DdlPreparedPack.timeBuilder(andonKnowledgeBase.getCreateDateTimeStart(), andonKnowledgeBase.getCreateDateTimeEnd(), "createDatetime", packBean, true);
}
getStringBuilderPack(andonKnowledgeBase, packBean);
packBean.setOrderByStr(andonKnowledgeBase.orderBy());
return packBean;
}
/**
* 按条件查询按灯队列信息
* @param andonManageQueue
* @return
@ -335,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.getNumEqualPack(andonDisposalCfg.getFlowStatus(),"flowStatus", result);
getStringBuilderPack(andonDisposalCfg, result);
return result;

16
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java
Unescape Escape View File

@ -5,12 +5,20 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* @Description :字段元信息注解
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
public @interface FieldAnnotation {
boolean property() default true;
boolean modify() default true;
boolean display() default true;
int pric() default 2;
boolean mainkey() default false;
boolean modify() default true; // 是否能修改
boolean display() default true; // 是否需要在界面显示
int pric() default 2; // 对于浮点型，界面显示的精度
boolean mainkey() default false; // 是否为主键
String defaultValue() default ""; // 字段的默认值
}

11
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java
Unescape Escape View File

@ -5,9 +5,16 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* @Description :字段传播依赖设置
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
public @interface RippleAnnotation {
String[] dependence() default {};
String method() default "";
String[] dependence() default {}; // 字段依赖的路径
String method() default ""; // 字段值计算时调用的方法，方法写在service中.
}

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

@ -58,6 +58,10 @@ public class BaseOrder extends BaseCode {
@ApiParam(value ="接单日期")
private Date receiveDate;
@Column(name="SPECIFY_MATERIAL_NUM")
@ApiParam(value ="专料号")
private String specifyMaterialNum;
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(property = false)

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

@ -41,7 +41,7 @@ public class FieldInfo extends BaseCode {
private FIELD_TYPE type;
@Column(name="TYPE_NAME")
@ApiParam(value ="类型全称")
@ApiParam(value ="类型名称")
private String typeName;
@Column(name="CUSTOMIZE")
@ -80,6 +80,13 @@ public class FieldInfo extends BaseCode {
@ApiParam(value ="数据库类型")
private JDBCType jdbcType;
@Column(name="DEFAULT_VALUE")
@ApiParam(value ="字段默认值")
private String defaultValue;
@ApiParam(value ="枚举项内容")
private transient Enum<?>[] enumItems;
@JsonIgnore
private transient Class<? extends BaseBean> clazz;
@JsonIgnore

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

@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.IMPORT_DETAIL_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EExportDetail;
import cn.estsh.i3plus.pojo.aps.holders.EImportDetail;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;

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

@ -53,4 +53,8 @@ public class MatCalcRule extends BaseRule {
@ApiParam(value ="批量补充")
private Boolean batchSupply;
@Column(name="ASSIGN_LIMIT")
@ApiParam(value ="物料分配制约")
private Integer assignLimit;
}

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

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
@ -31,10 +32,12 @@ import java.util.List;
public class Material extends BaseCode {
@Column(name="TYPE")
@ApiParam(value ="类型")
@FieldAnnotation(defaultValue = "PRODUCT")
private MATERIAL_TYPE type;
@Column(name="PREPARE_TYPE")
@ApiParam(value ="备料类型")
@FieldAnnotation(defaultValue = "SELF_MAKE")
private PREPARE_TYPE prepareType;
@Column(name="REPL_TYPE")
@ -68,23 +71,26 @@ public class Material extends BaseCode {
@Column(name="LEVEL")
@ApiParam(value ="低阶码")
@RippleAnnotation(dependence = {"OperOutputs.Operation.ProductRouting.Material"}, method = "calcLevel")
@FieldAnnotation(modify = false)
private Integer level;
@Column(name="IS_AUTO_FIX_PEGGING")
@ApiParam(value ="自动补充标识")
private boolean autoFixPegging;
@FieldAnnotation(defaultValue = "true")
private Boolean autoFixPegging;
@Column(name="MAX_MANUF_BATCH")
@Column(name="MAX_PRODUCT_BATCH")
@ApiParam(value ="最大制造批量")
private Double maxManufBatch;
private Double maxProductBatch;
@Column(name="MIN_MANUF_BATCH")
@Column(name="MIN_PRODUCT_BATCH")
@ApiParam(value ="最小制造批量")
private Double minManufBatch;
@FieldAnnotation(defaultValue = "0.0")
private Double minProductBatch;
@Column(name="MANUF_UNIT_BATCH")
@Column(name="UNIT_PRODUCT_BATCH")
@ApiParam(value ="制造批量单位")
private Double manufUnitBatch;
private Double UnitProductBatch;
@Column(name="MAX_PUR_BATCH")
@ApiParam(value ="最大采购批量")
@ -94,9 +100,9 @@ public class Material extends BaseCode {
@ApiParam(value ="最小采购批量")
private Double minPurBatch;
@Column(name="PUR_UNIT_BATCH")
@Column(name="UNIT_PUR_BATCH")
@ApiParam(value ="采购批量单位")
private Double purUnitBatch;
private Double unitPurBatch;
@Column(name="MIN_STOCK_COUNT")
@ApiParam(value ="最小库存数量")
@ -110,6 +116,10 @@ public class Material extends BaseCode {
@ApiParam(value ="最大库存数量")
private Double maxStockCount;
@Column(name="ORDER_BATCH_PERIOD")
@ApiParam(value ="订单合并期间")
private String orderBatchPeriod;
@JsonBackReference
public List<ProductRouting> getProductRoutings() {
return BeanRelation.list(this, EMaterial.ProductRoutings);

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

@ -59,6 +59,10 @@ public class OperResource extends BaseAPS {
@ApiParam(value ="优先级")
private Integer priority;
@Column(name="USER_MATCH_NUMBER")
@ApiParam(value ="资源使用配套号")
private String userMatchNumber;
@Column(name="OPERATION_ID")
@ApiParam(value ="工序")
@FieldAnnotation(property = false)

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

@ -50,21 +50,13 @@ public class Operation extends BaseAPS {
private String ratio;
@Column(name="COUNT")
@ApiParam(value ="分割数量")
private Double count;
@ApiParam(value ="分割的工作个数")
private Integer count;
@Column(name="BATCH")
@ApiParam(value ="分割批量")
private Double batch;
@Column(name="MIN_BATCH")
@ApiParam(value ="最小批量")
private Double minBatch;
@Column(name="TAIL_DEAL")
@ApiParam(value ="尾数处理")
private TAIL_DEAL tailDeal;
@Column(name="CONS_TYPE")
@ApiParam(value ="接续方式")
private CONSTRAINT_TYPE consType;

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

@ -1,6 +1,9 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EResCalendar;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -8,6 +11,7 @@ import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.List;
/**
* @Description :日历
@ -40,4 +44,14 @@ public class ResCalendar extends BaseAPS {
@Column(name="PRIORITY")
@ApiParam(value ="优先级")
private Integer priority;
@JsonBackReference
public List<DayShift> getDayShifts() {
return BeanRelation.list(this, EResCalendar.DayShifts);
}
@JsonBackReference
public List<Resource> getResources() {
return BeanRelation.list(this, EResCalendar.Resources);
}
}

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

@ -30,21 +30,13 @@ public class StandOperation extends BaseCode {
private String ratio;
@Column(name="COUNT")
@ApiParam(value ="分割数量")
private Double count;
@ApiParam(value ="分割的工作个数")
private Integer count;
@Column(name="BATCH")
@ApiParam(value ="分割批量")
private Double batch;
@Column(name="MIN_BATCH")
@ApiParam(value ="最小批量")
private Double minBatch;
@Column(name="TAIL_DEAL")
@ApiParam(value ="尾数处理方式")
private TAIL_DEAL tailDeal;
@Column(name="DIRECTION")
@ApiParam(value ="排程方向")
private DIRECTION direction;

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

@ -97,6 +97,22 @@ public class Work extends BaseCode {
@ApiParam(value ="计划主资源")
private String planResource;
@Column(name="FIX_SPLIT")
@ApiParam(value ="已分割的工作是否重新分割")
private Boolean fixSplit;
@Column(name="NEED_PREV_COUNT")
@ApiParam(value ="需要的前工作数量")
private Double needPrevCount;
@Column(name="SCH_FAILED")
@ApiParam(value ="是否排程失败")
private Boolean schFailed;
@Column(name="FAILED_REASON")
@ApiParam(value ="排程失败原因")
private String failedReason;
@Column(name="ORDER_ID")
@ApiParam(value ="订单")
@FieldAnnotation(property = false)
@ -168,4 +184,6 @@ public class Work extends BaseCode {
public List<PlanFeedback> getPlanFeedbacks() {
return BeanRelation.list(this, EWork.PlanFeedbacks);
}
public WorkPlan getWorkPlan() { return BeanRelation.get(this, EWork.WorkPlan); }
}

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

@ -0,0 +1,63 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
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 lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
* @Description :工作计划
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-10-17
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="APS_WORK_PLAN")
@Api("工作计划")
public class WorkPlan extends BaseAPS {
private Date prevSetStart;
private Date prevSetEnd;
private String prevSetTime;
private Date produceStart;
private Date produceEnd;
private String produceTime;
private Date postSetStart;
private Date postSetEnd;
private String postSetTime;
private Date lockStart;
private Date lockEnd;
private String lockTime;
private Date edgeTime;
private Long workId;
private Long resourceId;
public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }
public void setWork(Work work) {
this.workId = work != null ? work.getId() : 0l;
BeanRelation.set(this, EWorkPlan.Work, work);
}
public Resource getResource() { return BeanRelation.get(this, EWorkPlan.Resource); }
public void setResource(Resource resource) {
this.resourceId = resource != null ? resource.getId() : 0l;
BeanRelation.set(this, EWorkPlan.Resource, resource);
}
}

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

@ -58,6 +58,10 @@ public class WorkResource extends BaseAPS {
@ApiParam(value ="最大后设置中断时间")
private String maxPostSdTime;
@Column(name="USER_MATCH_NUMBER")
@ApiParam(value ="资源使用配套号")
private String userMatchNumber;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(property = false)

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

@ -1,15 +1,25 @@
package cn.estsh.i3plus.pojo.aps.common;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import javax.persistence.MappedSuperclass;
import java.util.HashMap;
import java.util.Map;
/**
* @Description :APS基类
* 对于APS所有实体类均需继承该类。
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
@Data
@MappedSuperclass
public abstract class BaseAPS extends BaseBean {
@JsonIgnore
private transient Map<String, Object> customFields = new HashMap<>();
public Object getCustomField(String code) {

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

@ -6,6 +6,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import java.util.*;
import java.util.function.Consumer;
/**
* @Description :APS 实体对象的元信息
* 包含实体对象之间的关联关系信息。
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public class BeanInfo {
private Class<? extends BaseBean> cls;
private BeanInfo superBeanInfo;
@ -279,6 +287,9 @@ public class BeanInfo {
case STRING:
cls = String.class;
break;
case DURATION:
cls = DateDuration.class;
break;
default:
break;
}

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

@ -9,6 +9,14 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Predicate;
/**
* @Description :关联关系工具类
*
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public class BeanRelation {
Map<Class<? extends BaseBean>, Map<Long, Map<Enum<?>, List<BaseBean>>>> caches = new HashMap<>();
@ -74,6 +82,14 @@ public class BeanRelation {
}
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) {
T result = getImpl(nextEntity, pred, args, 0);
if (result != null) {
return result;
}
}
return null;
}
@ -149,7 +165,7 @@ public class BeanRelation {
* @param relaBean
*/
public static void set(BaseBean bean, Enum<?> holder, BaseBean relaBean) {
if (bean == null) {
if (bean == null || holder == null) {
return;
}
if (relaBean == null) {
@ -201,7 +217,7 @@ public class BeanRelation {
* @param bean
* @param holder
*/
private static void remove(BaseBean bean, Enum<?> holder) {
public static void remove(BaseBean bean, Enum<?> holder) {
if (bean == null || holder == null) {
return;
}
@ -225,7 +241,7 @@ public class BeanRelation {
* @param holder
* @param relaBean
*/
private static void remove(BaseBean bean, Enum<?> holder, BaseBean relaBean) {
public static void remove(BaseBean bean, Enum<?> holder, BaseBean relaBean) {
if (bean == null || holder == null) {
return;
}

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

@ -0,0 +1,22 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* 物料分配限制
* 主要考虑输出订的最晚计算时间不能晚于输入的最晚计算时间
*/
public enum MATERIAL_ASSIGN_LIMIT {
NONE(0), // 不进行任何制约
INVENTORY(1), // 库存制约
PURCHASE(2), // 采购制约
PRODUCT(4); // 制造制约
private int _value;
MATERIAL_ASSIGN_LIMIT(int value) {
_value = value;
}
public int value() {
return this._value;
}
}

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

@ -0,0 +1,22 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :预置的资源选择规则
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum RESOURCE_CHOISE_RULE {
PREV_SET_TIME, // 前设置时间
PRODUCE_TIME, // 生产时间
POST_SET_TIME, // 后设置时间
WORK_WAIT_TIME, // 工作等待时间
RES_BALANCE, // 资源均衡度
SAME_MATERIAL, // 相同物料
SAME_ORDER, // 相同订单
NEARLY_WORK, // 前后工作
POST_RESOURCE, // 后资源制约
SAME_ASS_RESOURCE, // 相同副资源
RESOURCE_PRIORITY; // 资源优先级
}

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

@ -0,0 +1,32 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :预置的工作排序规则
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum WORK_SORT_RULE {
NONE,
ORDER_LET, // 订单交货期
ORDER_PRIORITY, // 订单优先级
ORDER_EST, // 订单最早开始时刻
ORDER_COUNT, // 订单数量
ORDER_RECEIVE_DATE,// 订单接单日期
ORDER_LET_SUB_EST,// 订单交货期与订单最早开始时刻之差
ORDER_PRESSURE, // 订单紧迫程度
ORDER_SURPLUS, // 订单余裕度
NOPLAN_OPERATION_SIZE,// 残留工序数
REMAIN_PRODUCE_TIME, // 残留生产时间
MIN_OPERATION_REMAIN_TIME,// 最小工序宽裕时间
WORK_LET, // 工作最晚结束时刻
WORK_EST, // 工作最早开始时刻
INVENTORY_RELA, // 订单物品库存量相对值
FIRST_WORK_BEGIN,// 订单首工作上次开始时刻
HAVE_HIGH_WORK, // 订单中含有高级别工作
WORK_RESOURCE_SIZE, // 工作的可用资源数
TOP_ORDER_LET,// 顶层订单的交货期
TOP_ORDER_CODE, // 顶层订单代码
TOP_ORDER_PRIORITY; // 顶层订单优先级
}

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

@ -0,0 +1,8 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum WORK_SPLIT_TYPE {
NONE, // 不分割
RATIO, // 按比例分割
COUNT, // 按数量分割
BATCH // 按批量分割
}

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

@ -1,4 +1,6 @@
package cn.estsh.i3plus.pojo.aps.holders;
public enum EResCalendar {
DayShifts,
Resources
}

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

@ -1,13 +1,14 @@
package cn.estsh.i3plus.pojo.aps.holders;
public enum EWork {
Order,
ParentWork,
WorkResources,
WorkInputs,
WorkOutputs,
PrevRelations,
PostRelations,
Operation,
PlanFeedbacks
Order, // 订单
ParentWork, // 父工作
WorkResources, // 工作资源
WorkInputs, // 工作输入
WorkOutputs, // 工作输出
PrevRelations, // 前关联
PostRelations, // 后关联
Operation, // 工序
PlanFeedbacks, // 工作计划反馈
WorkPlan // 关联的为主资源的计划
}

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

@ -0,0 +1,7 @@
package cn.estsh.i3plus.pojo.aps.holders;
public enum EWorkPlan {
Work,
Resource,
AssPlans // 关联的为副资源的工作计划
}

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

@ -0,0 +1,18 @@
package cn.estsh.i3plus.pojo.aps.model;
import cn.estsh.i3plus.pojo.aps.bean.WorkResource;
import java.util.List;
/**
* @Description :主副资源配套组合
* 只允许一个主资源，可以有多个副资源，但同一套号的副资源不能有多个。
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-11
* @Modify:
**/
public class ResourceCompose {
public WorkResource resource;
public List<WorkResource> assResource;
}

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

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

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

@ -1,3 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="ResCalendar">
<Relation field="DayShifts" name="DayShift" type="MULTI_TO_MULTI">
</Relation>
<Relation field="Resources" name="Resource" type="MULTI_TO_MULTI">
</Relation>
</Class>

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

@ -4,7 +4,7 @@
</Relation>
<Relation field="WorkInputs" name="WorkInput" reverse="Work" type="ONE_TO_MULTI" owner="true">
</Relation>
<Relation field="WORK_RESOURCES" name="WorkResource" reverse="Work" type="ONE_TO_MULTI" owner="true">
<Relation field="WorkResources" name="WorkResource" reverse="Work" type="ONE_TO_MULTI" owner="true">
</Relation>
<Relation field="PostRelations" name="WorkRelation" reverse="PrevWork" type="ONE_TO_MULTI" owner="false">
</Relation>
@ -12,6 +12,6 @@
</Relation>
<Relation field="Operation" name="Operation" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="PlanFeedback" name="PlanFeedback" reverse="Work" type="ONE_TO_MULTI" owner="true">
<Relation field="PlanFeedbacks" name="PlanFeedback" reverse="Work" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

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

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="WorkInput">
<Relation field="WorkRelations" name="WorkRelation" reverse="WorkInput" type="ONE_TO_MULTI" owner="true">
</Relation>
<Relation field="Material" name="Material" reverse="WorkInputs" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="OperInput" name="OperInput" reverse="WorkInputs" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="WorkRelations" name="WorkRelation" reverse="WorkInput" type="ONE_TO_MULTI" owner="true">
</Relation>
<Relation field="Material" name="Material" reverse="WorkInputs" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="OperInput" name="OperInput" reverse="WorkInputs" type="MULTI_TO_ONE" owner="false">
</Relation>
</Class>

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

@ -0,0 +1,9 @@
<?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>
</Class>

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="WorkResource">
<Relation field="Resource" name="Resource" reverse="WorkResources" type="MULTI_TO_ONE" owner="false">
<Relation field="Resource" name="Resource" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="OperResource" name="OperResource" reverse="WorkResources" type="MULTI_TO_ONE" owner="false">
</Relation>

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

@ -20,7 +20,7 @@ import java.net.NetworkInterface;
* @CreateDate : 2018-09-11 16:35
* @Modify:
**/
public class SnowflakeIdMaker {
public class SnowflakeIdMaker {
public static final Logger LOGGER = LoggerFactory.getLogger(SnowflakeIdMaker.class);

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

@ -11,7 +11,6 @@ import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
import com.thoughtworks.xstream.io.xml.XppDomDriver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.Writer;
import java.lang.reflect.Field;
@ -35,6 +34,9 @@ public class XStreamFactory {
public static final String CDATA_PREFIX = "<![CDATA[";
public static final String CDATA_SUFFIX = "]]>";
private XStreamFactory() {
}
public static XStream getXStream() {
final NameCoder nameCoder = new NoNameCoder();
XStream xStream = new XStream(new XppDomDriver(nameCoder) {

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

@ -12,6 +12,53 @@ import org.apache.commons.lang3.StringUtils;
**/
public class AndonEnumUtil {
/**
* 按灯状态
* 10-是，20-否
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum KNOWLEDGE_AUDIT_STATUS {
PENDING(10,"待审批"),
PASS(20,"审批通过"),
STOP(99,"审批不通过");
private int value;
private String description;
KNOWLEDGE_AUDIT_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;
}
public static int descriptionOfValue(String val) {
int tmp = -1;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 语音播报类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -462,7 +509,9 @@ public class AndonEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_OPERATION_SOURCE{
PHYSICAL("10","物理操作"),
SOFT("20","软件操作");
SOFT("20","软件操作"),
SCHEDULE("30","队列，定时操作"),
INSERT("40","插入动作");
private String value;
private String description;
@ -702,7 +751,8 @@ public class AndonEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NOTICE_MESSAGE_SEND_TYPE {
SMS("10","短信"),
EMAIL("20","邮箱");
EMAIL("20","邮箱"),
BROAD_CAST("30","广播");
private String value;
private String description;

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

@ -114,15 +114,17 @@ public class BlockSoftSwitchEnumUtil {
/* WebService */
SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"),
SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"),
SERVER_WEB_SERVICE_RECORDING_XML(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240004,"记录请求Body"),
// CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"),
CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"),
CLIENT_WEB_SERVICE_PARAM_OBJECT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140004,"Client Param Object"),
/* 数据源 */
CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"),
/* Restful */
CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client REST客户端适配器"),
SERVER_RESTFUL_IMPP(SUIT_MODE.SERVER,CASE_TYPE.RESTFUL,120001,"Client REST服务端适配器"),
SERVER_RESTFUL_IMPP(SUIT_MODE.SERVER,CASE_TYPE.RESTFUL,220001,"Client REST服务端适配器"),
/* Socket */
SERVER_SOCKET_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.SOCKET,210001,"Socket Server Hello测试服务"),
@ -216,7 +218,10 @@ public class BlockSoftSwitchEnumUtil {
SCHEDULE(2,"定时调度"),
RABBITMQ(3,"MQ 调用"),
HTTP(4,"接口调用"),
CLOUD(5,"Cloud调用");
CLOUD(5,"Cloud调用"),
REST(6,"REST调用"),
WEB_SERVICE(7,"WebService"),
SOCKET(8,"socket");
private int value;
private String description;
@ -766,4 +771,97 @@ public class BlockSoftSwitchEnumUtil {
return tmp;
}
}
/**
* 适配报文类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SUIT_DATA_TYPE {
XML(10, "XML"),
JSON(20, "JSON");
private int value;
private String description;
private SUIT_DATA_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 SUIT_DATA_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
}
/**
* 适配报文处理状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SUIT_PROCESS_STATUS {
UNPROCESSED(10, "未处理"),
PROCESSING(20, "处理中"),
PROCESS(30, "已处理");
private int value;
private String description;
private SUIT_PROCESS_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;
}
public static SUIT_PROCESS_STATUS valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
}
}

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

@ -12,6 +12,778 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
/**
* mes设备作业任务明细-执行状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_DETAIL_ACTION_STATUS {
PENDING(10, "待处理"),
COMPLETE(20, "已完成"),
CANCEL(30, "取消");
private int value;
private String description;
MES_EQU_TASK_DETAIL_ACTION_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_EQU_TASK_DETAIL_FINAL_RESULT {
YES(10, "合格"),
NO(20, "不合格");
private int value;
private String description;
MES_EQU_TASK_DETAIL_FINAL_RESULT(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_DETAIL_REPAIR_FLAG {
FALSE(10, "否"),
TRUE(20, "是");
private int value;
private String description;
MES_EQU_TASK_DETAIL_REPAIR_FLAG(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_STATUS {
CREATE(10, "创建"),
LANDED(20, "下达"),
OPEN(30, "开启"),
CLOSE(40, "关闭"),
CANCEL(50, "取消");
private int value;
private String description;
MES_EQU_TASK_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_EQU_TASK_SOURCE {
PLAN(10, "周期计划"),
CREATE(20, "手工创建"),
ANDON(30, "ANDON");
private int value;
private String description;
MES_EQU_TASK_SOURCE(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_FLAG {
FALSE(10, "未通知"),
TRUE(20, "已通知");
private int value;
private String description;
MES_EQU_TASK_NOTIFY_FLAG(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_INSERT_EXCEL {
MES_PLAN_ORDER(10, "生产计划"),
MES_EQUIPMENT(20, "设备台账"),
MES_EQU_TASK_STANDARD(30, "设备作业要求");
private int value;
private String description;
MES_INSERT_EXCEL(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_INSERT_EXCEL getByValue(int value) {
for (MES_INSERT_EXCEL 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_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(10, "手机号");
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(1, "正常"),
REWORK(2, "返修");
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(1, "绑定"),
UNTYING(2, "解绑");
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(1, "是"),
NO_KEY(2, "否");
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(1, "已维修"),
NO_REPAIR(2, "待维修");
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(1, "工位扫描"),
QUALITY_JUDGEMENT(2, "质量判定"),
MATERIAL_DISMANTLING(3, "物料拆解"),
REWORK(4, "返修作业"),
WORKSTATION_MONITORING(5, "工位监控");
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 {
CHECK(10, "点检"),
MAINTAIN(20, "保养"),
REPAIR(30, "维修");
private int value;
private String description;
MES_EQU_TASK_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过程质量检测类型
*/
@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设备类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -551,7 +1323,9 @@ public class MesEnumUtil {
public enum PASS_FAIL {
PASS(1, "合格"),
FAIL(2, "不合格");
FAIL(2, "不合格"),
SCRAP(3, "报废"),
DISMANTLED(4, "已拆解");
private int value;
private String description;
@ -672,7 +1446,8 @@ public class MesEnumUtil {
OPEN(30, "启动"),
PAUSE(40, "暂停"),
CANCEL(50, "取消"),
CLOSE(60, "关闭");
CLOSE(60, "关闭"),
COMPLETE(70, "完成");
private int value;
private String description;
@ -709,7 +1484,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;
@ -942,6 +1718,7 @@ public class MesEnumUtil {
CREATE(10, "创建"),
PROCESS(20, "加工"),
OFFLINE(30, "下线"),
PACKAGE_SCAN(35, "打包扫描"),
INSTOCKED(40, "入库"),
SHIPING(50, "发运"),
CLOSE(90, "关闭"),
@ -1096,7 +1873,10 @@ public class MesEnumUtil {
MODULE_CONTENT("moduleContent", "组件内容"),
CUSTOM_COMPONENT("customComponent", "定制内容"),
TASK_COMPLETE("taskComplete", "整个扫描完成"),
RENEW_REQUEST_PARAMS("renewRequestParams","回传刷新StationResultBean");
STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
RUNNING_INFO("runningInfo", "执行信息"),
RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");
private String value;
private String description;

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

@ -351,20 +351,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 +376,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;
}
}
@ -817,7 +817,8 @@ public class MesPcnEnumUtil {
OPEN(30, "启动"),
PAUSE(40, "暂停"),
CANCEL(50, "取消"),
CLOSE(60, "关闭");
CLOSE(60, "关闭"),
COMPLETE(70, "完成");
private int value;
private String description;
@ -854,7 +855,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;
@ -1163,6 +1165,80 @@ public class MesPcnEnumUtil {
}
/**
* 条码生成业务类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum COMPANY_TYPE {
RULECODE("ruleCode", "规则编码"),
PREFIX("prefix", "前缀"),
PART_NO("partNo", "物料号"),
CUST_PART_NO("custPartNo", "客户物料号"),
CUST_CODE("custCode", "客户代码"),
PROD_LOCATION("prodLocation", "产地"),
YEAR("year", "年"),
MOTH("month", "月"),
DAY("day", "日"),
HOUR("hour", "小时"),
MINUTE("minute", "分钟"),
SECOND("second", "秒"),
SERIAL("serialNo", "序列号");
private String value;
private String description;
COMPANY_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* mes工步类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_STEP_TYPE {
AUTO_RUN(10, "自动执行"),
SCAN_RUN(20, "扫描执行");
private Integer value;
private String description;
MES_STEP_TYPE(Integer value, String description) {
this.value = value;
this.description = description;
}
public Integer 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 (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesRoute 流程的类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -1256,13 +1332,13 @@ public class MesPcnEnumUtil {
}
/**
* redis过期时间
* 条码类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PCN_SN_TYPE {
NORMAL(10, "不过期"),
FIRST_INSPECTION(20, "一分钟");
NORMAL(10, "正常件"),
FIRST_INSPECTION(20, "首检件");
private int value;
private String description;
@ -1292,4 +1368,225 @@ public class MesPcnEnumUtil {
}
/**
* MesPlanOrder实体对应的source值 计划来源
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CACHE_KEY {
TRAY("TRAY:", "托盘缓存key"),
SERIAL_NO("PCN_SERIAL:", "条码缓存key");
private String value;
private String description;
CACHE_KEY(String value, String description) {
this.value = value;
this.description = description;
}
public String 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.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
@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;
}
}
}

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

@ -285,6 +285,26 @@ public class WmsEnumUtil {
}
return tmp;
}
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 codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
@ -601,7 +621,9 @@ public class WmsEnumUtil {
AMPR(230, "AMPR", "AMPR"),
FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"),
VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"),
VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库");
VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"),
VDA_PICKING_GOODS(270, "VDA_PICKING_GOODS", "VDA生产领料"),
VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料");
private int value;
@ -772,7 +794,10 @@ public class WmsEnumUtil {
VDAINSTOCK("VDAINSTOCK", "VDA入库"),
VDAMOVESTOCK("VDAMOVESTOCK", "VDA内部移库"),
VDA_FAST_STOCK("VDA_FAST_STOCK", "VDA采购快速入库"),
VDAREPORT("VDAREPORT", "VDA生产报工");
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单箱领料");
private String value;
private String description;
@ -1070,8 +1095,8 @@ public class WmsEnumUtil {
DAY_INVENTORY(10, "日常盘点"),
MONTH_INVENTORY(20, "月度盘点"),
SEASON_INVENTORY(30, "季度盘点"),
YEAR_INVENTORY(40, "年度盘点");
YEAR_INVENTORY(40, "年度盘点"),
AJUST_INVENTORY(50, "库存调整盘点");
private int value;
private String description;
@ -1500,6 +1525,7 @@ public class WmsEnumUtil {
CHECKLIST(1, "可选列表"),
NUMBER(10, "数字"),
STRING(20, "字符串"),
CONFIGURABLE_STR(25, "可配字符串"),
OUT_OR_UNNECESSARY(30, "出参或者不必需的参数");
private int value;
@ -3354,7 +3380,6 @@ public class WmsEnumUtil {
INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"),
INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢"),
INVENTORY_DIS(40, "INVENTORY_DIS", "库位不一致"),
INVENTORY_FIT(50, "INVENTORY_FIT", "库位一致"),
INVENTORY_WITHOUT(60, "INVENTORY_WITHOUT", "未盘");
private int value;
@ -3702,5 +3727,111 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
* 物流规则 处理模式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTING_RULE_TYPE {
PROMOTION_TYPE(10, "REPLENISH_TYPE", "推动规则"),
REPLENISH_TYPE(20, "PROMOTION_TYPE", "补货规则");
private int value;
private String code;
private String description;
ROUTING_RULE_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(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 valueOfDescription(int val) {
return valueOf(val);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 物流规则 处理单位
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTING_DELAY_UNIT {
M(10, "M", "分"),
D(20, "D", "天");
private int value;
private String code;
private String description;
ROUTING_DELAY_UNIT(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(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 valueOfDescription(int val) {
return valueOf(val);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

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() {

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

@ -14,10 +14,10 @@ import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :mes系统业务动作
* @Description :工位投料信息
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-12
* @Author : Wynne.Lu
* @CreateDate : 2019-09-17
* @Modify:
**/
@Data
@ -54,7 +54,7 @@ public class MesCellFeed extends BaseBean {
@Column(name = "RAW_QTY")
@ApiParam("特殊批次")
private Long rawQty;
private Double rawQty;
@Column(name = "LOT_NO")
@ApiParam("关联批次")
@ -64,7 +64,7 @@ public class MesCellFeed extends BaseBean {
@ApiParam("供应商代码")
private String supplierCode;
public long getRawQtyVal() {
public double getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;
}

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;
}

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

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.mes.bean;
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
@ -23,9 +23,9 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DB")
@Table(name = "MES_DATASOURCE")
@Api("地址清单")
public class MesDb extends BaseBean {
public class MesDatasource extends BaseBean {
@Column(name = "DS_CODE")
@ApiParam("数据源代码")
@ -55,6 +55,10 @@ public class MesDb extends BaseBean {
@ApiParam("密码")
private String dsPassword;
@Column(name = "DS_DB_NAME")
@ApiParam("数据库名称")
private String dsDbName;
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;

42
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.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: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;
}

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;
}

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

@ -0,0 +1,69 @@
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 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 Integer 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;
}

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 meno;
}

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() {

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

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Author: Wynne.Lu
@ -27,6 +28,7 @@ import javax.persistence.Table;
@Api("PLC配置表")
public class MesPlc extends BaseBean {
@Column(name = "PLC_CODE")
@ApiParam("PLC代码")
private String plcCode;
@ -63,23 +65,31 @@ public class MesPlc extends BaseBean {
@ApiParam("分组名称")
private String groupName;
@Column(name="EQUIPMENT_CODE")
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
@ApiParam("生产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
@ApiParam("工位")
private String workCellCode;
@Column(name = "ENABLED")
@ApiParam("是否启用 0 false 1 true")
private Integer enabled;
@Column(name = "PLC_CFG")
@ApiParam("PLC的值的设定")
private String plcCfg;
@Column(name = "ANALYSIS_RULE")
@ApiParam("解析规则")
private String analysisRule;
@Column(name = "IS_ANALYSIS")
@ApiParam("是否解析")
private String isAnalysis;
@Transient
@ApiParam("设备名称")
private String equipmentName;
}

12
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")
@ -76,9 +76,17 @@ public class MesProcessBom extends BaseBean {
private Integer isCheck;
@Column(name = "IS_FEED")
@ApiParam(value = "是否检查")
@ApiParam(value = "是否投料配置")
private Integer isFeed;
@Column(name = "is_BIND_KEY")
@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 String 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;

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

@ -0,0 +1,95 @@
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 : Wynne.Lu
* @CreateDate : 2019-10-17
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCT_DATA")
@Api("生产数据")
public class MesProductData extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CENTER_NAME")
@ApiParam("工作中心名称")
private String workCenterName;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name = "WORK_CELL_NAME")
@ApiParam("工作单元名称")
private String workCellName;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_DESC")
@ApiParam("物料名称")
private String partDesc;
@Column(name = "EQU_CODE")
@ApiParam("设备代码")
private String equCode;
@Column(name = "EQU_NAME")
@ApiParam("设备名称")
private String equName;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@Column(name = "OBJECT_NAME")
@ApiParam("对象名称")
private String objectName;
@Column(name = "FIELD_CODE")
@ApiParam("字段代码")
private String fieldCode;
@Column(name = "FIELD_NAME")
@ApiParam("字段名称")
private String fieldName;
@Column(name = "FIELD_VALUE")
@ApiParam("字段值")
private String fieldValue;
@Column(name = "ROW_NO")
@ApiParam("数据行号")
private String rowNo;
@Column(name = "GROUP_NO")
@ApiParam("数据组号")
private String groupNo;
}

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

@ -0,0 +1,101 @@
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\12 16:33
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QC_CHECK_DATA")
@Api("质量过程检测数据")
public class MesQcCheckData extends BaseBean {
@Column(name = "CHECK_ID")
@ApiParam("检测id")
private String checkId;
@Column(name = "PART_NO")
@ApiParam("物料编码")
private String partNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "CHECK_TYPE")
@ApiParam("检测类型")
private Integer checkType;
@Column(name = "CHECK_ITEM")
@ApiParam("检测项")
private String checkItem;
@Column(name = "CHECK_STANDARD")
@ApiParam("检测标准")
private String checkStandard;
@Column(name = "CHECK_GUIDE")
@ApiParam("检测指导")
private String checkGuide;
@Column(name = "CHECK_FREQUENCY")
@ApiParam("频率")
private String checkFrequency;
@Column(name = "CHECK_VALUE")
@ApiParam("检测值")
private String checkValue;
@Column(name = "CHECK_RESULT")
@ApiParam("判定结果")
private String checkResult;
@Column(name = "SN")
@ApiParam("产品条码")
private String sn;
@Column(name = "QTY")
@ApiParam("产品数量")
private String qty;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Column(name = "ORDER_NO")
@ApiParam("工单号")
private String orderNo;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Transient
@ApiParam("过程质量检测数据")
private List<MesQcCheckStandard> mesQcCheckStandardList;
}

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

@ -0,0 +1,76 @@
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;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\12 14:46
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QC_CHECK_STANDARD")
@Api("质量检测标准")
public class MesQcCheckStandard extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("物料编码")
private String partNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "CHECK_TYPE")
@ApiParam("检测类型")
private Integer checkType;
@Column(name = "CHECK_ITEM")
@ApiParam("检测项")
private String checkItem;
@Column(name = "CHECK_STANDARD")
@ApiParam("检测标准")
private String checkStandard;
@Column(name = "CHECK_GUIDE")
@ApiParam("检测指导")
private String checkGuide;
@Column(name = "CHECK_FREQUENCY")
@ApiParam("频率")
private String checkFrequency;
@Transient
@ApiParam("物料名称")
private String partName;
@Transient
@ApiParam("检测结果")
private String checkResult;
@Transient
@ApiParam("检测值")
private String checkValue;
}

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;

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

@ -46,7 +46,7 @@ public class MesRawPartSn extends BaseBean {
@Column(name = "RAW_QTY")
@ApiParam("数量")
private Long rawQty;
private Double rawQty;
@Column(name = "LOT_NO")
@ApiParam("生产批次")
@ -64,7 +64,7 @@ public class MesRawPartSn extends BaseBean {
@ApiParam("供应商代码")
private String supplierCode;
public long getRawQtyVal() {
public double getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;
}

8
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;
@Column(name="REPAIR_TYPE")
@Column(name = "REPAIR_TYPE")
@ApiParam("维修类型")
private Integer repairType;
}

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

Write Preview
Loading…
Cancel
Save