Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin
6 years ago
commit
65b5ac3803
@ -0,0 +1,63 @@
|
||||
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;
|
||||
import javax.persistence.Transient;
|
||||
|
||||
/**
|
||||
* @Description :物料关键数据
|
||||
* @Reference :
|
||||
* @Author : crish
|
||||
* @CreateDate : 2019-05-15
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_KP_DATA")
|
||||
@Api("生产区域")
|
||||
public class MesKpData extends BaseBean {
|
||||
@Column(name="PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name="KEY_DATA_CODE")
|
||||
@ApiParam("关键数据代码")
|
||||
private String keyDataCode;
|
||||
|
||||
@Column(name="KEY_DATA_NAME")
|
||||
@ApiParam("关键数据名称")
|
||||
private String keyDataName;
|
||||
|
||||
@Column(name="KEY_DATA_COUNT")
|
||||
@ApiParam("关键数据数量")
|
||||
private Integer keyDataCount;
|
||||
|
||||
@Column(name="UPPER_LIMIT")
|
||||
@ApiParam("数据上限")
|
||||
private Double upperLimit;
|
||||
|
||||
@Column(name="LOWER_LIMIT")
|
||||
@ApiParam("数据下限")
|
||||
private Double lowerLimit;
|
||||
|
||||
@Transient
|
||||
@ApiParam("扭矩值")
|
||||
private Double torqueValue;
|
||||
|
||||
@Transient
|
||||
@ApiParam("是否在范围之内")
|
||||
private Boolean ok;
|
||||
}
|
||||
@ -0,0 +1,59 @@
|
||||
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 :PLC设备信息配置表
|
||||
* @Reference :
|
||||
* @Author : Crish
|
||||
* @CreateDate : 2019-05-17
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_PLC_CONFIGURE")
|
||||
@Api("PLC设备信息配置表")
|
||||
public class MesPLCConfigure extends BaseBean {
|
||||
@Column(name="IP")
|
||||
@ApiParam("设备ip")
|
||||
private String ipAddress;
|
||||
|
||||
@Column(name="AREA_CODE")
|
||||
@ApiParam("区域代码")
|
||||
private String channelName;
|
||||
|
||||
@Column(name="AREA_NAME")
|
||||
@ApiParam("区域名称")
|
||||
private String deviceName;
|
||||
|
||||
@Column(name="AREA_CODE")
|
||||
@ApiParam("区域代码")
|
||||
private String tagName;
|
||||
|
||||
@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;
|
||||
|
||||
}
|
||||
@ -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,82 @@
|
||||
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-05-17
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_TORQUE_DETAIL")
|
||||
@Api("扭矩信息记录表")
|
||||
public class MesTorqueDetail extends BaseBean {
|
||||
@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;
|
||||
}
|
||||
@ -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,17 @@
|
||||
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.MesArea;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesKpData;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : crish
|
||||
* @CreateDate : 2019-05-15
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesKpDataRepository extends BaseRepository<MesKpData, 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.MesArea;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesPLCConfigureRepository extends BaseRepository<MesPLCConfigureRepository, 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,17 @@
|
||||
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.MesArea;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTorqueDetail;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesTorqueDetailRepository extends BaseRepository<MesTorqueDetail, 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,30 @@
|
||||
package cn.estsh.i3plus.pojo.model.mes;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess;
|
||||
import cn.estsh.i3plus.pojo.model.wms.WmsActionGroupDetailsModel;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 流程Model
|
||||
* @Reference :
|
||||
* @Author : dragon.xu
|
||||
* @CreateDate : 2019-05-15 13:27
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("流程Model")
|
||||
public class MesRouteModel implements Serializable {
|
||||
@ApiParam("流程代码")
|
||||
public String routeCode;
|
||||
@ApiParam("工厂代码")
|
||||
public String organizeCode;
|
||||
@ApiParam("GOJS位置")
|
||||
public String position;
|
||||
@ApiParam("流程明细Model集合")
|
||||
public List<MesRouteProcessModel> mesRouteProcessModelList;
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
package cn.estsh.i3plus.pojo.model.mes;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProdRouteOptParam;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcessStep;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.*;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Description : 流程工序Model
|
||||
* @Reference :
|
||||
* @Author : dragon.xu
|
||||
* @CreateDate : 2019-04-29 15:39
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("流程工序Model")
|
||||
public class MesRouteProcessModel {
|
||||
@ApiParam("流程工序")
|
||||
public MesRouteProcess mesRouteProcess;
|
||||
@ApiParam("流程工步参数配置表(根据Seq分组)")
|
||||
public Map<String, List<MesRouteProcessStep>> mesRouteProcessStepMap;
|
||||
@ApiParam("流程工步参数配置表(根据Seq分组)")
|
||||
public Map<String, List<MesProdRouteOptParam>> mesProdRouteOptParamMap;
|
||||
}
|
||||
Loading…
Reference in New Issue