Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
汪云昊
5 years ago
commit
e416b032c2
@ -0,0 +1,72 @@
|
||||
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 : siliter.yuan
|
||||
* @CreateDate : 2020-06-03 15:38
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_AGV_STOP_RECORD")
|
||||
@Api("MES_停机记录表")
|
||||
public class MesAgvStopRecord extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = -8961182851767690154L;
|
||||
@Column(name = "STOP_TYPE")
|
||||
@ApiParam("停机类型")
|
||||
private Integer stopType;
|
||||
|
||||
@Column(name = "PRODUCT_SN")
|
||||
@ApiParam("产品条码")
|
||||
private String productSn;
|
||||
|
||||
@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 = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "STOP_START_TIME")
|
||||
@ApiParam("停机开始时间")
|
||||
private String stopStartTime;
|
||||
|
||||
@Column(name = "STOP_END_TIME")
|
||||
@ApiParam("停机结束时间")
|
||||
private String stopEndTime;
|
||||
|
||||
@Column(name = "STOP_REASON")
|
||||
@ApiParam("停机原因")
|
||||
private String stopReason;
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class DefectTypeModel<T> implements Serializable {
|
||||
|
||||
// 缺陷/维修
|
||||
@ApiParam("业务类型")
|
||||
private String busiType;
|
||||
|
||||
@ApiParam("List结果集")
|
||||
private List<T> resultList;
|
||||
|
||||
}
|
||||
@ -0,0 +1,56 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class RepairAndDefectModel implements Serializable {
|
||||
|
||||
@ApiParam("产品条码")
|
||||
private String serialNumber;
|
||||
|
||||
@ApiParam("生产工单号")
|
||||
private String workOrderNo;
|
||||
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("物料名称")
|
||||
private String partName;
|
||||
|
||||
@ApiParam("缺陷代码")
|
||||
private String defectCode;
|
||||
|
||||
@ApiParam("缺陷名称")
|
||||
private String defectName;
|
||||
|
||||
@ApiParam("缺陷位置")
|
||||
private String defectLocation;
|
||||
|
||||
@ApiParam("面位")
|
||||
private String sideLocation;
|
||||
|
||||
@ApiParam("维修状态")
|
||||
private Integer repairStatus;
|
||||
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@ApiParam("维修代码")
|
||||
private String repairCode;
|
||||
|
||||
@ApiParam("维修名称")
|
||||
private String repairName;
|
||||
|
||||
@ApiParam("缺陷原因代码")
|
||||
private String dcCode;
|
||||
|
||||
@ApiParam("缺陷原因描述")
|
||||
private String dcName;
|
||||
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class ScatterBomModel implements Serializable {
|
||||
|
||||
@ApiParam("产线")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("工位")
|
||||
private String workCellCode;
|
||||
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("物料名称")
|
||||
private String partName;
|
||||
|
||||
@ApiParam("个数")
|
||||
private Double qty;
|
||||
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProduceCtgyPicture;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class SkinCheckModel implements Serializable {
|
||||
|
||||
@ApiParam("主队列编号")
|
||||
private String orderNo;
|
||||
|
||||
@ApiParam("产品条码")
|
||||
private String serialNumber;
|
||||
|
||||
@ApiParam("生产号")
|
||||
private String vinCode;
|
||||
|
||||
@ApiParam("产线")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("工位")
|
||||
private String workCellCode;
|
||||
|
||||
@ApiParam("车型")
|
||||
private String prodCfgTypeCode;
|
||||
|
||||
@ApiParam("等级")
|
||||
private String gradeCode;
|
||||
|
||||
@ApiParam("面位")
|
||||
private String sideLocation;
|
||||
|
||||
// 产品位置图片
|
||||
private List<MesProduceCtgyPicture> produceCtgyPictureList;
|
||||
|
||||
}
|
||||
@ -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.MesAgvStopRecord;
|
||||
|
||||
/**
|
||||
* @Description: 停机记录数据操作层
|
||||
* @Reference:
|
||||
* @Author: siliter.yuan
|
||||
* @CreateDate: 2020\06\03 10:34
|
||||
* @Modify:
|
||||
**/
|
||||
public interface MesAgvStopRecordRepository extends BaseRepository<MesAgvStopRecord, Long> {
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package cn.estsh.i3plus.pojo.model.common;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-5-29 下午3:40
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class ThreadModel implements Serializable {
|
||||
|
||||
@ApiParam(value ="自定义调用ID")
|
||||
private Long requestId;
|
||||
@ApiParam(value ="当前用户ID")
|
||||
private Long userId;
|
||||
@ApiParam(value ="当前用户名称")
|
||||
private String userName;
|
||||
@ApiParam(value ="用户登录IP")
|
||||
private String userHost;
|
||||
@ApiParam(value ="用户登录浏览器")
|
||||
private String userBrowser;
|
||||
@ApiParam(value ="用户登录操作系统")
|
||||
private String userOs;
|
||||
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
package cn.estsh.i3plus.pojo.model.mes;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description : Mes电检检测实体字段Model信息
|
||||
* @Reference :
|
||||
* @Author : siliter.yuan
|
||||
* @CreateDate : 2020-06-01 09:53
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
public class MesElectricDataModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -6376845639646546495L;
|
||||
|
||||
@ApiParam(value = "车型")
|
||||
public String carType;
|
||||
|
||||
@ApiParam(value = "颜色代码")
|
||||
public String colorCode;
|
||||
|
||||
@ApiParam(value = "日期时间")
|
||||
private String dateTime;
|
||||
|
||||
@ApiParam(value = "生产序号")
|
||||
private String productSeq;
|
||||
|
||||
@ApiParam(value = "车型信息")
|
||||
private String carTypeInfo;
|
||||
|
||||
@ApiParam(value = "生产模式")
|
||||
private String productModel;
|
||||
|
||||
@ApiParam(value = "产品生产号")
|
||||
private String productNumber;
|
||||
|
||||
@ApiParam(value = "备用")
|
||||
private String spare;
|
||||
|
||||
@ApiParam(value = "所有零件信息包括所有选配信息")
|
||||
private String other;
|
||||
|
||||
@ApiParam(value = "电检结果")
|
||||
private String electricResult;
|
||||
|
||||
@ApiParam(value = "文件名称")
|
||||
private String ftpFileName;
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package cn.estsh.i3plus.pojo.model.mes;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description : Mes电检检测补录数据实体字段Model信息
|
||||
* @Reference :
|
||||
* @Author : siliter.yuan
|
||||
* @CreateDate : 2020-06-02 09:53
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class MesElectricMarkUpDataModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -6376845779646546495L;
|
||||
|
||||
@ApiParam(value = "工作中心代码")
|
||||
public String workCenterCode;
|
||||
|
||||
@ApiParam(value = "工作单元代码")
|
||||
public String workCellCode;
|
||||
|
||||
@ApiParam(value = "过程条码")
|
||||
private String serialNumber;
|
||||
|
||||
@ApiParam(value = "产品生产号")
|
||||
private String productNumber;
|
||||
|
||||
@ApiParam(value = "电检结果")
|
||||
private String electricResult;
|
||||
|
||||
@ApiParam(value = "测试时间")
|
||||
private String testDateTime;
|
||||
|
||||
@ApiParam(value = "是否补录")
|
||||
private Integer isMarkUp;
|
||||
|
||||
@ApiParam(value = "补录时间")
|
||||
private String markUpDateTime;
|
||||
|
||||
@ApiParam(value = "开始时间")
|
||||
private String startDateTimeStr;
|
||||
|
||||
@ApiParam(value = "结束时间")
|
||||
private String endDateTimeStr;
|
||||
|
||||
public MesElectricMarkUpDataModel(String workCenterCode, String workCellCode, String serialNumber, String productNumber,
|
||||
String electricResult, String testDateTime, Integer isMarkUp, String markUpDateTime) {
|
||||
this.workCenterCode = workCenterCode;
|
||||
this.workCellCode = workCellCode;
|
||||
this.serialNumber = serialNumber;
|
||||
this.productNumber = productNumber;
|
||||
this.electricResult = electricResult;
|
||||
this.testDateTime = testDateTime;
|
||||
this.isMarkUp = isMarkUp;
|
||||
this.markUpDateTime = markUpDateTime;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,73 @@
|
||||
package cn.estsh.i3plus.pojo.model.wms;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jimmy.zeng
|
||||
* @CreateDate : 2020-06-02 9:27
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class WmsLocateModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 2433931236774158401L;
|
||||
|
||||
@ApiParam(value = "箱数")
|
||||
public Long snBoxQty;
|
||||
|
||||
@ApiParam(value = "最大包装数量")
|
||||
public Integer maxPackageQty;
|
||||
|
||||
@ApiParam(value = "库位利用率值")
|
||||
public Double proportionValue;
|
||||
|
||||
@ApiParam(value = "库位代码")
|
||||
public String locateNo;
|
||||
|
||||
@ApiParam(value = "库位名称")
|
||||
public String locateName;
|
||||
|
||||
@ApiParam(value = "存储区代码")
|
||||
public String zoneNo;
|
||||
|
||||
@ApiParam(value = "存储区名称")
|
||||
public String zoneName;
|
||||
|
||||
@ApiParam(value = "仓库代码")
|
||||
public String whNo;
|
||||
|
||||
@ApiParam(value = "仓库名称")
|
||||
public String whNoName;
|
||||
|
||||
@ApiParam(value = "组织代码")
|
||||
public String organizeCode;
|
||||
|
||||
@ApiParam(value = "库位利用率查询")
|
||||
public Integer proportion;
|
||||
|
||||
@ApiParam(value = "库位利用率")
|
||||
public String proportionValueStr;
|
||||
|
||||
public WmsLocateModel() {
|
||||
}
|
||||
|
||||
public WmsLocateModel(Long snBoxQty, Integer maxPackageQty, Double proportionValue,
|
||||
String locateNo, String locateName, String zoneNo,
|
||||
String zoneName, String whNo, String whNoName, String organizeCode) {
|
||||
this.snBoxQty = snBoxQty;
|
||||
this.maxPackageQty = maxPackageQty;
|
||||
this.proportionValue = proportionValue;
|
||||
this.locateNo = locateNo;
|
||||
this.locateName = locateName;
|
||||
this.zoneNo = zoneNo;
|
||||
this.zoneName = zoneName;
|
||||
this.whNo = whNo;
|
||||
this.whNoName = whNoName;
|
||||
this.organizeCode = organizeCode;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,45 @@
|
||||
package cn.estsh.i3plus.pojo.report.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-5-28 下午3:33
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="BR_CSS_STYLE")
|
||||
@Api(value="自定义样式")
|
||||
public class BrCssStyle extends BaseBean {
|
||||
|
||||
private static final long serialVersionUID = 8651392479116992679L;
|
||||
|
||||
@Column(name="STYLE_CODE")
|
||||
@ApiParam(value ="样式编码")
|
||||
private String styleCode;
|
||||
|
||||
@Column(name="STYLE_CONTENT")
|
||||
@ApiParam(value ="样式内容")
|
||||
private String styleContent;
|
||||
|
||||
@Column(name="STYLE_DESCRIPTION")
|
||||
@ApiParam(value ="样式描述")
|
||||
private String styleDescription;
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package cn.estsh.i3plus.pojo.report.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.report.bean.BrCssStyle;
|
||||
import cn.estsh.i3plus.pojo.report.bean.BrElement;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-5-28 下午3:39
|
||||
* @Modify:
|
||||
**/
|
||||
public interface BrCssStyleRepository extends BaseRepository<BrCssStyle,Long> {
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue