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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
yun-zuoyi
WYnneaoapc 6 years ago
parent 2da78c3237 7139d9b5f1
commit 1eca1a963a
86 changed files with 2503 additions and 261 deletions
Show Stats Download Patch File Download Diff File

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

@ -32,6 +32,10 @@ public class AndonBroadCast extends BaseBean {
@ApiParam("广播设备编号")
private String targetIds;
@Column(name="GROUP_NO")
@ApiParam("分组号")
private String groupNo;
@Column(name="WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;

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

@ -35,11 +35,15 @@ public class AndonBroadCastCfg extends BaseBean {
@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;
}

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

@ -51,8 +51,12 @@ public class AndonDisposalCfg extends BaseBean {
@ApiParam(value = "呼叫原因描述")
private String acNameRdd;
@AnnoOutputColumn(refClass = AndonEnumUtil.APPROVAL_STATUS.class,refForeignKey = "value",value = "description")
@Column(name = "APPROVAL_STATUS")
@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;
}

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

@ -0,0 +1,65 @@
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 {
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam(value = "工作单元代码")
private String workCellCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
private String alarmCode;
@Column(name = "AC_CODE")
@ApiParam(value = "呼叫原因代码")
private String acCode;
@Column(name = "EM_CODE")
@ApiParam(value = "处理措施代码")
private String emCode;
@Column(name = "RP_WHERE")
@ApiParam(value = "有效时长")
private Integer rpWhere;
@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;
}

216
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,59 @@ 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;
// 是否转呼
public Integer getIsShiftCall() {
return this.isShiftCall == null ? 0 : this.isShiftCall;
@ -474,9 +371,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();

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

@ -272,6 +272,55 @@ 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;
// 是否转呼
public Integer getIsShiftCall() {
return this.isShiftCall == null ? 0 : this.isShiftCall;

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

@ -40,7 +40,56 @@ 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;
}

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

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

@ -91,6 +91,7 @@ public class AndonHqlPack {
DdlPreparedPack.getStringEqualPack(andonBroadCast.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonBroadCast.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(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,41 @@ 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.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAlarmCode(), "alarmCode", packBean);
DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getEmCode(), "emCode", packBean);
DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAcCode(), "acCode", packBean);
DdlPreparedPack.getNumEqualPack(andonDisposalMaintenCfg.getIsValid(),"isValid",packBean);
return packBean;
}
/**
* 安灯附属表
* @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.getStringEqualPack(andonQueueAttach.getPartNo(), "partNo", packBean);
DdlPreparedPack.getNumEqualPack(andonQueueAttach.getIsValid(),"isValid",packBean);
return packBean;
}
/***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 End ************/
@ -291,6 +323,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 +393,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;

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

@ -20,4 +20,5 @@ public @interface FieldAnnotation {
boolean display() default true; // 是否需要在界面显示
int pric() default 2; // 对于浮点型，界面显示的精度
boolean mainkey() default false; // 是否为主键
String defaultValue() default ""; // 字段的默认值
}

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

6
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,10 +71,12 @@ 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 ="自动补充标识")
@FieldAnnotation(defaultValue = "true")
private Boolean autoFixPegging;
@Column(name="MAX_PRODUCT_BATCH")
@ -80,6 +85,7 @@ public class Material extends BaseCode {
@Column(name="MIN_PRODUCT_BATCH")
@ApiParam(value ="最小制造批量")
@FieldAnnotation(defaultValue = "0.0")
private Double minProductBatch;
@Column(name="UNIT_PRODUCT_BATCH")

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)

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

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

@ -184,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)

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

@ -1,6 +1,7 @@
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;
@ -18,6 +19,7 @@ import java.util.Map;
@Data
@MappedSuperclass
public abstract class BaseAPS extends BaseBean {
@JsonIgnore
private transient Map<String, Object> customFields = new HashMap<>();
public Object getCustomField(String code) {

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

@ -287,6 +287,9 @@ public class BeanInfo {
case STRING:
cls = String.class;
break;
case DURATION:
cls = DateDuration.class;
break;
default:
break;
}

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

@ -217,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;
}
@ -241,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/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; // 顶层订单优先级
}

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 // 关联的为副资源的工作计划
}

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>

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>

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

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

@ -13,19 +13,18 @@ public class MesEnumUtil {
/**
* mes设备作业任务明细-执行状态
* mes 工位类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_DETAIL_ACTION_STATUS {
public enum MES_IS_REPEAT {
PENDING(10, "待处理"),
COMPLETE(20, "已完成"),
CANCEL(30, "取消");
REPEATABLE(1, "可重复"),
NOT_REPEAT(2, "不可重复");
private int value;
private String description;
MES_EQU_TASK_DETAIL_ACTION_STATUS(int value, String description) {
MES_IS_REPEAT(int value, String description) {
this.value = value;
this.description = description;
}
@ -38,6 +37,17 @@ public class MesEnumUtil {
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++) {
@ -51,18 +61,18 @@ public class MesEnumUtil {
}
/**
* mes设备作业任务明细-整体结果
* mes 工位类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_DETAIL_FINAL_RESULT {
public enum MES_WORK_CELL_TYPE {
YES(10, "合格"),
NO(20, "不合格");
NORMAL(1, "正常"),
REWORK(2, "返修");
private int value;
private String description;
MES_EQU_TASK_DETAIL_FINAL_RESULT(int value, String description) {
MES_WORK_CELL_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -75,6 +85,17 @@ public class MesEnumUtil {
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++) {
@ -88,18 +109,18 @@ public class MesEnumUtil {
}
/**
* mes设备作业任务明细-维修标识
* pcn 动作类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_DETAIL_REPAIR_FLAG {
public enum MES_ACTION_TYPE {
FALSE(10, "否"),
TRUE(20, "是");
BIND(1, "绑定"),
UNTYING(2, "解绑");
private int value;
private String description;
MES_EQU_TASK_DETAIL_REPAIR_FLAG(int value, String description) {
MES_ACTION_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -112,6 +133,17 @@ public class MesEnumUtil {
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++) {
@ -125,21 +157,18 @@ public class MesEnumUtil {
}
/**
* mes设备作业状态
* pcn 是否是关键件
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_STATUS {
public enum MES_IS_KEY {
CREATE(10, "创建"),
LANDED(20, "下达"),
OPEN(30, "开启"),
CLOSE(40, "关闭"),
CANCEL(50, "取消");
IS_KEY(1, "是"),
NO_KEY(2, "否");
private int value;
private String description;
MES_EQU_TASK_STATUS(int value, String description) {
MES_IS_KEY(int value, String description) {
this.value = value;
this.description = description;
}
@ -152,6 +181,17 @@ public class MesEnumUtil {
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++) {
@ -165,19 +205,18 @@ public class MesEnumUtil {
}
/**
* mes设备作业任务来源
* mes 维修状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_SOURCE {
public enum MES_REPAIR_STATUS {
PLAN(10, "周期计划"),
CREATE(20, "手工创建"),
ANDON(30, "ANDON");
REPAIRED(1, "已维修"),
NO_REPAIR(2, "待维修");
private int value;
private String description;
MES_EQU_TASK_SOURCE(int value, String description) {
MES_REPAIR_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
@ -190,6 +229,17 @@ public class MesEnumUtil {
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++) {
@ -203,18 +253,21 @@ public class MesEnumUtil {
}
/**
* mes设备作业通知标识
* mes 操作类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_NOTIFY_FLAG {
public enum MES_OPERATE_TYPE {
FALSE(10, "未通知"),
TRUE(20, "已通知");
WORKSTATION_SCAN(1, "工位扫描"),
QUALITY_JUDGEMENT(2, "质量判定"),
MATERIAL_DISMANTLING(3, "物料拆解"),
REWORK(4, "返修作业"),
WORKSTATION_MONITORING(5, "工位监控");
private int value;
private String description;
MES_EQU_TASK_NOTIFY_FLAG(int value, String description) {
MES_OPERATE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -227,6 +280,17 @@ public class MesEnumUtil {
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++) {
@ -240,7 +304,7 @@ public class MesEnumUtil {
}
/**
* mes导入模块
* mes设备作业要求-作业类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_INSERT_EXCEL {
@ -922,7 +986,9 @@ public class MesEnumUtil {
public enum PASS_FAIL {
PASS(1, "合格"),
FAIL(2, "不合格");
FAIL(2, "不合格"),
SCRAP(3, "报废"),
DISMANTLED(4, "已拆解");
private int value;
private String description;
@ -1469,7 +1535,6 @@ public class MesEnumUtil {
CUSTOM_COMPONENT("customComponent", "定制内容"),
TASK_COMPLETE("taskComplete", "整个扫描完成"),
STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
RUNNING_INFO("runningInfo", "运行信息"),
RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");

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

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

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

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

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

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

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

@ -125,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;
}

86
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.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 14:33
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_REPAIR_RECORD")
@Api("维修信息记录表")
public class MesRepairRecord extends BaseBean {
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("产品物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "DEFECT_NAME")
@ApiParam("缺陷名称")
private String defectName;
@Column(name = "SIDE_LOCATION")
@ApiParam("产品面位")
private String sideLocation;
@Column(name = "DEFECT_LOCATION")
@ApiParam("缺陷位置")
private String defectLocation;
@Column(name = "REPAIR_CODE")
@ApiParam("维修代码")
private String repairCode;
@Column(name = "REPAIR_NAME")
@ApiParam("维修名称")
private String repairName;
@Column(name = "DC_CODE")
@ApiParam("缺陷原因代码")
private String dcCode;
@Column(name = "DC_NAME")
@ApiParam("缺陷原因描述")
private String dcName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("生产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
@Column(name = "MEMO")
@ApiParam("备注")
private String meno;
}

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

@ -0,0 +1,70 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 14:42
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_SCRAP_RECORD")
@Api("报废信息记录表")
public class MesScrapRecord extends BaseBean {
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("产品物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "SCRAP_CODE")
@ApiParam("报废代码")
private String repairCode;
@Column(name = "SCRAP_NAME")
@ApiParam("报废名称")
private String scrapName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("生产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
@Column(name = "SCRAP_REASON")
@ApiParam("报废原因")
private String scrapReason;
@Column(name = "MEMO")
@ApiParam("备注")
private String meno;
}

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

@ -42,4 +42,8 @@ public class MesWorkCell extends BaseBean {
@Column(name = "AREA_CODE")
@ApiParam("生产区域代码")
private String areaCode;
@Column(name = "WORK_CELL_TYPE")
@ApiParam("工位类型")
private String workCellType;
}

36
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java
Unescape Escape View File

@ -0,0 +1,36 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\18 19:15
* @Modify:
**/
@Data
@Api("mes 物料BOM")
public class MesPartBomModel {
@ApiParam("物料编号")
private String partNo;
@ApiParam("物料名称")
private String partName;
@ApiParam("数量")
private Integer qty;
public MesPartBomModel() {
}
public MesPartBomModel(String partNo, String partName, Integer qty) {
this.partNo = partNo;
this.partName = partName;
this.qty = qty;
}
}

34
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java
Unescape Escape View File

@ -1,8 +1,6 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPart;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueOrder;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder;
import cn.estsh.i3plus.pojo.mes.pcn.bean.*;
import java.util.List;
@ -15,6 +13,12 @@ import java.util.List;
**/
public class RequestModel {
private List<MesDefectRecord> mesDefectRecordList; // 不良/缺陷记录数据集
private List<MesRepairRecord> mesRepairRecordList; // 维修记录数据集
private List<MesDismantleRecord> dismantleRecordList; // 拆解记录数据集
private List<MesWorkOrder> workOrderList; // 工单数据集
private List<MesPart> partList; // 物料数据集
@ -46,6 +50,30 @@ public class RequestModel {
this.partList = partList;
}
public List<MesDefectRecord> getMesDefectRecordList() {
return mesDefectRecordList;
}
public void setMesDefectRecordList(List<MesDefectRecord> mesDefectRecordList) {
this.mesDefectRecordList = mesDefectRecordList;
}
public List<MesRepairRecord> getMesRepairRecordList() {
return mesRepairRecordList;
}
public void setMesRepairRecordList(List<MesRepairRecord> mesRepairRecordList) {
this.mesRepairRecordList = mesRepairRecordList;
}
public List<MesDismantleRecord> getDismantleRecordList() {
return dismantleRecordList;
}
public void setDismantleRecordList(List<MesDismantleRecord> dismantleRecordList) {
this.dismantleRecordList = dismantleRecordList;
}
public List<MesWorkOrder> getWorkOrderList() {
return workOrderList;
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefectCause;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 20:04
* @Modify:
**/
public interface MesDefectCauseRepository extends BaseRepository<MesDefectCause, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefectRecord;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 20:05
* @Modify:
**/
public interface MesDefectRecordRepository extends BaseRepository<MesDefectRecord, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 20:04
* @Modify:
**/
public interface MesDefectRepository extends BaseRepository<MesDefect, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDismantleRecord;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 20:06
* @Modify:
**/
public interface MesDismantleRecordRepository extends BaseRepository<MesDismantleRecord, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceCtgyPicture;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 20:35
* @Modify:
**/
public interface MesProduceCtgyPictureRepository extends BaseRepository<MesProduceCtgyPicture, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRepairRecord;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 20:06
* @Modify:
**/
public interface MesRepairRecordRepository extends BaseRepository<MesRepairRecord, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesScrapRecord;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 20:07
* @Modify:
**/
public interface MesScrapRecordRepository extends BaseRepository<MesScrapRecord, Long> {
}

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

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @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/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java
Unescape Escape View File

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @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;
}

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

@ -0,0 +1,86 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description:
* @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;
}

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

@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :设备作业任务
@ -65,4 +67,20 @@ public class MesEquTask extends BaseBean {
@ApiParam("关联任务")
private String relateTask;
@Transient
@ApiParam(value = "设备代码")
private String equipmentCode;
@Transient
@ApiParam(value = "计划日期起始时间")
private String planTimeStart;
@Transient
@ApiParam(value = "计划日期结束时间")
private String planTimeEnd;
@Transient
@ApiParam(value ="明细列表")
private List<MesEquTaskDetail> mesEquTaskDetailList;
}

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

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 15:00
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PART_OBJECT")
@Api("物料对象配置表")
public class MesPartObject extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("物料编码")
private String partNo;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@Column(name = "OBJECT_NAME")
@ApiParam("物料名称")
private String objectName;
}

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

@ -87,6 +87,10 @@ public class MesProcessBom extends BaseBean {
@ApiParam(value = "是否绑定关键件")
private Integer isBindKey;
@Column(name = "IS_KEY")
@ApiParam(value = "是否关键件")
private Integer isKey;
@Transient
@ApiParam("是否已绑定")
private Boolean isBind;

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

@ -86,6 +86,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 String actionType;
public int getIsFeedVal() {
return this.isFeed == null ? 0 : this.isFeed;
}

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

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description:
* @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;
}

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

@ -0,0 +1,86 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 14:33
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_REPAIR_RECORD")
@Api("维修信息记录表")
public class MesRepairRecord extends BaseBean {
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("产品物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "DEFECT_NAME")
@ApiParam("缺陷名称")
private String defectName;
@Column(name = "SIDE_LOCATION")
@ApiParam("产品面位")
private String sideLocation;
@Column(name = "DEFECT_LOCATION")
@ApiParam("缺陷位置")
private String defectLocation;
@Column(name = "REPAIR_CODE")
@ApiParam("维修代码")
private String repairCode;
@Column(name = "REPAIR_NAME")
@ApiParam("维修名称")
private String repairName;
@Column(name = "DC_CODE")
@ApiParam("缺陷原因代码")
private String dcCode;
@Column(name = "DC_NAME")
@ApiParam("缺陷原因描述")
private String dcName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("生产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
@Column(name = "MEMO")
@ApiParam("备注")
private String meno;
}

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

@ -36,4 +36,8 @@ public class MesScrap extends BaseBean {
@ApiParam("报废名称")
private String scrapName;
@Column(name="SCRAP_TYPE")
@ApiParam("报废类型")
private String scrapType;
}

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

@ -0,0 +1,66 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 14:42
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_SCRAP_RECORD")
@Api("报废信息记录表")
public class MesScrapRecord extends BaseBean {
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("产品物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "SCRAP_CODE")
@ApiParam("报废代码")
private String repairCode;
@Column(name = "SCRAP_NAME")
@ApiParam("报废名称")
private String scrapName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("生产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
@Column(name = "MEMO")
@ApiParam("备注")
private String meno;
}

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

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 14:22
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_TYPE_CFG")
@Api("类型信息表")
public class MesTypeCfg extends BaseBean {
@Column(name = "TYPE_CODE")
@ApiParam("类型代码")
private String typeCode;
@Column(name = "TYPE_NAME")
@ApiParam("类型名称")
private String typeName;
@Column(name = "BUSINESS_TYPE_CODE")
@ApiParam("业务类型代码")
private String businessTypeCode;
@Column(name = "BUSINESS_TYPE_NAME")
@ApiParam("业务类型名称")
private String businessTypeName;
}

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

@ -47,6 +47,10 @@ public class MesWorkCell extends BaseBean {
@ApiParam("生产区域代码")
private String areaCode;
@Column(name = "WORK_CELL_TYPE")
@ApiParam("工位类型")
private String workCellType;
@Transient
@ApiParam(value = "子集列表")
private List<MesEquipment> childTreeList;

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

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -201,7 +201,7 @@ public class MesWorkOrder extends BaseBean {
@Transient
@ApiParam("mes生产工单页面按钮控制")
private MesWorkOrderButtonModel workOrderButtonModel;
private MesButtonFlagModel workOrderButtonModel;
@Transient
@ApiParam(value = "下达按钮编号")

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

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;

7
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java → modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java
Unescape Escape View File

@ -17,8 +17,8 @@ import java.io.Serializable;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("mes生产工单页面按钮控制model")
public class MesWorkOrderButtonModel implements Serializable {
@Api("mes页面按钮控制model")
public class MesButtonFlagModel implements Serializable {
@ApiParam("修改按钮")
private boolean updateButton;
@ -47,5 +47,8 @@ public class MesWorkOrderButtonModel implements Serializable {
@ApiParam("完成按钮")
private boolean completeButton;
@ApiParam("关闭按钮-提醒")
private boolean closeButtonNoticeFlag;
}

105
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java
Unescape Escape View File

@ -0,0 +1,105 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
@Data
public class MesEquTaskDetailModel implements Serializable {
@ApiParam("id")
private Long id;
@ApiParam("作业任务编号")
private String taskNo;
@ApiParam("设备代码")
private String equipmentCode;
@ApiParam("设备名称")
private String equipmentName;
@ApiParam("执行状态")
private Integer actionStatus;
@ApiParam("整体结果")
private Integer finalResult;
@ApiParam("备注")
private String memo;
@ApiParam("维修标识")
private Integer repairFlag;
@ApiParam("作业类型")
private Integer taskType;
@ApiParam(value="生产线")
private String workCenterCode;
@ApiParam("组织代码")
public String organizeCode;
@ApiParam("有效性")
public Integer isValid;
@ApiParam("是否已删除")
public Integer isDeleted;
@ApiParam("创建用户")
public String createUser;
@ApiParam("创建日期")
public String createDatetime;
@ApiParam("修改人")
public String modifyUser;
@ApiParam("修改日期")
public String modifyDatetime;
@ApiParam("执行状态")
private String actionStatusName;
@ApiParam("整体结果")
private String finalResultName;
@ApiParam("维修标识")
private String repairFlagName;
@ApiParam("作业类型")
private String taskTypeName;
public MesEquTaskDetailModel() {
}
public MesEquTaskDetailModel(Long id, String taskNo, String equipmentCode, String equipmentName, String workCenterCode) {
this.id = id;
this.taskNo = taskNo;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
this.workCenterCode = workCenterCode;
}
public MesEquTaskDetailModel(Long id, String taskNo, String equipmentCode, String equipmentName, Integer actionStatus, Integer finalResult, String memo, Integer repairFlag, Integer taskType, String workCenterCode, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
this.id = id;
this.taskNo = taskNo;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
this.actionStatus = actionStatus;
this.finalResult = finalResult;
this.memo = memo;
this.repairFlag = repairFlag;
this.taskType = taskType;
this.workCenterCode = workCenterCode;
this.organizeCode = organizeCode;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
}
}

100
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java
Unescape Escape View File

@ -0,0 +1,100 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
@Data
public class MesEquTaskModel implements Serializable {
@ApiParam("id")
private Long id;
@ApiParam("作业任务编号")
private String taskNo;
@ApiParam("作业类型")
private Integer taskType;
@ApiParam("作业状态")
private Integer taskStatus;
@ApiParam(value="生产线")
private String workCenterCode;
@ApiParam("计划日期")
private String planTime;
@ApiParam("任务来源")
private Integer taskSource;
@ApiParam("备注")
private String memo;
@ApiParam("通知标识")
private Integer notifyFlag;
@ApiParam("关联任务")
private String relateTask;
@ApiParam("组织代码")
public String organizeCode;
@ApiParam("有效性")
public Integer isValid;
@ApiParam("是否已删除")
public Integer isDeleted;
@ApiParam("创建用户")
public String createUser;
@ApiParam("创建日期")
public String createDatetime;
@ApiParam("修改人")
public String modifyUser;
@ApiParam("修改日期")
public String modifyDatetime;
@ApiParam("作业类型")
private String taskTypeName;
@ApiParam("作业状态")
private String taskStatusName;
@ApiParam("任务来源")
private String taskSourceName;
@ApiParam("通知标识")
private String notifyFlagName;
@ApiParam("mes设备作业任务页面按钮控制")
private MesButtonFlagModel equTaskButtonFlagModel;
public MesEquTaskModel() {
}
public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
this.id = id;
this.taskNo = taskNo;
this.taskType = taskType;
this.taskStatus = taskStatus;
this.workCenterCode = workCenterCode;
this.planTime = planTime;
this.taskSource = taskSource;
this.memo = memo;
this.notifyFlag = notifyFlag;
this.relateTask = relateTask;
this.organizeCode = organizeCode;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
}
}

9
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java
Unescape Escape View File

@ -102,6 +102,15 @@ public class MesEquipmentModel implements Serializable {
}
public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
this.status = status;
this.workCenterCode = workCenterCode;
this.equipmentCategory = equipmentCategory;
}
public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode) {
this.wcId = wcId;
this.id = id;

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesDefectCause;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 16:56
* @Modify:
**/
public interface MesDefectCauseRepository extends BaseRepository<MesDefectCause, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesDefect;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 15:24
* @Modify:
**/
public interface MesDefectRepository extends BaseRepository<MesDefect, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesProduceCtgyPicture;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 15:44
* @Modify:
**/
public interface MesProduceCtgyPictureRepository extends BaseRepository<MesProduceCtgyPicture, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesTypeCfg;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 16:29
* @Modify:
**/
public interface MesTypeCfgRepository extends BaseRepository<MesTypeCfg, Long> {
}

83
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -1398,4 +1398,87 @@ public class MesHqlPack {
}
return packBean;
}
/**
* MES 缺陷查询条件封装
* @param mesDefect
* @param organizeCode
* @return
*/
public static DdlPackBean getMesDefect(MesDefect mesDefect, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesDefect, organizeCode);
if (!StringUtils.isEmpty(mesDefect.getDefectCode())) {
DdlPreparedPack.getStringLikerPack(mesDefect.getDefectCode(), "defectCode", packBean);
}
if (!StringUtils.isEmpty(mesDefect.getDefectName())) {
DdlPreparedPack.getStringLikerPack(mesDefect.getDefectName(), "defectName", packBean);
}
if (!StringUtils.isEmpty(mesDefect.getDefectType())) {
DdlPreparedPack.getStringLikerPack(mesDefect.getDefectType(), "defectType", packBean);
}
return packBean;
}
/**
* MES 产品类型图片查询条件封装
* @param mesProduceCtgyPicture
* @param organizeCode
* @return
*/
public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceCtgyPicture, organizeCode);
if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCtgyCode())) {
DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCtgyCode(), "produceCtgyCode", packBean);
}
if (!StringUtils.isEmpty(mesProduceCtgyPicture.getPictureName())) {
DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getPictureName(), "pictureName", packBean);
}
if (!StringUtils.isEmpty(mesProduceCtgyPicture.getSideLocation())) {
DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getSideLocation(), "sideLocation", packBean);
}
return packBean;
}
/**
* MES 类型信息查询条件封装
* @param mesTypeCfg
* @param organizeCode
* @return
*/
public static DdlPackBean getMesTypeCfg(MesTypeCfg mesTypeCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesTypeCfg, organizeCode);
if (!StringUtils.isEmpty(mesTypeCfg.getTypeCode())) {
DdlPreparedPack.getStringLikerPack(mesTypeCfg.getTypeCode(), "typeCode", packBean);
}
if (!StringUtils.isEmpty(mesTypeCfg.getBusinessTypeCode())) {
DdlPreparedPack.getStringLikerPack(mesTypeCfg.getBusinessTypeCode(), "businessTypeCode", packBean);
}
if (!StringUtils.isEmpty(mesTypeCfg.getTypeName())) {
DdlPreparedPack.getStringLikerPack(mesTypeCfg.getTypeName(), "typeName", packBean);
}
if (!StringUtils.isEmpty(mesTypeCfg.getBusinessTypeName())) {
DdlPreparedPack.getStringLikerPack(mesTypeCfg.getBusinessTypeName(), "businessTypeName", packBean);
}
return packBean;
}
/**
* MES 缺陷原因查询条件封装
* @param mesDefectCause
* @param organizeCode
* @return
*/
public static DdlPackBean getMesDefectCause(MesDefectCause mesDefectCause, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesDefectCause, organizeCode);
if (!StringUtils.isEmpty(mesDefectCause.getDcCode())) {
DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcCode(), "dcCode", packBean);
}
if (!StringUtils.isEmpty(mesDefectCause.getDcName())) {
DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcName(), "dcName", packBean);
}
if (!StringUtils.isEmpty(mesDefectCause.getDcType())) {
DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcType(), "dcType", packBean);
}
return packBean;
}
}

11
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/FindWriteModel.java
Unescape Escape View File

@ -0,0 +1,11 @@
package cn.estsh.i3plus.pojo.model.wms;
import lombok.Data;
import java.util.List;
@Data
public class FindWriteModel {
private List<String> snList;
private String organizeCode;
}

22
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java
Unescape Escape View File

@ -0,0 +1,22 @@
package cn.estsh.i3plus.pojo.model.wms;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* @Description 冲销Model
* @Reference
* @Author dragon
* @CreateDate 2019/10/18 1:18
* @Modify
*/
@Data
public class WmsWriteOffModel implements Serializable {
private static final long serialVersionUID = -5490167040159056107L;
private String locateNo;
private List<String> snList;
private List<Map<String, Object>> summaryList;
}

13
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
Unescape Escape View File

@ -149,12 +149,23 @@ public class WmsCSFactTrans extends BaseBean {
this.srcZoneNo = srcZoneNo;
this.srcWhNo = srcWhNo;
}
public WmsCSFactTrans(String partNo,String partNameRdd,String unit, String orderNo, String organizeCode,double qty) {
this.partNo=partNo;
this.partNameRdd = partNameRdd;
this.unit = unit;
this.orderNo = orderNo;
this.organizeCode = organizeCode;
this.qty=qty;
}
public WmsCSFactTrans(Long countBoxQty,Double sumPartQty,String zoneNo, String partNo, String partNameRdd) {
this.countBoxQty = countBoxQty;
this.sumPartQty = sumPartQty;
this.zoneNo = zoneNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
}
}

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

@ -178,4 +178,12 @@ public class WmsCSOrderDetails extends BaseBean {
this.organizeCode = organizeCode;
this.transStatus = transStatus;
}
public WmsCSOrderDetails(String partNo,String partNameRdd,String unit, String orderNo, String organizeCode,double qty) {
this.partNo=partNo;
this.partNameRdd = partNameRdd;
this.unit = unit;
this.orderNo = orderNo;
this.organizeCode = organizeCode;
this.qty=qty;
}
}

46
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
Unescape Escape View File

@ -42,7 +42,7 @@ public class WmsMoveMaster extends BaseBean {
*/
@Column(name = "ORDER_STATUS")
@ApiParam(value = "状态", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description")
public Integer orderStatus;
@Column(name = "REMARK")
@ -58,7 +58,7 @@ public class WmsMoveMaster extends BaseBean {
@ApiParam(value = "错误信息")
private String errorMessage;
@Column(name="IS_URGENT")
@Column(name = "IS_URGENT")
@ApiParam(value = "是否紧急", example = "0")
public Integer isUrgent;
@ -68,7 +68,7 @@ public class WmsMoveMaster extends BaseBean {
@Column(name = "BUSI_TYPE_CODE")
@ApiParam(value = "业务类型编码")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
private Integer busiTypeCode;
@Column(name = "REF_ORDER_NO")
@ -81,7 +81,7 @@ public class WmsMoveMaster extends BaseBean {
@Transient
@ApiParam("状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description")
private Integer itemStatus;
@Transient
@ -140,7 +140,7 @@ public class WmsMoveMaster extends BaseBean {
@ApiParam("交易类型名称")
private String transTypeName;
@Column(name="FIX_ID")
@Column(name = "FIX_ID")
@ApiParam(value = "设备编号")
public String fixId;
@ -164,16 +164,17 @@ public class WmsMoveMaster extends BaseBean {
return isSnapshot == null ? 0 : isSnapshot.intValue();
}
public WmsMoveMaster(){};
public WmsMoveMaster() {
}
public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage,
Integer isUrgent,String carNo, Integer busiTypeCode, String refOrderNo, String refSrc,String partNo, Integer itemStatus,String remark,
String organizeCode,String createDatetime,String createUser,String modifyDatetime,String modifyUser,String fixId,
public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage,
Integer isUrgent, String carNo, Integer busiTypeCode, String refOrderNo, String refSrc, String partNo, Integer itemStatus, String remark,
String organizeCode, String createDatetime, String createUser, String modifyDatetime, String modifyUser, String fixId,
Double sumTranQty) {
this.orderNo = orderNo;
this.orderStatus = orderStatus;
this.remark = remark;
this.isUrgent=isUrgent;
this.isUrgent = isUrgent;
this.transTypeCode = transTypeCode;
this.errorMessage = errorMessage;
this.busiTypeCode = busiTypeCode;
@ -182,18 +183,18 @@ public class WmsMoveMaster extends BaseBean {
this.refOrderNo = refOrderNo;
this.carNo = carNo;
this.refSrc = refSrc;
this.organizeCode =organizeCode;
this.createDatetime= createDatetime;
this.organizeCode = organizeCode;
this.createDatetime = createDatetime;
this.createUser = createUser;
this.modifyDatetime =modifyDatetime;
this.modifyUser =modifyUser;
this.modifyDatetime = modifyDatetime;
this.modifyUser = modifyUser;
this.fixId = fixId;
this.transQty = sumTranQty;
}
public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus,
String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc,
String createDatetime,String createUser,String modifyUser,String modifyDatetime) {
public WmsMoveMaster(Long id, String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus,
String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode, String refSrc,
String createDatetime, String createUser, String modifyUser, String modifyDatetime) {
this.id = id;
this.orderNo = orderNo;
this.organizeCode = organizeCode;
@ -212,16 +213,17 @@ public class WmsMoveMaster extends BaseBean {
this.fixId = fixId;
this.busiTypeCode = busiTypeCode;
this.refSrc = refSrc;
this.createDatetime= createDatetime;
this.createDatetime = createDatetime;
this.createUser = createUser;
this.modifyUser =modifyUser;
this.modifyDatetime =modifyDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
}
public Double getTransQty(){
public Double getTransQty() {
return this.transQty == null ? 0 : this.transQty.doubleValue();
}
public int getBusiTypeCodeVal(){
public int getBusiTypeCodeVal() {
return this.busiTypeCode == null ? 0 : this.busiTypeCode.intValue();
}
}

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java
Unescape Escape View File

@ -126,7 +126,7 @@ public class WmsInterfaceDataMapper extends BaseBean {
* 扩展脚本编号，用于扩展接口功能
*/
@Column(name = "SCRIPT_NO")
public String ScriptNo;
public String scriptNo;
/**
* 调用脚本方法获取数据

30
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SnDifferModel.java
Unescape Escape View File

@ -0,0 +1,30 @@
package cn.estsh.i3plus.pojo.wms.modelbean;
import io.swagger.annotations.Api;
import lombok.Data;
@Data
@Api("盘点条码差异返回Model")
public class SnDifferModel {
//盘点单号
private String orderNo;
//条码
private String sn;
//源库位编码
private String locateNo;
//物料代码
private String partNo;
//物料名称
private String partNameRdd;
//应盘数量
private String qty;
//实盘数量
private String factQty;
//
private String whNo;
//仓库编码
private String zoneNo ;
//差异状态
private String wmStatus;
}
Write Preview
Loading…
Cancel
Save