Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest
jun
3 years ago
commit
4f6c900bcc
@ -0,0 +1,11 @@
|
||||
package cn.estsh.i3plus.pojo.aps.annotation;
|
||||
|
||||
/**
|
||||
* @author Jason
|
||||
* @ClassName: ClassLevelAnnotation
|
||||
* @Description: TODO(这里用一句话描述这个类的作用)
|
||||
* @date 2022-01-22
|
||||
*/
|
||||
public @interface ClassLevelAnnotation {
|
||||
int level();
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
|
||||
import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
|
||||
import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
|
||||
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 javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :删除订单历史表
|
||||
* @Reference :
|
||||
* @Author : pantianhu
|
||||
* @CreateDate : 2022-07-13 11:03
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_DELETE_ORDER_HISTORY")
|
||||
@Api("删除订单历史表")
|
||||
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
|
||||
public class DeleteOrderHistory extends BaseBean {
|
||||
@Column(name="TOP_ORDER")
|
||||
@ApiParam(value ="顶层订单号")
|
||||
private String topOrder;
|
||||
}
|
||||
@ -1,63 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
|
||||
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.Lob;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description : 排程优化规则
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2021-03-24
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_HEURISTIC_OPTIMIZE")
|
||||
@Api("排程优化规则")
|
||||
public class HeuristicOptimize extends BaseRule {
|
||||
private static final long serialVersionUID = -464821596740369199L;
|
||||
|
||||
@Column(name="WORK_FILTER")
|
||||
@ApiParam(value ="工作筛选")
|
||||
private String workFilter;
|
||||
|
||||
@Lob
|
||||
@Column(name="WORK_SORT")
|
||||
@ApiParam(value ="工作排序")
|
||||
private String workSort;
|
||||
|
||||
@Column(name="RES_FILTER")
|
||||
@ApiParam(value ="资源筛选")
|
||||
private String resFilter;
|
||||
|
||||
@Lob
|
||||
@Column(name="RES_SELECT")
|
||||
@ApiParam(value ="资源选择")
|
||||
private String resSelect;
|
||||
|
||||
@Column(name="WAITING_TIME")
|
||||
@ApiParam(value ="最大等待时间")
|
||||
private String waitingTime;
|
||||
|
||||
@Column(name="OPTIMIZE_INTERVAL")
|
||||
@ApiParam(value ="优化间隔")
|
||||
private String optimizeInterval;
|
||||
|
||||
@Column(name="MAX_WAITING_LIMIT")
|
||||
@ApiParam(value ="最大等待时间限制")
|
||||
private Boolean maxWaitingLimit;
|
||||
|
||||
@Column(name="MAX_WAITING_ADJUST")
|
||||
@ApiParam(value ="最大等待时间调整")
|
||||
private Boolean maxWaitingAdjust;
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
|
||||
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.Date;
|
||||
|
||||
/**
|
||||
* @Description :产线
|
||||
* @Reference :
|
||||
* @Author : pantianhu
|
||||
* @CreateDate : 2022-03-29 11:26
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_PRODUCT_LINE")
|
||||
@Api("产线信息")
|
||||
@ClassLevelAnnotation(level = 0)
|
||||
public class ProductLine extends BaseAPS {
|
||||
private static final long serialVersionUID = 6900226668783322736L;
|
||||
|
||||
@Column(name="CODE")
|
||||
@ApiParam(value ="编码")
|
||||
@FieldAnnotation(popSearch = true, mainkey = true)
|
||||
private String code;
|
||||
|
||||
@Column(name="NAME")
|
||||
@ApiParam(value ="名称")
|
||||
@FieldAnnotation(popSearch = true)
|
||||
private String name;
|
||||
|
||||
@Column(name="TYPE")
|
||||
@ApiParam(value ="产线类型")
|
||||
private ApsEnumUtil.SANLUX_PRODUCT_TYPE type;
|
||||
|
||||
@Column(name="PRODUCT_QUALITY")
|
||||
@ApiParam(value ="指定品质")
|
||||
private String productQuality;
|
||||
|
||||
@Column(name="SHIFT_LIMIT_NUM")
|
||||
@ApiParam(value ="多楔带限制模数")
|
||||
private Integer shiftLimitNum;
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
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;
|
||||
|
||||
/**
|
||||
* @author Jason
|
||||
* @ClassName: SupplyOrder
|
||||
* @Description: 补充订单
|
||||
* @date 2021-12-30
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_SUPPLY_ORDER")
|
||||
@Api("补充订单")
|
||||
public class SupplyOrder extends BaseOrder {
|
||||
private static final long serialVersionUID = -5829272956141252627L;
|
||||
|
||||
@Column(name="FINISH_COUNT")
|
||||
@ApiParam(value ="完工数")
|
||||
@FieldAnnotation(modify = false, defaultValue = "0")
|
||||
private Double finishCount;
|
||||
|
||||
@Column(name="QUALIFIED_COUNT")
|
||||
@ApiParam(value ="检验合格数量")
|
||||
@FieldAnnotation(modify = false, defaultValue = "0")
|
||||
private Double qualifiedCount;
|
||||
|
||||
@JsonIgnore
|
||||
public Work getWork() {
|
||||
return BeanRelation.get(this, EBaseOrder.Works);
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,11 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
/**
|
||||
* @Description : 规则关系标识
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-11
|
||||
* @Modify:
|
||||
**/
|
||||
public enum EBaseRule {
|
||||
}
|
||||
|
||||
@ -1,4 +1,11 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
/**
|
||||
* @Description : 班次关系标识
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-11
|
||||
* @Modify:
|
||||
**/
|
||||
public enum EDayShift {
|
||||
}
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
/**
|
||||
* @Description : 导出明细关系标识
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-11
|
||||
* @Modify:
|
||||
**/
|
||||
public enum EExportDetail {
|
||||
Project
|
||||
}
|
||||
|
||||
@ -1,5 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
/**
|
||||
* @Description : 炉计划关系标识
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-11
|
||||
* @Modify:
|
||||
**/
|
||||
public enum EFurnacePlan {
|
||||
WorkPlans
|
||||
WorkPlans,
|
||||
MergePlan,
|
||||
OriginMergePlan,
|
||||
}
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
/**
|
||||
* @Description : 导入字段关系标识
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-11
|
||||
* @Modify:
|
||||
**/
|
||||
public enum EImportField {
|
||||
ImportDetail
|
||||
}
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
/**
|
||||
* @Description : 插单关系标识
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-11
|
||||
* @Modify:
|
||||
**/
|
||||
public enum EInsertedOrder {
|
||||
ProductRouting
|
||||
}
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
/**
|
||||
* @Description : 计算中间结果明细
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-11
|
||||
* @Modify:
|
||||
**/
|
||||
public enum EInterMediateDetail {
|
||||
Result
|
||||
}
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
/**
|
||||
* @Description : 库存关系标识
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-11
|
||||
* @Modify:
|
||||
**/
|
||||
public enum EInventory {
|
||||
SafeStockOrders
|
||||
}
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
/**
|
||||
* @Description : 物料交期承诺
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-11
|
||||
* @Modify:
|
||||
**/
|
||||
public enum EMaterialDeliveryPromise {
|
||||
Material,
|
||||
}
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
/**
|
||||
* @Description : 成品检验报工关系标识
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-11
|
||||
* @Modify:
|
||||
**/
|
||||
public enum EOrderFeedback {
|
||||
Order
|
||||
}
|
||||
|
||||
@ -1,5 +1,13 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
/**
|
||||
* @Description : 工作报工关系标识
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-11
|
||||
* @Modify:
|
||||
**/
|
||||
public enum EPlanFeedback {
|
||||
Work
|
||||
Work,
|
||||
TopOrder,
|
||||
}
|
||||
|
||||
@ -1,6 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
/**
|
||||
* @Description : 资源关系标识
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-11
|
||||
* @Modify:
|
||||
**/
|
||||
public enum EResource {
|
||||
WorkShop,
|
||||
WorkPlans
|
||||
WorkPlans,
|
||||
BindResource,
|
||||
SubBindResources,
|
||||
ProductLine
|
||||
}
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
/**
|
||||
* @Description : 规则组合关系标识
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-11
|
||||
* @Modify:
|
||||
**/
|
||||
public enum ERuleGroup {
|
||||
Details
|
||||
}
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
/**
|
||||
* @Description : 安全库存关系标识
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-11
|
||||
* @Modify:
|
||||
**/
|
||||
public enum ESafeStockOrder {
|
||||
Inventory
|
||||
}
|
||||
|
||||
@ -1,8 +1,15 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
/**
|
||||
* @Description : 运输时间关系标识
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-11
|
||||
* @Modify:
|
||||
**/
|
||||
public enum EShippingTime {
|
||||
PrevRes, // 前资源
|
||||
PostRes, // 后资源
|
||||
PrevStand, // 前标准工序
|
||||
PostStand // 后标准工序
|
||||
PrevRes,
|
||||
PostRes,
|
||||
PrevStand,
|
||||
PostStand
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue