Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
andly.pan
4 years ago
commit
43d7195a37
@ -0,0 +1,50 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EInterMediateDetail;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :计算中间结果明细
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2021-04-27
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_INTER_MEDIATE_DETAIL")
|
||||
@Api("计算中间结果")
|
||||
public class InterMediateDetail extends BaseAPS {
|
||||
private static final long serialVersionUID = -2588016171684238811L;
|
||||
|
||||
@Column(name="RESULT_ID")
|
||||
@ApiParam(value ="中间结果")
|
||||
@FieldAnnotation(relation = "InterMediateResult")
|
||||
private Long resultId;
|
||||
|
||||
@Column(name="RULE")
|
||||
@ApiParam(value ="评估规则")
|
||||
private String rule;
|
||||
|
||||
@Column(name="EVALUATE_VALUE")
|
||||
@ApiParam(value ="评估值")
|
||||
private Double evaluateValue;
|
||||
|
||||
public InterMediateResult getResult() { return BeanRelation.get(this, EInterMediateDetail.Result); }
|
||||
|
||||
public void setResult(InterMediateResult result) {
|
||||
this.resultId = result != null ? result.getId() : 0;
|
||||
BeanRelation.set(this, EInterMediateDetail.Result, result);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,67 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EInterMediateResult;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EWorkInput;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan;
|
||||
import com.fasterxml.jackson.annotation.JsonBackReference;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description :计算中间结果
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2021-04-25
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_INTER_MEDIATE_RESULT")
|
||||
@Api("计算中间结果")
|
||||
public class InterMediateResult extends BaseAPS {
|
||||
private static final long serialVersionUID = -1869359887027950540L;
|
||||
|
||||
@Column(name="WORK_ID")
|
||||
@ApiParam(value ="工作")
|
||||
@FieldAnnotation(relation = "Work")
|
||||
private Long workId;
|
||||
|
||||
@Column(name="RESOURCE_ID")
|
||||
@ApiParam(value ="资源")
|
||||
@FieldAnnotation(relation = "Resource")
|
||||
private Long resourceId;
|
||||
|
||||
@Column(name="EVALUATE_VALUE")
|
||||
@ApiParam(value ="评估值")
|
||||
private Double evaluateValue;
|
||||
|
||||
public Work getWork() {
|
||||
return BeanRelation.get(this, EInterMediateResult.Work);
|
||||
}
|
||||
|
||||
public void setWork(Work work) {
|
||||
this.workId = work != null ? work.getId() : 0l;
|
||||
BeanRelation.set(this, EInterMediateResult.Work, work);
|
||||
}
|
||||
|
||||
public Resource getResource() { return BeanRelation.get(this, EInterMediateResult.Resource); }
|
||||
|
||||
public void setResource(Resource resource) {
|
||||
this.resourceId = resource != null ? resource.getId() : 0l;
|
||||
BeanRelation.set(this, EInterMediateResult.Resource, resource);
|
||||
}
|
||||
|
||||
@JsonBackReference
|
||||
public List<InterMediateDetail> getDetails() { return BeanRelation.get(this, EInterMediateResult.Details); }
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EInterMediateDetail {
|
||||
Result
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EInterMediateResult {
|
||||
Work,
|
||||
Resource,
|
||||
Details
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
package cn.estsh.i3plus.pojo.aps.tool;
|
||||
|
||||
public class APSDoubleTool {
|
||||
public static boolean isZero(Double value) {
|
||||
return (value == null) || (value > -0.000001 && value < 0.000001);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="InterMediateResult">
|
||||
<Relation field="Work" name="Work" type="MULTI_TO_ONE">
|
||||
</Relation>
|
||||
<Relation field="Resource" name="Resource" type="MULTI_TO_ONE">
|
||||
</Relation>
|
||||
<Relation field="Details" name="InterMediateDetail" reverse="Result" type="ONE_TO_MULTI" owner="true">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -0,0 +1,55 @@
|
||||
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.*;
|
||||
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_CONTAINER_SN_RECORD", indexes = {
|
||||
@Index(columnList = "SERIAL_NUMBER"),
|
||||
@Index(columnList = "PART_NO"),
|
||||
@Index(columnList = "CT_NO")
|
||||
})
|
||||
@Api("容器条码记录表")
|
||||
public class MesContainerSnRecord extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -303802118993255101L;
|
||||
@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 = "CT_NO")
|
||||
@ApiParam("容器号")
|
||||
private String ctNo;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam("数量")
|
||||
private Double qty;
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
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.*;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Author: Wynne.Lu
|
||||
* @CreateDate: 2019/10/18 2:55 下午
|
||||
* @Description:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Inheritance(strategy = InheritanceType.JOINED)
|
||||
@Table(name = "MES_HOLIDAY_VACTION")
|
||||
@Api("节假日")
|
||||
public class MesHolidayVacation extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -1620451254243818560L;
|
||||
@Column(name = "YEAR")
|
||||
@ApiParam("年")
|
||||
private String year;
|
||||
|
||||
@Column(name = "MONTH")
|
||||
@ApiParam("月")
|
||||
private String month;
|
||||
|
||||
@Column(name = "DAY")
|
||||
@ApiParam("日")
|
||||
private String day;
|
||||
}
|
||||
@ -0,0 +1,49 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.mes.model.ProductDataModel;
|
||||
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.*;
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate:2019\10\9 0009
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Inheritance(strategy = InheritanceType.JOINED)
|
||||
@Table(name = "MES_PLC_DATA_RECORD", indexes = {
|
||||
@Index(columnList = "PLC_CODE")
|
||||
})
|
||||
@Api("PLC数据记录表")
|
||||
public class MesPlcDataRecord extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -8789141495695469898L;
|
||||
@Column(name = "PLC_CODE")
|
||||
@ApiParam("PLC代码")
|
||||
private String plcCode;
|
||||
|
||||
@Column(name = "PLC_NAME")
|
||||
@ApiParam("PLC名称")
|
||||
private String plcName;
|
||||
|
||||
@Column(name = "PLC_VLAUE")
|
||||
@ApiParam("PLC型号")
|
||||
private String plcValue;
|
||||
|
||||
}
|
||||
@ -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.MesContainerSnRecord;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2021/5/1 12:21 PM
|
||||
* @Modify:
|
||||
*/
|
||||
public interface MesContainerSnRecordRepository extends BaseRepository<MesContainerSnRecord, 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.MesHolidayVacation;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2021/5/7 4:44 PM
|
||||
* @Modify:
|
||||
*/
|
||||
public interface MesHolidayVacationRepository extends BaseRepository<MesHolidayVacation, 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.MesPlcDataRecord;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2021/5/2 4:11 PM
|
||||
* @Modify:
|
||||
*/
|
||||
public interface MesPlcDataRecordRepository extends BaseRepository<MesPlcDataRecord, Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue