Merge branch 'test'
crish
6 years ago
commit
410558d43c
@ -0,0 +1,80 @@
|
||||
package cn.estsh.i3plus.pojo.andon.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
|
||||
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-11-11-14:23
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name="ANDON_MESSAGE_RECORD")
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("通知记录")
|
||||
public class AndonMessageRecord extends BaseBean {
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam(value = "工作中心")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "ANDON_ORDER_NO")
|
||||
@ApiParam(value = "安灯队列编号")
|
||||
private String andonOrderNo;
|
||||
|
||||
@Column(name = "ALARM_CODE")
|
||||
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
|
||||
@ApiParam(value = "安灯类型")
|
||||
private String alarmCode;
|
||||
|
||||
@Column(name = "STATUS_CODE")
|
||||
@AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_ACTION_TAG.class,refForeignKey = "code",value = "description")
|
||||
@ApiParam(value = "安灯状态代码")
|
||||
private String statusCode;
|
||||
|
||||
@Column(name = "RP_OBJECT_CODE")
|
||||
@ApiParam(value = "通知对象代码")
|
||||
private String rpObjectCode;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "通知对象名称")
|
||||
private String rpObjectName;
|
||||
|
||||
@Column(name = "RP_CODE")
|
||||
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
|
||||
@ApiParam(value = "通知方式")
|
||||
private String rpCode;
|
||||
|
||||
@Column(name = "RP_NAME")
|
||||
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
|
||||
@ApiParam(value = "通知方式名称")
|
||||
private String rpName;
|
||||
|
||||
@Column(name = "RP_LEVEL")
|
||||
@ApiParam(value = "通知等级")
|
||||
private String rpLevel;
|
||||
|
||||
@Column(name = "IS_SUCCEED")
|
||||
@ApiParam(value = "成功标识")
|
||||
private String isSucceed;
|
||||
|
||||
@Column(name = "MEMO")
|
||||
@ApiParam(value = "备注")
|
||||
private String memo;
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
package cn.estsh.i3plus.pojo.andon.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
|
||||
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-11-11-14:23
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name="ANDON_RESPONSE")
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("通知方式")
|
||||
public class AndonResponse extends BaseBean {
|
||||
|
||||
@Column(name = "RESPONSE_CODE")
|
||||
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
|
||||
@ApiParam(value = "通知方式")
|
||||
private String responseCode;
|
||||
|
||||
@Column(name = "RESPONSE_NAME")
|
||||
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
|
||||
@ApiParam(value = "通知名称")
|
||||
private String responseName;
|
||||
|
||||
@Column(name = "RESPONSE_CONTENT")
|
||||
@ApiParam(value = "通知内容")
|
||||
private String responseContent;
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
package cn.estsh.i3plus.pojo.andon.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description: 按照安灯类型统计分组统计当天发生的安灯总次数和安灯超时次数 model
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-11-12-10:21
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class AndonBoardModel {
|
||||
|
||||
@ApiParam("安灯类型")
|
||||
private String alarmCode;
|
||||
|
||||
@ApiParam("安灯类型名称")
|
||||
private String alarmName;
|
||||
|
||||
@ApiParam("安灯正常处理的次数")
|
||||
private Integer inTime;
|
||||
|
||||
@ApiParam("安灯超时次数")
|
||||
private Integer overTime;
|
||||
|
||||
@ApiParam("安灯总次数")
|
||||
private Integer totalTime;
|
||||
|
||||
public int getTotalTimeVal() {
|
||||
return totalTime == null ? 0 : totalTime;
|
||||
}
|
||||
|
||||
public int getOverTimeVal() {
|
||||
return overTime == null ? 0 : overTime;
|
||||
}
|
||||
|
||||
public int getInTime() {
|
||||
return inTime == null ? 0 : inTime;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonMessageRecord;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-11-12-14:24
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonMessageRecordRepository extends BaseRepository<AndonMessageRecord, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonResponse;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description: 通知方式
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-11-11-15:12
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonResponseRepository extends BaseRepository<AndonResponse, Long> {
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description :BOM树
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("BOM树")
|
||||
public class BomTree extends BaseAPS {
|
||||
|
||||
@ApiParam(value ="物料类型")
|
||||
private ApsEnumUtil.MATERIAL_TYPE type;
|
||||
|
||||
@ApiParam(value ="备料类型")
|
||||
private ApsEnumUtil.PREPARE_TYPE prepareType;
|
||||
|
||||
@ApiParam(value ="补充类型")
|
||||
private ApsEnumUtil.REPLENISHMENT_TYPE replType;
|
||||
|
||||
@ApiParam(value ="采购提前期")
|
||||
private String purchaseLeadTime;
|
||||
|
||||
@ApiParam(value ="制造提前期")
|
||||
private String manufLeadTime;
|
||||
|
||||
@ApiParam(value ="配送提前期")
|
||||
private String shipmentLeadTime;
|
||||
|
||||
@ApiParam(value ="单位采购量")
|
||||
private Integer unitPurchase;
|
||||
|
||||
@ApiParam(value ="单位制造量")
|
||||
private Integer unitManuf;
|
||||
|
||||
@ApiParam(value ="单位配送量")
|
||||
private Integer unitShipment;
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
|
||||
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 : jason.niu
|
||||
* @CreateDate : 2019-10-22
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="APS_FURNACE_CAPACITY")
|
||||
@Api("炉容量")
|
||||
public class FurnaceCapacity extends BaseAPS {
|
||||
|
||||
@Column(name="RES_CODES")
|
||||
@ApiParam(value ="资源编码")
|
||||
private String resCodes;
|
||||
|
||||
@Column(name="STAND_CODE")
|
||||
@ApiParam(value ="标准工序编码")
|
||||
private String standCode;
|
||||
|
||||
@Column(name="MATERIAL_CODE")
|
||||
@ApiParam(value ="物料编码")
|
||||
private String materialCode;
|
||||
|
||||
@Column(name="CAPACITY")
|
||||
@ApiParam(value ="容量限制")
|
||||
private Double capacity;
|
||||
}
|
||||
@ -0,0 +1,52 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
/**
|
||||
* @Description :订单树
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("订单树")
|
||||
public class OrderTree extends BaseAPS {
|
||||
@ApiParam(value ="物料编码")
|
||||
private String material;
|
||||
|
||||
@ApiParam(value ="数量")
|
||||
private Double count;
|
||||
|
||||
@ApiParam(value ="最晚结束时刻")
|
||||
private Date let;
|
||||
|
||||
@ApiParam(value ="最早开始时刻计算值")
|
||||
private Date calcEst;
|
||||
|
||||
@ApiParam(value ="最晚结束时刻计算值")
|
||||
private Date calcLet;
|
||||
|
||||
@ApiParam(value ="计划开始")
|
||||
private Date planBegin;
|
||||
|
||||
@ApiParam(value ="计划结束")
|
||||
private Date planEnd;
|
||||
|
||||
@ApiParam(value ="接单日期")
|
||||
private Date receiveDate;
|
||||
|
||||
@ApiParam(value ="优先级")
|
||||
private Integer priority;
|
||||
|
||||
@ApiParam(value ="专料号")
|
||||
private String specifyMaterialNum;
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :日历类型
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum CALENDAR_TYPE {
|
||||
ENABLE, // 启用
|
||||
DISABLE // 停用
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
public enum CALENDAR_WEEK {
|
||||
MONDAY(1), // 星期一
|
||||
TUESDAY(2), // 星期二
|
||||
WEDNESDAY(4), // 星期三
|
||||
THURSDAY(8), // 星期四
|
||||
FRIDAY(16), // 星期五
|
||||
SATURDAY(32), // 星期六
|
||||
SUNDAY(64); // 星期天
|
||||
|
||||
private int _value;
|
||||
|
||||
CALENDAR_WEEK(int value) {
|
||||
_value = value;
|
||||
}
|
||||
|
||||
public int value() {
|
||||
return this._value;
|
||||
}
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :接续方式
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum CONSTRAINT_TYPE {
|
||||
ES, // 前工作开始，后工作结束
|
||||
SS, // 前工作开始，后工作开始
|
||||
EE, // 前工作结束，后工作结束
|
||||
SSEE // 前后工作同时开始或同时结束
|
||||
}
|
||||
@ -1,8 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
public enum DATA_LINK_TYPE {
|
||||
CSV,
|
||||
MYSQL,
|
||||
ORACLE,
|
||||
SQLSERVER
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :排程方向
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum DIRECTION {
|
||||
POSITIVE, // 正向
|
||||
REVERSE // 逆向
|
||||
}
|
||||
@ -1,7 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
public enum DYNAMIC_SET_CALC {
|
||||
MIN, // 取最小值
|
||||
MAX, // 取最大值
|
||||
SUM // 求和
|
||||
}
|
||||
@ -1,7 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
public enum DYNAMIC_SET_TYPE {
|
||||
PREV_SET, // 只对前设置影响
|
||||
POST_SET, // 只对后设置影响
|
||||
ALL // 对前后设置都产生影响
|
||||
}
|
||||
@ -1,6 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
public enum IMPORT_DETAIL_TYPE {
|
||||
REPLACE,
|
||||
DIFF
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
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;
|
||||
}
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :物料类型
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum MATERIAL_TYPE {
|
||||
PRODUCT, // 成品
|
||||
HALF_PRODUCT, // 半成品
|
||||
RAW_MATERIAL, // 原材料
|
||||
VIRTUAL // 虚拟件
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :订单删除限制
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum ORDER_DEL_LIMIT {
|
||||
NONE,
|
||||
NO_PO,
|
||||
NO_PLAN,
|
||||
NO_POR,
|
||||
NO_PPRS
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :工作计划包含的时间类型
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum PLAN_TYPE {
|
||||
PREV_SET,
|
||||
PRODUCE,
|
||||
POST_SET,
|
||||
LOCK
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :备料类型
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum PREPARE_TYPE {
|
||||
NO,
|
||||
SELF_MAKE, // 自制
|
||||
PURCHASE // 采购
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :补充类型
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum REPLENISHMENT_TYPE {
|
||||
NO,
|
||||
BATCH, // 批量补充
|
||||
ONEBYONE // 一对一补充
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :预置的资源选择规则
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum RESOURCE_CHOISE_RULE {
|
||||
PREV_SET_TIME, // 前设置时间
|
||||
PRODUCE_TIME, // 生产时间
|
||||
POST_SET_TIME, // 后设置时间
|
||||
WORK_WAIT_TIME, // 工作等待时间
|
||||
RES_BALANCE, // 资源均衡度
|
||||
SAME_MATERIAL, // 相同物料
|
||||
SAME_ORDER, // 相同订单
|
||||
NEARLY_WORK, // 前后工作
|
||||
POST_RESOURCE, // 后资源制约
|
||||
SAME_ASS_RESOURCE, // 相同副资源
|
||||
RESOURCE_PRIORITY; // 资源优先级
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :资源区分
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum RESOURCE_CLASS {
|
||||
LIMITLESS, // 无限能力
|
||||
SINGLE, // 单能力
|
||||
BATCH // 炉资源
|
||||
}
|
||||
@ -1,7 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
public enum RESOURCE_LOCK_TYPE {
|
||||
NONE, // 不锁定
|
||||
PRODUCE_BEGIN, // 与后工序生产开始时刻有关
|
||||
PRODUCE_END // 与后工序生产结束时刻有关
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :资源类型
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum RESOURCE_TYPE {
|
||||
MAIN, // 主资源
|
||||
ASS // 副资源
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :锁定时间计算方式
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum RES_COMB_LOCK_TYPE {
|
||||
KEEP_ORIGIN, // 各自锁定
|
||||
MAIN_LOCK, // 主资源锁定
|
||||
MAX_ALL_RESOURCE, // 最大锁定时间
|
||||
}
|
||||
@ -1,18 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :生产时间计算方法
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum RES_COMB_TIME_TYPE {
|
||||
MAIN_RESOURCE, // 主资源
|
||||
MAX_ASS_RESOURCE, // 副资源最大值
|
||||
MIN_ASS_RESOURCE, // 副资源最小值
|
||||
AVG_ASS_RESOURCE, // 副资源平均值
|
||||
MAX_ALL_RESOURCE, // 主副资源最大值
|
||||
MIN_ALL_RESOURCE, // 主副资源最小值
|
||||
AVG_ALL_RESOURCE // 主副资源平均值
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :工艺路径有效性判断类型
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-10-29
|
||||
* @Modify:
|
||||
**/
|
||||
public enum ROUTING_VALID_TYPE {
|
||||
ORDER_CALC_LET, // 与订单的最晚结束时刻计算值做比较
|
||||
CALC_LET_LT, // 与最晚结束时刻计算值-提前期做比较
|
||||
BASE_TIME // 与基准时刻做比较
|
||||
}
|
||||
@ -1,8 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
public enum RULE_TYPE {
|
||||
CANCEL_PLAN,
|
||||
MAT_CALC,
|
||||
HEURISTIC,
|
||||
FIELD_SET
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :尾数处理方式
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum TAIL_DEAL {
|
||||
NODEAL, // 不处理
|
||||
CEILING, // 向下
|
||||
PUSHFRONT // 向上
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :时间圆整方式
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum TIME_ROUND_TYPE {
|
||||
UP, // 向上
|
||||
DOWN, // 向下
|
||||
ROUNDING // 四舍五入
|
||||
}
|
||||
@ -1,18 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :使用类型
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum USE_TYPE {
|
||||
MAIN, // 主资源
|
||||
FIRST_ASS, // 第一套副资源
|
||||
SECOND_ASS, // 第二套副资源
|
||||
THIRD_ASS, // 第三套副资源
|
||||
FOURTH_ASS, // 第四套副资源
|
||||
FIFTH_ASS, // 第五套副资源
|
||||
SIXTH_ASS // 第六套副资源
|
||||
}
|
||||
@ -1,7 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
public enum WORK_PLAN_TYPE {
|
||||
MAIN_PLAN, // 主资源计划
|
||||
ASS_PLAN, // 副资源计划
|
||||
BATCH_PLAN // 炉资源计划
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :工作关联类型
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum WORK_RELATION_TYPE {
|
||||
INNER, // 订单内关联
|
||||
OUTER // 订单间关联
|
||||
}
|
||||
@ -1,31 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :预置的工作排序规则
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum WORK_SORT_RULE {
|
||||
NONE,
|
||||
ORDER_LET, // 订单交货期
|
||||
ORDER_PRIORITY, // 订单优先级
|
||||
ORDER_EST, // 订单最早开始时刻
|
||||
ORDER_COUNT, // 订单数量
|
||||
ORDER_RECEIVE_DATE,// 订单接单日期
|
||||
ORDER_LET_SUB_EST,// 订单交货期与订单最早开始时刻之差
|
||||
ORDER_SURPLUS, // 订单余裕度
|
||||
NOPLAN_OPERATION_SIZE,// 残留工序数
|
||||
REMAIN_PRODUCE_TIME, // 残留生产时间
|
||||
MIN_OPERATION_REMAIN_TIME,// 最小工序宽裕时间
|
||||
WORK_LET, // 工作最晚结束时刻
|
||||
WORK_EST, // 工作最早开始时刻
|
||||
INVENTORY_RELA, // 订单物品库存量相对值
|
||||
FIRST_WORK_BEGIN,// 订单首工作上次开始时刻
|
||||
HAVE_HIGH_WORK, // 订单中含有高级别工作
|
||||
WORK_RESOURCE_SIZE, // 工作的可用资源数
|
||||
TOP_ORDER_LET,// 顶层订单的交货期
|
||||
TOP_ORDER_CODE, // 顶层订单代码
|
||||
TOP_ORDER_PRIORITY; // 顶层订单优先级
|
||||
}
|
||||
@ -1,8 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
public enum WORK_SPLIT_TYPE {
|
||||
NONE, // 不分割
|
||||
RATIO, // 按比例分割
|
||||
COUNT, // 按数量分割
|
||||
BATCH // 按批量分割
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :工作状态
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum WORK_STATUS {
|
||||
NOPLAN, // 未计划
|
||||
PLANDONE, // 计划完毕
|
||||
INDICATIONDONE, // 指示完毕
|
||||
CONFIRM, // 确认
|
||||
STARTPRODUCT, // 开始生产
|
||||
FINISH // 完成
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :工作类型
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum WORK_TYPE {
|
||||
FICTITIOUS, // 虚拟工作
|
||||
NORMAL // 普通工作
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Bom接口数据
|
||||
*/
|
||||
@Data
|
||||
public class BomModel {
|
||||
@Data
|
||||
public static class Detail {
|
||||
private String label;
|
||||
private String name;
|
||||
}
|
||||
|
||||
private String label;
|
||||
private String name;
|
||||
private Long id;
|
||||
private List<Detail> details = new ArrayList<>();
|
||||
private List<BomModel> children = new ArrayList<>();
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description :交换两对象的显示位置
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-11-10
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class ExchangeBeanOrderNumber {
|
||||
@ApiParam(value ="前对象ID")
|
||||
private Long prevId;
|
||||
@ApiParam(value ="后对象ID")
|
||||
private Long postId;
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.FurnaceCapacity;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface IFurnaceCapacityRepository extends CrudRepository<FurnaceCapacity, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.FurnaceSetting;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface IFurnaceSettingRepository extends CrudRepository<FurnaceSetting, Long> {
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,64 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.model;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Author: wangjie
|
||||
* @CreateDate: 2019/9/23 8:06 PM
|
||||
* @Description:
|
||||
**/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Api("产品包装model")
|
||||
public class ProdPackageModel {
|
||||
|
||||
@ApiParam("工单号")
|
||||
private String workOrderNo;
|
||||
|
||||
@ApiParam("生产线")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("客户代码")
|
||||
private String custCode;
|
||||
|
||||
@ApiParam("班次")
|
||||
private String shiftCode;
|
||||
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("物料名称")
|
||||
private String partNameRdd;
|
||||
|
||||
@ApiParam("单位")
|
||||
private String unit;
|
||||
|
||||
@ApiParam("工单数量")
|
||||
private Double workOrderQty;
|
||||
|
||||
@ApiParam("完成数量")
|
||||
private Double completeQty;
|
||||
|
||||
@ApiParam("包装规格数量")
|
||||
private Double packSpecQty;
|
||||
|
||||
@ApiParam("包装规格")
|
||||
private String packSpec;
|
||||
|
||||
@ApiParam("包装集合")
|
||||
private List<MesPackage> packageList;
|
||||
|
||||
@ApiParam("工单集合")
|
||||
private List<MesWorkOrder> workOrderList;
|
||||
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.model;
|
||||
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Author: Wynne.Lu
|
||||
* @CreateDate: 2019/11/12 3:50 下午
|
||||
* @Description: 下拉工步参数对象
|
||||
**/
|
||||
@Data
|
||||
@Api("下拉工步参数对象")
|
||||
public class StepParamsModel implements Serializable {
|
||||
private static final long serialVersionUID = -6361645141217616499L;
|
||||
|
||||
@ApiParam("参数代码")
|
||||
private String paramCode;
|
||||
|
||||
@ApiParam("参数代码")
|
||||
private Map<String, Object> paramValues;
|
||||
|
||||
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue