Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
commit
dfdb6be4bb
@ -0,0 +1,22 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* 物料分配限制
|
||||
* 主要考虑输出订的最晚计算时间不能晚于输入的最晚计算时间
|
||||
*/
|
||||
public enum MATERIAL_ASSIGN_LIMIT {
|
||||
NONE(0), // 不进行任何制约
|
||||
INVENTORY(1), // 库存制约
|
||||
PURCHASE(2), // 采购制约
|
||||
PRODUCT(4); // 制造制约
|
||||
|
||||
private int _value;
|
||||
|
||||
MATERIAL_ASSIGN_LIMIT(int value) {
|
||||
_value = value;
|
||||
}
|
||||
|
||||
public int value() {
|
||||
return this._value;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
public enum WORK_SPLIT_TYPE {
|
||||
NONE, // 不分割
|
||||
RATIO, // 按比例分割
|
||||
COUNT, // 按数量分割
|
||||
BATCH // 按批量分割
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="WorkResource">
|
||||
<Relation field="Resource" name="Resource" reverse="WorkResources" type="MULTI_TO_ONE" owner="false">
|
||||
<Relation field="Resource" name="Resource" type="MULTI_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
<Relation field="OperResource" name="OperResource" reverse="WorkResources" type="MULTI_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
|
||||
@ -0,0 +1,64 @@
|
||||
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 javax.persistence.Transient;
|
||||
|
||||
/**
|
||||
* @Description :设备周期作业计划
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-10-11
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_EQU_TASK_PLAN")
|
||||
@Api("设备周期作业计划")
|
||||
public class MesEquTaskPlan extends BaseBean {
|
||||
@Column(name="EQUIPMENT_CODE")
|
||||
@ApiParam("设备代码")
|
||||
private String equipmentCode;
|
||||
|
||||
@Column(name="EQUIPMENT_NAME")
|
||||
@ApiParam("设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
@Column(name="TASK_TYPE")
|
||||
@ApiParam("作业类型")
|
||||
private Integer taskType;
|
||||
|
||||
@Column(name="TASK_CYCLE")
|
||||
@ApiParam("周期(天)")
|
||||
private Integer taskCycle;
|
||||
|
||||
@Column(name="LAST_TIME")
|
||||
@ApiParam("上一执行时间")
|
||||
private String lastTime;
|
||||
|
||||
@Column(name="DAYS_IN_ADVANCE")
|
||||
@ApiParam("创建提前天数")
|
||||
private Integer daysInAdvance;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value="生产线")
|
||||
private String workCenterCode;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value="设备类别")
|
||||
private String equipmentCategory;
|
||||
|
||||
}
|
||||
@ -0,0 +1,98 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\10\15 17:20
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class MesDatasourceModel implements Serializable {
|
||||
@ApiParam("id")
|
||||
private Long id;
|
||||
|
||||
@ApiParam("设备代码")
|
||||
private String equipmentCode;
|
||||
|
||||
@ApiParam("设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
@ApiParam( "有效性")
|
||||
public Integer isValid;
|
||||
|
||||
@ApiParam( "是否已删除")
|
||||
public Integer isDeleted;
|
||||
|
||||
@ApiParam( "创建用户")
|
||||
public String createUser;
|
||||
|
||||
@ApiParam( "创建日期")
|
||||
public String createDatetime;
|
||||
|
||||
@ApiParam( "修改人")
|
||||
public String modifyUser;
|
||||
|
||||
@ApiParam( "修改日期")
|
||||
public String modifyDatetime;
|
||||
|
||||
@ApiParam("组织代码")
|
||||
public String organizeCode;
|
||||
|
||||
@ApiParam("数据源代码")
|
||||
private String dsCode;
|
||||
|
||||
@ApiParam("数据源名称")
|
||||
private String dsName;
|
||||
|
||||
@ApiParam("数据源类型")
|
||||
private String dsType;
|
||||
|
||||
@ApiParam("主机")
|
||||
private String dsHost;
|
||||
|
||||
@ApiParam("端口")
|
||||
private Integer dsPort;
|
||||
|
||||
@ApiParam("用户名")
|
||||
private String dsUser;
|
||||
|
||||
@ApiParam("密码")
|
||||
private String dsPassword;
|
||||
|
||||
@ApiParam("数据库名称")
|
||||
private String dsDbName;
|
||||
|
||||
public MesDatasourceModel() {
|
||||
|
||||
}
|
||||
|
||||
public MesDatasourceModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
|
||||
String modifyUser, String modifyDatetime, String organizeCode, String dsCode, String dsName, String dsType,
|
||||
String dsHost, Integer dsPort, String dsUser, String dsPassword, String dsDbName) {
|
||||
this.id = id;
|
||||
this.equipmentCode = equipmentCode;
|
||||
this.equipmentName = equipmentName;
|
||||
this.isValid = isValid;
|
||||
this.isDeleted = isDeleted;
|
||||
this.createUser = createUser;
|
||||
this.createDatetime = createDatetime;
|
||||
this.modifyUser = modifyUser;
|
||||
this.modifyDatetime = modifyDatetime;
|
||||
this.organizeCode = organizeCode;
|
||||
this.dsCode = dsCode;
|
||||
this.dsName = dsName;
|
||||
this.dsType = dsType;
|
||||
this.dsHost = dsHost;
|
||||
this.dsPort = dsPort;
|
||||
this.dsUser = dsUser;
|
||||
this.dsPassword = dsPassword;
|
||||
this.dsDbName = dsDbName;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,87 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class MesEquTaskPlanModel implements Serializable {
|
||||
@ApiParam("id")
|
||||
private Long id;
|
||||
|
||||
@ApiParam("设备代码")
|
||||
private String equipmentCode;
|
||||
|
||||
@ApiParam("设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
@ApiParam("作业类型")
|
||||
private Integer taskType;
|
||||
|
||||
@ApiParam("周期(天)")
|
||||
private Integer taskCycle;
|
||||
|
||||
@ApiParam("上一执行时间")
|
||||
private String lastTime;
|
||||
|
||||
@ApiParam("创建提前天数")
|
||||
private Integer daysInAdvance;
|
||||
|
||||
@ApiParam("生产线")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("设备类别")
|
||||
private String equipmentCategory;
|
||||
|
||||
@ApiParam("组织代码")
|
||||
public String organizeCode;
|
||||
|
||||
@ApiParam("有效性")
|
||||
public Integer isValid;
|
||||
|
||||
@ApiParam("是否已删除")
|
||||
public Integer isDeleted;
|
||||
|
||||
@ApiParam("创建用户")
|
||||
public String createUser;
|
||||
|
||||
@ApiParam("创建日期")
|
||||
public String createDatetime;
|
||||
|
||||
@ApiParam("修改人")
|
||||
public String modifyUser;
|
||||
|
||||
@ApiParam("修改日期")
|
||||
public String modifyDatetime;
|
||||
|
||||
@ApiParam("作业类型")
|
||||
private String taskTypeName;
|
||||
|
||||
@ApiParam("设备类别")
|
||||
private String equipmentCategoryName;
|
||||
|
||||
|
||||
public MesEquTaskPlanModel() {
|
||||
|
||||
}
|
||||
|
||||
public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
|
||||
this.id = id;
|
||||
this.equipmentCode = equipmentCode;
|
||||
this.equipmentName = equipmentName;
|
||||
this.taskType = taskType;
|
||||
this.taskCycle = taskCycle;
|
||||
this.lastTime = lastTime;
|
||||
this.daysInAdvance = daysInAdvance;
|
||||
this.workCenterCode = workCenterCode;
|
||||
this.equipmentCategory = equipmentCategory;
|
||||
this.organizeCode = organizeCode;
|
||||
this.isValid = isValid;
|
||||
this.isDeleted = isDeleted;
|
||||
this.createUser = createUser;
|
||||
this.createDatetime = createDatetime;
|
||||
this.modifyUser = modifyUser;
|
||||
this.modifyDatetime = modifyDatetime;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,122 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\10\15 15:58
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class MesPlcModel implements Serializable {
|
||||
@ApiParam("id")
|
||||
private Long id;
|
||||
|
||||
@ApiParam("设备代码")
|
||||
private String equipmentCode;
|
||||
|
||||
@ApiParam("设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
@ApiParam( "有效性")
|
||||
public Integer isValid;
|
||||
|
||||
@ApiParam( "是否已删除")
|
||||
public Integer isDeleted;
|
||||
|
||||
@ApiParam( "创建用户")
|
||||
public String createUser;
|
||||
|
||||
@ApiParam( "创建日期")
|
||||
public String createDatetime;
|
||||
|
||||
@ApiParam( "修改人")
|
||||
public String modifyUser;
|
||||
|
||||
@ApiParam( "修改日期")
|
||||
public String modifyDatetime;
|
||||
|
||||
@ApiParam("组织代码")
|
||||
public String organizeCode;
|
||||
|
||||
@ApiParam("PLC代码")
|
||||
private String plcCode;
|
||||
|
||||
@ApiParam("PLC名称")
|
||||
private String plcName;
|
||||
|
||||
@ApiParam("PLC型号")
|
||||
private String plcModel;
|
||||
|
||||
@ApiParam("PLC IP")
|
||||
private String plcIp;
|
||||
|
||||
@ApiParam("通道")
|
||||
private String channel;
|
||||
|
||||
@ApiParam("标签名称")
|
||||
private String tagName;
|
||||
|
||||
@ApiParam("标签地址")
|
||||
private String tagAddress;
|
||||
|
||||
@ApiParam("标签数据类型")
|
||||
private String dataType;
|
||||
|
||||
@ApiParam("分组名称")
|
||||
private String groupName;
|
||||
|
||||
@ApiParam("生产线")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("工位")
|
||||
private String workCellCode;
|
||||
|
||||
@ApiParam("PLC的值的设定")
|
||||
private String plcCfg;
|
||||
|
||||
@ApiParam("解析规则")
|
||||
private String analysisRule;
|
||||
|
||||
@ApiParam("是否解析")
|
||||
private String isAnalysis;
|
||||
|
||||
public MesPlcModel(){
|
||||
|
||||
}
|
||||
|
||||
public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
|
||||
String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel,
|
||||
String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName,
|
||||
String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis){
|
||||
this.id = id;
|
||||
this.equipmentCode = equipmentCode;
|
||||
this.equipmentName = equipmentName;
|
||||
this.isValid = isValid;
|
||||
this.isDeleted = isDeleted;
|
||||
this.createUser = createUser;
|
||||
this.createDatetime = createDatetime;
|
||||
this.modifyUser = modifyUser;
|
||||
this.modifyDatetime = modifyDatetime;
|
||||
this.organizeCode = organizeCode;
|
||||
this.plcCode = plcCode;
|
||||
this.plcName = plcName;
|
||||
this.plcModel = plcModel;
|
||||
this.plcIp = plcIp;
|
||||
this.channel = channel;
|
||||
this.tagName = tagName;
|
||||
this.tagAddress = tagAddress;
|
||||
this.dataType = dataType;
|
||||
this.groupName = groupName;
|
||||
this.workCenterCode = workCenterCode;
|
||||
this.workCellCode = workCellCode;
|
||||
this.plcCfg = plcCfg;
|
||||
this.analysisRule = analysisRule;
|
||||
this.isAnalysis = isAnalysis;
|
||||
}
|
||||
}
|
||||
@ -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.MesEquTaskPlan;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : 王杰
|
||||
* @CreateDate : 2019-10-11
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesEquTaskPlanRepository extends BaseRepository<MesEquTaskPlan, Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue