Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
andly.pan
4 years ago
commit
754124ff25
@ -0,0 +1,25 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 导入校验错误信息
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2021-02-25
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("导入校验错误信息")
|
||||
public class ImportErrorInfo {
|
||||
private List<String> headers = new ArrayList<>();
|
||||
private List<List<String>> errorData = new ArrayList<>(100);
|
||||
|
||||
public boolean hasErrorData() {
|
||||
return !errorData.isEmpty();
|
||||
}
|
||||
}
|
||||
@ -1,47 +0,0 @@
|
||||
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 javax.persistence.Inheritance;
|
||||
import javax.persistence.InheritanceType;
|
||||
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:
|
||||
* @CreateDate: 2020/10/13
|
||||
* @Author: simon.song
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Inheritance(strategy = InheritanceType.JOINED)
|
||||
@Table(name = "MES_BOARD_IMAGE")
|
||||
@Api("MES_看板图片")
|
||||
public class MesBoardImage extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -3511836584646450267L;
|
||||
|
||||
@Column(name = "BOARD_CODE")
|
||||
@ApiParam("看板代码")
|
||||
private String boardCode;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "IMAGE_URL")
|
||||
@ApiParam("图片路径")
|
||||
private String imageUrl;
|
||||
|
||||
}
|
||||
@ -0,0 +1,148 @@
|
||||
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.ColumnDefault;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.*;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-04-16-17:36
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Inheritance(strategy = InheritanceType.JOINED)
|
||||
@Table(name = "MES_QUEUE_ORDER_DETAIL_RECORD", indexes = {
|
||||
@Index(columnList = "ORDER_NO"),
|
||||
@Index(columnList = "SERIAL_NUMBER"),
|
||||
@Index(columnList = "QUEUE_GROUP_NO"),
|
||||
@Index(columnList = "PRODUCE_CATEGORY_CODE")
|
||||
})
|
||||
@Api("生产队列明细记录表")
|
||||
public class MesQueueOrderDetailRecord extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = 7840873844253353896L;
|
||||
|
||||
@Column(name = "ORDER_NO")
|
||||
@ApiParam("主队列编号")
|
||||
private String orderNo;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME_RDD")
|
||||
@ApiParam("物料名称")
|
||||
private String partNameRdd;
|
||||
|
||||
@Column(name = "SERIAL_NUMBER")
|
||||
@ApiParam("产品条码")
|
||||
private String serialNumber;
|
||||
|
||||
@Column(name = "SEQ", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam("队列明细序号")
|
||||
private Double seq;
|
||||
|
||||
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam("数量")
|
||||
private Double qty;
|
||||
|
||||
@Column(name = "STATUS")
|
||||
@ApiParam("状态")
|
||||
private Integer status;
|
||||
|
||||
@Column(name = "WORK_TYPE")
|
||||
@ApiParam("生产类型")
|
||||
private String workType;
|
||||
|
||||
@Column(name = "PRODUCE_CATEGORY_CODE")
|
||||
@ApiParam("产品位置")
|
||||
private String produceCategoryCode;
|
||||
|
||||
@Column(name = "PRODUCE_CATEGORY_NAME_RDD")
|
||||
@ApiParam("产品位置名称")
|
||||
private String produceCategoryNameRdd;
|
||||
|
||||
@Column(name = "PPT_CODE")
|
||||
@ApiParam("产品类型名称")
|
||||
private String pptCode;
|
||||
|
||||
@Column(name = "QUEUE_GROUP_NO")
|
||||
@ApiParam("分组队列编号")
|
||||
private String queueGroupNo;
|
||||
|
||||
@Column(name = "GROUP_NO")
|
||||
@ApiParam("组内编号")
|
||||
private Integer groupNo;
|
||||
|
||||
@Column(name = "IS_GROUP_PRINTED")
|
||||
@ApiParam("料架是否已打印")
|
||||
private Integer isGroupPrinted = 2;
|
||||
|
||||
@Column(name = "PRODUCE_COLOR")
|
||||
@ApiParam("产品颜色")
|
||||
private String produceColor;
|
||||
|
||||
@Column(name = "PRODUCE_COLOR_CODE")
|
||||
@ApiParam("产品颜色代码")
|
||||
private String produceColorCode;
|
||||
|
||||
@Column(name = "OPTION_CODE")
|
||||
@ApiParam("选项代码")
|
||||
private String optionCode;
|
||||
|
||||
@Column(name = "ASSY_NO")
|
||||
@ApiParam("组件编号")
|
||||
private String assyNo;
|
||||
|
||||
@Column(name = "FORMULA_CONTENT")
|
||||
@ApiParam("配方内容")
|
||||
private String formulaContent;
|
||||
|
||||
@Column(name = "FINSIH_QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam("已生产数量")
|
||||
private Double finsihQty;
|
||||
|
||||
@Column(name = "GROUP_SIDE")
|
||||
@ApiParam("料架摆放位置")
|
||||
private String groupSide;
|
||||
|
||||
@Column(name = "GROUP_SEQ")
|
||||
@ApiParam("分组序号")
|
||||
private String groupSeq;
|
||||
|
||||
@Column(name = "PRODUCT_SN")
|
||||
@ApiParam("产品条码")
|
||||
private String productSn;
|
||||
|
||||
@Column(name = "IS_EMPTY")
|
||||
@ApiParam("是否放空")
|
||||
private Integer isEmpty;
|
||||
|
||||
@Column(name = "JIS_BACKFLUSH_STATUS")
|
||||
@ApiParam("回冲标识")
|
||||
private String jisBackflushStatus;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心")
|
||||
private String workCenterCode;
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesBoardImage;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @CreateDate: 2020/10/13
|
||||
* @Author: simon.song
|
||||
*/
|
||||
@Repository
|
||||
public interface MesBoardImageRepository extends BaseRepository<MesBoardImage, Long> {
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderDetailRecord;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2021/2/26 10:18 AM
|
||||
* @Modify:
|
||||
*/
|
||||
public interface MesQueueOrderDetailRecordRepository extends BaseRepository<MesQueueOrderDetailRecord, Long> {
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
package cn.estsh.i3plus.pojo.model.platform;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2021/2/20 下午4:39
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Api("日志字段模型")
|
||||
public class LogFieldModel implements Serializable {
|
||||
private static final long serialVersionUID = 6303989757683476327L;
|
||||
|
||||
@ApiParam("日志时间")
|
||||
private String time;
|
||||
|
||||
@ApiParam("线程")
|
||||
private String thread;
|
||||
|
||||
@ApiParam("日志等级")
|
||||
private String level;
|
||||
|
||||
@ApiParam("执行堆栈")
|
||||
private String stack;
|
||||
|
||||
@ApiParam("日志信息")
|
||||
private String message;
|
||||
}
|
||||
@ -0,0 +1,57 @@
|
||||
package cn.estsh.i3plus.pojo.model.platform;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2021/2/20 下午12:55
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Api("系统日志模型")
|
||||
public class SysLogModel implements Serializable {
|
||||
private static final long serialVersionUID = -2982120258911167575L;
|
||||
|
||||
@ApiParam("查询日期")
|
||||
private String queryDate;
|
||||
|
||||
@ApiParam("查询开始时间")
|
||||
private String queryBeginTime;
|
||||
|
||||
@ApiParam("查询结束时间")
|
||||
private String queryEndTime;
|
||||
|
||||
@ApiParam("索引名称")
|
||||
private String indexName;
|
||||
|
||||
@ApiParam("索引类型")
|
||||
private Integer indexType;
|
||||
|
||||
@ApiParam("聚合时间")
|
||||
private Integer aggsDuration;
|
||||
|
||||
@ApiParam("日志等级")
|
||||
private Integer level;
|
||||
|
||||
@ApiParam("执行线程")
|
||||
private String thread;
|
||||
|
||||
@ApiParam("服务器环境变量HostId")
|
||||
private String hostId;
|
||||
|
||||
@ApiParam("日志信息")
|
||||
private List<LogFieldModel> logs;
|
||||
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue