task `1425` pcn pojo 迁移

yun-zuoyi
luweihao 5 years ago
parent 05d0a0a375
commit 5892f87bdc

@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.Data; import lombok.Data;
@ -12,7 +14,9 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
* @Description : * @Description :
@ -37,4 +41,19 @@ public class MesArea extends BaseBean implements Serializable {
@Column(name = "AREA_NAME") @Column(name = "AREA_NAME")
@ApiParam("区域名称") @ApiParam("区域名称")
private String areaName; private String areaName;
@Transient
@ApiParam(value = "子集列表")
private List<MesWorkCenter> childTreeList;
@Transient
@ApiParam(value = "名称")
private String name;
// 默认值 -1
@Transient
@ApiParam(value = "父节点", access = "父节点", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
} }

@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable; import java.io.Serializable;
/** /**

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("流程工序关系") @Api("流程工序关系")
public class MesRouteProcess extends BaseBean implements Serializable { public class MesRouteProcess extends BaseBean implements Serializable {
private static final long serialVersionUID = 3477334942090180010L; private static final long serialVersionUID = 3477334942090180010L;
@Column(name = "ROUTE_CODE") @Column(name = "ROUTE_CODE")
@ApiParam("流程代码") @ApiParam("流程代码")
private String routeCode; private String routeCode;

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("工序工作单元对照") @Api("工序工作单元对照")
public class MesRouteProcessCell extends BaseBean implements Serializable { public class MesRouteProcessCell extends BaseBean implements Serializable {
private static final long serialVersionUID = -703779336699805482L; private static final long serialVersionUID = -703779336699805482L;
@Column(name = "ROUTE_CODE") @Column(name = "ROUTE_CODE")
@ApiParam("流程代码") @ApiParam("流程代码")
private String routeCode; private String routeCode;

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("班次休息信息") @Api("班次休息信息")
public class MesShiftRest extends BaseBean implements Serializable { public class MesShiftRest extends BaseBean implements Serializable {
private static final long serialVersionUID = -8712815093203320523L; private static final long serialVersionUID = -8712815093203320523L;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码") @ApiParam("工作中心代码")
private String workCenterCode; private String workCenterCode;

@ -22,8 +22,8 @@ import java.io.Serializable;
@Table(name = "MES_TIME") @Table(name = "MES_TIME")
@Api("工步参数") @Api("工步参数")
public class MesTime extends BaseBean implements Serializable { public class MesTime extends BaseBean implements Serializable {
private static final long serialVersionUID = 1562011791394529076L; private static final long serialVersionUID = 1562011791394529076L;
@Column(name = "MODULE") @Column(name = "MODULE")
@ApiParam("组件") @ApiParam("组件")
private String module; private String module;

@ -29,8 +29,8 @@ import java.io.Serializable;
@Table(name = "MES_TORQUE_DETAIL") @Table(name = "MES_TORQUE_DETAIL")
@Api("扭矩信息记录表") @Api("扭矩信息记录表")
public class MesTorqueDetail extends BaseBean implements Serializable { public class MesTorqueDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = 2900363253333046861L; private static final long serialVersionUID = 2900363253333046861L;
@Column(name = "SN") @Column(name = "SN")
@ApiParam("过程条码") @ApiParam("过程条码")
private String serialNumber; private String serialNumber;

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_TYPE_CFG") @Table(name = "MES_TYPE_CFG")
@Api("类型信息表") @Api("类型信息表")
public class MesTypeCfg extends BaseBean implements Serializable { public class MesTypeCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -1699612238800419597L; private static final long serialVersionUID = -1699612238800419597L;
@Column(name = "TYPE_CODE") @Column(name = "TYPE_CODE")
@ApiParam("类型代码") @ApiParam("类型代码")
private String typeCode; private String typeCode;

@ -27,8 +27,8 @@ import java.io.Serializable;
@Table(name = "MES_WC_CHECK") @Table(name = "MES_WC_CHECK")
@Api("开线检查") @Api("开线检查")
public class MesWcCheck extends BaseBean implements Serializable { public class MesWcCheck extends BaseBean implements Serializable {
private static final long serialVersionUID = 8057329890155185557L; private static final long serialVersionUID = 8057329890155185557L;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心") @ApiParam("工作中心")
private String workCenterCode; private String workCenterCode;

@ -30,8 +30,8 @@ import java.io.Serializable;
}) })
@Api("开线检查记录") @Api("开线检查记录")
public class MesWcCheckRecord extends BaseBean implements Serializable { public class MesWcCheckRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -2173902677953303765L; private static final long serialVersionUID = -2173902677953303765L;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心") @ApiParam("工作中心")
private String workCenterCode; private String workCenterCode;

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("工作单元") @Api("工作单元")
public class MesWorkCell extends BaseBean implements Serializable { public class MesWorkCell extends BaseBean implements Serializable {
private static final long serialVersionUID = -493313481197504121L; private static final long serialVersionUID = -493313481197504121L;
@Column(name = "WORK_CELL_CODE") @Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码") @ApiParam("工作单元代码")
private String workCellCode; private String workCellCode;

@ -27,8 +27,8 @@ import java.io.Serializable;
}) })
@Api("工位监控异常信息") @Api("工位监控异常信息")
public class MesWorkCellMonitorLog extends BaseBean implements Serializable { public class MesWorkCellMonitorLog extends BaseBean implements Serializable {
private static final long serialVersionUID = -5634446206963213556L; private static final long serialVersionUID = -5634446206963213556L;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心") @ApiParam("工作中心")
private String workCenterCode; private String workCenterCode;

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_WORK_CELL_PARAM") @Table(name = "MES_WORK_CELL_PARAM")
@Api("mes工作单元参数") @Api("mes工作单元参数")
public class MesWorkCellParam extends BaseBean implements Serializable { public class MesWorkCellParam extends BaseBean implements Serializable {
private static final long serialVersionUID = -3659425774085368499L; private static final long serialVersionUID = -3659425774085368499L;
@Column(name = "PARAM_CODE") @Column(name = "PARAM_CODE")
@ApiParam("参数代码") @ApiParam("参数代码")
private String paramCode; private String paramCode;

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("工作单元参数配置") @Api("工作单元参数配置")
public class MesWorkCellParamCfg extends BaseBean implements Serializable { public class MesWorkCellParamCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 1739991089354361293L; private static final long serialVersionUID = 1739991089354361293L;
@Column(name = "WORK_CELL_CODE") @Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码") @ApiParam("工作单元代码")
private String workCellCode; private String workCellCode;

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_WORK_CELL_POINT") @Table(name = "MES_WORK_CELL_POINT")
@Api("工站队列") @Api("工站队列")
public class MesWorkCellPoint extends BaseBean implements Serializable { public class MesWorkCellPoint extends BaseBean implements Serializable {
private static final long serialVersionUID = 2881841596678871526L; private static final long serialVersionUID = 2881841596678871526L;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心") @ApiParam("工作中心")
private String workCenterCode; private String workCenterCode;

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("工作中心") @Api("工作中心")
public class MesWorkCenter extends BaseBean implements Serializable { public class MesWorkCenter extends BaseBean implements Serializable {
private static final long serialVersionUID = -1119897685621371682L; private static final long serialVersionUID = -1119897685621371682L;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码") @ApiParam("工作中心代码")
private String workCenterCode; private String workCenterCode;

@ -27,11 +27,11 @@ import java.io.Serializable;
@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO") @Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")
}, uniqueConstraints = { }, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"})
} })
)
@Api("生产工单") @Api("生产工单")
public class MesWorkOrder extends BaseBean implements Serializable { public class MesWorkOrder extends BaseBean implements Serializable {
private static final long serialVersionUID = 8065877030194822855L; private static final long serialVersionUID = 8065877030194822855L;
@Column(name = "ORDER_NO", nullable = false) @Column(name = "ORDER_NO", nullable = false)
@ApiParam("工单号") @ApiParam("工单号")
private String orderNo; private String orderNo;

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("生产工单日志") @Api("生产工单日志")
public class MesWorkOrderLog extends BaseBean implements Serializable { public class MesWorkOrderLog extends BaseBean implements Serializable {
private static final long serialVersionUID = -7018645997937147427L; private static final long serialVersionUID = -7018645997937147427L;
@Column(name = "ORDER_NO") @Column(name = "ORDER_NO")
@ApiParam("工单号") @ApiParam("工单号")
private String orderNo; private String orderNo;

@ -17,12 +17,21 @@ import java.io.Serializable;
@Data @Data
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Api("pcn页面按钮控制model") @Api("mes页面按钮控制model")
public class MesButtonFlagModel implements Serializable { public class MesButtonFlagModel implements Serializable {
@ApiParam("修改按钮") @ApiParam("修改按钮")
private boolean updateButton; private boolean updateButton;
@ApiParam("按配置修改按钮")
private boolean updateButtonConfig;
@ApiParam("下达按钮")
private boolean transmitButton;
// @ApiParam("测试动态下达按钮")
// private boolean dynamicTransmitButtonTest;
@ApiParam("启动按钮") @ApiParam("启动按钮")
private boolean startUpButton; private boolean startUpButton;
@ -38,5 +47,11 @@ public class MesButtonFlagModel implements Serializable {
@ApiParam("完成按钮") @ApiParam("完成按钮")
private boolean completeButton; private boolean completeButton;
@ApiParam("关闭按钮-提醒")
private boolean closeButtonNoticeFlag;
@ApiParam("维修任务按钮")
private boolean repairButton;
} }

@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
@ -72,12 +73,12 @@ public class MesBom extends BaseBean implements Serializable {
@Column(name = "EFF_START_TIME") @Column(name = "EFF_START_TIME")
@ApiParam(value = "生效时间") @ApiParam(value = "生效时间")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String effStartTime; private String effStartTime;
@Column(name = "EFF_END_TIME") @Column(name = "EFF_END_TIME")
@ApiParam(value = "失效时间") @ApiParam(value = "失效时间")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String effEndTime; private String effEndTime;
public double getQtyVal() { public double getQtyVal() {

@ -27,7 +27,7 @@ import java.io.Serializable;
@DynamicUpdate @DynamicUpdate
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CUSTOMER") @Table(name = "MES_CUSTOMER")
@Api("客户产线代码") @Api("客户信息")
public class MesCustomer extends BaseBean implements Serializable { public class MesCustomer extends BaseBean implements Serializable {
private static final long serialVersionUID = 6049359006918853570L; private static final long serialVersionUID = 6049359006918853570L;
@Column(name = "CUSTOMER_CODE") @Column(name = "CUSTOMER_CODE")

@ -58,16 +58,15 @@ public class MesDatasource extends BaseBean implements Serializable {
@ApiParam("密码") @ApiParam("密码")
private String dsPassword; private String dsPassword;
@Column(name = "DS_DB_NAME")
@ApiParam("数据库名称")
private String dsDbName;
@Column(name = "EQUIPMENT_CODE") @Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码") @ApiParam("设备代码")
private String equipmentCode; private String equipmentCode;
@Column(name = "DS_DB_NAMsE")
@ApiParam("数据库名称")
private String dsDbName;
@Transient @Transient
@ApiParam("设备名称") @ApiParam("设备名称")
private String equipmentName; private String equipmentName;
} }

@ -11,7 +11,9 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
* @Description: * @Description:
@ -41,4 +43,26 @@ public class MesDefect extends BaseBean implements Serializable {
@Column(name = "DEFECT_TYPE") @Column(name = "DEFECT_TYPE")
@ApiParam("缺陷类型") @ApiParam("缺陷类型")
private String defectType; private String defectType;
@Transient
@ApiParam("缺陷类型名称")
private String defectTypeName;
@Transient
@ApiParam("缺陷位置")
private String defectLocation;
@Transient
@ApiParam("缺陷类型子集")
private List<MesDefect> mesDefectList;
public MesDefect() {
}
public MesDefect(String defectCode, String defectName, String defectType, String defectTypeName) {
this.defectCode = defectCode;
this.defectName = defectName;
this.defectType = defectType;
this.defectTypeName = defectTypeName;
}
} }

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_DEFECT_CAUSE") @Table(name = "MES_DEFECT_CAUSE")
@Api("缺陷原因表") @Api("缺陷原因表")
public class MesDefectCause extends BaseBean implements Serializable { public class MesDefectCause extends BaseBean implements Serializable {
private static final long serialVersionUID = -4078847071878784152L; private static final long serialVersionUID = -4078847071878784152L;
@Column(name = "DC_CODE") @Column(name = "DC_CODE")
@ApiParam("缺陷原因代码") @ApiParam("缺陷原因代码")
private String dcCode; private String dcCode;

@ -8,12 +8,10 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* @Description: * @Description:
@ -34,6 +32,7 @@ import java.util.Date;
@Api("不良信息记录表") @Api("不良信息记录表")
public class MesDefectRecord extends BaseBean implements Serializable { public class MesDefectRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -6672562641463628050L; private static final long serialVersionUID = -6672562641463628050L;
@Column(name = "SERIAL_NUMBER") @Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码") @ApiParam("产品条码")
private String serialNumber; private String serialNumber;
@ -78,6 +77,9 @@ public class MesDefectRecord extends BaseBean implements Serializable {
@ApiParam("备注") @ApiParam("备注")
private String memo; private String memo;
@Transient
private List<MesDefect> mesDefectList;
public int getRepairStatusVal() { public int getRepairStatusVal() {
return this.repairStatus == null ? 0 : this.repairStatus; return this.repairStatus == null ? 0 : this.repairStatus;
} }

@ -8,11 +8,9 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
/** /**
* @Description: * @Description:
@ -60,11 +58,11 @@ public class MesDismantleRecord extends BaseBean implements Serializable {
@Column(name = "QTY") @Column(name = "QTY")
@ApiParam("产品数量") @ApiParam("产品数量")
private Integer qty; private Double qty;
@Column(name = "DISMANTLE_QTY") @Column(name = "DISMANTLE_QTY")
@ApiParam("拆解数") @ApiParam("拆解数")
private Integer dismantleQty; private BigDecimal dismantleQty;
@Column(name = "ITEM_PART_NO") @Column(name = "ITEM_PART_NO")
@ApiParam("子物料编码") @ApiParam("子物料编码")
@ -76,17 +74,24 @@ public class MesDismantleRecord extends BaseBean implements Serializable {
@Column(name = "OK_QTY") @Column(name = "OK_QTY")
@ApiParam("合格数") @ApiParam("合格数")
private Integer okQty; private BigDecimal okQty;
@Column(name = "MISS_QTY") @Column(name = "MISS_QTY")
@ApiParam("缺失数") @ApiParam("缺失数")
private Integer missQty; private BigDecimal missQty;
@Column(name = "SCRAP_QTY") @Column(name = "SCRAP_QTY")
@ApiParam("报废数") @ApiParam("报废数")
private Integer scrapQty; private BigDecimal scrapQty;
@Column(name = "MEMO") @Column(name = "MEMO")
@ApiParam("备注") @ApiParam("备注")
private String meno; private String memo;
@Column(name = "LOT_NO")
@ApiParam("关联批次")
private String lotNo;
@Transient
private String serialNumber;
} }

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_ESOP") @Table(name = "MES_ESOP")
@Api("作业指导书信息表(ODS)") @Api("作业指导书信息表(ODS)")
public class MesEsop extends BaseBean implements Serializable { public class MesEsop extends BaseBean implements Serializable {
private static final long serialVersionUID = -2025246159538929513L; private static final long serialVersionUID = -2025246159538929513L;
@Column(name = "PART_NO") @Column(name = "PART_NO")
@ApiParam("零件号") @ApiParam("零件号")
private String partNo; private String partNo;

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("系统业务事件") @Api("系统业务事件")
public class MesEvent extends BaseBean implements Serializable { public class MesEvent extends BaseBean implements Serializable {
private static final long serialVersionUID = -2941486161983912085L; private static final long serialVersionUID = -2941486161983912085L;
@Column(name = "EVENT_CODE") @Column(name = "EVENT_CODE")
@ApiParam("事件代码") @ApiParam("事件代码")
private String eventCode; private String eventCode;

@ -34,6 +34,7 @@ import java.io.Serializable;
@Api("系统业务事件动作") @Api("系统业务事件动作")
public class MesEventAction extends BaseBean implements Serializable { public class MesEventAction extends BaseBean implements Serializable {
private static final long serialVersionUID = 1188871471049646861L; private static final long serialVersionUID = 1188871471049646861L;
@Column(name = "EVENT_CODE") @Column(name = "EVENT_CODE")
@ApiParam("事件代码") @ApiParam("事件代码")
private String eventCode; private String eventCode;

@ -27,8 +27,8 @@ import java.io.Serializable;
@Table(name = "MES_FI_CFG") @Table(name = "MES_FI_CFG")
@Api("首检件配置") @Api("首检件配置")
public class MesFiCfg extends BaseBean implements Serializable { public class MesFiCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 6919161447256638470L; private static final long serialVersionUID = 6919161447256638470L;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("产线") @ApiParam("产线")
private String workCenterCode; private String workCenterCode;

@ -27,8 +27,8 @@ import java.io.Serializable;
@Table(name = "MES_FILE") @Table(name = "MES_FILE")
@Api("文件表") @Api("文件表")
public class MesFile extends BaseBean implements Serializable { public class MesFile extends BaseBean implements Serializable {
private static final long serialVersionUID = 5057339077996828057L; private static final long serialVersionUID = 5057339077996828057L;
@Column(name = "FILE_NAME") @Column(name = "FILE_NAME")
@ApiParam("文件名称") @ApiParam("文件名称")
private String fileName; private String fileName;

@ -15,10 +15,10 @@ import javax.persistence.Transient;
import java.io.Serializable; import java.io.Serializable;
/** /**
* @Description: * @Description :
* @Reference : * @Reference :
* @Author: yiming.gu * @Author : crish
* @CreateDate:2019-05-21 * @CreateDate : 2019-05-15
* @Modify: * @Modify:
**/ **/
@Data @Data
@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("物料关键数据关系") @Api("物料关键数据关系")
public class MesKpData extends BaseBean implements Serializable { public class MesKpData extends BaseBean implements Serializable {
private static final long serialVersionUID = 8243089140216459544L; private static final long serialVersionUID = 8243089140216459544L;
@Column(name = "PART_NO") @Column(name = "PART_NO")
@ApiParam("物料号") @ApiParam("物料号")
private String partNo; private String partNo;

@ -27,8 +27,8 @@ import java.util.List;
@Table(name = "MES_LABEL_TEMPLATE") @Table(name = "MES_LABEL_TEMPLATE")
@Api(value = "打印模板", description = "打印模板") @Api(value = "打印模板", description = "打印模板")
public class MesLabelTemplate extends BaseBean implements Serializable { public class MesLabelTemplate extends BaseBean implements Serializable {
private static final long serialVersionUID = 5371856566557305323L; private static final long serialVersionUID = 5371856566557305323L;
@Column(name = "TEMPLATE_CODE") @Column(name = "TEMPLATE_CODE")
@ApiParam(value = "模板代码") @ApiParam(value = "模板代码")
private String templateCode; private String templateCode;

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_LABEL_TEMPLATE_PARAM") @Table(name = "MES_LABEL_TEMPLATE_PARAM")
@Api(value = "打印模板参数", description = "打印模板参数") @Api(value = "打印模板参数", description = "打印模板参数")
public class MesLabelTemplateParam extends BaseBean implements Serializable { public class MesLabelTemplateParam extends BaseBean implements Serializable {
private static final long serialVersionUID = 6476163540527157643L; private static final long serialVersionUID = 6476163540527157643L;
@Column(name = "TEMPLATE_ID") @Column(name = "TEMPLATE_ID")
@ApiParam(value = "模板ID", access = "模板ID", example = "-1") @ApiParam(value = "模板ID", access = "模板ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("系统业务方法") @Api("系统业务方法")
public class MesMethod extends BaseBean implements Serializable { public class MesMethod extends BaseBean implements Serializable {
private static final long serialVersionUID = -3254086662292709833L; private static final long serialVersionUID = -3254086662292709833L;
@Column(name = "METHOD_CODE") @Column(name = "METHOD_CODE")
@ApiParam("方法代码") @ApiParam("方法代码")
private String methodCode; private String methodCode;

@ -27,8 +27,8 @@ import java.io.Serializable;
@Table(name = "MES_MONITOR_TASK") @Table(name = "MES_MONITOR_TASK")
@Api("监听任务") @Api("监听任务")
public class MesMonitorTask extends BaseBean implements Serializable { public class MesMonitorTask extends BaseBean implements Serializable {
private static final long serialVersionUID = 4606062283853607814L; private static final long serialVersionUID = 4606062283853607814L;
@Column(name = "TASK_NO") @Column(name = "TASK_NO")
@ApiParam("任务编号") @ApiParam("任务编号")
private String taskNo; private String taskNo;

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_MONITOR_TASK_DETAIL") @Table(name = "MES_MONITOR_TASK_DETAIL")
@Api("监听任务明细") @Api("监听任务明细")
public class MesMonitorTaskDetail extends BaseBean implements Serializable { public class MesMonitorTaskDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = -8703163858851139587L; private static final long serialVersionUID = -8703163858851139587L;
@Column(name = "TASK_NO") @Column(name = "TASK_NO")
@ApiParam("任务编号") @ApiParam("任务编号")
private String taskNo; private String taskNo;

@ -19,7 +19,6 @@ import java.io.Serializable;
* @CreateDate: 2019/8/22 5:59 PM * @CreateDate: 2019/8/22 5:59 PM
* @Description: * @Description:
**/ **/
@Data @Data
@Entity @Entity
@DynamicInsert @DynamicInsert
@ -28,8 +27,8 @@ import java.io.Serializable;
@Table(name = "MES_NUMBER_RULE") @Table(name = "MES_NUMBER_RULE")
@Api("条码生成规则") @Api("条码生成规则")
public class MesNumberRule extends BaseBean implements Serializable { public class MesNumberRule extends BaseBean implements Serializable {
private static final long serialVersionUID = -7547623897602721464L; private static final long serialVersionUID = -7547623897602721464L;
@Column(name = "RULE_CODE") @Column(name = "RULE_CODE")
@ApiParam("规则代码") @ApiParam("规则代码")
private String ruleCode; private String ruleCode;

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Version;
import java.io.Serializable; import java.io.Serializable;
/** /**
@ -27,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_NUMBER_SERIALNO") @Table(name = "MES_NUMBER_SERIALNO")
@Api("编码序号") @Api("编码序号")
public class MesNumberSerialno extends BaseBean implements Serializable { public class MesNumberSerialno extends BaseBean implements Serializable {
private static final long serialVersionUID = -6004402998083665263L; private static final long serialVersionUID = -6004402998083665263L;
@Column(name = "CURRENT_NUMBER_PREFIX") @Column(name = "CURRENT_NUMBER_PREFIX")
@ApiParam("当前编号前缀") @ApiParam("当前编号前缀")
private String currentNumberPrefix; private String currentNumberPrefix;
@ -40,4 +41,9 @@ public class MesNumberSerialno extends BaseBean implements Serializable {
@Column(name = "CURRENT_NUMBER") @Column(name = "CURRENT_NUMBER")
@ApiParam("当前编号") @ApiParam("当前编号")
private String currentNumber; private String currentNumber;
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public transient Integer lockVersion;
} }

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_OBJECT_CFG") @Table(name = "MES_OBJECT_CFG")
@Api("对象结构") @Api("对象结构")
public class MesObjectCfg extends BaseBean implements Serializable { public class MesObjectCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 55753384888695913L; private static final long serialVersionUID = 55753384888695913L;
@Column(name = "OBJECT_CODE") @Column(name = "OBJECT_CODE")
@ApiParam("对象代码") @ApiParam("对象代码")
private String objectCode; private String objectCode;
@ -55,11 +55,11 @@ public class MesObjectCfg extends BaseBean implements Serializable {
private String pojoAttr; private String pojoAttr;
@Column(name = "IS_SAVE") @Column(name = "IS_SAVE")
@ApiParam("是否存储") @ApiParam("是否保存 1存 2不存")
private Integer isSave; private Integer isSave;
@Transient @Transient
@ApiParam("是否存储") @ApiParam("是否存储")
private String isSaveName; private String isSaveName;
} }

@ -31,6 +31,7 @@ import java.io.Serializable;
@Deprecated @Deprecated
public class MesPLCConfigure extends BaseBean implements Serializable { public class MesPLCConfigure extends BaseBean implements Serializable {
private static final long serialVersionUID = 2609782937477343108L; private static final long serialVersionUID = 2609782937477343108L;
@Column(name = "IP") @Column(name = "IP")
@ApiParam("设备ip") @ApiParam("设备ip")
private String ipAddress; private String ipAddress;

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("包装规格") @Api("包装规格")
public class MesPackage extends BaseBean implements Serializable { public class MesPackage extends BaseBean implements Serializable {
private static final long serialVersionUID = 5275923991324889995L; private static final long serialVersionUID = 5275923991324889995L;
@Column(name = "PACKAGE_NO", nullable = false) @Column(name = "PACKAGE_NO", nullable = false)
@ApiParam("包装编号") @ApiParam("包装编号")
private String packageNo; private String packageNo;
@ -101,4 +102,18 @@ public class MesPackage extends BaseBean implements Serializable {
@ApiParam("打印状态文字") @ApiParam("打印状态文字")
private String printStrStatus; private String printStrStatus;
@Transient
@ApiParam("打印缓存id")
private String printId;
public MesPackage() {
}
public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) {
this.packageNo = packageNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.qty = qty;
this.packSpecQty = packSpecQty;
}
} }

@ -28,8 +28,8 @@ import java.io.Serializable;
}) })
@Api("包装规格明细") @Api("包装规格明细")
public class MesPackageDetail extends BaseBean implements Serializable { public class MesPackageDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = 6980459490465566975L; private static final long serialVersionUID = 6980459490465566975L;
@Column(name = "PACKAGE_NO", nullable = false) @Column(name = "PACKAGE_NO", nullable = false)
@ApiParam("包装编码") @ApiParam("包装编码")
private String packageNo; private String packageNo;
@ -39,11 +39,11 @@ public class MesPackageDetail extends BaseBean implements Serializable {
private String serialNumber; private String serialNumber;
@Column(name = "PART_NO") @Column(name = "PART_NO")
@ApiParam("物料号") @ApiParam("物料号")
private String partNo; private String partNo;
@Column(name = "PART_NAME_RDD") @Column(name = "PART_NAME_RDD")
@ApiParam("产品条码") @ApiParam("物料名称")
private String partNameRdd; private String partNameRdd;
@Column(name = "PACKAGE_NO2") @Column(name = "PACKAGE_NO2")

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")})
@Api("包装履历表") @Api("包装履历表")
public class MesPackageTravel extends BaseBean implements Serializable { public class MesPackageTravel extends BaseBean implements Serializable {
private static final long serialVersionUID = -6425620221708201986L; private static final long serialVersionUID = -6425620221708201986L;
@Column(name = "PACKAGE_NO") @Column(name = "PACKAGE_NO")
@ApiParam("包装编码") @ApiParam("包装编码")
private String packageNo; private String packageNo;

@ -31,6 +31,7 @@ import java.io.Serializable;
@Api("物料信息") @Api("物料信息")
public class MesPart extends BaseBean implements Serializable { public class MesPart extends BaseBean implements Serializable {
private static final long serialVersionUID = -7731182105899332283L; private static final long serialVersionUID = -7731182105899332283L;
@Column(name = "PART_NO") @Column(name = "PART_NO")
@ApiParam("零件号") @ApiParam("零件号")
private String partNo; private String partNo;
@ -75,10 +76,6 @@ public class MesPart extends BaseBean implements Serializable {
@ApiParam("产品类型代码") @ApiParam("产品类型代码")
private String produceCategoryCode; private String produceCategoryCode;
@Transient
@ApiParam("产品类型名称")
private String produceCategoryName;
@Column(name = "PROCESS_MATCH_TYPE") @Column(name = "PROCESS_MATCH_TYPE")
@ApiParam("过程编码匹配类型") @ApiParam("过程编码匹配类型")
private Integer processMatchType; private Integer processMatchType;
@ -92,6 +89,10 @@ public class MesPart extends BaseBean implements Serializable {
private Integer productMatchType; private Integer productMatchType;
@Transient @Transient
@ApiParam("产品类型名称")
private String produceCategoryName;
@Transient
@ApiParam("过程编码匹配类型名称") @ApiParam("过程编码匹配类型名称")
private String processMatchTypeName; private String processMatchTypeName;
@ -102,4 +103,8 @@ public class MesPart extends BaseBean implements Serializable {
@Transient @Transient
@ApiParam("产品编码匹配类型") @ApiParam("产品编码匹配类型")
private String productMatchTypeName; private String productMatchTypeName;
@Transient
@ApiParam("分类名称")
private String categoryName;
} }

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("零件种类") @Api("零件种类")
public class MesPartCategory extends BaseBean implements Serializable { public class MesPartCategory extends BaseBean implements Serializable {
private static final long serialVersionUID = 106841156414035968L; private static final long serialVersionUID = 106841156414035968L;
@Column(name = "CATEGORY_CODE") @Column(name = "CATEGORY_CODE")
@ApiParam("分类代码") @ApiParam("分类代码")
private String categoryCode; private String categoryCode;

@ -30,8 +30,8 @@ import java.io.Serializable;
@Table(name = "MES_PATTERN_JIS") @Table(name = "MES_PATTERN_JIS")
@Api("JIS发运模式") @Api("JIS发运模式")
public class MesPatternJis extends BaseBean implements Serializable { public class MesPatternJis extends BaseBean implements Serializable {
private static final long serialVersionUID = 216398440591829755L; private static final long serialVersionUID = 216398440591829755L;
@Column(name = "PATTERN_NO") @Column(name = "PATTERN_NO")
@ApiParam("模式编号") @ApiParam("模式编号")
private String patternNo; private String patternNo;
@ -45,7 +45,7 @@ public class MesPatternJis extends BaseBean implements Serializable {
private Integer queueNo; private Integer queueNo;
@Column(name = "HANDLE_NO") @Column(name = "HANDLE_NO")
@ApiParam("一次处理队列数") @ApiParam("一次处理数")
private Integer handleNo; private Integer handleNo;
@Column(name = "PATTERN_DESC") @Column(name = "PATTERN_DESC")

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("PCN节点") @Api("PCN节点")
public class MesPcn extends BaseBean implements Serializable { public class MesPcn extends BaseBean implements Serializable {
private static final long serialVersionUID = -9150091413555406397L; private static final long serialVersionUID = -9150091413555406397L;
@Column(name = "PCN_CODE") @Column(name = "PCN_CODE")
@ApiParam("PCN代码") @ApiParam("PCN代码")
private String pcnCode; private String pcnCode;

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("PCN节点连接日志") @Api("PCN节点连接日志")
public class MesPcnConnectLog extends BaseBean implements Serializable { public class MesPcnConnectLog extends BaseBean implements Serializable {
private static final long serialVersionUID = 2756240593256441951L; private static final long serialVersionUID = 2756240593256441951L;
@Column(name = "PCN_CODE") @Column(name = "PCN_CODE")
@ApiParam("PCN代码") @ApiParam("PCN代码")
private String pcnCode; private String pcnCode;

@ -30,7 +30,6 @@ import java.io.Serializable;
@Table(name = "MES_PCN_SYNC_CFG") @Table(name = "MES_PCN_SYNC_CFG")
@Api("MES_PCN_同步配置") @Api("MES_PCN_同步配置")
public class MesPcnSyncCfg extends BaseBean implements Serializable { public class MesPcnSyncCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 7270930330576127126L; private static final long serialVersionUID = 7270930330576127126L;
@Column(name = "PCN_CODE") @Column(name = "PCN_CODE")
@ -58,7 +57,7 @@ public class MesPcnSyncCfg extends BaseBean implements Serializable {
private String syncTime; private String syncTime;
@Column(name = "SYNC_PATTERN") @Column(name = "SYNC_PATTERN")
@ApiParam("同步方式 2、新增 1、修改") @ApiParam("同步方式 2.新增 1.修改")
private Integer syncPattern; private Integer syncPattern;
@Column(name = "SYNC_TYPE") @Column(name = "SYNC_TYPE")

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("MES_PCN同步异常日志") @Api("MES_PCN同步异常日志")
public class MesPcnSyncErrorLog extends BaseBean implements Serializable { public class MesPcnSyncErrorLog extends BaseBean implements Serializable {
private static final long serialVersionUID = -6031591772505958774L; private static final long serialVersionUID = -6031591772505958774L;
@Column(name = "PCN_CODE") @Column(name = "PCN_CODE")
@ApiParam("PCN代码") @ApiParam("PCN代码")
private String pcnCode; private String pcnCode;

@ -0,0 +1,72 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description : 线
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-09-01 11:02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PCN_SYS_USER_OFFLINE")
@Api(value = "账号离线登陆表", description = "账号离线登陆表。")
public class MesPcnSysUserOffline extends BaseBean implements Serializable {
private static final long serialVersionUID = 7617353154826718154L;
@Column(name = "USER_ID")
@ApiParam(value = "人员ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@Column(name = "USER_CODE")
@ApiParam(value = "用户编号", access = "用户编号")
private String userCode;
@Column(name = "USER_NAME")
@ApiParam(value = "用户名称", access = "账号名称")
private String userName;
@Column(name = "LOGIN_NAME")
@ApiParam(value = "登陆名称", access = "登陆名称")
private String loginName;
@Column(name="USER_TYPE")
@ApiParam(value ="账号类型(枚举,待定)" , example ="-1")
private Integer userType;
@Lob
@Column(name="LOGIN_INFO")
@ApiParam(value ="登陆信息" , access ="登陆信息")
private String loginInfo;
@Lob
@Column(name="MENU_LIST")
@ApiParam(value ="菜单" , access ="菜单")
private String menuList;
@Lob
@Column(name="MODULE_LIST")
@ApiParam(value ="模块" , access ="模块")
private String moduleList;
}

@ -29,8 +29,8 @@ import java.io.Serializable;
@Table(name = "MES_PCN_TASK") @Table(name = "MES_PCN_TASK")
@Api("mes-pcn定时任务工作清单") @Api("mes-pcn定时任务工作清单")
public class MesPcnTask extends BaseBean implements Serializable { public class MesPcnTask extends BaseBean implements Serializable {
private static final long serialVersionUID = 4129717677965409395L; private static final long serialVersionUID = 4129717677965409395L;
@Column(name = "TASK_CODE") @Column(name = "TASK_CODE")
@ApiParam("任务代码") @ApiParam("任务代码")
private String taskCode; private String taskCode;

@ -0,0 +1,53 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes-pcn
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-08-27
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PCN_TASK_LOG")
@Api("mes-pcn定时任务工作清单同步记录")
public class MesPcnTaskLog extends BaseBean implements Serializable {
private static final long serialVersionUID = -784806389462540310L;
@Column(name = "SYNC_TIME_START")
@ApiParam("同步数据开始时间")
private String syncTimeStart;
@Column(name = "SYNC_TIME_END")
@ApiParam("同步数据截止时间")
private String syncTimeEnd;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Column(name = "ERROR_CONTENT")
@ApiParam("异常内容")
private Long errorContent;
public int getSyncStatusVal() {
return this.syncStatus == null ? 0 : this.syncStatus;
}
}

@ -31,6 +31,7 @@ import java.io.Serializable;
@Api("生产主计划") @Api("生产主计划")
public class MesPlanOrder extends BaseBean implements Serializable { public class MesPlanOrder extends BaseBean implements Serializable {
private static final long serialVersionUID = 6773005820598583458L; private static final long serialVersionUID = 6773005820598583458L;
@Column(name = "ORDER_NO", nullable = false) @Column(name = "ORDER_NO", nullable = false)
@ApiParam("生产计划单号") @ApiParam("生产计划单号")
private String orderNo; private String orderNo;

@ -30,8 +30,8 @@ import java.io.Serializable;
@Table(name = "MES_PLC") @Table(name = "MES_PLC")
@Api("PLC配置表") @Api("PLC配置表")
public class MesPlc extends BaseBean implements Serializable { public class MesPlc extends BaseBean implements Serializable {
private static final long serialVersionUID = -7172265186837551268L; private static final long serialVersionUID = -7172265186837551268L;
@Column(name = "PLC_CODE") @Column(name = "PLC_CODE")
@ApiParam("PLC代码") @ApiParam("PLC代码")
private String plcCode; private String plcCode;

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("工序") @Api("工序")
public class MesProcess extends BaseBean implements Serializable { public class MesProcess extends BaseBean implements Serializable {
private static final long serialVersionUID = -615476712907856558L; private static final long serialVersionUID = -615476712907856558L;
@Column(name = "PROCESS_CODE") @Column(name = "PROCESS_CODE")
@ApiParam("工序代码") @ApiParam("工序代码")
private String processCode; private String processCode;

@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.*; import javax.persistence.*;
import java.io.Serializable; import java.io.Serializable;
@ -36,6 +35,7 @@ import java.io.Serializable;
@Api("产品绑定记录表") @Api("产品绑定记录表")
public class MesProdBindRecord extends BaseBean implements Serializable { public class MesProdBindRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -6984193022328810942L; private static final long serialVersionUID = -6984193022328810942L;
// 联合唯一索引必须加:, nullable = false // 联合唯一索引必须加:, nullable = false
@Column(name = "SERIAL_NUMBER", nullable = false) @Column(name = "SERIAL_NUMBER", nullable = false)
@ApiParam(value = "产品条码") @ApiParam(value = "产品条码")
@ -79,11 +79,11 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
private String supplierCode; private String supplierCode;
@Column(name = "LOT_NO") @Column(name = "LOT_NO")
@ApiParam @ApiParam("关联批次")
private String lotNo; private String lotNo;
@Column(name = "IS_FEED") @Column(name = "IS_FEED")
@ApiParam @ApiParam("是否投料配置")
private Integer isFeed; private Integer isFeed;
@Column(name = "VERSION") @Column(name = "VERSION")
@ -100,7 +100,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
@Column(name = "ACTION_TYPE") @Column(name = "ACTION_TYPE")
@ApiParam(value = "动作类型") @ApiParam(value = "动作类型")
private String actionType; private Integer actionType;
@ApiParam(value = "是否绑定关键件名称") @ApiParam(value = "是否绑定关键件名称")
private String isBindKeyName; private String isBindKeyName;

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("产品配置") @Api("产品配置")
public class MesProdCfg extends BaseBean implements Serializable { public class MesProdCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -1301835558902463754L; private static final long serialVersionUID = -1301835558902463754L;
@Column(name = "PROD_CFG_CODE") @Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码") @ApiParam("产品配置代码")
private String prodCfgCode; private String prodCfgCode;

@ -31,6 +31,7 @@ import java.io.Serializable;
@Api("产品配置明细") @Api("产品配置明细")
public class MesProdCfgDetail extends BaseBean implements Serializable { public class MesProdCfgDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = -5678006170645940563L; private static final long serialVersionUID = -5678006170645940563L;
@Column(name = "PROD_CFG_CODE") @Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码") @ApiParam("产品配置代码")
private String prodCfgCode; private String prodCfgCode;

@ -27,8 +27,8 @@ import java.io.Serializable;
@Table(name = "MES_PROD_PACK") @Table(name = "MES_PROD_PACK")
@Api("产品包装关系") @Api("产品包装关系")
public class MesProdPack extends BaseBean implements Serializable { public class MesProdPack extends BaseBean implements Serializable {
private static final long serialVersionUID = -5748484568201154400L; private static final long serialVersionUID = -5748484568201154400L;
@Column(name = "PART_NO") @Column(name = "PART_NO")
@ApiParam("物料号") @ApiParam("物料号")
private String partNo; private String partNo;

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("产品类流程配置表") @Api("产品类流程配置表")
public class MesProdRouteCfg extends BaseBean implements Serializable { public class MesProdRouteCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -3903152693262813917L; private static final long serialVersionUID = -3903152693262813917L;
@Column(name = "PART_NO") @Column(name = "PART_NO")
@ApiParam("物料号") @ApiParam("物料号")
private String partNo; private String partNo;

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_PRODUCE_CATEGORY") @Table(name = "MES_PRODUCE_CATEGORY")
@Api("系统业务动作") @Api("系统业务动作")
public class MesProduceCategory extends BaseBean implements Serializable { public class MesProduceCategory extends BaseBean implements Serializable {
private static final long serialVersionUID = -992595557921651448L; private static final long serialVersionUID = -992595557921651448L;
@Column(name = "PRODUCE_CTGY_CODE") @Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型代码") @ApiParam("产品类型代码")
private String produceCategoryCode; private String produceCategoryCode;

@ -29,8 +29,8 @@ import java.io.Serializable;
@Table(name = "MES_PRODUCE_CTGY_PICTURE") @Table(name = "MES_PRODUCE_CTGY_PICTURE")
@Api("产品类型图片表") @Api("产品类型图片表")
public class MesProduceCtgyPicture extends BaseBean implements Serializable { public class MesProduceCtgyPicture extends BaseBean implements Serializable {
private static final long serialVersionUID = 4199856772441042802L; private static final long serialVersionUID = 4199856772441042802L;
@Column(name = "PRODUCE_CTGY_CODE") @Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型代码") @ApiParam("产品类型代码")
private String produceCtgyCode; private String produceCtgyCode;
@ -43,7 +43,21 @@ public class MesProduceCtgyPicture extends BaseBean implements Serializable {
@ApiParam("文件id") @ApiParam("文件id")
private Long fileId; private Long fileId;
@Column(name = "PICTURE_URL")
@ApiParam("图片URL")
private String pictureUrl;
@Transient @Transient
@ApiParam("文件原名称") @ApiParam("文件原名称")
private String fileOriginName; private String fileOriginName;
@Transient
@ApiParam("文件名称")
private String fileName;
@Transient
@ApiParam("文件URL")
private String fileUrl;
} }

@ -33,8 +33,8 @@ import java.math.BigDecimal;
}) })
@Api("产品条码表") @Api("产品条码表")
public class MesProduceSn extends BaseBean implements Serializable { public class MesProduceSn extends BaseBean implements Serializable {
private static final long serialVersionUID = -1630924042562178494L; private static final long serialVersionUID = -1630924042562178494L;
@Column(name = "SERIAL_NUMBER", nullable = false) @Column(name = "SERIAL_NUMBER", nullable = false)
@ApiParam("过程条码") @ApiParam("过程条码")
private String serialNumber; private String serialNumber;
@ -72,11 +72,11 @@ public class MesProduceSn extends BaseBean implements Serializable {
private Integer printStatus; private Integer printStatus;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码") @ApiParam("生产线")
private String workCenterCode; private String workCenterCode;
@Column(name = "WORK_CELL_CODE") @Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码") @ApiParam("工")
private String workCellCode; private String workCellCode;
@Column(name = "ROUTE_CODE") @Column(name = "ROUTE_CODE")
@ -120,7 +120,7 @@ public class MesProduceSn extends BaseBean implements Serializable {
private String custCode; private String custCode;
@Column(name = "SN_TYPE") @Column(name = "SN_TYPE")
@ApiParam("条码类型") @ApiParam("条码类型 10=正常 20=首检件")
private Integer snType; private Integer snType;
@Column(name = "TRAY_NO") @Column(name = "TRAY_NO")

@ -33,6 +33,7 @@ import java.io.Serializable;
@Api("产品条码履历表") @Api("产品条码履历表")
public class MesProduceSnTravel extends BaseBean implements Serializable { public class MesProduceSnTravel extends BaseBean implements Serializable {
private static final long serialVersionUID = -1807953720033107108L; private static final long serialVersionUID = -1807953720033107108L;
@Column(name = "SERIAL_NUMBER") @Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码") @ApiParam("过程条码")
private String serialNumber; private String serialNumber;

@ -29,8 +29,8 @@ import java.io.Serializable;
@Table(name = "MES_PRODUCT_ENCODE_CFG") @Table(name = "MES_PRODUCT_ENCODE_CFG")
@Api("产品编码配置") @Api("产品编码配置")
public class MesProductEncodeCfg extends BaseBean implements Serializable { public class MesProductEncodeCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 5608141802461306170L; private static final long serialVersionUID = 5608141802461306170L;
@Column(name = "CODE_TYPE") @Column(name = "CODE_TYPE")
@ApiParam("编码类型") @ApiParam("编码类型")
private Integer codeType; private Integer codeType;

@ -31,8 +31,8 @@ import java.util.List;
}) })
@Api("质量过程检测数据") @Api("质量过程检测数据")
public class MesQcCheckData extends BaseBean implements Serializable { public class MesQcCheckData extends BaseBean implements Serializable {
private static final long serialVersionUID = -8044433561607606170L; private static final long serialVersionUID = -8044433561607606170L;
@Column(name = "CHECK_ID") @Column(name = "CHECK_ID")
@ApiParam("检测id") @ApiParam("检测id")
private String checkId; private String checkId;
@ -116,4 +116,12 @@ public class MesQcCheckData extends BaseBean implements Serializable {
@Transient @Transient
@ApiParam("工作单元名称") @ApiParam("工作单元名称")
private String workCellName; private String workCellName;
@Transient
@ApiParam("产品条码")
private String serialNumber;
@Transient
@ApiParam("过程质量检测数据")
private List<MesQcCheckStandard> mesQcCheckStandardList;
} }

@ -13,6 +13,7 @@ import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient; import javax.persistence.Transient;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
* @Description: * @Description:
@ -29,8 +30,8 @@ import java.io.Serializable;
@Table(name = "MES_QC_CHECK_STANDARD") @Table(name = "MES_QC_CHECK_STANDARD")
@Api("质量检测标准") @Api("质量检测标准")
public class MesQcCheckStandard extends BaseBean implements Serializable { public class MesQcCheckStandard extends BaseBean implements Serializable {
private static final long serialVersionUID = 3977375527789854590L; private static final long serialVersionUID = 3977375527789854590L;
@Column(name = "PART_NO") @Column(name = "PART_NO")
@ApiParam("物料编码") @ApiParam("物料编码")
private String partNo; private String partNo;
@ -63,6 +64,18 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
@ApiParam("频率") @ApiParam("频率")
private String checkFrequency; private String checkFrequency;
@Transient
@ApiParam("物料名称")
private String partName;
@Transient
@ApiParam("检测结果")
private String checkResult;
@Transient
@ApiParam("检测值")
private String checkValue;
@Column(name = "CHECK_ITEM_TYPE") @Column(name = "CHECK_ITEM_TYPE")
@ApiParam("检测项类型") @ApiParam("检测项类型")
private String checkItemType; private String checkItemType;
@ -71,4 +84,29 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
@ApiParam("检测类型名称") @ApiParam("检测类型名称")
private String checkTypeName; private String checkTypeName;
@Transient
@ApiParam("检测项类型名称")
private String checkItemTypeName;
@Transient
private List<MesQcCheckStandard> childQcList;
public MesQcCheckStandard() {
}
public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard
, String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) {
this.id = id;
this.partNo = partNo;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.checkType = checkType;
this.checkItem = checkItem;
this.checkStandard = checkStandard;
this.checkGuide = checkGuide;
this.checkFrequency = checkFrequency;
this.partName = partName;
this.checkItemType = checkItemType;
this.checkItemTypeName = checkItemTypeName;
}
} }

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable; import java.io.Serializable;
/** /**
@ -29,8 +30,8 @@ import java.io.Serializable;
@Table(name = "MES_QUEUE_JIS") @Table(name = "MES_QUEUE_JIS")
@Api("JIS发运队列") @Api("JIS发运队列")
public class MesQueueJis extends BaseBean implements Serializable { public class MesQueueJis extends BaseBean implements Serializable {
private static final long serialVersionUID = -2712958514118946868L; private static final long serialVersionUID = -2712958514118946868L;
@Column(name = "JIS_NO") @Column(name = "JIS_NO")
@ApiParam("主队列编号") @ApiParam("主队列编号")
private String jisNo; private String jisNo;
@ -63,4 +64,8 @@ public class MesQueueJis extends BaseBean implements Serializable {
@ApiParam("工作单元代码") @ApiParam("工作单元代码")
private String workCellCode; private String workCellCode;
@Transient
@ApiParam("颜色")
private String color;
} }

@ -29,8 +29,8 @@ import java.io.Serializable;
@Table(name = "MES_QUEUE_JIS_DETAIL") @Table(name = "MES_QUEUE_JIS_DETAIL")
@Api("JIS发运队列明细") @Api("JIS发运队列明细")
public class MesQueueJisDetail extends BaseBean implements Serializable { public class MesQueueJisDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = -3242843412307565585L; private static final long serialVersionUID = -3242843412307565585L;
@Column(name = "JIS_NO") @Column(name = "JIS_NO")
@ApiParam("主队列编号") @ApiParam("主队列编号")
private String jisNo; private String jisNo;
@ -52,7 +52,7 @@ public class MesQueueJisDetail extends BaseBean implements Serializable {
private Integer status; private Integer status;
@Column(name = "FINAL_STATUS") @Column(name = "FINAL_STATUS")
@ApiParam("发运整体状态") @ApiParam("明细整体状态")
private Integer finalStatus; private Integer finalStatus;
@Column(name = "SERIAL_NUMBER") @Column(name = "SERIAL_NUMBER")

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.mes.bean; package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.Data; import lombok.Data;
@ -11,9 +10,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*; import javax.persistence.*;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/** /**
* @Description: * @Description:
@ -35,6 +31,7 @@ import java.util.List;
@Api("生产队列主表") @Api("生产队列主表")
public class MesQueueOrder extends BaseBean implements Serializable { public class MesQueueOrder extends BaseBean implements Serializable {
private static final long serialVersionUID = -7459452106180601417L; private static final long serialVersionUID = -7459452106180601417L;
@Column(name = "ORDER_NO", nullable = false) @Column(name = "ORDER_NO", nullable = false)
@ApiParam("主队列编号") @ApiParam("主队列编号")
private String orderNo; private String orderNo;

@ -31,6 +31,7 @@ import java.io.Serializable;
@Api("生产队列明细") @Api("生产队列明细")
public class MesQueueOrderDetail extends BaseBean implements Serializable { public class MesQueueOrderDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = 7840873844253353896L; private static final long serialVersionUID = 7840873844253353896L;
@Column(name = "ORDER_NO", nullable = false) @Column(name = "ORDER_NO", nullable = false)
@ApiParam("主队列编号") @ApiParam("主队列编号")
private String orderNo; private String orderNo;
@ -61,7 +62,7 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
@Column(name = "WORK_TYPE") @Column(name = "WORK_TYPE")
@ApiParam("生产类型") @ApiParam("生产类型")
private String workOrderType; private String workType;
@Column(name = "PRODUCE_CATEGORY_CODE") @Column(name = "PRODUCE_CATEGORY_CODE")
@ApiParam("产品类型代码") @ApiParam("产品类型代码")
@ -90,4 +91,13 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
public int getStatusVal() { public int getStatusVal() {
return this.status == null ? 0 : this.status; return this.status == null ? 0 : this.status;
} }
public MesQueueOrderDetail() {
}
public MesQueueOrderDetail(Double queueSeq, Double seq, String serialNumber) {
this.queueSeq = queueSeq;
this.seq = seq;
this.serialNumber = serialNumber;
}
} }

@ -31,6 +31,7 @@ import java.io.Serializable;
@Api("原材料信息") @Api("原材料信息")
public class MesRawPartSn extends BaseBean implements Serializable { public class MesRawPartSn extends BaseBean implements Serializable {
private static final long serialVersionUID = 1590983555938105569L; private static final long serialVersionUID = 1590983555938105569L;
@Column(name = "PART_NO") @Column(name = "PART_NO")
@ApiParam("物料号") @ApiParam("物料号")
private String partNo; private String partNo;

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("维修") @Api("维修")
public class MesRepair extends BaseBean implements Serializable { public class MesRepair extends BaseBean implements Serializable {
private static final long serialVersionUID = 5304257976947321917L; private static final long serialVersionUID = 5304257976947321917L;
@Column(name = "REPAIR_CODE") @Column(name = "REPAIR_CODE")
@ApiParam("维修代码") @ApiParam("维修代码")
private String repairCode; private String repairCode;

@ -8,11 +8,9 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
* @Description: * @Description:
@ -33,8 +31,8 @@ import java.io.Serializable;
}) })
@Api("维修信息记录表") @Api("维修信息记录表")
public class MesRepairRecord extends BaseBean implements Serializable { public class MesRepairRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -1758374702271940323L; private static final long serialVersionUID = -1758374702271940323L;
@Column(name = "SERIAL_NUMBER") @Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码") @ApiParam("产品条码")
private String serialNumber; private String serialNumber;
@ -90,4 +88,16 @@ public class MesRepairRecord extends BaseBean implements Serializable {
@Column(name = "MEMO") @Column(name = "MEMO")
@ApiParam("备注") @ApiParam("备注")
private String memo; private String memo;
@Transient
@ApiParam("备注")
private String spareMemo;
@Transient
@ApiParam("不良记录id")
private Long defectRecordId;
@Transient
@ApiParam("缺陷集合")
private List<MesDefect> mesDefectList;
} }

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("流程表") @Api("流程表")
public class MesRoute extends BaseBean implements Serializable { public class MesRoute extends BaseBean implements Serializable {
private static final long serialVersionUID = -3616935751787295145L; private static final long serialVersionUID = -3616935751787295145L;
@Column(name = "ROUTE_CODE") @Column(name = "ROUTE_CODE")
@ApiParam("流程代码") @ApiParam("流程代码")
private String routeCode; private String routeCode;

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("流程工序关系") @Api("流程工序关系")
public class MesRouteProcess extends BaseBean implements Serializable { public class MesRouteProcess extends BaseBean implements Serializable {
private static final long serialVersionUID = -1248219638779313299L; private static final long serialVersionUID = -1248219638779313299L;
@Column(name = "ROUTE_CODE") @Column(name = "ROUTE_CODE")
@ApiParam("流程代码") @ApiParam("流程代码")
private String routeCode; private String routeCode;

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("工序工作单元对照") @Api("工序工作单元对照")
public class MesRouteProcessCell extends BaseBean implements Serializable { public class MesRouteProcessCell extends BaseBean implements Serializable {
private static final long serialVersionUID = 4823057491756814599L; private static final long serialVersionUID = 4823057491756814599L;
@Column(name = "ROUTE_CODE") @Column(name = "ROUTE_CODE")
@ApiParam("流程代码") @ApiParam("流程代码")
private String routeCode; private String routeCode;

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("报废原因") @Api("报废原因")
public class MesScrap extends BaseBean implements Serializable { public class MesScrap extends BaseBean implements Serializable {
private static final long serialVersionUID = 2850681183524213132L; private static final long serialVersionUID = 2850681183524213132L;
@Column(name = "SCRAP_CODE") @Column(name = "SCRAP_CODE")
@ApiParam("报废代码") @ApiParam("报废代码")
private String scrapCode; private String scrapCode;

@ -31,8 +31,8 @@ import java.io.Serializable;
}) })
@Api("报废信息记录表") @Api("报废信息记录表")
public class MesScrapRecord extends BaseBean implements Serializable { public class MesScrapRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -5451178133547076360L; private static final long serialVersionUID = -5451178133547076360L;
@Column(name = "SERIAL_NUMBER") @Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码") @ApiParam("产品条码")
private String serialNumber; private String serialNumber;
@ -51,7 +51,7 @@ public class MesScrapRecord extends BaseBean implements Serializable {
@Column(name = "SCRAP_CODE") @Column(name = "SCRAP_CODE")
@ApiParam("报废代码") @ApiParam("报废代码")
private String repairCode; private String scrapCode;
@Column(name = "SCRAP_NAME") @Column(name = "SCRAP_NAME")
@ApiParam("报废名称") @ApiParam("报废名称")

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("班次信息") @Api("班次信息")
public class MesShift extends BaseBean implements Serializable { public class MesShift extends BaseBean implements Serializable {
private static final long serialVersionUID = 4001070186534674096L; private static final long serialVersionUID = 4001070186534674096L;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码") @ApiParam("工作中心代码")
private String workCenterCode; private String workCenterCode;

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("班组") @Api("班组")
public class MesShiftGroup extends BaseBean implements Serializable { public class MesShiftGroup extends BaseBean implements Serializable {
private static final long serialVersionUID = 3409573116624543569L; private static final long serialVersionUID = 3409573116624543569L;
@Column(name = "GROUP_CODE") @Column(name = "GROUP_CODE")
@ApiParam("班组代码") @ApiParam("班组代码")
private String groupCode; private String groupCode;

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("班次休息信息") @Api("班次休息信息")
public class MesShiftRest extends BaseBean implements Serializable { public class MesShiftRest extends BaseBean implements Serializable {
private static final long serialVersionUID = 5486276486536860088L; private static final long serialVersionUID = 5486276486536860088L;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码") @ApiParam("工作中心代码")
private String workCenterCode; private String workCenterCode;

@ -32,6 +32,7 @@ import java.io.Serializable;
@Api("工位物料清单") @Api("工位物料清单")
public class MesStationBom extends BaseBean implements Serializable { public class MesStationBom extends BaseBean implements Serializable {
private static final long serialVersionUID = 1817387724628691734L; private static final long serialVersionUID = 1817387724628691734L;
@Column(name = "PART_NO") @Column(name = "PART_NO")
@ApiParam("零件号") @ApiParam("零件号")
private String partNo; private String partNo;
@ -69,7 +70,6 @@ public class MesStationBom extends BaseBean implements Serializable {
@ApiParam(value = "是否检查") @ApiParam(value = "是否检查")
private Integer isCheck; private Integer isCheck;
@Column(name = "IS_FEED") @Column(name = "IS_FEED")
@ApiParam(value = "是否投料配置") @ApiParam(value = "是否投料配置")
private Integer isFeed; private Integer isFeed;
@ -91,6 +91,14 @@ public class MesStationBom extends BaseBean implements Serializable {
private Double boundQty; private Double boundQty;
@Transient @Transient
@ApiParam("关键件代码")
private String keyBarCode;
@Transient
@ApiParam("产品条码")
private String serialNumber;
@Transient
@ApiParam(value = "是否可重复名称") @ApiParam(value = "是否可重复名称")
private String isRepeatName; private String isRepeatName;
@ -126,6 +134,10 @@ public class MesStationBom extends BaseBean implements Serializable {
return this.isBind == null ? false : this.isBind; return this.isBind == null ? false : this.isBind;
} }
public double getBoundQtyVal() {
return this.boundQty == null ? 0.0d : this.boundQty;
}
@Override @Override
public String toString() { public String toString() {
return "MesStationBom{" + return "MesStationBom{" +

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable; import java.io.Serializable;
/** /**
@ -29,6 +30,7 @@ import java.io.Serializable;
@Api("工步") @Api("工步")
public class MesStep extends BaseBean implements Serializable { public class MesStep extends BaseBean implements Serializable {
private static final long serialVersionUID = -1106608189453496947L; private static final long serialVersionUID = -1106608189453496947L;
@Column(name = "STEP_CODE") @Column(name = "STEP_CODE")
@ApiParam("工步代码") @ApiParam("工步代码")
private String stepCode; private String stepCode;
@ -48,4 +50,54 @@ public class MesStep extends BaseBean implements Serializable {
@Column(name = "STEP_OBJECT") @Column(name = "STEP_OBJECT")
@ApiParam("工步对象") @ApiParam("工步对象")
private String stepObject; private String stepObject;
/**
* 使
*/
@Transient
@ApiParam("流程代码")
private String routeCode;
/**
* 使
*/
@Transient
@ApiParam("工序代码")
private String processCode;
/**
* 使
*/
@Transient
@ApiParam("工步顺序")
private Integer stepSeq;
/**
* 使
*/
@Transient
@ApiParam("工步执行完毕")
private boolean isComplete;
/**
* 使
*/
@Transient
@ApiParam("工步是否跳过")
private boolean isJump;
public MesStep() {
}
public MesStep(String stepCode, String stepName, String stepText, String stepType, String stepObject,
String routeCode, String processCode, Integer stepSeq) {
this.stepCode = stepCode;
this.stepName = stepName;
this.stepText = stepText;
this.stepType = stepType;
this.stepObject = stepObject;
this.routeCode = routeCode;
this.processCode = processCode;
this.stepSeq = stepSeq;
}
} }

@ -29,6 +29,7 @@ import java.io.Serializable;
@Api("工步参数") @Api("工步参数")
public class MesStepParam extends BaseBean implements Serializable { public class MesStepParam extends BaseBean implements Serializable {
private static final long serialVersionUID = 6709455994477993263L; private static final long serialVersionUID = 6709455994477993263L;
@Column(name = "STEP_CODE") @Column(name = "STEP_CODE")
@ApiParam("工步代码") @ApiParam("工步代码")
private String stepCode; private String stepCode;
@ -44,8 +45,8 @@ public class MesStepParam extends BaseBean implements Serializable {
@Column(name = "PARAM_NAME") @Column(name = "PARAM_NAME")
@ApiParam("参数名称") @ApiParam("参数名称")
private String paramName; private String paramName;
//text select
@Column(name = "PARAM_ATTRIBUTE") @Column(name = "PARAM_ATTRIBUTE")
@ApiParam("参数属性") @ApiParam("参数属性 text select")
private String paramAttribute; private String paramAttribute;
} }

@ -0,0 +1,40 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_TIME")
@Api("工步参数")
public class MesTime extends BaseBean implements Serializable {
private static final long serialVersionUID = 1562011791394529076L;
@Column(name = "MODULE")
@ApiParam("组件")
private String module;
@Column(name = "ELAPSE")
@ApiParam("耗时")
private Long elapse;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
}

@ -0,0 +1,97 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : Crish
* @CreateDate : 2019-05-17
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_TORQUE_DETAIL")
@Api("扭矩信息记录表")
public class MesTorqueDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = 2900363253333046861L;
@Column(name = "SN")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "UPPER_LIMIT")
@ApiParam("最大值")
private Double upperLimit;
@Column(name = "LOWER_LIMIT")
@ApiParam("最小值")
private Double lowerLimit;
@Column(name = "TORQUE_DETAIL_VALUE")
@ApiParam("扭矩值")
private Double torqueValue;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name = "ok")
@ApiParam("扭矩是否合格")
private String ok;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "p_set")
@ApiParam("螺丝枪PSET设置值")
private String deviceSetValue;
@Column(name = "MAXANGLE")
@ApiParam("最大扭矩")
private String maxAngle;
@Column(name = "MINANGLE")
@ApiParam("最小扭矩")
private String minAngel;
@Column(name = "FINALANGLE")
@ApiParam("最终扭矩")
private Integer finalAngle;
@Column(name = "WORK_ORDER_NO")
@ApiParam("工单号")
private String workOrderNo;
@Column(name = "KEY_DATA_CODE")
@ApiParam("关键数据代码")
private String keyDataCode;
@Column(name = "RESULT_MSG")
@ApiParam("扭矩判定结果")
private String resultMsg;
}

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_TYPE_CFG") @Table(name = "MES_TYPE_CFG")
@Api("类型信息表") @Api("类型信息表")
public class MesTypeCfg extends BaseBean implements Serializable { public class MesTypeCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 7666533200631763797L; private static final long serialVersionUID = 7666533200631763797L;
@Column(name = "TYPE_CODE") @Column(name = "TYPE_CODE")
@ApiParam("类型代码") @ApiParam("类型代码")
private String typeCode; private String typeCode;

@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_WC_CHECK") @Table(name = "MES_WC_CHECK")
@Api("开线检查") @Api("开线检查")
public class MesWcCheck extends BaseBean implements Serializable { public class MesWcCheck extends BaseBean implements Serializable {
private static final long serialVersionUID = 7937744978114334701L; private static final long serialVersionUID = 7937744978114334701L;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心") @ApiParam("工作中心")
private String workCenterCode; private String workCenterCode;

@ -30,8 +30,8 @@ import java.io.Serializable;
}) })
@Api("开线检查记录") @Api("开线检查记录")
public class MesWcCheckRecord extends BaseBean implements Serializable { public class MesWcCheckRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 6919654845394560128L; private static final long serialVersionUID = 6919654845394560128L;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心") @ApiParam("工作中心")
private String workCenterCode; private String workCenterCode;
@ -77,7 +77,7 @@ public class MesWcCheckRecord extends BaseBean implements Serializable {
private String groupCode; private String groupCode;
@Column(name = "OVERALL_RESULT") @Column(name = "OVERALL_RESULT")
@ApiParam @ApiParam("总体结果")
private Integer overAllResult; private Integer overAllResult;
} }

@ -27,8 +27,8 @@ import java.io.Serializable;
@Table(name = "MES_WC_EQUIPMENT") @Table(name = "MES_WC_EQUIPMENT")
@Api("工作单元设备关系表") @Api("工作单元设备关系表")
public class MesWcEquipment extends BaseBean implements Serializable { public class MesWcEquipment extends BaseBean implements Serializable {
private static final long serialVersionUID = 188390912605665500L; private static final long serialVersionUID = 188390912605665500L;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码") @ApiParam("工作中心代码")
private String workCenterCode; private String workCenterCode;

@ -33,6 +33,7 @@ import java.util.List;
@Api("工作单元") @Api("工作单元")
public class MesWorkCell extends BaseBean implements Serializable { public class MesWorkCell extends BaseBean implements Serializable {
private static final long serialVersionUID = 8552890090536989486L; private static final long serialVersionUID = 8552890090536989486L;
@Column(name = "WORK_CELL_CODE") @Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码") @ApiParam("工作单元代码")
private String workCellCode; private String workCellCode;

@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import java.io.Serializable; import java.io.Serializable;
/** /**
@ -30,8 +27,8 @@ import java.io.Serializable;
}) })
@Api("工位监控异常信息") @Api("工位监控异常信息")
public class MesWorkCellMonitorLog extends BaseBean implements Serializable { public class MesWorkCellMonitorLog extends BaseBean implements Serializable {
private static final long serialVersionUID = 1432794181428753903L; private static final long serialVersionUID = 1432794181428753903L;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心") @ApiParam("工作中心")
private String workCenterCode; private String workCenterCode;
@ -44,7 +41,7 @@ public class MesWorkCellMonitorLog extends BaseBean implements Serializable {
@ApiParam("物料号") @ApiParam("物料号")
private String partNo; private String partNo;
@Column(name = "workOrderNo") @Column(name = "WORK_ORDER_NO")
@ApiParam("工单") @ApiParam("工单")
private String workOrderNo; private String workOrderNo;
@ -60,6 +57,7 @@ public class MesWorkCellMonitorLog extends BaseBean implements Serializable {
@ApiParam("流程") @ApiParam("流程")
private String routeCOde; private String routeCOde;
@Lob
@Column(name = "MESSAGE") @Column(name = "MESSAGE")
@ApiParam("异常信息") @ApiParam("异常信息")
private String message; private String message;

@ -29,8 +29,8 @@ import java.io.Serializable;
@Table(name = "MES_WORK_CELL_PARAM") @Table(name = "MES_WORK_CELL_PARAM")
@Api("mes工作单元参数") @Api("mes工作单元参数")
public class MesWorkCellParam extends BaseBean implements Serializable { public class MesWorkCellParam extends BaseBean implements Serializable {
private static final long serialVersionUID = 1017369816822438021L; private static final long serialVersionUID = 1017369816822438021L;
@Column(name = "PARAM_CODE") @Column(name = "PARAM_CODE")
@ApiParam("参数代码") @ApiParam("参数代码")
private String paramCode; private String paramCode;

@ -30,6 +30,7 @@ import java.io.Serializable;
@Api("工作单元参数配置") @Api("工作单元参数配置")
public class MesWorkCellParamCfg extends BaseBean implements Serializable { public class MesWorkCellParamCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -8507576103087989740L; private static final long serialVersionUID = -8507576103087989740L;
@Column(name = "WORK_CELL_CODE") @Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码") @ApiParam("工作单元代码")
private String workCellCode; private String workCellCode;

@ -32,8 +32,8 @@ import java.util.List;
@Table(name = "MES_WORK_CELL_POINT") @Table(name = "MES_WORK_CELL_POINT")
@Api("工站队列") @Api("工站队列")
public class MesWorkCellPoint extends BaseBean implements Serializable { public class MesWorkCellPoint extends BaseBean implements Serializable {
private static final long serialVersionUID = -6817903235638554748L; private static final long serialVersionUID = -6817903235638554748L;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心") @ApiParam("工作中心")
private String workCenterCode; private String workCenterCode;

@ -33,6 +33,7 @@ import java.util.List;
@Api("工作中心") @Api("工作中心")
public class MesWorkCenter extends BaseBean implements Serializable { public class MesWorkCenter extends BaseBean implements Serializable {
private static final long serialVersionUID = 5583253625290231595L; private static final long serialVersionUID = 5583253625290231595L;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码") @ApiParam("工作中心代码")
private String workCenterCode; private String workCenterCode;

@ -24,14 +24,14 @@ import java.io.Serializable;
@DynamicInsert @DynamicInsert
@DynamicUpdate @DynamicUpdate
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_ORDER", indexes = { @Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")},
@Index(columnList = "ORDER_NO") uniqueConstraints = {
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"})
}) })
@Api("生产工单") @Api("生产工单")
public class MesWorkOrder extends BaseBean implements Serializable { public class MesWorkOrder extends BaseBean implements Serializable {
private static final long serialVersionUID = -3566003375267865064L; private static final long serialVersionUID = -3566003375267865064L;
@Column(name = "ORDER_NO", nullable = false) @Column(name = "ORDER_NO", nullable = false)
@ApiParam("工单号") @ApiParam("工单号")
private String orderNo; private String orderNo;
@ -215,6 +215,9 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam(value = "下达按钮编号") @ApiParam(value = "下达按钮编号")
public String buttonCode; public String buttonCode;
@Transient
@ApiParam("批量打包开窗页面查询工单=1")
private String pageType;
public double getQtyVal() { public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty; return this.qty == null ? 0.0d : this.qty;

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

Loading…
Cancel
Save