Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
许心洁
6 years ago
commit
b5696a63f7
@ -0,0 +1,63 @@
|
||||
package cn.estsh.i3plus.pojo.andon.model;
|
||||
|
||||
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.Entity;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: yiming.gu
|
||||
* @CreateDate:2019-04-18-14:16
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("组织模型")
|
||||
public class ProdOrgModel extends BaseBean {
|
||||
|
||||
@ApiParam("区域名称")
|
||||
private String areaName;
|
||||
|
||||
@ApiParam("区域代码")
|
||||
private String areaCode;
|
||||
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("工作中心名称")
|
||||
private String workCenterName;
|
||||
|
||||
@ApiParam("ERP工作中心")
|
||||
private String erpWorkCenter;
|
||||
|
||||
@ApiParam("工作版本")
|
||||
private String workVer;
|
||||
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@ApiParam("工作单元名称")
|
||||
private String workCellName;
|
||||
|
||||
@ApiParam("设备代码")
|
||||
private String equipmentCode;
|
||||
|
||||
@ApiParam("设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
@ApiParam("设备状态")
|
||||
private String status;
|
||||
|
||||
@ApiParam("当前级")
|
||||
private Integer level;
|
||||
}
|
||||
@ -0,0 +1,93 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-04-16-17:36
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_KPSN_RULE")
|
||||
@Api("关键件条码校验规则")
|
||||
public class MesKpsnRule extends BaseBean {
|
||||
@Column(name="PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name="LENGTH")
|
||||
@ApiParam("长度")
|
||||
private Integer length;
|
||||
|
||||
@Column(name="FROM1")
|
||||
@ApiParam("起始1")
|
||||
private Integer from1;
|
||||
|
||||
@Column(name="TO1")
|
||||
@ApiParam("至1")
|
||||
private Integer to1;
|
||||
|
||||
@Column(name="FIX1")
|
||||
@ApiParam("内容1")
|
||||
private String fix1;
|
||||
|
||||
@Column(name="FROM2")
|
||||
@ApiParam("起始2")
|
||||
private Integer from2;
|
||||
|
||||
@Column(name="TO2")
|
||||
@ApiParam("至2")
|
||||
private Integer to2;
|
||||
|
||||
@Column(name="FIX2")
|
||||
@ApiParam("内容2")
|
||||
private String fix2;
|
||||
|
||||
@Column(name="TYPE")
|
||||
@ApiParam("类型")
|
||||
private String type;
|
||||
|
||||
@Column(name="BIND_RULE")
|
||||
@ApiParam("绑定规则")
|
||||
private Integer bandRule;
|
||||
|
||||
@Column(name="SUPPLIER_CODE")
|
||||
@ApiParam("供应商代码")
|
||||
private String supplierCode;
|
||||
|
||||
public int getLengthVal() {
|
||||
return this.length == null ? 0 : this.length;
|
||||
}
|
||||
|
||||
public int getFrom1Val() {
|
||||
return this.from1 == null ? 0 : this.from1;
|
||||
}
|
||||
|
||||
public int getTo1Val() {
|
||||
return this.to1 == null ? 0 : this.to1;
|
||||
}
|
||||
|
||||
public int getFrom2Val() {
|
||||
return this.from2 == null ? 0 : this.from2;
|
||||
}
|
||||
|
||||
public int getTo2Val() {
|
||||
return this.to2 == null ? 0 : this.to2;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,78 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.bean;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import javax.persistence.Transient;
|
||||
|
||||
/**
|
||||
* @Description :工序物料清单
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_PROCESS_BOM")
|
||||
@Api("工序物料清单")
|
||||
public class MesProcessBom extends BaseBean {
|
||||
@Column(name="PART_NO")
|
||||
@ApiParam("零件号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name="PROCESS_CODE")
|
||||
@ApiParam("工序代码")
|
||||
private String processCode;
|
||||
|
||||
@Column(name="ITEM_PART_NO")
|
||||
@ApiParam("子零件")
|
||||
private String itemPartNo;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "子零件数量", example = "0")
|
||||
private Double qty;
|
||||
|
||||
@Column(name = "IS_REPEAT")
|
||||
@ApiParam(value = "是否可重复")
|
||||
private Integer isRepeat;
|
||||
|
||||
@Column(name = "IS_CHECK")
|
||||
@ApiParam(value = "是否检查")
|
||||
private Integer isCheck;
|
||||
|
||||
@Transient
|
||||
@ApiParam("是否已绑定")
|
||||
private boolean isBind;
|
||||
|
||||
@Transient
|
||||
@ApiParam("显示颜色")
|
||||
private String color;
|
||||
|
||||
|
||||
public double getQtyVal() {
|
||||
return this.qty == null ? 0.0d : this.qty;
|
||||
}
|
||||
|
||||
public int getIsRepeatVal() {
|
||||
return this.isRepeat == null ? 0 : this.isRepeat;
|
||||
}
|
||||
|
||||
public int getIsCheckVal() {
|
||||
return this.isCheck == null ? 0 : this.isCheck;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,83 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :产品绑定记录表
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_PROD_BIND_RECORD")
|
||||
@Api("产品绑定记录表")
|
||||
public class MesProdBindRecord extends BaseBean {
|
||||
@Column(name = "SERIAL_NUMBER")
|
||||
@ApiParam(value = "产品条码")
|
||||
private String serialNumber;
|
||||
|
||||
@Column(name="PART_NO")
|
||||
@ApiParam("产品条码零件号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name="WORK_ORDER")
|
||||
@ApiParam("工单号")
|
||||
private String workOrder;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam(value = "工作中心")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam(value = "工作单元")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "STEP_CODE")
|
||||
@ApiParam(value = "工步代码")
|
||||
private String stepCode;
|
||||
|
||||
@Column(name="ITEM_PART_NO")
|
||||
@ApiParam("原材料零件号")
|
||||
private String itemPartNo;
|
||||
|
||||
@Column(name="KP_SN")
|
||||
@ApiParam("原材料条码")
|
||||
private String kpSn;
|
||||
|
||||
@Column(name = "KP_QTY")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "原材料数量", example = "0")
|
||||
private Double kpQty;
|
||||
|
||||
@Column(name="SUPPLIER_CODE")
|
||||
@ApiParam("供应商")
|
||||
private String supplierCode;
|
||||
|
||||
@Column(name="VERSION")
|
||||
@ApiParam("版本")
|
||||
private String version;
|
||||
|
||||
@Column(name = "RESULT")
|
||||
@ApiParam(value = "结果")
|
||||
private String result;
|
||||
|
||||
public double getQtyVal() {
|
||||
return this.kpQty == null ? 0.0d : this.kpQty;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,66 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class StepModel implements Serializable {
|
||||
@ApiParam("工步代码")
|
||||
private String stepCode;
|
||||
|
||||
@ApiParam("工步名称")
|
||||
private String stepName;
|
||||
|
||||
@ApiParam("工步描述")
|
||||
private String stepText;
|
||||
|
||||
@ApiParam("工步类型")
|
||||
private String stepType;
|
||||
|
||||
@ApiParam("工步对象")
|
||||
private String stepObject;
|
||||
|
||||
/**
|
||||
* 工位扫描业务所需使用字段
|
||||
*/
|
||||
@ApiParam("流程代码")
|
||||
private String routeCode;
|
||||
|
||||
/**
|
||||
* 工位扫描业务所需使用字段
|
||||
*/
|
||||
@ApiParam("工序代码")
|
||||
private String processCode;
|
||||
|
||||
/**
|
||||
* 工位扫描业务所需使用字段
|
||||
*/
|
||||
@ApiParam("工步顺序")
|
||||
private Integer stepSeq;
|
||||
|
||||
/**
|
||||
* 工位扫描业务所需使用字段
|
||||
*/
|
||||
@ApiParam("工步执行完毕")
|
||||
private boolean isComplete;
|
||||
|
||||
/**
|
||||
* 工位扫描业务所需使用字段
|
||||
*/
|
||||
@ApiParam("工步是否跳过")
|
||||
private boolean isJump;
|
||||
|
||||
public StepModel(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;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesKpsnRule;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesKpsnRuleRepository extends BaseRepository<MesKpsnRule, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProcessBom;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesProcessBomRepository extends BaseRepository<MesProcessBom, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdBindRecord;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesProdBindRecordRepository extends BaseRepository<MesProdBindRecord, Long> {
|
||||
}
|
||||
@ -0,0 +1,84 @@
|
||||
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 org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :产品绑定记录表
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_PROD_BIND_RECORD")
|
||||
@Api("产品绑定记录表")
|
||||
public class MesProdBindRecord extends BaseBean {
|
||||
@Column(name = "SERIAL_NUMBER")
|
||||
@ApiParam(value = "产品条码")
|
||||
private String serialNumber;
|
||||
|
||||
@Column(name="PART_NO")
|
||||
@ApiParam("产品条码零件号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name="WORK_ORDER")
|
||||
@ApiParam("工单号")
|
||||
private String workOrder;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam(value = "工作中心")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam(value = "工作单元")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "STEP_CODE")
|
||||
@ApiParam(value = "工步代码")
|
||||
private String stepCode;
|
||||
|
||||
@Column(name="ITEM_PART_NO")
|
||||
@ApiParam("原材料零件号")
|
||||
private String itemPartNo;
|
||||
|
||||
@Column(name="KP_SN")
|
||||
@ApiParam("原材料条码")
|
||||
private String kpSn;
|
||||
|
||||
@Column(name = "KP_QTY")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "原材料数量", example = "0")
|
||||
private Double kpQty;
|
||||
|
||||
@Column(name="SUPPLIER_CODE")
|
||||
@ApiParam("供应商")
|
||||
private String supplierCode;
|
||||
|
||||
@Column(name="VERSION")
|
||||
@ApiParam("版本")
|
||||
private String version;
|
||||
|
||||
@Column(name = "RESULT")
|
||||
@ApiParam(value = "结果")
|
||||
private String result;
|
||||
|
||||
public double getQtyVal() {
|
||||
return this.kpQty == null ? 0.0d : this.kpQty;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesProdBindRecordRepository extends BaseRepository<MesProdBindRecord, Long> {
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
package cn.estsh.i3plus.pojo.model.andon;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.MesArea;
|
||||
import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
|
||||
import javax.persistence.Transient;
|
||||
import java.util.List;
|
||||
|
||||
public class SysOrganizeModel extends SysOrganize{
|
||||
|
||||
@Transient
|
||||
@ApiParam(value ="子集列表")
|
||||
private List<MesArea> childTreeList;
|
||||
|
||||
public List<MesArea> getChildTreeList() {
|
||||
return childTreeList;
|
||||
}
|
||||
|
||||
public void setChildTreeList(List<MesArea> childTreeList) {
|
||||
this.childTreeList = childTreeList;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue