Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wynne1005
4 years ago
commit
261d5b3655
@ -0,0 +1,46 @@
|
||||
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;
|
||||
|
||||
@Column(name="RES_FILTER")
|
||||
@ApiParam(value ="资源筛选")
|
||||
private String resFilter;
|
||||
|
||||
@Lob
|
||||
@Column(name="RES_SELECT")
|
||||
@ApiParam(value ="资源选择")
|
||||
private String resSelect;
|
||||
|
||||
@Column(name="OPTIMIZE_INTERVAL")
|
||||
@ApiParam(value ="优化间隔")
|
||||
private String optimizeInterval;
|
||||
}
|
||||
@ -0,0 +1,68 @@
|
||||
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 cn.estsh.i3plus.pojo.aps.holders.EInsertedOrder;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description :插单管理
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2021-03-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_INSERTED_ORDER")
|
||||
@Api("插单管理")
|
||||
public class InsertedOrder extends BaseOrder {
|
||||
private static final long serialVersionUID = -5036380772996107234L;
|
||||
|
||||
@Column(name="ORDER_STATUS")
|
||||
@ApiParam(value ="订单状态")
|
||||
@FieldAnnotation(defaultValue = "UNCOMMIT")
|
||||
private ApsEnumUtil.INSERTED_ORDER_STATUS orderStatus = ApsEnumUtil.INSERTED_ORDER_STATUS.UNCOMMIT;
|
||||
|
||||
@Column(name="STAND_OPERATIONS")
|
||||
@ApiParam("工序")
|
||||
private String standOperations;
|
||||
|
||||
@Column(name="PRODUCT_ROUTING_ID")
|
||||
@ApiParam(value ="工艺路线")
|
||||
@FieldAnnotation(property = false)
|
||||
private Long productRoutingId;
|
||||
|
||||
@Column(name="FINISH_COUNT")
|
||||
@ApiParam(value ="完工数")
|
||||
private Double finishCount;
|
||||
|
||||
@Column(name="REMARK")
|
||||
@ApiParam(value ="备注")
|
||||
private String remark;
|
||||
|
||||
public ProductRouting getProductRouting() {
|
||||
return BeanRelation.get(this, EInsertedOrder.ProductRouting);
|
||||
}
|
||||
|
||||
public void setProductRouting(ProductRouting routing) {
|
||||
this.productRoutingId = routing != null ? routing.getId() : 0l;
|
||||
BeanRelation.set(this, EInsertedOrder.ProductRouting, routing);
|
||||
}
|
||||
|
||||
@JsonIgnore
|
||||
public Work getWork() {
|
||||
return BeanRelation.get(this, EBaseOrder.Works);
|
||||
}
|
||||
}
|
||||
@ -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,79 @@
|
||||
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.EOrderFeedback;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EPlanFeedback;
|
||||
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 : 2020-03-19
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_ORDER_FEEDBACK")
|
||||
@Api("订单反馈")
|
||||
public class OrderFeedback extends BaseAPS {
|
||||
private static final long serialVersionUID = 7822380202121225936L;
|
||||
|
||||
@Column(name="ORDER_ID")
|
||||
@ApiParam(value ="顶层订单号")
|
||||
@FieldAnnotation(relation = "Order", modify = false)
|
||||
private Long orderId;
|
||||
|
||||
@Column(name="DELIVER_RATE")
|
||||
@ApiParam(value ="发货百分比")
|
||||
private Double deliverRate;
|
||||
|
||||
@Column(name="QUALIFIED_RATE")
|
||||
@ApiParam(value ="成品合格百分比")
|
||||
private Double qualifiedRate;
|
||||
|
||||
@Column(name="INVENTORY_COUNT")
|
||||
@ApiParam(value ="库存扣减数量")
|
||||
private Double inventoryCount;
|
||||
|
||||
@Column(name="LAST_OPERATION_COUNT")
|
||||
@ApiParam(value ="硫化报工数量")
|
||||
private Double lastOperationCount;
|
||||
|
||||
@Column(name="UNQUALIFIED_COUNT")
|
||||
@ApiParam(value ="不良数量")
|
||||
private Double unqualifiedCount;
|
||||
|
||||
@Column(name="QUALIFIED_COUNT")
|
||||
@ApiParam(value ="成品合格数量")
|
||||
private Double qualifiedCount;
|
||||
|
||||
@Column(name="ADD_UNQUALIFIED_COUNT")
|
||||
@ApiParam(value ="累加不良数量")
|
||||
@FieldAnnotation(display = false)
|
||||
private Double addUnqualifiedCount;
|
||||
|
||||
@Column(name="ADD_QUALIFIED_COUNT")
|
||||
@ApiParam(value ="累加合格数量")
|
||||
@FieldAnnotation(display = false)
|
||||
private Double addQualifiedCount;
|
||||
|
||||
public BaseOrder getOrder() {
|
||||
return BeanRelation.get(this, EOrderFeedback.Order);
|
||||
}
|
||||
|
||||
public void setOrder(BaseOrder order) {
|
||||
this.orderId = order != null ? order.getId() : 0l;
|
||||
BeanRelation.set(this, EOrderFeedback.Order, order);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
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 lombok.EqualsAndHashCode;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :优先级
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2021-04-08
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_PRIORITY_TYPE")
|
||||
@Api("优先级")
|
||||
public class PriorityType extends BaseAPS {
|
||||
private static final long serialVersionUID = 445577901076659576L;
|
||||
|
||||
@Column(name="CODE")
|
||||
@ApiParam(value ="标识")
|
||||
@FieldAnnotation(mainkey = true, popSearch = true)
|
||||
private String code;
|
||||
|
||||
@Column(name="VALUE")
|
||||
@ApiParam(value ="值")
|
||||
@FieldAnnotation(notEmpty = true, popSearch = true)
|
||||
private Integer value;
|
||||
}
|
||||
@ -0,0 +1,59 @@
|
||||
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 cn.estsh.i3plus.pojo.aps.holders.ESafeStockOrder;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description :安全库存订单
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2021-02-23
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_SAFE_STOCK_ORDER")
|
||||
@Api("安全库存订单")
|
||||
public class SafeStockOrder extends BaseOrder {
|
||||
|
||||
private static final long serialVersionUID = 5944067344390531794L;
|
||||
|
||||
@Column(name="ORDER_STATUS")
|
||||
@ApiParam(value ="订单状态")
|
||||
@FieldAnnotation(defaultValue = "UNCOMMIT")
|
||||
private ApsEnumUtil.SAFE_STOCK_ORDER_STATUS orderStatus = ApsEnumUtil.SAFE_STOCK_ORDER_STATUS.UNCOMMIT;
|
||||
|
||||
@Column(name="INVENTORY_ID")
|
||||
@ApiParam(value ="库存")
|
||||
@FieldAnnotation(relation = "Inventory", notEmpty = true)
|
||||
private Long inventoryId;
|
||||
|
||||
@Column(name="FINISH_COUNT")
|
||||
@ApiParam(value ="完工数")
|
||||
private Double finishCount;
|
||||
|
||||
@JsonIgnore
|
||||
public Work getWork() {
|
||||
return BeanRelation.get(this, EBaseOrder.Works);
|
||||
}
|
||||
|
||||
public Inventory getInventory() { return BeanRelation.get(this, ESafeStockOrder.Inventory); }
|
||||
|
||||
public void setInventory(Inventory inventory) {
|
||||
this.inventoryId = inventory != null ? inventory.getId() : 0;
|
||||
BeanRelation.set(this, ESafeStockOrder.Inventory, inventory);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
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 lombok.EqualsAndHashCode;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :车间
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2021-03-22
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_WORK_SHOP")
|
||||
@Api("车间")
|
||||
public class WorkShop extends BaseAPS {
|
||||
private static final long serialVersionUID = 5627016086816721284L;
|
||||
|
||||
@Column(name="CODE")
|
||||
@ApiParam(value ="编码")
|
||||
@FieldAnnotation(popSearch = true, mainkey = true)
|
||||
private String code;
|
||||
|
||||
@Column(name="NAME")
|
||||
@ApiParam(value ="名称")
|
||||
@FieldAnnotation(popSearch = true, notEmpty = true)
|
||||
private String name;
|
||||
|
||||
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EImportDetail {
|
||||
Project
|
||||
Project,
|
||||
Fields
|
||||
}
|
||||
|
||||
@ -0,0 +1,5 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EImportField {
|
||||
ImportDetail
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EInsertedOrder {
|
||||
ProductRouting
|
||||
}
|
||||
@ -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,5 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EInventory {
|
||||
SafeStockOrders
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EOrderFeedback {
|
||||
Order
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EResource {
|
||||
WorkShop,
|
||||
WorkPlans
|
||||
}
|
||||
|
||||
@ -0,0 +1,5 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum ESafeStockOrder {
|
||||
Inventory
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EStandOperation {
|
||||
WorkShop
|
||||
}
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 表格导出查询参数
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-02-25
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("表格导出查询参数")
|
||||
public class ExportModelRequest {
|
||||
private String filter;
|
||||
private List<APSPager.SortData> sorts;
|
||||
private String tableName;
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description : 进度条显示信息。
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-04-01
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class ImportDataModel {
|
||||
@ApiParam(value ="当前执行进度")
|
||||
private Integer curProcess = 0;
|
||||
|
||||
@ApiParam(value ="总行数")
|
||||
private Integer totalSize = 0;
|
||||
|
||||
@ApiParam(value ="进度消息")
|
||||
private String processMsg = "";
|
||||
|
||||
private Boolean finish = false;
|
||||
|
||||
@ApiParam(value ="异常消息")
|
||||
private String exception = "";
|
||||
|
||||
private ImportErrorInfo errorInfo;
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 导入校验错误信息
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2021-02-25
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("导入校验错误信息")
|
||||
public class ImportErrorInfo {
|
||||
private List<String> headers = new ArrayList<>();
|
||||
private List<List<String>> errorData = new ArrayList<>(100);
|
||||
|
||||
public boolean hasErrorData() {
|
||||
return !errorData.isEmpty();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.FurnacePlan;
|
||||
import cn.estsh.i3plus.pojo.aps.bean.Resource;
|
||||
import cn.estsh.i3plus.pojo.aps.bean.WorkPlan;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description : 计划记录
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2021-04-15
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class PlanRecord {
|
||||
/**
|
||||
* 需要插入的工作计划
|
||||
*/
|
||||
private WorkPlan plan;
|
||||
/**
|
||||
* 插入到目标资源
|
||||
*/
|
||||
private Resource resource;
|
||||
/**
|
||||
* 插入到目标工作计划前面
|
||||
*/
|
||||
private WorkPlan postPlan;
|
||||
|
||||
/**
|
||||
* 插入到指定炉资源上
|
||||
*/
|
||||
private FurnacePlan furnacePlan;
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.Work;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 工作排程记录
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2021-04-15
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class WorkRecord {
|
||||
private Work work;
|
||||
private Work splitWork;
|
||||
private PlanRecord mainPlan;
|
||||
private List<PlanRecord> assPlans = new ArrayList<>();
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.HeuristicOptimize;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface HeuristicOptimizeRepository extends CrudRepository<HeuristicOptimize, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.OrderFeedback;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface IOrderFeedbackRepository extends CrudRepository<OrderFeedback, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.ImportField;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface ImportFieldRepository extends CrudRepository<ImportField, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.InsertedOrder;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface InsertedOrderRepository extends CrudRepository<InsertedOrder, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.PriorityType;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface PriorityTypeRepository extends CrudRepository<PriorityType, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.SafeStockOrder;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface SafeStockOrderRepository extends CrudRepository<SafeStockOrder, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.WorkShop;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface WorkShopRepository extends CrudRepository<WorkShop, Long> {
|
||||
}
|
||||
@ -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,43 @@
|
||||
package cn.estsh.i3plus.pojo.aps.validator;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.CalendarTimeAnntation;
|
||||
import cn.estsh.i3plus.pojo.aps.model.TimeBlock;
|
||||
import cn.estsh.i3plus.pojo.base.util.StringUtil;
|
||||
|
||||
import javax.validation.ConstraintValidator;
|
||||
import javax.validation.ConstraintValidatorContext;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
|
||||
public class CalendarTimeValidator implements ConstraintValidator<CalendarTimeAnntation, String> {
|
||||
SimpleDateFormat timeFormat = new SimpleDateFormat("yyyy-MM-dd");
|
||||
|
||||
@Override
|
||||
public boolean isValid(String s, ConstraintValidatorContext constraintValidatorContext) {
|
||||
for (String strTime : s.split(",")) {
|
||||
if (StringUtil.isEmpty(strTime)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
String[] times = strTime.split("~");
|
||||
if (times.length == 1) {
|
||||
try {
|
||||
timeFormat.parse(times[0]);
|
||||
} catch (ParseException e) {
|
||||
return false;
|
||||
}
|
||||
} else if (times.length == 2) {
|
||||
try {
|
||||
TimeBlock timeBlock = new TimeBlock();
|
||||
timeBlock.setBegin(timeFormat.parse(times[0]));
|
||||
timeBlock.setEnd(timeFormat.parse(times[1]));
|
||||
} catch (ParseException e) {
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,4 @@
|
||||
package cn.estsh.i3plus.pojo.aps.validator;
|
||||
|
||||
public interface ImportGroup {
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
package cn.estsh.i3plus.pojo.aps.validator;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.ShiftTimeAnnotation;
|
||||
import cn.estsh.i3plus.pojo.aps.model.TimeBlock;
|
||||
import cn.estsh.i3plus.pojo.base.util.StringUtil;
|
||||
|
||||
import javax.validation.ConstraintValidator;
|
||||
import javax.validation.ConstraintValidatorContext;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
|
||||
public class ShiftTimeValidator implements ConstraintValidator<ShiftTimeAnnotation, String> {
|
||||
SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm");
|
||||
|
||||
@Override
|
||||
public boolean isValid(String s, ConstraintValidatorContext constraintValidatorContext) {
|
||||
if (StringUtil.isEmpty(s)) {
|
||||
return false;
|
||||
}
|
||||
for (String strTime : s.split(",")) {
|
||||
String[] times = strTime.split("-");
|
||||
if (times.length != 2) {
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
TimeBlock timeBlock = new TimeBlock();
|
||||
timeBlock.setBegin(timeFormat.parse(times[0]));
|
||||
timeBlock.setEnd(timeFormat.parse(times[1]));
|
||||
} catch (ParseException e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="ImportDetail">
|
||||
<Relation field="Fields" name="ImportField" reverse="ImportDetail" type="ONE_TO_MULTI" owner="true">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="InsertedOrder" extends="BaseOrder">
|
||||
<Relation field="ProductRouting" name="ProductRouting" type="ONE_TO_ONE" owner="true">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -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,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="Inventory" extends="BaseOrder">
|
||||
<Relation field="SafeStockOrders" name="SafeStockOrder" reverse="Inventory" type="ONE_TO_MULTI" owner="true">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="OrderFeedback">
|
||||
<Relation field="Order" name="BaseOrder" type="ONE_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -1,3 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="PlanFeedback">
|
||||
</Class>
|
||||
@ -1,5 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="Resource">
|
||||
<Relation field="WorkShop" name="WorkShop" type="MULTI_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
<Relation field="WorkPlans" name="WorkPlan" reverse="Resource" type="ONE_TO_MULTI" owner="true">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -1,3 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="StandOperation">
|
||||
<Relation field="WorkShop" name="WorkShop" type="MULTI_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -0,0 +1,55 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>i3plus-pojo</artifactId>
|
||||
<groupId>i3plus.pojo</groupId>
|
||||
<version>1.0-DEV-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>i3plus-pojo-mes-pcn</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>i3plus.pojo</groupId>
|
||||
<artifactId>i3plus-pojo-base</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>dev</id>
|
||||
<properties>
|
||||
<profileActive>DEV</profileActive>
|
||||
</properties>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>test</id>
|
||||
<properties>
|
||||
<profileActive>TEST</profileActive>
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>docker</id>
|
||||
<properties>
|
||||
<profileActive>DOCKER</profileActive>
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>prod</id>
|
||||
<properties>
|
||||
<profileActive>PROD</profileActive>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
<build>
|
||||
<finalName>${project.artifactId}-${project.version}</finalName>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
@ -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;
|
||||
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue