diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 7fdc84c..9c806e2 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -52,4 +52,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 99a4195..b4040ec 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -56,4 +56,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ClassLevelAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ClassLevelAnnotation.java new file mode 100644 index 0000000..dada68b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ClassLevelAnnotation.java @@ -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(); +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java index 1d24b39..5371a20 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java @@ -26,6 +26,7 @@ import javax.persistence.Table; @Api("副资源设置时间") public class AssistResourceSetTime extends BaseAPS { private static final long serialVersionUID = 901172392855536686L; + @Column(name="RES_CODE") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index b22eb80..432e6c6 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -36,6 +37,7 @@ import java.util.List; @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class BaseOrder extends BaseAPS { private static final long serialVersionUID = -2571085172798608026L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) @@ -109,19 +111,23 @@ public class BaseOrder extends BaseAPS { @FieldAnnotation(modify = false) private Integer delayTime; - private transient Date lastBegin; + @Column(name="CHECK_FINISH") + @ApiParam(value ="检验完成") + @FieldAnnotation(property = false) + private Boolean checkFinish; @JsonBackReference public List getWorks() { return BeanRelation.list(this, EBaseOrder.Works); } + @JsonIgnore public Material getMaterial() { return BeanRelation.get(this, EBaseOrder.Material); } public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; + this.materialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EBaseOrder.Material, material); } @@ -135,6 +141,7 @@ public class BaseOrder extends BaseAPS { return BeanRelation.list(this, EBaseOrder.PostRelations); } + @JsonIgnore public PriorityType getPriority() { return BeanRelation.get(this, EBaseOrder.Priority); } public void setPriority(PriorityType priority) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java index 0142e58..f649237 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java @@ -25,8 +25,13 @@ import javax.persistence.MappedSuperclass; @ExcludeImportExport public class BaseRule extends BaseAPS { private static final long serialVersionUID = -1818853814377611968L; + @Column(name="CODE") @ApiParam(value ="规则编码") @FieldAnnotation(popSearch = true, mainkey = true) private String code; + + @Column(name="REMARK") + @ApiParam(value ="备注") + private String remark; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java index f4f3b4d..60d2e84 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java @@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -23,11 +24,9 @@ import javax.persistence.Table; @Api("取消计划规则") public class CancelPlanRule extends BaseRule { private static final long serialVersionUID = 2674055522875545446L; + + @Lob @Column(name="WORK_FILTERS") @ApiParam(value ="工作筛选") private String workFilters; - - @Column(name="RECORD_RIGHT_EDGE") - @ApiParam(value ="记录工作右边界") - private Boolean recordRightEdge; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java index 0d537d2..4b402e9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java @@ -26,6 +26,7 @@ import javax.persistence.Table; @Api("数据集成数据连接信息") public class DataLink extends BaseAPS { private static final long serialVersionUID = 8324774871058505466L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java index 8d7733d..710b92c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java @@ -32,6 +32,7 @@ import javax.persistence.Table; @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class DayShift extends BaseAPS { private static final long serialVersionUID = 7964370027924366093L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DeleteOrderHistory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DeleteOrderHistory.java new file mode 100644 index 0000000..797aa47 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DeleteOrderHistory.java @@ -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; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java index ea42942..ed30351 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java @@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -26,6 +27,8 @@ import javax.persistence.Table; @Api("动态设置时间") public class DynamicSetTime extends BaseAPS { private static final long serialVersionUID = -1696499471488104793L; + + @Lob @Column(name="RES_CODE") @ApiParam(value ="资源代码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java index e859fe8..c279a98 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java @@ -4,6 +4,7 @@ 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.EExportDetail; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,6 +12,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -26,8 +28,8 @@ import javax.persistence.Table; @Table(name = "APS_EXPORT_DETAIL") @Api("数据导出明细") public class ExportDetail extends BaseAPS { - private static final long serialVersionUID = -8898414164032180539L; + @Column(name="OUT_NAME") @ApiParam(value ="外部表名") private String outName; @@ -36,10 +38,12 @@ public class ExportDetail extends BaseAPS { @ApiParam(value ="内部表名") private String inName; + @Lob @Column(name="FILTER") @ApiParam(value ="筛选") private String filter; + @Lob @Column(name="SORT_BY") @ApiParam(value ="排序") private String sortBy; @@ -54,12 +58,13 @@ public class ExportDetail extends BaseAPS { @FieldAnnotation(relation = "Project") private Long projectId; + @JsonIgnore public ExportProject getProject() { return BeanRelation.get(this, EExportDetail.Project); } public void setProject(ExportProject project) { - this.projectId = project != null ? project.getId() : 0l; + this.projectId = project != null ? project.getId() : 0L; BeanRelation.set(this, EExportDetail.Project, project); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index bf6ca40..6564681 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -30,6 +30,7 @@ import java.util.List; @Api("数据导出明细集合") public class ExportProject extends BaseAPS { private static final long serialVersionUID = -7281303629295174330L; + @Column(name="NAME") @ApiParam(value ="标识名") private String name; @@ -45,12 +46,13 @@ public class ExportProject extends BaseAPS { @ApiParam(value ="当前执行的明细名称") private transient String curDetailName; + @JsonIgnore public DataLink getLink() { return BeanRelation.get(this, EExportProject.Link); } public void setLink(DataLink link) { - this.linkId = link != null ? link.getId() : 0l; + this.linkId = link != null ? link.getId() : 0L; BeanRelation.set(this, EExportProject.Link, link); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java index cff475c..7abcf74 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -24,6 +25,7 @@ import javax.persistence.Table; @Api("表达式记录") public class ExpressionRecord extends BaseAPS { private static final long serialVersionUID = 4038954046132896632L; + @Column(name="BEAN_NAME") @ApiParam(value ="表名") private String beanName; @@ -36,6 +38,7 @@ public class ExpressionRecord extends BaseAPS { @ApiParam(value ="名称") private String name; + @Lob @Column(name="EXPRESSION") @ApiParam(value ="表达式") private String expression; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index 49cf675..b8daf9f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -13,10 +13,7 @@ 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; +import javax.persistence.*; import java.lang.reflect.Method; import java.sql.JDBCType; @@ -37,6 +34,7 @@ import java.sql.JDBCType; @ExcludeImportExport public class FieldInfo extends BaseAPS { private static final long serialVersionUID = -6195036426929675850L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) @@ -87,6 +85,7 @@ public class FieldInfo extends BaseAPS { @ApiParam(value ="字段提示") private String tips; + @Lob @Column(name="EXPRESSION") @ApiParam(value ="表达式") private String expression; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java index ee8ddc3..b476159 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java @@ -25,6 +25,7 @@ import javax.persistence.Table; @Api("属性赋值规则") public class FieldSetRule extends BaseRule { private static final long serialVersionUID = 6880145972942618559L; + @Column(name="BEAN") @ApiParam(value ="实体名") private String bean; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java index 57deab2..5191d3d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import javax.validation.constraints.Min; @@ -30,8 +31,9 @@ import javax.validation.constraints.Min; @Table(name="APS_FURNACE_CAPACITY") @Api("炉容量") public class FurnaceCapacity extends BaseAPS { - private static final long serialVersionUID = -5657804042629460659L; + + @Lob @Column(name="RES_CODES") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java index f57b2ac..ff0c36b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java @@ -1,9 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EFurnacePlan; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -30,9 +32,10 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name="APS_FURNACE_PLAN") @Api("炉资源计划") +@ClassLevelAnnotation(level = 1) public class FurnacePlan extends BaseAPS { - private static final long serialVersionUID = 6816465736285211114L; + @Column(name="CAPACITY", columnDefinition = "decimal(18,8)") @ApiParam(value ="已占用的能力") private Double capacity; @@ -41,14 +44,33 @@ public class FurnacePlan extends BaseAPS { @ApiParam(value ="容量限制") private Double capacityLimit; - @Column(name="MIN_PRODUCT_BATCH") - @ApiParam(value ="最小加工批量") - private Integer minProductBatch; + @Column(name="REMAIN_CAPACITY") + @ApiParam(value ="剩余可组炉容量") + private Double remainCapacity; @Column(name="FIX_PLAN") @ApiParam(value ="固定组炉的计划") private Boolean fixPlan; + @Column(name="MERGE_PLAN_ID") + @ApiParam(value ="合并炉计划") + private Long mergePlanId; + @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EFurnacePlan.WorkPlans); } + + @JsonIgnore + public FurnacePlan getMergePlan() { + return BeanRelation.get(this, EFurnacePlan.MergePlan); + } + + public void setMergePlan(FurnacePlan plan) { + this.mergePlanId = plan != null ? plan.getId() : 0L; + BeanRelation.set(this, EFurnacePlan.MergePlan, plan); + } + + @JsonBackReference + public FurnacePlan getOriginMergePlan() { + return BeanRelation.get(this, EFurnacePlan.OriginMergePlan); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java index d31c13f..9168a5b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java @@ -29,8 +29,8 @@ import javax.persistence.Table; @Table(name="APS_FURNACE_SETTING") @Api("组炉设置") public class FurnaceSetting extends BaseAPS { - private static final long serialVersionUID = -4566911526487268870L; + @Column(name="RES_CODES") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java deleted file mode 100644 index decdc04..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java +++ /dev/null @@ -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; -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index 294ec49..2173165 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -26,13 +26,14 @@ import javax.persistence.Table; @Api("排程运算规则") public class HeuristicRule extends BaseRule { private static final long serialVersionUID = -4856714428377308150L; + @Column(name="WORK_FILTER") @ApiParam(value ="工作筛选") private String workFilter; - @Column(name="RES_FILTER") - @ApiParam(value ="资源筛选") - private String resFilter; +// @Column(name="RES_FILTER") +// @ApiParam(value ="资源筛选") +// private String resFilter; @Lob @Column(name="WORK_SORT") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index e8f1d60..7f037ed 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,7 +36,6 @@ import java.util.List; @Api("数据导入明细") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class ImportDetail extends BaseAPS { - private static final long serialVersionUID = 1264030397500660450L; @Column(name="NAME") @@ -117,15 +117,20 @@ public class ImportDetail extends BaseAPS { @ApiParam(value ="外部对象筛选") private String outterFilter; + @Column(name="UPDATE_SQL") + @ApiParam(value ="更新外部数据") + private String updateSQL; + @FieldAnnotation(property = false) private transient ImportDataModel model; + @JsonIgnore public ImportProject getProject() { return BeanRelation.get(this, EImportDetail.Project); } public void setProject(ImportProject project) { - this.projectId = project != null ? project.getId() : 0l; + this.projectId = project != null ? project.getId() : 0L; BeanRelation.set(this, EImportDetail.Project, project); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java index cb0d6e4..991423a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EImportDetail; import cn.estsh.i3plus.pojo.aps.holders.EImportField; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,8 +29,8 @@ import javax.persistence.Transient; @Table(name = "APS_IMPORT_FIELD") @Api("数据导入字段配置") public class ImportField extends BaseAPS { - private static final long serialVersionUID = 8848879008582197564L; + @Column(name="FIELD_NAME") @ApiParam("字段名") private String fieldName; @@ -49,11 +50,19 @@ public class ImportField extends BaseAPS { @ApiParam(value = "是否必填", example = "0") private Integer isRequire; + @Column(name="IGNORE_NOT_VALID") + @ApiParam(value = "无效忽略", example = "0") + private Boolean ignoreNotValid; + @Column(name="MAX_LENGTH") @ApiParam(value = "最大长度", example = "0") @FieldAnnotation(defaultValue = "255") private Integer maxLength; + @Column(name="ADD_VALUE") + @ApiParam(value = "累加数值", example = "0") + private Boolean addValue; + @Column(name="VALIDATOR") @ApiParam("校验表达式") private String validator; @@ -75,12 +84,13 @@ public class ImportField extends BaseAPS { @FieldAnnotation(relation = "ImportDetail", notEmpty = true) private Long importDetailId; + @JsonIgnore public ImportDetail getImportDetail() { return BeanRelation.get(this, EImportField.ImportDetail); } public void setImportDetail(ImportDetail detail) { - this.importDetailId = detail != null ? detail.getId() : 0l; + this.importDetailId = detail != null ? detail.getId() : 0L; BeanRelation.set(this, EImportField.ImportDetail, detail); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java index 35aaf50..e239736 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EImportProject; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,6 +30,7 @@ import java.util.List; @Api("数据导入明细集合") public class ImportProject extends BaseAPS { private static final long serialVersionUID = -1899074765155621438L; + @Column(name="NAME") @ApiParam(value ="标识名") private String name; @@ -44,12 +46,13 @@ public class ImportProject extends BaseAPS { @ApiParam(value ="当前执行的明细名称") private transient String curDetailName; + @JsonIgnore public DataLink getLink() { return BeanRelation.get(this, EImportProject.Link); } public void setLink(DataLink link) { - this.linkId = link != null ? link.getId() : 0l; + this.linkId = link != null ? link.getId() : 0L; BeanRelation.set(this, EImportProject.Link, link); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java index a7e3134..81037a3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java @@ -1,5 +1,6 @@ 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.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; @@ -27,6 +28,7 @@ import javax.persistence.Table; @Entity @Table(name = "APS_INSERTED_ORDER") @Api("插单管理") +@ClassLevelAnnotation(level = 3) public class InsertedOrder extends BaseOrder { private static final long serialVersionUID = -5036380772996107234L; @@ -46,22 +48,30 @@ public class InsertedOrder extends BaseOrder { @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; @Column(name="REMARK") @ApiParam(value ="备注") private String remark; + @Column(name="FORCE_COUNT") + @ApiParam(value ="强制完成数量") + @FieldAnnotation(modify = false, defaultValue = "0") + private Double forceCount; + + @JsonIgnore public ProductRouting getProductRouting() { return BeanRelation.get(this, EInsertedOrder.ProductRouting); } public void setProductRouting(ProductRouting routing) { - this.productRoutingId = routing != null ? routing.getId() : 0l; + this.productRoutingId = routing != null ? routing.getId() : 0L; BeanRelation.set(this, EInsertedOrder.ProductRouting, routing); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java index 2f8136f..804ba93 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java @@ -4,6 +4,7 @@ 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 com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -41,10 +42,11 @@ public class InterMediateDetail extends BaseAPS { @ApiParam(value ="评估值") private Double evaluateValue; + @JsonIgnore public InterMediateResult getResult() { return BeanRelation.get(this, EInterMediateDetail.Result); } public void setResult(InterMediateResult result) { - this.resultId = result != null ? result.getId() : 0; + this.resultId = result != null ? result.getId() : 0L; BeanRelation.set(this, EInterMediateDetail.Result, result); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java index 87d59be..a0c99a1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java @@ -7,6 +7,7 @@ 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 com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -46,19 +47,21 @@ public class InterMediateResult extends BaseAPS { @ApiParam(value ="评估值") private Double evaluateValue; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EInterMediateResult.Work); } public void setWork(Work work) { - this.workId = work != null ? work.getId() : 0l; + this.workId = work != null ? work.getId() : 0L; BeanRelation.set(this, EInterMediateResult.Work, work); } + @JsonIgnore public Resource getResource() { return BeanRelation.get(this, EInterMediateResult.Resource); } public void setResource(Resource resource) { - this.resourceId = resource != null ? resource.getId() : 0l; + this.resourceId = resource != null ? resource.getId() : 0L; BeanRelation.set(this, EInterMediateResult.Resource, resource); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index 25594d0..ea01d99 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -1,5 +1,6 @@ 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.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; @@ -30,6 +31,7 @@ import java.util.List; @Entity @Table(name = "APS_INVENTORY") @Api("库存") +@ClassLevelAnnotation(level = 3) public class Inventory extends BaseOrder { private static final long serialVersionUID = 2378846162007550439L; @@ -46,11 +48,6 @@ public class Inventory extends BaseOrder { @FieldAnnotation(modify = false) private Double assignCount; -// @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)") -// @ApiParam(value ="多余量") -// @FieldAnnotation(modify = false) -// private Double excessCount; - @Column(name="SINGLE_SUPPLY_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="单次补充数量") private Double singleSupplyCount; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java index e214454..e674109 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java @@ -25,6 +25,7 @@ import javax.persistence.Table; @Api("物料运算规则") public class MatCalcRule extends BaseRule { private static final long serialVersionUID = 2102986260688118982L; + @Column(name="MATERIAL_FILTER") @ApiParam(value ="物料筛选") private String materialFilter; @@ -67,10 +68,4 @@ public class MatCalcRule extends BaseRule { @Column(name="BATCH_SUPPLY") @ApiParam(value ="批量补充") private Boolean batchSupply; - - @Column(name="ASSIGN_LIMIT") - @ApiParam(value ="物料分配制约") - @FieldAnnotation(multiEnumClass = ApsEnumUtil.MATERIAL_ASSIGN_LIMIT.class) - private Integer assignLimit; - } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index e00c22a..12b6322 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -1,17 +1,17 @@ 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.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; -import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import cn.estsh.i3plus.pojo.aps.holders.EMaterial; -import cn.estsh.i3plus.pojo.aps.holders.EResource; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,8 +35,10 @@ import java.util.List; @Table(name = "APS_MATERIAL") @Api("物料") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) +@ClassLevelAnnotation(level = 1) public class Material extends BaseAPS { private static final long serialVersionUID = -7928225487946173108L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) @@ -62,11 +64,6 @@ public class Material extends BaseAPS { @FieldAnnotation(defaultValue = "ONEBYONE") private ApsEnumUtil.REPLENISHMENT_TYPE replType; - @Column(name="GROUP_ID") - @ApiParam(value ="物料组") - @FieldAnnotation(relation = "Material") - private Long groupId; - @Column(name="PURCHASE_LEAD_TIME") @ApiParam(value ="采购提前期") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) @@ -100,11 +97,6 @@ public class Material extends BaseAPS { @FieldAnnotation(modify = false) private Integer level; - @Column(name="IS_AUTO_FIX_PEGGING") - @ApiParam(value ="自动补充标识") - @FieldAnnotation(defaultValue = "1") - private Boolean autoFixPegging; - @Column(name="MAX_PRODUCT_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="最大生产批量") private Double maxProductBatch; @@ -145,11 +137,6 @@ public class Material extends BaseAPS { @FieldAnnotation(property = false) private Double maxStockCount; - @Column(name="ORDER_BATCH_PERIOD") - @ApiParam(value ="订单合并期间") - @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) - private String orderBatchPeriod; - @Column(name="LABEL_NAME") @ApiParam(value ="标签名称") private String labelName; @@ -163,17 +150,9 @@ public class Material extends BaseAPS { @FieldAnnotation(relation = "WorkShop") private Long workShopId; - public Material getGroup() { - return BeanRelation.get(this, EMaterial.Group); - } - - public void setGroup(Material material) { - this.groupId = material != null ? material.getId() : 0l; - BeanRelation.set(this, EMaterial.Group, material); - } - - @JsonBackReference - public List getChilds() { return BeanRelation.list(this, EMaterial.Childs); } + @Column(name="BATCH_DAYS") + @ApiParam(value ="合并天数") + private Integer batchDays; @JsonBackReference public List getProductRoutings() { @@ -230,10 +209,11 @@ public class Material extends BaseAPS { return BeanRelation.listByClass(this, ProductOrder.class, EMaterial.Orders); } + @JsonIgnore public WorkShop getWorkShop() { return BeanRelation.get(this, EMaterial.WorkShop); } public void setWorkShop(WorkShop workShop) { - this.workShopId = workShop != null ? workShop.getId() : 0l; + this.workShopId = workShop != null ? workShop.getId() : 0; BeanRelation.set(this, EMaterial.WorkShop, workShop); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java index 1e7ca3b..4a85de9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import cn.estsh.i3plus.pojo.aps.holders.EMaterialDeliveryPromise; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,6 +30,7 @@ import java.util.Date; @Api("物料交期承诺") public class MaterialDeliveryPromise extends BaseBean { private static final long serialVersionUID = 831759543772896829L; + @Column(name="QTY") @ApiParam(value ="到货数量") private Double count; @@ -42,12 +44,13 @@ public class MaterialDeliveryPromise extends BaseBean { @FieldAnnotation(relation = "Material", notEmpty = true) private Long materialId; + @JsonIgnore public Material getMaterial() { return BeanRelation.get(this, EMaterialDeliveryPromise.Material); } public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; + this.materialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EMaterialDeliveryPromise.Material, material); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java index d77217c..b199355 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java @@ -26,6 +26,7 @@ import javax.persistence.Table; @Api("物料设置时间") public class MaterialSetTime extends BaseAPS { private static final long serialVersionUID = -7996431489447641539L; + @Column(name="RES_CODE") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true, mainkey = true) @@ -45,9 +46,4 @@ public class MaterialSetTime extends BaseAPS { @ApiParam(value ="设置时间") @FieldAnnotation(notEmpty = true) private String time; - -// @Column(name="PRIORITY") -// @ApiParam(value ="优先级") -// @FieldAnnotation(defaultValue = "10", mainkey = true) -// private Integer priority; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index 2d389fa..d08d131 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -1,11 +1,13 @@ 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.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EOperInput; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,8 +30,10 @@ import java.util.List; @Entity @Table(name = "APS_OPER_INPUT") @Api("工序输入") +@ClassLevelAnnotation(level = 4) public class OperInput extends BaseAPS { private static final long serialVersionUID = 6653235155693766804L; + @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) @@ -70,21 +74,23 @@ public class OperInput extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String minSpaceTime; + @JsonIgnore public Operation getOperation() { return BeanRelation.get(this, EOperInput.Operation); } public void setOperation(Operation oper) { - this.operationId = oper != null ? oper.getId() : 0l; + this.operationId = oper != null ? oper.getId() : 0L; BeanRelation.set(this, EOperInput.Operation, oper); } + @JsonIgnore public Material getInputMaterial() { return BeanRelation.get(this, EOperInput.InputMaterial); } public void setInputMaterial(Material material) { - this.inputMaterialId = material != null ? material.getId() : 0l; + this.inputMaterialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EOperInput.InputMaterial, material); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index e17e69d..a8e55bb 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -1,10 +1,12 @@ 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.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EOperOutput; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -27,8 +29,10 @@ import java.util.List; @Entity @Table(name = "APS_OPER_OUTPUT") @Api("工序输出") +@ClassLevelAnnotation(level = 4) public class OperOutput extends BaseAPS { private static final long serialVersionUID = 3185682762290147209L; + @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) @@ -54,21 +58,23 @@ public class OperOutput extends BaseAPS { @FieldAnnotation(defaultValue = "0.0") private Double fixScrapCount; + @JsonIgnore public Operation getOperation() { return BeanRelation.get(this, EOperOutput.Operation); } public void setOperation(Operation oper) { - this.operationId = oper != null ? oper.getId() : 0l; + this.operationId = oper != null ? oper.getId() : 0L; BeanRelation.set(this, EOperOutput.Operation, oper); } + @JsonIgnore public Material getOutputMaterial() { return BeanRelation.get(this, EOperOutput.OutputMaterial); } public void setOutputMaterial(Material material) { - this.outputMaterialId = material != null ? material.getId() : 0l; + this.outputMaterialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EOperOutput.OutputMaterial, material); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index e054949..306a24f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -1,11 +1,13 @@ 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.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EOperResource; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,8 +30,10 @@ import java.util.List; @Entity @Table(name = "APS_OPER_RESOURCE") @Api("工序资源") +@ClassLevelAnnotation(level = 4) public class OperResource extends BaseAPS { private static final long serialVersionUID = -8683889582369342606L; + @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) @@ -83,21 +87,23 @@ public class OperResource extends BaseAPS { @ApiParam(value ="资源使用配套号") private String userMatchNumber; + @JsonIgnore public Operation getOperation() { return BeanRelation.get(this, EOperResource.Operation); } public void setOperation(Operation oper) { - this.operationId = oper != null ? oper.getId() : 0l; + this.operationId = oper != null ? oper.getId() : 0L; BeanRelation.set(this, EOperResource.Operation, oper); } + @JsonIgnore public Resource getResource() { return BeanRelation.get(this, EOperResource.Resource); } public void setResource(Resource res) { - this.resourceId = res != null ? res.getId() : 0l; + this.resourceId = res != null ? res.getId() : 0L; BeanRelation.set(this, EOperResource.Resource, res); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 36eceaa..730a894 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -1,11 +1,13 @@ 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.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EOperation; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,8 +30,10 @@ import java.util.List; @Entity @Table(name = "APS_OPERATION") @Api("工序") +@ClassLevelAnnotation(level = 3) public class Operation extends BaseAPS { private static final long serialVersionUID = 4394179144091116858L; + @Column(name="NUMBER") @ApiParam(value ="工序号") @FieldAnnotation(notEmpty = true) @@ -59,22 +63,6 @@ public class Operation extends BaseAPS { @ApiParam(value ="固定报废数") private Double fixScrapCount; - @Column(name="RATIO") - @ApiParam(value ="分割比例") - private String ratio; - - @Column(name="COUNT") - @ApiParam(value ="分割的工作个数") - private Integer count; - - @Column(name="BATCH", columnDefinition = "decimal(18,8)") - @ApiParam(value ="分割批量") - private Double batch; - - @Column(name="REMAINDER", columnDefinition = "decimal(18,8)") - @ApiParam(value ="分割余数") - private Double remainder; - @Column(name="CONS_TYPE") @ApiParam(value ="接续方式") @FieldAnnotation(defaultValue = "ES") @@ -90,12 +78,13 @@ public class Operation extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String minSpaceTime; + @JsonIgnore public ProductRouting getProductRouting() { return BeanRelation.get(this, EOperation.ProductRouting); } public void setProductRouting(ProductRouting routing) { - this.productRoutingId = routing != null ? routing.getId() : 0l; + this.productRoutingId = routing != null ? routing.getId() : 0L; BeanRelation.set(this, EOperation.ProductRouting, routing); } @@ -114,12 +103,13 @@ public class Operation extends BaseAPS { return BeanRelation.list(this, EOperation.OperResources); } + @JsonIgnore public StandOperation getStandOperation() { return BeanRelation.get(this, EOperation.StandOperation); } public void setStandOperation(StandOperation std) { - this.standOperationId = std != null ? std.getId() : 0l; + this.standOperationId = std != null ? std.getId() : 0L; BeanRelation.set(this, EOperation.StandOperation, std); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java index b4cdff2..a995c89 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java @@ -5,6 +5,7 @@ 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 com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,7 +32,7 @@ public class OrderFeedback extends BaseAPS { @Column(name="ORDER_ID") @ApiParam(value ="顶层订单号") - @FieldAnnotation(relation = "Order", modify = false) + @FieldAnnotation(mainkey = true, relation = "Order") private Long orderId; @Column(name="ORDER_COUNT") @@ -56,20 +57,19 @@ public class OrderFeedback extends BaseAPS { @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; + @JsonIgnore public BaseOrder getOrder() { return BeanRelation.get(this, EOrderFeedback.Order); } public void setOrder(BaseOrder order) { - this.orderId = order != null ? order.getId() : 0l; + this.orderId = order != null ? order.getId() : 0L; BeanRelation.set(this, EOrderFeedback.Order, order); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java index b5dad6b..c93dc74 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java @@ -25,6 +25,7 @@ import java.util.Date; @ExcludeImportExport public class OrderTree extends BaseAPS { private static final long serialVersionUID = -7505923374791695738L; + @ApiParam(value ="物料编码") private String material; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java index 2c394a3..ef65b38 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java @@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.util.Date; @@ -27,6 +28,8 @@ import java.util.Date; @Api("加班日历") public class OvertimeCalendar extends BaseAPS { private static final long serialVersionUID = -501715721073189464L; + + @Lob @Column(name="RES_CODES") @ApiParam(value ="资源代码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index e5ade8e..a7a006e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -1,11 +1,13 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; 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.EParentWork; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,8 +33,10 @@ import java.util.List; @Table(name = "APS_PARENT_WORK") @Api("父工作") @ExcludeImportExport +@ClassLevelAnnotation(level = 5) public class ParentWork extends BaseAPS { private static final long serialVersionUID = 8792781216193806606L; + @Column(name="count", columnDefinition = "decimal(18,8)") @ApiParam(value ="数量") private Double count; @@ -42,6 +46,11 @@ public class ParentWork extends BaseAPS { @FieldAnnotation(property = false) private Integer serialNumber = 0; + @Column(name="CONFIRM_SERIAL") + @ApiParam(value ="下发流水号") + @FieldAnnotation(property = false) + private Integer confirmSerial = 0; + @Column(name="PRODUCT_ORDER_ID") @ApiParam(value ="订单") @FieldAnnotation(property = false) @@ -52,21 +61,23 @@ public class ParentWork extends BaseAPS { @FieldAnnotation(property = false) private Long operationId; + @JsonIgnore public BaseOrder getProductOrder() { return BeanRelation.get(this, EParentWork.ProductOrder); } public void setProductOrder(ProductOrder order) { - this.productOrderId = order != null ? order.getId() : 0l; + this.productOrderId = order != null ? order.getId() : 0L; BeanRelation.set(this, EParentWork.ProductOrder, order); } + @JsonIgnore public Operation getOperation() { return BeanRelation.get(this, EParentWork.Operation); } public void setOperation(Operation oper) { - this.operationId = oper != null ? oper.getId() : 0l; + this.operationId = oper != null ? oper.getId() : 0L; BeanRelation.set(this, EParentWork.Operation, oper); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java index 5ed25cd..12041dd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java @@ -1,10 +1,14 @@ 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.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EPlanFeedback; +import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; +import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; 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; @@ -26,33 +30,53 @@ import javax.persistence.Table; @Entity @Table(name = "APS_PLAN_FEEDBACK") @Api("工作反馈") +@MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class PlanFeedback extends BaseAPS { - private static final long serialVersionUID = 2520555825093741381L; - @Column(name="WORK_ID") - @ApiParam(value ="工作") - @FieldAnnotation(property = false) + @Column(name = "WORK_ID") + @ApiParam(value = "工作") + @FieldAnnotation(popSearch = true, mainkey = true, relation = "Work") private Long workId; - @Column(name="STATUS") - @ApiParam(value ="状态") + @Column(name = "TOP_ORDER_ID") + @ApiParam(value = "顶层订单") + @FieldAnnotation(popSearch = true, mainkey = true, relation = "Order") + private Long topOrderId; + + @Column(name = "STATUS") + @ApiParam(value = "状态") private ApsEnumUtil.FEED_BACK_STATUS status; - @Column(name="ACTUAL_COUNT") - @ApiParam(value ="实际完成数量") + @Column(name = "PLAN_COUNT") + @ApiParam(value = "计划完成数量") + private Double planCount; + + @Column(name = "ACTUAL_COUNT") + @ApiParam(value = "实际完成数量") private Double actualCount; - @Column(name="REMARK") - @ApiParam(value ="备注") + @Column(name = "REMARK") + @ApiParam(value = "备注") private String remark; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EPlanFeedback.Work); } public void setWork(Work work) { - this.workId = work != null ? work.getId() : 0l; + this.workId = work != null ? work.getId() : 0L; BeanRelation.set(this, EPlanFeedback.Work, work); } + + @JsonIgnore + public BaseOrder getTopOrder() { + return BeanRelation.get(this, EPlanFeedback.TopOrder); + } + + public void setTopOrder(BaseOrder topOrder) { + this.topOrderId = topOrder != null ? topOrder.getId() : 0L; + BeanRelation.set(this, EPlanFeedback.TopOrder, topOrder); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java index f9e9ffa..9c7aa50 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java @@ -1,5 +1,6 @@ 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 io.swagger.annotations.Api; @@ -23,6 +24,7 @@ import javax.persistence.Table; @Entity @Table(name = "APS_PRIORITY_TYPE") @Api("优先级") +@ClassLevelAnnotation(level = 0) public class PriorityType extends BaseAPS { private static final long serialVersionUID = 445577901076659576L; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductLine.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductLine.java new file mode 100644 index 0000000..96321d5 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductLine.java @@ -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; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 2b079df..ec2805c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -1,11 +1,13 @@ 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.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EProductOrder; import cn.estsh.i3plus.pojo.aps.holders.EProductRouting; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,8 +31,10 @@ import java.util.List; @Entity @Table(name = "APS_PRODUCT_ORDER") @Api("生产订单") +@ClassLevelAnnotation(level = 3) public class ProductOrder extends BaseOrder { private static final long serialVersionUID = 6900226668783662736L; + @Column(name="EST") @ApiParam(value ="最早开始时间") private Date est; @@ -56,11 +60,6 @@ public class ProductOrder extends BaseOrder { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.OBJECT, typeName = "ProductRouting") private String specifyRouting; - @Column(name="RECALC_COUNT") - @ApiParam(value ="是否重新计算数量") - @FieldAnnotation(defaultValue = "true") - private Boolean recalcCount; - @Column(name="SPECIFY_TOP_ORDER") @ApiParam(value ="指定顶层订单") private String specifyTopOrder; @@ -95,10 +94,12 @@ public class ProductOrder extends BaseOrder { @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; @Column(name="PRODUCT_ROUTING_ID") @@ -111,12 +112,13 @@ public class ProductOrder extends BaseOrder { @FieldAnnotation(property = false) private Long srcInsertedOrder; + @JsonIgnore public ProductRouting getProductRouting() { return BeanRelation.get(this, EProductOrder.ProductRouting); } public void setProductRouting(ProductRouting routing) { - this.productRoutingId = routing != null ? routing.getId() : 0l; + this.productRoutingId = routing != null ? routing.getId() : 0L; BeanRelation.set(this, EProductOrder.ProductRouting, routing); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index a109c6a..11507d3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -1,5 +1,6 @@ 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.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; @@ -8,6 +9,7 @@ import cn.estsh.i3plus.pojo.aps.holders.EProductRouting; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,8 +34,10 @@ import java.util.List; @Table(name = "APS_PRODUCT_ROUTING") @Api("工艺路线") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) +@ClassLevelAnnotation(level = 2) public class ProductRouting extends BaseAPS { private static final long serialVersionUID = 4905294866468216722L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) @@ -62,12 +66,18 @@ public class ProductRouting extends BaseAPS { @FieldAnnotation(defaultValue = "10") private Integer priority; + @Column(name="ROUTING_CHANGE") + @ApiParam(value ="工艺路径变更") + @FieldAnnotation(display = false) + private Boolean routingChange; + + @JsonIgnore public Material getMaterial() { return BeanRelation.get(this, EProductRouting.Material); } public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; + this.materialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EProductRouting.Material, material); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index f1a6064..88b4590 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -1,5 +1,6 @@ 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.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; @@ -26,8 +27,10 @@ import javax.persistence.Table; @Entity @Table(name = "APS_PURCHASE_ORDER") @Api("采购订单") +@ClassLevelAnnotation(level = 3) public class PurchaseOrder extends BaseOrder { private static final long serialVersionUID = 4699381603433121631L; + @Column(name="SPECIFY_TOP_ORDER") @ApiParam(value ="指定顶层订单") private String specifyTopOrder; @@ -50,11 +53,6 @@ public class PurchaseOrder extends BaseOrder { @FieldAnnotation(modify = false) private String calcLeadTime; -// @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)") -// @ApiParam(value ="多余量") -// @FieldAnnotation(modify = false) -// private Double excessCount; - @Column(name="AUTO_SUPPLY") @ApiParam(value ="物料计算时自动补充") @FieldAnnotation(defaultValue = "true") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java index e6af6a5..ec346f0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java @@ -35,6 +35,7 @@ import java.util.List; @Api("日历") public class ResCalendar extends BaseAPS { private static final long serialVersionUID = 8338930205816433211L; + @Lob @Column(name="RES_CODES") @ApiParam(value ="资源编码") @@ -61,6 +62,10 @@ public class ResCalendar extends BaseAPS { @FieldAnnotation(defaultValue = "10") private Integer priority; + @Column(name="SHIFT_NUMBER") + @ApiParam(value ="班次数量") + private Integer shiftNumber; + @JsonBackReference public List getDayShifts() { return BeanRelation.list(this, EResCalendar.DayShifts); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java index e40a718..595ff9a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java @@ -3,6 +3,7 @@ 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.base.enumutil.ApsEnumUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index b5dbeae..495d597 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -1,5 +1,6 @@ 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.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; @@ -9,6 +10,7 @@ import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -18,7 +20,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; -import java.util.Date; import java.util.List; /** @@ -34,8 +35,10 @@ import java.util.List; @Table(name = "APS_RESOURCE") @Api("资源") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) +@ClassLevelAnnotation(level = 1) public class Resource extends BaseAPS { private static final long serialVersionUID = 3304084329600816457L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) @@ -80,14 +83,6 @@ public class Resource extends BaseAPS { @ApiParam(value ="最大生产批量") private Double maxProduceBatch; - @Column(name="TIME_TAIL_ADJUST") - @ApiParam(value ="时间尾数圆整") - private String timeTailAdjust; - - @Column(name="TIME_ADJUST") - @ApiParam(value ="时间圆整") - private String timeAdjust; - @Column(name="MAX_PREV_SD_TIME") @ApiParam(value ="最大前设置中断时间") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) @@ -103,40 +98,48 @@ public class Resource extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxPostSdTime; - @Column(name="ROUND_TYPE") - @ApiParam(value ="圆整类型") - @FieldAnnotation(defaultValue = "ROUNDING") - private ApsEnumUtil.TIME_ROUND_TYPE roundType; - @Column(name="EFFICIENCY_EFFECT") @ApiParam(value ="效率影响类型") @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) private Integer EfficiencyEffect; - @Column(name="TIME_ROUND") - @ApiParam(value ="时间圆整影响") - @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) - private Integer timeRound; - - @Column(name="TIME_TAIL_ROUND") - @ApiParam(value ="时间尾数影响") - @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) - private Integer timeTailRound; - - @ApiParam(value ="是否存在任务冲突") - @FieldAnnotation(property = false) - @Transient - private boolean hasConflict; + @Column(name="BIND_RESOURCE_ID") + @ApiParam(value ="绑定资源") + @FieldAnnotation(relation = "Order", modify = false) + private Long bindResourceId; - private transient Date rightLimit; + @Column(name="PRODUCT_LINE_ID") + @ApiParam(value ="生产线") + @FieldAnnotation(relation = "ProductLine") + private Long productLineId; + @JsonIgnore public WorkShop getWorkShop() { return BeanRelation.get(this, EResource.WorkShop); } public void setWorkShop(WorkShop workShop) { - this.workShopId = workShop != null ? workShop.getId() : 0l; + this.workShopId = workShop != null ? workShop.getId() : 0L; BeanRelation.set(this, EResource.WorkShop, workShop); } + @JsonIgnore + public ProductLine getProductLine() { return BeanRelation.get(this, EResource.ProductLine); } + + public void setProductLine(ProductLine productLine) { + this.productLineId = productLine != null ? productLine.getId() : 0L; + BeanRelation.set(this, EResource.ProductLine, productLine); + } + @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EResource.WorkPlans); } + + @JsonIgnore + public Resource getBindResource() { return BeanRelation.get(this, EResource.BindResource); } + + public void setBindResource(Resource bindResource) { + this.bindResourceId = bindResource != null ? bindResource.getId() : 0L; + BeanRelation.set(this, EResource.BindResource, bindResource); + } + + @JsonBackReference + public List getSubBindResources() { return BeanRelation.list(this, EResource.SubBindResources); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java index 282ae40..b8f4475 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.ERuleDetail; 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; @@ -29,8 +30,8 @@ import javax.persistence.Table; @Api("规则明细") @ExcludeImportExport public class RuleDetail extends BaseAPS { - private static final long serialVersionUID = -6433950357039396107L; + @Column(name="TYPE") @ApiParam(value ="规则类型") private String type; @@ -49,6 +50,7 @@ public class RuleDetail extends BaseAPS { @FieldAnnotation(relation = "Rule", display = false) private Long ruleId; + @JsonIgnore public RuleGroup getRuleGroup() { return BeanRelation.get(this, ERuleDetail.RuleGroup); } public void setRuleGroup(RuleGroup ruleGroup) { @@ -56,6 +58,7 @@ public class RuleDetail extends BaseAPS { BeanRelation.set(this, ERuleDetail.RuleGroup, ruleGroup); } + @JsonIgnore public BaseRule getRule() { return BeanRelation.get(this, ERuleDetail.Rule); } public void setRule(BaseRule rule) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java index eb2a239..9ae936a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java @@ -32,6 +32,7 @@ import java.util.List; @ExcludeImportExport public class RuleGroup extends BaseAPS { private static final long serialVersionUID = 4741897751041891075L; + @Column(name="CODE") @ApiParam(value ="编码") private String code; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java index d1118a1..c7a02ba 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java @@ -1,5 +1,6 @@ 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.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; @@ -27,8 +28,8 @@ import javax.persistence.Table; @Entity @Table(name = "APS_SAFE_STOCK_ORDER") @Api("安全库存订单") +@ClassLevelAnnotation(level = 4) public class SafeStockOrder extends BaseOrder { - private static final long serialVersionUID = 5944067344390531794L; @Column(name="ORDER_STATUS") @@ -43,10 +44,12 @@ public class SafeStockOrder extends BaseOrder { @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 @@ -54,6 +57,7 @@ public class SafeStockOrder extends BaseOrder { return BeanRelation.get(this, EBaseOrder.Works); } + @JsonIgnore public Inventory getInventory() { return BeanRelation.get(this, ESafeStockOrder.Inventory); } public void setInventory(Inventory inventory) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index 88c8cfe..25cc0f3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -1,5 +1,6 @@ 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.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; @@ -27,8 +28,10 @@ import java.util.Date; @Entity @Table(name = "APS_SALES_ORDER") @Api("销售订单") +@ClassLevelAnnotation(level = 3) public class SalesOrder extends BaseOrder { private static final long serialVersionUID = -511784925441907538L; + @Column(name="LOW_EST") @ApiParam(value ="底阶最早开始时间") private Date lowEst; @@ -77,12 +80,12 @@ public class SalesOrder extends BaseOrder { @Column(name="FINISH_COUNT") @ApiParam(value ="完工数") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, defaultValue = "0") private Double finishCount; @Column(name="QUALIFIED_COUNT") @ApiParam(value ="检验合格数量") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, defaultValue = "0") private Double qualifiedCount; @Column(name="SERIAL_NUMBER") @@ -90,6 +93,11 @@ public class SalesOrder extends BaseOrder { @FieldAnnotation(property = false) private Integer serialNumber = 0; + @Column(name="FORCE_COUNT") + @ApiParam(value ="强制完成数量") + @FieldAnnotation(modify = false, defaultValue = "0") + private Double forceCount; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EBaseOrder.Works); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java index bf0944d..c57c970 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java @@ -26,8 +26,8 @@ import java.util.Date; @Api("流水号") @ExcludeImportExport public class SerialNumber extends BaseAPS { - private static final long serialVersionUID = 312483211086701109L; + @Column(name="S_NUMBER") @ApiParam(value ="销售订单流水号") private Integer sNumber = 0; @@ -52,6 +52,10 @@ public class SerialNumber extends BaseAPS { @ApiParam(value ="插单流水号") private Integer hNumber = 0; + @Column(name="Z_NUMBER") + @ApiParam(value ="补充订单流水号") + private Integer zNumber = 0; + @Column(name="LAST_DATE") @ApiParam(value ="最后生成日期") private Date lastDate; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java index bc0ec95..205e038 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java @@ -4,6 +4,7 @@ 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.EShippingTime; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -58,31 +59,35 @@ public class ShippingTime extends BaseAPS { @FieldAnnotation(defaultValue = "10") private Integer priority; + @JsonIgnore public Resource getPrevRes() {return BeanRelation.get(this, EShippingTime.PrevRes); } public void setPrevRes(Resource res) { - this.prevResId = res != null ? res.getId() : 0l; + this.prevResId = res != null ? res.getId() : 0L; BeanRelation.set(this, EShippingTime.PrevRes, res); } + @JsonIgnore public Resource getPostRes() { return BeanRelation.get(this, EShippingTime.PostRes); } public void setPostRes(Resource res) { - this.postResId = res != null ? res.getId() : 0l; + this.postResId = res != null ? res.getId() : 0L; BeanRelation.set(this, EShippingTime.PostRes, res); } + @JsonIgnore public StandOperation getPrevStand() { return BeanRelation.get(this, EShippingTime.PrevStand);} public void setPrevStand(StandOperation stand) { - this.prevStandId = stand != null ? stand.getId() : 0l; + this.prevStandId = stand != null ? stand.getId() : 0L; BeanRelation.set(this, EShippingTime.PrevStand, stand); } + @JsonIgnore public StandOperation getPostStand() { return BeanRelation.get(this, EShippingTime.PostStand); } public void setPostStand(StandOperation stand) { - this.postStandId = stand != null ? stand.getId() : 0l; + this.postStandId = stand != null ? stand.getId() : 0L; BeanRelation.set(this, EShippingTime.PostStand, stand); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 3235ae8..e11de37 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -1,5 +1,6 @@ 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.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; @@ -8,6 +9,7 @@ import cn.estsh.i3plus.pojo.aps.holders.EStandOperation; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; 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; @@ -30,8 +32,10 @@ import javax.persistence.Table; @Table(name = "APS_STAND_OPERATION") @Api("标准工序") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) +@ClassLevelAnnotation(level = 1) public class StandOperation extends BaseAPS { private static final long serialVersionUID = -6869403951765771775L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) @@ -47,22 +51,6 @@ public class StandOperation extends BaseAPS { @FieldAnnotation(defaultValue = "POSITIVE") private ApsEnumUtil.DIRECTION direction; - @Column(name="RATIO") - @ApiParam(value ="分割比例") - private String ratio; - - @Column(name="COUNT") - @ApiParam(value ="分割的工作个数") - private Integer count; - - @Column(name="BATCH", columnDefinition = "decimal(18,8)") - @ApiParam(value ="分割批量") - private Double batch; - - @Column(name="REMAINDER", columnDefinition = "decimal(18,8)") - @ApiParam(value ="分割余数") - private Double remainder; - @Column(name="MIN_SPACE_TIME") @ApiParam(value ="最小时间间隔") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) @@ -73,6 +61,22 @@ public class StandOperation extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxSpaceTime; + @Column(name="FLUSH_TIME_BLOCK") + @ApiParam(value ="基准时间间隔") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) + // 刷新计划时将一天时间按块分割，后工作在本工作的下一时间块中排程。 + private String flushTimeBlock; + + @Column(name="BASE_TIME_LIMIT") + @ApiParam(value ="基准时间限制") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) + private String baseTimeLimit; + + @Column(name="OVER_SHIFT_SPLIT_LIMIT") + @ApiParam(value ="跨班次时间限制") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) + private String overShiftSplitLimit; + @Column(name="COMB_TYPE") @ApiParam(value ="生产组合方式") @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") @@ -87,10 +91,11 @@ public class StandOperation extends BaseAPS { @ApiParam(value ="工序类型") private ApsEnumUtil.SANLUX_OPERATION_TYPE type = ApsEnumUtil.SANLUX_OPERATION_TYPE.NORMAL; + @JsonIgnore public WorkShop getWorkShop() { return BeanRelation.get(this, EStandOperation.WorkShop); } public void setWorkShop(WorkShop workShop) { - this.workShopId = workShop != null ? workShop.getId() : 0l; + this.workShopId = workShop != null ? workShop.getId() : 0L; BeanRelation.set(this, EStandOperation.WorkShop, workShop); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SupplyOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SupplyOrder.java new file mode 100644 index 0000000..b087ae4 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SupplyOrder.java @@ -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); + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index c088593..ac6b52f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -27,6 +27,7 @@ import java.util.Date; @Api("系统参数") public class SysParam extends BaseAPS { private static final long serialVersionUID = 3115620726438869596L; + @Column(name="BASE_TIME") @ApiParam(value ="基准时间") private Date baseTime; @@ -36,11 +37,6 @@ public class SysParam extends BaseAPS { @FieldAnnotation(defaultValue = "20") private Integer maxInterruptCount = 20; - @Column(name="TYPE") - @ApiParam(value ="工艺路径有效判断类型") - @FieldAnnotation(defaultValue = "CALC_LET_LT") - private ApsEnumUtil.ROUTING_VALID_TYPE type; - @Column(name="RULE_GROUP_ID") @ApiParam(value ="规则组id") @FieldAnnotation(display = false) @@ -69,4 +65,20 @@ public class SysParam extends BaseAPS { @Column(name="FOUR_FIRST_SUPPLY") @ApiParam(value ="是否牵纱补满模") private Boolean fourFirstSupply = false; + + @Column(name="MAX_SPACE_LIMIT_DRAG") + @ApiParam(value ="间隔时间限制") + private Boolean maxSpaceLimitDrag = true; + + @Column(name="DEFAULT_FEEDBACK") + @ApiParam(value ="自动提交前三道") + private Boolean defaultFeedback = true; + + @Column(name="SAME_MATERIAL_INTERVAL") + @ApiParam(value ="相同物料选择间隔") + private String sameMaterialInterval; + + @Column(name="MERGE_RATIO") + @ApiParam(value ="合并余数需求比列") + private Integer mergeRatio; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index e7571fd..4c2125f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -1,5 +1,6 @@ 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.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; @@ -11,6 +12,7 @@ import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -36,8 +38,10 @@ import java.util.List; @Table(name = "APS_WORK") @Api("工作") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) +@ClassLevelAnnotation(level = 6) public class Work extends BaseAPS { private static final long serialVersionUID = 6471740978550523187L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true, modify = false) @@ -128,10 +132,10 @@ public class Work extends BaseAPS { @ApiParam(value ="已分割的工作是否固定") private Boolean fixSplit; - @Column(name="NEED_PREV_COUNT", columnDefinition = "decimal(18,8)") - @ApiParam(value ="需要的前工作数量") - @FieldAnnotation(display = false, modify = false) - private Double needPrevCount; +// @Column(name="NEED_PREV_COUNT", columnDefinition = "decimal(18,8)") +// @ApiParam(value ="需要的前工作数量") +// @FieldAnnotation(display = false, modify = false) +// private Double needPrevCount; @Column(name="SCH_FAILED") @ApiParam(value ="是否排程失败") @@ -171,59 +175,77 @@ public class Work extends BaseAPS { @ApiParam(value ="动态拆分工作ID") private Long originWorkId; - @Column(name="SUPPLY_WORK_CODE") - @ApiParam(value ="补满模工作编码") - private String supplyWorkCode; +// @Column(name="SUPPLY_WORK_CODE") +// @ApiParam(value ="补满模工作编码") +// private String supplyWorkCode; - @ApiParam(value ="工作左边界") - private Date leftEdge; + @ApiParam(value ="工作排序顺序") + private Integer workSeqNumber; - @ApiParam(value ="工作右边界") - private Date rightEdge; + @ApiParam(value ="工作品质顺序") + private Integer workSeqQuality; - @ApiParam(value ="工作排序顺序") - private Integer workSeqNumber; + @Column(name="MOULD_ID") + @ApiParam(value ="模具能力id") + @FieldAnnotation(property = false) + private Long mouldId = 0L; + + @Column(name="FEEDBACK_SPLIT") + @ApiParam(value ="是否报工拆分") + @FieldAnnotation(modify = false) + private Boolean feedbackSplit; + + @Column(name="MOULD_NUM") + @ApiParam(value ="模具数量") + private Integer mouldNum; + + @Column(name="MOULD_CODE") + @ApiParam(value ="模具编码") + private String mouldCode; // 排程时，找插入位置的评估值 private transient double evaluateValue = 0; - private transient boolean supplyCount = false; // 排程时确定工作是正向排程还是逆向排程。 private transient boolean positive = true; + @JsonIgnore public BaseOrder getOrder() { return BeanRelation.get(this, EWork.Order); } public void setOrder(BaseOrder order) { - this.orderId = order != null ? order.getId() : 0l; + this.orderId = order != null ? order.getId() : 0L; BeanRelation.set(this, EWork.Order, order); } + @JsonIgnore public Operation getOperation() { return BeanRelation.get(this, EWork.Operation); } public void setOperation(Operation oper) { - this.operationId = oper != null ? oper.getId() : 0l; + this.operationId = oper != null ? oper.getId() : 0L; BeanRelation.set(this, EWork.Operation, oper); } + @JsonIgnore public Operation getOriginOperation() { return BeanRelation.get(this, EWork.OriginOperation); } public void setOriginOperation(Operation oper) { - this.originOperationId = oper != null ? oper.getId() : 0l; + this.originOperationId = oper != null ? oper.getId() : 0L; BeanRelation.set(this, EWork.OriginOperation, oper); } + @JsonIgnore public ParentWork getParentWork() { return BeanRelation.get(this, EWork.ParentWork); } public void setParentWork(ParentWork parentWork) { - this.parentWorkId = parentWork != null ? parentWork.getId() : 0l; + this.parentWorkId = parentWork != null ? parentWork.getId() : 0L; BeanRelation.set(this, EWork.ParentWork, parentWork); } @@ -253,8 +275,8 @@ public class Work extends BaseAPS { } @JsonBackReference - public PlanFeedback getPlanFeedback() { - return BeanRelation.get(this, EWork.PlanFeedback); + public List getPlanFeedback() { + return BeanRelation.list(this, EWork.PlanFeedback); } @JsonBackReference @@ -268,6 +290,7 @@ public class Work extends BaseAPS { @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EWork.WorkPlans); } + @JsonIgnore public Resource getSpecifyResource() { return BeanRelation.get(this, EWork.SpecifyResource); } @@ -287,6 +310,7 @@ public class Work extends BaseAPS { @JsonBackReference public List getDynSplitWorks() { return BeanRelation.list(this, EWork.DynSplitWorks); } + @JsonIgnore public Work getOriginWork() { return BeanRelation.get(this, EWork.OriginWork); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index 4390af5..412a04f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -1,10 +1,12 @@ 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.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkInput; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,8 +30,10 @@ import java.util.List; @Entity @Table(name = "APS_WORK_INPUT") @Api("工作输入") +@ClassLevelAnnotation(level = 7) public class WorkInput extends BaseAPS { private static final long serialVersionUID = 2654389476284740183L; + @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") @@ -60,12 +64,13 @@ public class WorkInput extends BaseAPS { @FieldAnnotation(property = false) private Long operInputId; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EWorkInput.Work); } public void setWork(Work work) { - this.workId = work != null ? work.getId() : 0l; + this.workId = work != null ? work.getId() : 0L; BeanRelation.set(this, EWorkInput.Work, work); } @@ -74,21 +79,23 @@ public class WorkInput extends BaseAPS { return BeanRelation.list(this, EWorkInput.WorkRelations); } + @JsonIgnore public Material getMaterial() { return BeanRelation.get(this, EWorkInput.Material); } public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; + this.materialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EWorkInput.Material, material); } + @JsonIgnore public OperInput getOperInput() { return BeanRelation.get(this, EWorkInput.OperInput); } public void setOperInput(OperInput input) { - this.operInputId = input != null ? input.getId() : 0l; + this.operInputId = input != null ? input.getId() : 0L; BeanRelation.set(this, EWorkInput.OperInput, input); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index 7f04aba..fcb9cab 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -1,10 +1,12 @@ 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.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkOutput; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,9 +31,10 @@ import java.util.List; @Entity @Table(name = "APS_WORK_OUTPUT") @Api("工作输出") +@ClassLevelAnnotation(level = 7) public class WorkOutput extends BaseAPS { - private static final long serialVersionUID = 6031001499619328313L; + @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") @@ -62,12 +65,13 @@ public class WorkOutput extends BaseAPS { @FieldAnnotation(property = false) private Long operOutputId; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EWorkOutput.Work); } public void setWork(Work work) { - this.workId = work != null ? work.getId() : 0l; + this.workId = work != null ? work.getId() : 0L; BeanRelation.set(this, EWorkOutput.Work, work); } @@ -76,21 +80,23 @@ public class WorkOutput extends BaseAPS { return BeanRelation.list(this, EWorkOutput.WorkRelations); } + @JsonIgnore public Material getMaterial() { return BeanRelation.get(this, EWorkOutput.Material); } public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; + this.materialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EWorkOutput.Material, material); } + @JsonIgnore public OperOutput getOperOutput() { return BeanRelation.get(this, EWorkOutput.OperOutput); } public void setOperOutput(OperOutput output) { - this.operOutputId = output != null ? output.getId() : 0l; + this.operOutputId = output != null ? output.getId() : 0L; BeanRelation.set(this, EWorkOutput.OperOutput, output); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 2ff8c15..b7f3790 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -1,5 +1,6 @@ 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.annotation.RippleAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; @@ -7,6 +8,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,9 +37,10 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name="APS_WORK_PLAN") @Api("工作计划") +@ClassLevelAnnotation(level = 8) public class WorkPlan extends BaseAPS { - private static final long serialVersionUID = 5489548115780676195L; + @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") @@ -72,14 +75,14 @@ public class WorkPlan extends BaseAPS { @ApiParam(value ="生产开始时间") @FieldAnnotation(modify = false) @RippleAnnotation(dependence = {"MainWork.PrevRelations.PrevWork.MainPlan.produceBegin", - "PrevPlan.produceBegin", "PrevFurnace.produceBegin"}, method = "calcPositive") + "PrevPlan.produceBegin", "PrevFurnace.produceBegin", "PrevAssPlan.produceBegin"}, method = "calcPositive") private Date produceBegin; @Column(name="PRODUCE_END") @ApiParam(value ="生产结束时间") @FieldAnnotation(modify = false) @RippleAnnotation(dependence = {"MainWork.PostRelations.PostWork.MainPlan.produceEnd", - "PostPlan.produceEnd", "PostFurnace.produceEnd"}, method = "calcReverse") + "PostPlan.produceEnd", "PostFurnace.produceEnd", "PostAssPlan.produceEnd"}, method = "calcReverse") private Date produceEnd; @Column(name="PRODUCE_TIME") @@ -136,27 +139,42 @@ public class WorkPlan extends BaseAPS { @RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse") private Date resProduceEnd; + @ApiParam(value ="调整时间") + private Date adjustDate; + + @Column(name="MOULD_CODE") + @ApiParam(value ="模具编码") + private String mouldCode; + + @Column(name="LINE_PRIORITY") + @ApiParam(value ="产线优先级") + private String linePriority; + + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } public void setWork(Work work) { - this.workId = work != null ? work.getId() : 0l; + this.workId = work != null ? work.getId() : 0L; BeanRelation.set(this, EWorkPlan.Work, work); } + @JsonIgnore public Resource getResource() { return BeanRelation.get(this, EWorkPlan.Resource); } public void setResource(Resource resource) { - this.resourceId = resource != null ? resource.getId() : 0l; + this.resourceId = resource != null ? resource.getId() : 0L; BeanRelation.set(this, EWorkPlan.Resource, resource); } + @JsonIgnore public WorkResource getWorkResource() { return BeanRelation.get(this, EWorkPlan.WorkResource); } public void setWorkResource(WorkResource workResource) { - this.workResourceId = workResource != null ? workResource.getId() : 0l; + this.workResourceId = workResource != null ? workResource.getId() : 0L; BeanRelation.set(this, EWorkPlan.WorkResource, workResource); } + @JsonIgnore public FurnacePlan getFurnacePlan() { return BeanRelation.get(this, EWorkPlan.FurnacePlan); } public void setFurnacePlan(FurnacePlan plan) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index 607a948..f94d8de 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation; 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; @@ -27,8 +28,8 @@ import javax.persistence.Table; @Table(name = "APS_Work_Relation") @Api("工作关联") public class WorkRelation extends BaseAPS { - private static final long serialVersionUID = -5824884364328962956L; + @Column(name="MATERIAL_ID") @ApiParam(value ="物料") @FieldAnnotation(relation = "Material", modify = false) @@ -97,66 +98,73 @@ public class WorkRelation extends BaseAPS { @FieldAnnotation(property = false) private Long workOutputId; + @JsonIgnore public WorkInput getWorkInput() { return BeanRelation.get(this, EWorkRelation.WorkInput); } public void setWorkInput(WorkInput input) { - this.workInputId = input != null ? input.getId() : 0l; + this.workInputId = input != null ? input.getId() : 0L; BeanRelation.set(this, EWorkRelation.WorkInput, input); } + @JsonIgnore public WorkOutput getWorkOutput() { return BeanRelation.get(this, EWorkRelation.WorkOutput); } public void setWorkOutput(WorkOutput output) { - this.workOutputId = output != null ? output.getId() : 0l; + this.workOutputId = output != null ? output.getId() : 0L; BeanRelation.set(this, EWorkRelation.WorkOutput, output); } + @JsonIgnore public Work getPrevWork() { return BeanRelation.get(this, EWorkRelation.PrevWork); } public void setPrevWork(Work work) { - this.prevWorkId = work != null ? work.getId() : 0l; + this.prevWorkId = work != null ? work.getId() : 0L; BeanRelation.set(this, EWorkRelation.PrevWork, work); } + @JsonIgnore public Work getPostWork() { return BeanRelation.get(this, EWorkRelation.PostWork); } public void setPostWork(Work work) { - this.postWorkId = work != null ? work.getId() : 0l; + this.postWorkId = work != null ? work.getId() : 0L; BeanRelation.set(this, EWorkRelation.PostWork, work); } + @JsonIgnore public BaseOrder getPrevOrder() { return BeanRelation.get(this, EWorkRelation.PrevOrder); } public void setPrevOrder(BaseOrder order) { - this.prevOrderId = order != null ? order.getId() : 0l; + this.prevOrderId = order != null ? order.getId() : 0L; BeanRelation.set(this, EWorkRelation.PrevOrder, order); } + @JsonIgnore public BaseOrder getPostOrder() { return BeanRelation.get(this, EWorkRelation.PostOrder); } public void setPostOrder(BaseOrder order) { - this.postOrderId = order != null ? order.getId() : 0l; + this.postOrderId = order != null ? order.getId() : 0L; BeanRelation.set(this, EWorkRelation.PostOrder, order); } + @JsonIgnore public Material getMaterial() { return BeanRelation.get(this, EWorkRelation.Material); } public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; + this.materialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EWorkRelation.Material, material); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index 7c845e8..21f062b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -1,10 +1,12 @@ 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.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkResource; 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; @@ -27,9 +29,10 @@ import javax.validation.constraints.Min; @Entity @Table(name = "APS_WORK_RESOURCE") @Api("工作资源") +@ClassLevelAnnotation(level = 7) public class WorkResource extends BaseAPS { - private static final long serialVersionUID = 4791940404968841144L; + @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") @@ -102,32 +105,35 @@ public class WorkResource extends BaseAPS { @Column(name="RES_CAPACITY_ID") @ApiParam(value ="设备能力id") @FieldAnnotation(property = false) - private Long resCapacityId = 0l; + private Long resCapacityId = 0L; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EWorkResource.Work); } public void setWork(Work work) { - this.workId = work != null ? work.getId() : 0l; + this.workId = work != null ? work.getId() : 0L; BeanRelation.set(this, EWorkResource.Work, work); } + @JsonIgnore public Resource getResource() { return BeanRelation.get(this, EWorkResource.Resource); } public void setResource(Resource res) { - this.resourceId = res != null ? res.getId() : 0l; + this.resourceId = res != null ? res.getId() : 0L; BeanRelation.set(this, EWorkResource.Resource, res); } + @JsonIgnore public OperResource getOperResource() { return BeanRelation.get(this, EWorkResource.OperResource); } public void setOperResource(OperResource res) { - this.operResourceId = res != null ? res.getId() : 0l; + this.operResourceId = res != null ? res.getId() : 0L; BeanRelation.set(this, EWorkResource.OperResource, res); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java index 273641d..4369823 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java @@ -1,5 +1,6 @@ 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 io.swagger.annotations.Api; @@ -23,6 +24,7 @@ import javax.persistence.Table; @Entity @Table(name = "APS_WORK_SHOP") @Api("车间") +@ClassLevelAnnotation(level = 0) public class WorkShop extends BaseAPS { private static final long serialVersionUID = 5627016086816721284L; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index e204a88..320ed77 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiParam; +import io.swagger.models.auth.In; import lombok.Data; import javax.persistence.Column; @@ -26,19 +27,18 @@ import java.util.HashMap; @ExcludeImportExport public abstract class BaseAPS extends BaseBean { private static final long serialVersionUID = -8638842158403944318L; - @JsonIgnore + @Lob @FieldAnnotation(property = false) private HashMap customFields = new HashMap<>(); - @Column(name="KEY") @ApiParam(value ="主键值") - @FieldAnnotation(display = false, modify = false) + @FieldAnnotation(display = false) @Transient private String key; @FieldAnnotation(property = false) - private transient Long updateId = 0l; + private transient Long updateId = 0L; public Object getCustomField(String code) { return customFields.get(code); @@ -80,6 +80,8 @@ public abstract class BaseAPS extends BaseBean { return Double.valueOf((String) value); } else if(value.getClass() == Double.class) { return (Double)value; + } else if (value.getClass() == Integer.class) { + return ((Integer)value).doubleValue(); } return null; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java index cad44d4..3626a73 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java @@ -17,10 +17,10 @@ import java.util.function.Consumer; * @Modify: **/ public class BeanInfo { - private Class cls; + private final Class cls; private BeanInfo superBeanInfo; - private List childsBeanInfos = new ArrayList<>(); - private Map, RelationInfo> relations = new HashMap<>(); + private final List childsBeanInfos = new ArrayList<>(); + private final Map, RelationInfo> relations = new HashMap<>(); public BeanInfo(Class cls) { this.cls = cls; @@ -97,14 +97,6 @@ public class BeanInfo { return (Class)cls; } - public BeanInfo getRelationBeanInfo(Enum holder) { - RelationInfo relaInfo = getRelationInfo(holder); - if (relaInfo != null) { - return relaInfo.getBeanInfo(); - } - return null; - } - public BeanInfo getRelationBeanInfo(String name) { RelationInfo relaInfo = getRelationInfo(name); if (relaInfo != null) { @@ -130,15 +122,6 @@ public class BeanInfo { return RELATION_TYPE.INVALID; } - public RELATION_TYPE getRelationType(String name) { - RelationInfo relaInfo = getRelationInfo(name); - if (relaInfo != null) { - return relaInfo.getType(); - } - - return RELATION_TYPE.INVALID; - } - private void foreach(Consumer fun) { for (Map.Entry, RelationInfo> entry : relations.entrySet()) { fun.accept(entry.getValue()); @@ -150,9 +133,7 @@ public class BeanInfo { public List> getAllHolders() { List> holders = new ArrayList<>(); - foreach((RelationInfo info)->{ - holders.add(info.getHolder()); - }); + foreach((RelationInfo info)-> holders.add(info.getHolder())); return holders; } @@ -176,8 +157,8 @@ public class BeanInfo { return holders; } - private static Map, BeanInfo> beanInfos = new HashMap<>(); - private static Map nameMapBeanInfos = new HashMap<>(); + private static final Map, BeanInfo> beanInfos = new HashMap<>(); + private static final Map nameMapBeanInfos = new HashMap<>(); private static IMainKeyValidatorImpl mainKeyValidator; static { @@ -220,13 +201,11 @@ public class BeanInfo { } public static BeanInfo getBeanInfo(Class cls) { - BeanInfo info = beanInfos.get(cls); - return info; + return beanInfos.get(cls); } public static BeanInfo getBeanInfo(String name) { - BeanInfo info = nameMapBeanInfos.get(name); - return info; + return nameMapBeanInfos.get(name); } public static Class getSuperClass(Class cls) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 9057dad..7b07ac9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -12,7 +12,6 @@ import java.util.function.Predicate; * @Reference : * @Author : jason.niu * @CreateDate : 2019-09-17 - * @Modify: **/ public class BeanRelation { Map, Map, List>>> caches = new HashMap<>(); @@ -23,9 +22,9 @@ public class BeanRelation { } } - private static Map relations = new ConcurrentHashMap<>(); + private static final Map relations = new ConcurrentHashMap<>(); private static BeanRelation get() { - Long userId = 0l; + Long userId = 0L; BeanRelation relation = relations.get(userId); if (relation == null) { synchronized (BeanRelation.class) { @@ -41,6 +40,12 @@ public class BeanRelation { return relation; } + public static void clear() { + for (Map.Entry, Map, List>>> entry : get().caches.entrySet()) { + entry.getValue().clear(); + } + } + private static Map, List> createRelation(Class cls) { Map, List> result = new HashMap<>(); BeanInfo beanInfo = BeanInfo.getBeanInfo(cls); @@ -56,7 +61,8 @@ public class BeanRelation { public static Map, List> get(BaseBean bean) { Map, List> temp = get().caches.get(bean.getClass()).get(bean.getId()); if (temp == null) { - synchronized (bean.getClass()) { + synchronized (BaseBean.class) { + temp = get().caches.get(bean.getClass()).get(bean.getId()); if (temp == null) { temp = createRelation(bean.getClass()); get().caches.get(bean.getClass()).put(bean.getId(), temp); @@ -214,8 +220,8 @@ public class BeanRelation { return result; } - private final static boolean lastListImpl(List result, BaseBean bean, BaseBean self, Predicate pred, - Enum[] holders, int index) { + private static boolean lastListImpl(List result, BaseBean bean, BaseBean self, Predicate pred, + Enum[] holders, int index) { if (index >= holders.length) { if (self == bean) { return false; @@ -270,10 +276,6 @@ public class BeanRelation { /** * 设值两个对象之间的关联 - * - * @param bean - * @param holder - * @param relaBean */ public static void set(BaseBean bean, Enum holder, BaseBean relaBean) { if (bean == null || holder == null) { @@ -309,11 +311,6 @@ public class BeanRelation { /** * 建立对象之间双向引用实现 - * - * @param bean - * @param holder - * @param relaBean - * @param reverseHolder */ private static void setImpl(BaseBean bean, Enum holder, BaseBean relaBean, Enum reverseHolder) { get(bean).get(holder).add(relaBean); @@ -324,8 +321,6 @@ public class BeanRelation { /** * 移除对象所有关系 - * - * @param bean */ public static void remove(BaseBean bean) { if (bean == null) { @@ -342,9 +337,6 @@ public class BeanRelation { /** * 移除关联 - * - * @param bean - * @param holder */ public static void remove(BaseBean bean, Enum holder) { if (bean == null || holder == null) { @@ -365,10 +357,6 @@ public class BeanRelation { /** * 移除关联的指定对象 - * - * @param bean - * @param holder - * @param relaBean */ public static void remove(BaseBean bean, Enum holder, BaseBean relaBean) { if (bean == null || holder == null) { @@ -383,11 +371,14 @@ public class BeanRelation { } /** + * 移除关联关系中的对象，并不会移除关联的对象的关系 + */ + public static void erase(BaseBean bean) { + get().caches.get(bean.getClass()).remove(bean.getId()); + } + + /** * 按指定路径，递归调用lambda表达式，当lambda表达式返回false或路径存在循环则退出递归。 - * @param bean - * @param fun - * @param holders - * @param */ public static void recursion(BaseBean bean, Predicate fun, Enum... holders) { if (holders.length == 0) { @@ -398,14 +389,9 @@ public class BeanRelation { /** * 按指定路径，递归调用实现。采用广度优先搜索。 - * @param bean - * @param fun - * @param holders - * @param index - * @param */ - private final static void recursionImpl(BaseBean bean, Predicate fun, - Enum[] holders, int index) { + private static void recursionImpl(BaseBean bean, Predicate fun, + Enum[] holders, int index) { if (index >= holders.length) { if (!fun.test((T) bean)) { return; @@ -415,7 +401,7 @@ public class BeanRelation { List relaBeans = list(bean, holders[index]); for (BaseBean relaBean : relaBeans) { - if (relaBean.getId() != bean.getId()) { + if (!relaBean.getId().equals(bean.getId())) { recursionImpl(relaBean, fun, holders, index + 1); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java index 49e3a5f..5d2e8c0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java @@ -9,7 +9,6 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import java.io.File; -import java.io.FileFilter; import java.io.IOException; import java.io.InputStream; import java.net.JarURLConnection; @@ -24,11 +23,7 @@ public class BeanRelationUtil { static class XMLReader extends DefaultHandler { private BeanInfo firstInfo = null; - private Enum firstHolder = null; - private BeanInfo secondInfo = null; - private Enum secondHolder = null; - private RELATION_TYPE type = RELATION_TYPE.INVALID; - private boolean owner = false; + public void startElement(String uri, String localName, String nodeName, Attributes attributes) throws SAXException { if (nodeName.equalsIgnoreCase("Class")) { final String name = attributes.getValue("name"); @@ -49,8 +44,8 @@ public class BeanRelationUtil { if (firstSignName == null) { throw new SAXException("Relation节点缺少field属性"); } - this.firstHolder = this.firstInfo.getHolder(firstSignName); - if (this.firstHolder == null) { + Enum firstHolder = this.firstInfo.getHolder(firstSignName); + if (firstHolder == null) { throw new SAXException("未定义枚举标识" + firstSignName); } @@ -58,46 +53,44 @@ public class BeanRelationUtil { if (secondFactoryName == null) { throw new SAXException("Relation节点缺少name属性"); } - this.secondInfo = BeanInfo.getBeanInfo(secondFactoryName); - if (this.secondInfo == null) { + BeanInfo secondInfo = BeanInfo.getBeanInfo(secondFactoryName); + if (secondInfo == null) { throw new SAXException("未找到" + secondFactoryName + "的类定义"); } String secondSignName = attributes.getValue("reverse"); + Enum secondHolder = null; if (secondSignName != null) { - this.secondHolder = this.secondInfo.getHolder(secondSignName); - if (this.secondHolder == null) { + secondHolder = secondInfo.getHolder(secondSignName); + if (secondHolder == null) { throw new SAXException(secondFactoryName + "类未定义枚举标识" + secondSignName); } - } else { - this.secondHolder = null; } String typeName = attributes.getValue("type"); if (typeName == null) { throw new SAXException("Relation节点缺少type属性"); } - this.type = RELATION_TYPE.valueOf(typeName); + RELATION_TYPE type = RELATION_TYPE.valueOf(typeName); String ownerName = attributes.getValue("owner"); - if (ownerName == null) { - this.owner = false; - } else { - this.owner = ownerName.equalsIgnoreCase("true") ? true : false; + boolean owner = false; + if (ownerName != null) { + owner = ownerName.equalsIgnoreCase("true"); } - RelationInfo firstData = this.getSignData(firstInfo, this.firstHolder); - firstData.setBeanInfo(this.secondInfo); - firstData.setType(this.type); - firstData.setOwner(this.owner); - firstData.setReverseHolder(this.secondHolder); + RelationInfo firstData = this.getSignData(firstInfo, firstHolder); + firstData.setBeanInfo(secondInfo); + firstData.setType(type); + firstData.setOwner(owner); + firstData.setReverseHolder(secondHolder); - if (this.secondHolder != null) { - RelationInfo secondData = this.getSignData(secondInfo, this.secondHolder); + if (secondHolder != null) { + RelationInfo secondData = this.getSignData(secondInfo, secondHolder); secondData.setBeanInfo(this.firstInfo); secondData.setOwner(false); - secondData.setReverseHolder(this.firstHolder); - switch (this.type) { + secondData.setReverseHolder(firstHolder); + switch (type) { case MULTI_TO_MULTI: secondData.setType(RELATION_TYPE.MULTI_TO_MULTI); break; @@ -165,8 +158,7 @@ public class BeanRelationUtil { } } } - } catch (IOException e) { - return; + } catch (IOException ignored) { } } @@ -176,13 +168,10 @@ public class BeanRelationUtil { return; } - File[] dirFiles = dir.listFiles(new FileFilter() { - - @Override - public boolean accept(File file) { - return file.isDirectory() || file.getName().endsWith(".xml"); - } - }); + File[] dirFiles = dir.listFiles(file -> file.isDirectory() || file.getName().endsWith(".xml")); + if (dirFiles == null) { + return; + } for (File file : dirFiles) { if (file.isDirectory()) { @@ -190,7 +179,7 @@ public class BeanRelationUtil { } else { try { loadXMLConfigure(file.getCanonicalPath()); - } catch (IOException e) { + } catch (IOException ignored) { } } } @@ -215,33 +204,30 @@ public class BeanRelationUtil { /** * 加载本地开发环境中的xml配置文件。 - * @param xmlPath */ private static void loadXMLConfigure(String xmlPath) { SAXParserFactory sf = SAXParserFactory.newInstance(); try { SAXParser sp = sf.newSAXParser(); sp.parse(new InputSource(xmlPath), new XMLReader()); - } catch (ParserConfigurationException | SAXException | IOException e) { + } catch (ParserConfigurationException | SAXException | IOException ignored) { } } /** * 加载jar中的xml配置文件。 - * @param is */ private static void loadXMLConfigure(InputStream is) { SAXParserFactory sf = SAXParserFactory.newInstance(); try { SAXParser sp = sf.newSAXParser(); sp.parse(new InputSource(is), new XMLReader()); - } catch (ParserConfigurationException | SAXException | IOException e) { + } catch (ParserConfigurationException | SAXException | IOException ignored) { } } /** * 将指定包下的类加载到内存中 - * @param packName */ public static List> loadClass(String packName) { List> clses = new ArrayList<>(); @@ -274,13 +260,10 @@ public class BeanRelationUtil { return; } - File[] dirFiles = dir.listFiles(new FileFilter() { - - @Override - public boolean accept(File file) { - return file.isDirectory() || file.getName().endsWith(".class"); - } - }); + File[] dirFiles = dir.listFiles(file -> file.isDirectory() || file.getName().endsWith(".class")); + if (dirFiles == null) { + return; + } for (File file : dirFiles) { if (file.isDirectory()) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java index 027f459..74eb03f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java @@ -20,7 +20,7 @@ public class CustomDateDeserializer extends JsonDeserializer { if (!StringUtils.isEmpty(text)) { try { return DATETIME_FORMATOR.parse(text); - } catch (ParseException e) { + } catch (ParseException ignored) { } } return null; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java index d6720fa..5236a10 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 订单关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EBaseOrder { Works, Material, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseRule.java index 9753913..8342a93 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseRule.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 规则关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EBaseRule { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java index 1c7f79e..052c635 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 班次关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EDayShift { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java index 70098c7..47a3150 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java @@ -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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java index be46ca5..dea1750 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 导出关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EExportProject { Link, Details diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java index 098fa63..f5e11f8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java @@ -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, } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java index 50772bb..00bcc79 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 导入明细关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EImportDetail { Project, Fields diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java index eeff1ef..c723817 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java @@ -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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java index 5f00e96..8df1fcb 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 导入关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EImportProject { Link, Details diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java index c8a6248..a1abc31 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java @@ -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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java index 0683e8f..0d9adab 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java @@ -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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java index 0465f7d..a32686e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 计算中间结果 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EInterMediateResult { Work, Resource, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java index 9c0719a..f7d036d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java @@ -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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java index 16f5f77..fb9fee4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java @@ -1,8 +1,13 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 物料关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EMaterial { - Group, - Childs, ProductRoutings, OperInputs, OperOutputs, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java index abc6ec5..848cc93 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java @@ -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, } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java index 9ce8642..eb13f50 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工序输入关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EOperInput { Operation, InputMaterial, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java index df02363..e91b487 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工序输出关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EOperOutput { Operation, OutputMaterial, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperResource.java index 36345e9..97db425 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperResource.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工序资源关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EOperResource { Operation, Resource, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java index 85a4795..8f84aa3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工序关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EOperation { ProductRouting, OperInputs, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java index 5719df5..365c2e9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java @@ -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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java index 334c388..378c042 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 父工作关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EParentWork { ProductOrder, Operation, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java index 5ce71a5..f49516a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java @@ -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, } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java index 5b2f068..3577b9c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 生产订单关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EProductOrder { ProductRouting, ParentWorks diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductRouting.java index 9fe315f..1882b55 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductRouting.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工艺路线关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EProductRouting { Material, Operations, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java index 1717230..50e753e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 资源日历关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EResCalendar { DayShifts, Resources diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java index ded90db..14634d6 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java @@ -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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleDetail.java index d63f726..a23953c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleDetail.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 规则明细关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum ERuleDetail { RuleGroup, Rule diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleGroup.java index db3dba0..e981d66 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleGroup.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleGroup.java @@ -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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java index bec040c..87bfc37 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java @@ -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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java index 100379b..430cef1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java @@ -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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java index 6e9ac1b..d710c15 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 标准工序关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EStandOperation { WorkShop } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index 689d599..a0406b3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -1,20 +1,27 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工作关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EWork { - Order, // 订单 - ParentWork, // 父工作 - WorkResources, // 工作资源 - WorkInputs, // 工作输入 - WorkOutputs, // 工作输出 - PrevRelations, // 前关联 - PostRelations, // 后关联 - Operation, // 工序 - OriginOperation, // 原始工序 - PlanFeedback, // 工作计划反馈 - MainPlan, // 关联的为主资源的计划 - WorkPlans, // 关联的工作计划 - SpecifyResource, // 指定资源 - DynSplitWorks, // 动态拆分后的工作 - OriginWork, // 动态拆分前的工作 - EvaluateResult, // 资源评估结果 + Order, + ParentWork, + WorkResources, + WorkInputs, + WorkOutputs, + PrevRelations, + PostRelations, + Operation, + OriginOperation, + PlanFeedback, + MainPlan, + WorkPlans, + SpecifyResource, + DynSplitWorks, + OriginWork, + EvaluateResult, } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java index ddfbd3a..6a54dbb 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工作输入关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EWorkInput { Work, WorkRelations, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java index e2f1de2..7e731b0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工作输出关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EWorkOutput { Work, WorkRelations, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java index cec9e5a..7aab9d4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 生产计划关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EWorkPlan { Work, MainWork, @@ -10,4 +17,7 @@ public enum EWorkPlan { PrevFurnace, PostFurnace, FurnacePlan, + PrevAssPlan, + PostAssPlan, + Mould } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java index 1fc05e6..6fc5188 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工作关联关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EWorkRelation { Material, PrevOrder, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java index 2f77bcc..0a2a131 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工作资源关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EWorkResource { Work, Resource, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java index 59d8be4..cfd3fe7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java @@ -6,8 +6,12 @@ import java.util.ArrayList; import java.util.List; /** - * Bom接口数据 - */ + * @Description : Bom接口数据 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ @Data public class BomModel { @Data diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ContextMenu.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ContextMenu.java index 2331242..feaeef9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ContextMenu.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ContextMenu.java @@ -3,8 +3,12 @@ package cn.estsh.i3plus.pojo.aps.model; import lombok.Data; /** - * 表格右键菜单 - */ + * @Description : 表格右键菜单 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ @Data public class ContextMenu { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java index 540a328..b888f46 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java @@ -64,7 +64,9 @@ public class DelaySalesOrder { @ApiParam(value ="允许的最大延期时间") private String allowDelayTime; - // 0正常显示，1显示黄色，2显示红色 + /** + * 0正常显示，1显示黄色，2显示红色 + */ @ApiParam(value ="背景显示颜色") private Integer backgroundColor; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/EnumModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/EnumModel.java index db5b676..aad92f9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/EnumModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/EnumModel.java @@ -2,6 +2,13 @@ package cn.estsh.i3plus.pojo.aps.model; import lombok.Data; +/** + * @Description : 枚举模型 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ @Data public class EnumModel { private String code; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java index b810c25..6799813 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java @@ -2,6 +2,13 @@ package cn.estsh.i3plus.pojo.aps.model; import lombok.Data; +/** + * @Description : 表达式函数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ @Data public class FunctionModel { private String code; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java index 7a80b06..8d16f9c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java @@ -8,6 +8,13 @@ import lombok.Data; import java.util.Date; +/** + * @Description : 甘特图日历请求参数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ @Data public class GanttCalendarModel { private String resourceId; @@ -18,9 +25,11 @@ public class GanttCalendarModel { @JsonDeserialize(using = CustomDateDeserializer.class) private Date endDate; private String cls; - //private String timeRangeColor; private String eventColor; private String name; - private Double percentDone;//完成百分比 + /** + * 完成百分比 + */ + private Double percentDone; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java index b0d518e..0171f62 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java @@ -2,10 +2,18 @@ package cn.estsh.i3plus.pojo.aps.model; import lombok.Data; +/** + * @Description : 甘特图拖拽工作块请求参数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ @Data public class GanttDragModel { private Long workId; private Long resId; private Long targetResId; private Long targetWorkId; + private Boolean ignoreSpaceLimit; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java index 0c5ab45..d0d00e9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java @@ -2,6 +2,13 @@ package cn.estsh.i3plus.pojo.aps.model; import lombok.Data; +/** + * @Description : 甘特图连线 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ @Data public class GanttLineModel { private long from; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java index d486f26..df3d311 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java @@ -10,6 +10,13 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +/** + * @Description : 订单甘特图工作块 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ @Data public class GanttOrderModel { private String id; @@ -23,11 +30,22 @@ public class GanttOrderModel { @JsonDeserialize(using = CustomDateDeserializer.class) private Date endDate; private String color; - private Double percentDone;//完成百分比 - private Boolean expanded;//是否展开树 - private Boolean rollup;//自动把数据相加 在children的上层 当前 - private String duration;//持续时间 天/小时/分钟 -// private String durationUnit; + /** + * 完成百分比 + */ + private Double percentDone; + /** + * 是否展开树 + */ + private Boolean expanded; + /** + * 自动把数据相加 在children的上层 当前 + */ + private Boolean rollup; + /** + * 持续时间 天/小时/分钟 + */ + private String duration; private Boolean manuallyScheduled; private List children = new ArrayList<>(); private List lineModels = new ArrayList<>(); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java index 6e2e3bb..b09259b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java @@ -9,6 +9,13 @@ import lombok.Data; import java.util.Date; import java.util.List; +/** + * @Description : 甘特图生产计划 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ @Data public class GanttPlanModel { private Long resourceId; @@ -20,9 +27,11 @@ public class GanttPlanModel { private Date endDate; private String cls; private String eventColor; + private String style; private String name; private Long workId; private List resIds; private Boolean draggable; private Boolean furnacePlan = false; + private Boolean overPriorityRange = false; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttResourceModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttResourceModel.java new file mode 100644 index 0000000..7571c55 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttResourceModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import lombok.Data; + +import java.util.Date; + +/** + * @Description : 订单甘特图工作块 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ +@Data +public class GanttResourceModel extends APSPager { + private Boolean hasEmptyResource; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date begin; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date end; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java index 7a4c619..c1dae27 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java @@ -3,8 +3,12 @@ package cn.estsh.i3plus.pojo.aps.model; import lombok.Data; /** - * KPI接口数据 - */ + * @Description : KPI接口数据 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-15 + * @Modify: + **/ @Data public class KPIModel { private Integer salesOrderCount; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java index 5ddc2dd..e81abef 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java @@ -60,7 +60,9 @@ public class LargeSpanOrder { @ApiParam(value ="跨度时间") private String spanTime; - // 0正常显示，1显示黄色，2显示红色 + /** + * 0正常显示，1显示黄色，2显示红色 + */ @ApiParam(value ="背景显示颜色") private Integer backgroundColor; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java index c7a0500..5142f87 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java @@ -52,7 +52,9 @@ public class MaterialDeliveryAnalyze { @JsonDeserialize(using = CustomDateDeserializer.class) private Date arrivalDate; - // 0正常显示，1显示红色 + /** + * 0正常显示，1显示红色 + */ @ApiParam(value ="背景显示颜色") private Integer backgroundColor; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MouldRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MouldRecord.java new file mode 100644 index 0000000..4432fbf --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MouldRecord.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +import java.util.Date; +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : pantianhu + * @CreateDate : 2022-02-25 11:22 + * @Modify: + **/ +@Data +public class MouldRecord { + private Date shifTime; + private Map mouldMap; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/OrderFinishStatusModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/OrderFinishStatusModel.java new file mode 100644 index 0000000..44919e9 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/OrderFinishStatusModel.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import io.swagger.annotations.Api; +import lombok.Data; + +/** + * 顶层订单完成情况 + * + * @Description : OrderFinishStatusModel + * @Author :gsz + * @Date 2021/10/21 10:45 + * @Modify + **/ +@Data +@Api("顶层订单完成情况报表") +public class OrderFinishStatusModel extends APSPager { + //订单号 + private String topOrderNo; + //订单类型 + private String orderType; + //物料编码 + private String materialCode; + //工厂货品 + private String materialName; + //商标编码 + private String code; + //商标 + private String logo; + //皮带标识编码 + private String leatherSignId; + //皮带标识 + private String sign; + //顶层订单数量 + private Integer topOrderCount; + //库存扣减数量 + private Integer inventoryBackCount; + //生产订单数量 + private Integer productOrderCount; + //参与排程数量 + private Double inScheduleCount; + //已下发数量 + private Double confirmCount; + //已报工数量 + private Double reportCount; + //牵纱排程数量 + private Double trainbearerScheduleCount; + //覆胶排程数量 + private Double coatingScheduleCount; + //包布排程数量 + private Double wrappingScheduleCount; + //硫化排程数量 + private Double sulfidationScheduleCount; + + +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java index eb35e2c..dba969e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java @@ -1,8 +1,6 @@ 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 cn.estsh.i3plus.pojo.aps.bean.*; import lombok.Data; /** @@ -18,11 +16,16 @@ public class PlanRecord { * 需要插入的工作计划 */ private WorkPlan plan; + private Work work; /** * 插入到目标资源 */ private Resource resource; /** + * 工作可用资源 + */ + private WorkResource workResource; + /** * 插入到目标工作计划前面 */ private WorkPlan postPlan; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java index 4080aa9..896cd06 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java @@ -54,7 +54,9 @@ public class PrematureProduct { @ApiParam(value ="提前完成时间") private String times; - // 0正常显示，1显示红色 + /** + * 0正常显示，1显示红色 + */ @ApiParam(value ="背景显示颜色") private Integer backgroundColor; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PromptModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PromptModel.java new file mode 100644 index 0000000..4505546 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PromptModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description :资源甘特图警告提示 + * @Reference : + * @Author : pantianhu + * @CreateDate : 2021-11-22 15:51 + * @Modify: + **/ +@Data +@Api("资源甘特图警告提示") +public class PromptModel { + + @ApiParam(value ="同工序跨设备提示") + private List promptMessage; +} + diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java index 788b585..9cd8071 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java @@ -20,13 +20,24 @@ import java.util.Date; @Data @Api("报表分页查询参数") public class ReportPager extends APSPager { + /** + * 统计开始时间 + */ @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) - private Date begin; // 统计开始时间 + private Date begin; + + /** + * 统计结束时间 + */ @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) - private Date end; // 统计结束时间 + private Date end; private ApsEnumUtil.MATERIAL_REPORT_TYPE type; - private ApsEnumUtil.REPORT_TIME_SPAN span; // 统计时间间隔 + + /** + * 统计时间间隔 + */ + private ApsEnumUtil.REPORT_TIME_SPAN span; private String shiftCode; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java index b7bcac0..ac6f52a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java @@ -9,15 +9,30 @@ import lombok.Data; import java.util.Date; +/** + * @Description : 资源负荷请求参数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-15 + * @Modify: + **/ @Data public class ResourceLoadRequest { private ApsEnumUtil.RESOURCE_LOAD_SPAN span; + + /** + * 统计开始时间 + */ @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) - private Date begin; // 统计开始时间 + private Date begin; + + /** + * 统计结束时间 + */ @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) - private Date end; // 统计结束时间 + private Date end; private Long[] resourceIds; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java index 6c0b455..3e9821b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java @@ -3,6 +3,13 @@ package cn.estsh.i3plus.pojo.aps.model; import io.swagger.annotations.ApiParam; import lombok.Data; +/** + * @Description : 规则执行结果明细 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-15 + * @Modify: + **/ @Data public class RuleDetailModel { @ApiParam(value ="主执行进度") @@ -28,6 +35,9 @@ public class RuleDetailModel { @ApiParam(value ="异常消息") private String exception = ""; + @ApiParam(value ="错误信息") + private ImportErrorInfo errorInfo; + public void addProcess() { this.curProcess += 1; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java index 112618a..b9b28b0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java @@ -6,6 +6,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +/** + * @Description : + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-15 + * @Modify: + **/ @Data public class ShiftReportModel { private List dates = new ArrayList<>(); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java index 91a36ab..9318579 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java @@ -6,6 +6,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +/** + * @Description : + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-15 + * @Modify: + **/ @Data public class StatisticReportReponse { private List headers = new ArrayList<>(); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java index 703a137..951b401 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.model; +import com.fasterxml.jackson.annotation.JsonBackReference; import lombok.Data; import java.util.Date; @@ -17,6 +18,10 @@ public class TimeBlock implements Comparable { private Date end; private boolean onDuty = true; private String shift; + @JsonBackReference + private TimeBlock nextBlock; + @JsonBackReference + private TimeBlock prevBlock; @Override public int compareTo(TimeBlock o) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DeleteOrderHistoryRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DeleteOrderHistoryRepository.java new file mode 100644 index 0000000..8192d0e --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DeleteOrderHistoryRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.DeleteOrderHistory; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : pantianhu + * @CreateDate : 2022-07-13 11:29 + * @Modify: + **/ +@Repository +public interface DeleteOrderHistoryRepository extends JpaRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ProductLineRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ProductLineRepository.java new file mode 100644 index 0000000..d69ec0e --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ProductLineRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.ProductLine; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description :产线信息 + * @Reference : + * @Author : pantianhu + * @CreateDate : 2022-04-01 9:46 + * @Modify: + **/ +@Repository +public interface ProductLineRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/HeuristicOptimizeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SupplyOrderRepository.java similarity index 52% rename from modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/HeuristicOptimizeRepository.java rename to modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SupplyOrderRepository.java index fe72851..08c7680 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/HeuristicOptimizeRepository.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SupplyOrderRepository.java @@ -1,9 +1,10 @@ package cn.estsh.i3plus.pojo.aps.repository; -import cn.estsh.i3plus.pojo.aps.bean.HeuristicOptimize; + +import cn.estsh.i3plus.pojo.aps.bean.SupplyOrder; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; @Repository -public interface HeuristicOptimizeRepository extends CrudRepository { +public interface SupplyOrderRepository extends CrudRepository { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java index 22a9add..9f3a4e6 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java @@ -7,9 +7,6 @@ public class APSDoubleTool { /** * 按指定精度向上取整 - * @param value - * @param pric - * @return */ public static double ceilPric(double value, int pric) { final double digits = Math.pow(10.0, pric); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/CalendarTimeValidator.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/CalendarTimeValidator.java index a7bcaf2..e049012 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/CalendarTimeValidator.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/CalendarTimeValidator.java @@ -3,6 +3,7 @@ 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 org.apache.commons.lang3.StringUtils; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; @@ -14,11 +15,13 @@ public class CalendarTimeValidator implements ConstraintValidator + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml index 6ce3798..ef83c89 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml @@ -2,8 +2,6 @@ - - \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml new file mode 100644 index 0000000..fc632b6 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml index 889e6c8..49c7e9b 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml @@ -4,4 +4,8 @@ + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index fe0de7a..23265ff 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -18,7 +18,7 @@ - + diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml index 47d45a9..6b2c8c0 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml @@ -6,4 +6,6 @@ + + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 3411cbc..f6d322a 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -70,4 +70,4 @@ - \ No newline at end of file + diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 6154f40..dd8e083 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -4,14 +4,16 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; /** - * @Description : - * @Reference : * @Author : jason.niu * @CreateDate : 2019-11-11 - * @Modify: **/ public class ApsEnumUtil { + public interface Enumerator { + String getValue(); + String getDescription(); + } + /** * 日历中选择星期的多选枚举 */ @@ -25,8 +27,8 @@ public class ApsEnumUtil { SATURDAY(32, "星期六"), SUNDAY(64, "星期天"); - private int value; - private String description; + private final int value; + private final String description; CALENDAR_WEEK(int value, String description) { this.value = value; @@ -55,51 +57,27 @@ public class ApsEnumUtil { /** * 物料类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MATERIAL_TYPE { + public enum MATERIAL_TYPE implements Enumerator { PRODUCT("PRODUCT", "成品"), HALF_PRODUCT("HALF_PRODUCT", "半成品"), RAW_MATERIAL("RAW_MATERIAL", "原材料"), INNER_PRODUCT("INNER_PRODUCT", "中间品"), VIRTUAL("VIRTUAL", "虚拟件"); - private String value; - private String description; + private final String value; + private final String description; MATERIAL_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } - public String getDescription() { - return description; - } - } - - /** - * 物料类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ORDER_VALID_TYPE { - VALID("VALID", "有效"), - INVALID("INVALID", "无效"); - - private String value; - private String description; - - ORDER_VALID_TYPE(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - + @Override public String getDescription() { return description; } @@ -108,24 +86,25 @@ public class ApsEnumUtil { /** * 物料报表统计类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MATERIAL_REPORT_TYPE { + public enum MATERIAL_REPORT_TYPE implements Enumerator { PURCHASE("PURCHASE", "采购"), PRODUCE("PRODUCE", "生产"), INVENTORY("INVENTORY", "库存"); - private String value; - private String description; + private final String value; + private final String description; MATERIAL_REPORT_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -134,8 +113,7 @@ public class ApsEnumUtil { /** * 报表时间间隔 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum REPORT_TIME_SPAN { + public enum REPORT_TIME_SPAN implements Enumerator { ONE_HOUR("ONE_HOUR", "1小时"), EIGHT_HOUR("EIGHT_HOUR", "8小时"), TWELVE_HOUR("TWELVE_HOUR", "12小时"), @@ -143,18 +121,20 @@ public class ApsEnumUtil { ONE_WEEK("ONE_WEEK", "一周"), ONE_MONTH("ONE_MONTH", "一月"); - private String value; - private String description; + private final String value; + private final String description; REPORT_TIME_SPAN(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -163,24 +143,25 @@ public class ApsEnumUtil { /** * 备料类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PREPARE_TYPE { + public enum PREPARE_TYPE implements Enumerator { NO("NO", "不备料"), SELF_MAKE("SELF_MAKE", "自制"), // 自制 PURCHASE("PURCHASE", "采购"); // 采购 - private String value; - private String description; + private final String value; + private final String description; PREPARE_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -189,24 +170,25 @@ public class ApsEnumUtil { /** * 补充类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum REPLENISHMENT_TYPE { + public enum REPLENISHMENT_TYPE implements Enumerator { NO("NO", "不补充"), BATCH("BATCH", "批量补充"), ONEBYONE("ONEBYONE", "一对一补充"); - private String value; - private String description; + private final String value; + private final String description; REPLENISHMENT_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -222,8 +204,8 @@ public class ApsEnumUtil { PURCHASE(2, "采购制约"), PRODUCT(4, "生产制约"); - private int value; - private String description; + private final int value; + private final String description; MATERIAL_ASSIGN_LIMIT(int value, String description) { this.value = value; @@ -252,49 +234,24 @@ public class ApsEnumUtil { /** * 排程方向 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DIRECTION { + public enum DIRECTION implements Enumerator { POSITIVE("POSITIVE", "正向"), REVERSE("REVERSE", "逆向"); - private String value; - private String description; + private final String value; + private final String description; DIRECTION(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } - public String getDescription() { - return description; - } - } - - /** - * 尾数处理方式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TAIL_DEAL { - NODEAL("NODEAL", "不处理"), - CEILING("CEILING", "向下"), - PUSHFRONT("PUSHFRONT", "向上"); - - private String value; - private String description; - - TAIL_DEAL(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - + @Override public String getDescription() { return description; } @@ -303,26 +260,27 @@ public class ApsEnumUtil { /** * 则管理中规则的类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RULE_TYPE { + public enum RULE_TYPE implements Enumerator { CANCEL_PLAN("CANCEL_PLAN", "取消计划"), MAT_CALC("MAT_CALC", "物料运算"), HEURISTIC("HEURISTIC", "排程运算"), FIELD_SET("FIELD_SET", "字段赋值"), FLUSH_PLAN("FLUSH_PLAN", "刷新计划"); - private String value; - private String description; + private final String value; + private final String description; RULE_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -331,50 +289,25 @@ public class ApsEnumUtil { /** * 资源区分 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RESOURCE_CLASS { + public enum RESOURCE_CLASS implements Enumerator { LIMITLESS("LIMITLESS", "无限能力"), SINGLE("SINGLE", "单资源"), BATCH("BATCH", "炉资源"); - private String value; - private String description; + private final String value; + private final String description; RESOURCE_CLASS(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } - public String getDescription() { - return description; - } - } - - /** - * 锁定时间的取值方式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RESOURCE_LOCK_TYPE { - NONE("NONE", "不锁定"), - PRODUCE_BEGIN("PRODUCE_BEGIN", "后工序生产开始时刻"), - PRODUCE_END("PRODUCE_END", "后工序生产结束时刻"); - - private String value; - private String description; - - RESOURCE_LOCK_TYPE(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - + @Override public String getDescription() { return description; } @@ -383,23 +316,24 @@ public class ApsEnumUtil { /** * 资源类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RESOURCE_TYPE { + public enum RESOURCE_TYPE implements Enumerator { MAIN("MAIN", "主资源"), ASS("ASS", "副资源"); - private String value; - private String description; + private final String value; + private final String description; RESOURCE_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -414,8 +348,8 @@ public class ApsEnumUtil { PRODUCE(2, "生产"), // 生产 POST_SET(4, "后设置"); // 后设置 - private int value; - private String description; + private final int value; + private final String description; EFFICIENCY_EFFECT(int value, String description){ this.value = value; @@ -444,7 +378,8 @@ public class ApsEnumUtil { PRODUCE_TIME("PRODUCE_TIME", "生产时间"), POST_SET_TIME("POST_SET_TIME", "后设置时间"), WORK_WAIT_TIME("WORK_WAIT_TIME", "工作等待时间"), - WAIT_TIME_LIMIT("WAIT_TIME_LIMIT", "等待时间限制"), +// WAIT_TIME_LIMIT("WAIT_TIME_LIMIT", "等待时间限制"), + WAIT_END_SUB_LEFT("WAIT_END_SUB_LEFT", "工作结束时间减去左边界"), RES_BALANCE("RES_BALANCE", "资源均衡度"), SAME_MATERIAL("SAME_MATERIAL", "相同物料"), SAME_ORDER("SAME_ORDER", "相同订单"), @@ -455,8 +390,8 @@ public class ApsEnumUtil { RESOURCE_USEAGE("RESOURCE_USEAGE", "资源使用率"), CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式"); - private String value; - private String description; + private final String value; + private final String description; RESOURCE_CHOISE_RULE(String value, String description) { this.value = value; @@ -477,26 +412,27 @@ public class ApsEnumUtil { /** * 订单删除限制 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ORDER_DEL_LIMIT { + public enum ORDER_DEL_LIMIT implements Enumerator { NONE("NONE", "不限制"), NO_PO("NO_PO", "未计划"), NO_PLAN("NO_PLAN", "计划完毕"), NO_POR("NO_POR", "指示完毕"), NO_PPRS("NO_PPRS", "已确认"); - private String value; - private String description; + private final String value; + private final String description; ORDER_DEL_LIMIT(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -505,8 +441,7 @@ public class ApsEnumUtil { /** * 生产时间计算方法 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RES_COMB_TIME_TYPE { + public enum RES_COMB_TIME_TYPE implements Enumerator { MAIN_RESOURCE("MAIN_RESOURCE", "主资源"), MAX_ASS_RESOURCE("MAX_ASS_RESOURCE", "副资源最大值"), MIN_ASS_RESOURCE("MIN_ASS_RESOURCE", "副资源最小值"), @@ -515,70 +450,20 @@ public class ApsEnumUtil { MIN_ALL_RESOURCE("MIN_ALL_RESOURCE", "主副资源最小值"), AVG_ALL_RESOURCE("AVG_ALL_RESOURCE", "主副资源平均值"); - private String value; - private String description; + private final String value; + private final String description; RES_COMB_TIME_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } - public String getDescription() { - return description; - } - } - - /** - * 时间圆整方式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TIME_ROUND_TYPE { - UP("UP", "向上"), - DOWN("DOWN", "向下"), - ROUNDING("ROUNDING", "四舍五入"); - - private String value; - private String description; - - TIME_ROUND_TYPE(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** - * 工艺路径有效性判断类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ROUTING_VALID_TYPE { - ORDER_CALC_LET("ORDER_CALC_LET", "与订单的最晚结束时刻计算值做比较"), - CALC_LET_LT("CALC_LET_LT", "与最晚结束时刻计算值-提前期做比较"), - BASE_TIME("BASE_TIME", "与基准时刻做比较"); - - private String value; - private String description; - - ROUTING_VALID_TYPE(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - + @Override public String getDescription() { return description; } @@ -587,8 +472,7 @@ public class ApsEnumUtil { /** * 使用类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum USE_TYPE { + public enum USE_TYPE implements Enumerator { MAIN("MAIN", "主资源"), FIRST_ASS("FIRST_ASS", "第一套副资源"), SECOND_ASS("SECOND_ASS", "第二套副资源"), @@ -597,18 +481,20 @@ public class ApsEnumUtil { FIFTH_ASS("FIFTH_ASS", "第五套副资源"), SIXTH_ASS("SIXTH_ASS", "第六套副资源"); - private String value; - private String description; + private final String value; + private final String description; USE_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -617,24 +503,25 @@ public class ApsEnumUtil { /** * 工作计划类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_PLAN_TYPE { + public enum WORK_PLAN_TYPE implements Enumerator { MAIN_PLAN("MAIN_PLAN", "主资源计划"), ASS_PLAN("ASS_PLAN", "副资源计划"), BATCH_PLAN("BATCH_PLAN", "炉资源计划"); - private String value; - private String description; + private final String value; + private final String description; WORK_PLAN_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -643,23 +530,24 @@ public class ApsEnumUtil { /** * 工作关联类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_RELATION_TYPE { + public enum WORK_RELATION_TYPE implements Enumerator { INNER("INNER", "订单内关联"), OUTER("OUTER", "订单间关联"); - private String value; - private String description; + private final String value; + private final String description; WORK_RELATION_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -668,8 +556,7 @@ public class ApsEnumUtil { /** * 工作排序规则 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_SORT_RULE { + public enum WORK_SORT_RULE implements Enumerator { ORDER_LET("ORDER_LET", "订单最晚结束时刻计算值"), ORDER_PRIORITY("ORDER_PRIORITY", "订单优先级"), ORDER_EST("ORDER_EST", "订单最早开始时刻"), @@ -691,46 +578,20 @@ public class ApsEnumUtil { TOP_ORDER_PRIORITY("TOP_ORDER_PRIORITY", "顶层订单优先级"), CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式"); - private String value; - private String description; + private final String value; + private final String description; WORK_SORT_RULE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } - public String getDescription() { - return description; - } - } - - /** - * 工作分割类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_SPLIT_TYPE { - NONE("NONE", "不分割"), - RATIO("RATIO", "按比例分割"), - COUNT("COUNT", "按数量分割"), - BATCH("BATCH", "按批量分割"), - REMAINDER("REMAINDER", "按余数分割"); - - private String value; - private String description; - - WORK_SPLIT_TYPE(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - + @Override public String getDescription() { return description; } @@ -739,8 +600,7 @@ public class ApsEnumUtil { /** * 工作状态 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_STATUS { + public enum WORK_STATUS implements Enumerator { NOPLAN("NOPLAN", "未计划"), PLANDONE("PLANDONE", "计划完毕"), INDICATIONDONE("INDICATIONDONE", "锁定"), @@ -748,18 +608,20 @@ public class ApsEnumUtil { STARTPRODUCT("STARTPRODUCT", "生产中"), FINISH("FINISH", "完成"); - private String value; - private String description; + private final String value; + private final String description; WORK_STATUS(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -768,8 +630,7 @@ public class ApsEnumUtil { /** * 工作种类 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_TYPE { + public enum WORK_TYPE implements Enumerator { // 工作不参与排程，比如销售订单的工作 FICTITIOUS("FICTITIOUS", "虚拟工作"), // 动态虚拟工作为不计算生产时间。 @@ -777,18 +638,20 @@ public class ApsEnumUtil { // 此工作参与排程 NORMAL("NORMAL", "普通工作"); - private String value; - private String description; + private final String value; + private final String description; WORK_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -797,24 +660,25 @@ public class ApsEnumUtil { /** * 动态设置时间影响类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DYNAMIC_SET_TYPE { + public enum DYNAMIC_SET_TYPE implements Enumerator { PREV_SET("PREV_SET", "只对前设置影响"), POST_SET("POST_SET", "只对后设置影响"), ALL("ALL", "对前后设置都产生影响"); - private String value; - private String description; + private final String value; + private final String description; DYNAMIC_SET_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -823,24 +687,25 @@ public class ApsEnumUtil { /** * 动态设置事件取值方式 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DYNAMIC_SET_CALC { + public enum DYNAMIC_SET_CALC implements Enumerator { MIN("MIN", "取最小值"), MAX("MAX", "取最大值"), SUM("SUM", "求和"); - private String value; - private String description; + private final String value; + private final String description; DYNAMIC_SET_CALC(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -849,25 +714,26 @@ public class ApsEnumUtil { /** * 接续方式 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum CONSTRAINT_TYPE { + public enum CONSTRAINT_TYPE implements Enumerator { ES("ES", "前工序结束，后工序开始"), SS("SS", "前工序开始，后工序开始"), EE("EE", "前工序结束，后工序结束"), SSEE("SSEE", "前后工序同时开始或同时结束"); - private String value; - private String description; + private final String value; + private final String description; CONSTRAINT_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -876,23 +742,24 @@ public class ApsEnumUtil { /** * 加班日历类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum CALENDAR_TYPE { + public enum CALENDAR_TYPE implements Enumerator { ENABLE("ENABLE", "加班"), DISABLE("DISABLE", "下班"); - private String value; - private String description; + private final String value; + private final String description; CALENDAR_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -901,62 +768,24 @@ public class ApsEnumUtil { /** * 导入类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum IMPORT_DETAIL_TYPE { + public enum IMPORT_DETAIL_TYPE implements Enumerator { REPLACE("REPLACE", "替代导入"), DIFF("DIFF", "差分导入"); - private String value; - private String description; + private final String value; + private final String description; IMPORT_DETAIL_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } - public String getDescription() { - return description; - } - } - - /** - * 字段赋值对象 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum FIELD_SET_BEAN { - Material("Material", "物料"), - ProductRouting("ProductRouting", "工艺路线"), - Operation("Operation", "工序"), - OperInput("OperInput", "工序输入"), - OperOutput("OperOutput", "工序输出"), - OperResource("OperResource", "工序资源"), - StandOperation("StandOperation", "标准工序"), - SalesOrder("SalesOrder", "销售订单"), - ProductOrder("ProductOrder", "生产订单"), - PurchaseOrder("PurchaseOrder", "采购订单"), - Inventory("Inventory", "库存"), - Work("Work", "工作"), - WorkInput("WorkInput", "工作输入"), - WorkOutput("WorkOutput", "工作输出"), - WorkResource("WorkResource", "工作资源"), - WorkRelation("WorkRelation", "工作关联"); - - private String value; - private String description; - - FIELD_SET_BEAN(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - + @Override public String getDescription() { return description; } @@ -965,24 +794,25 @@ public class ApsEnumUtil { /** * 计划类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PLAN_TYPE { - PREV_SET("", "前设置"), - PRODUCE("", "生产"), - POST_SET("", "后设置"); + public enum PLAN_TYPE implements Enumerator { + PREV_SET("PREV_SET", "前设置"), + PRODUCE("PRODUCE", "生产"), + POST_SET("POST_SET", "后设置"); - private String value; - private String description; + private final String value; + private final String description; PLAN_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -991,25 +821,26 @@ public class ApsEnumUtil { /** * 数据连接类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DATA_LINK_TYPE { + public enum DATA_LINK_TYPE implements Enumerator { EXCEL("EXCEL", "EXCEL"), MYSQL("MYSQL", "MySql"), ORACLE("ORACLE", "Oracle"), SQLSERVER("SQLSERVER", "SqlServer"); - private String value; - private String description; + private final String value; + private final String description; DATA_LINK_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -1018,8 +849,7 @@ public class ApsEnumUtil { /** * 字段的编辑类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum EDIT_TYPE { + public enum EDIT_TYPE implements Enumerator { NONE("NONE", "未知"), BOOLEAN("BOOLEAN", "布尔, 开关编辑"), CHAR("CHAR", "字符, 文本框编辑"), @@ -1040,18 +870,20 @@ public class ApsEnumUtil { QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项"), COLOR_PICKER("COLOR_PICKER", "颜色选择框"); - private String value; - private String description; + private final String value; + private final String description; EDIT_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -1060,8 +892,7 @@ public class ApsEnumUtil { /** * 字段类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum FIELD_TYPE { + public enum FIELD_TYPE implements Enumerator { NONE("NONE", "未知"), BOOLEAN("BOOLEAN", "布尔"), CHAR("CHAR", "字符"), @@ -1079,18 +910,20 @@ public class ApsEnumUtil { OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值"), LIST("LIST", "对象集合，不可编辑。"); - private String value; - private String description; + private final String value; + private final String description; FIELD_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -1099,8 +932,7 @@ public class ApsEnumUtil { /** * 资源符合时间间隔类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RESOURCE_LOAD_SPAN { + public enum RESOURCE_LOAD_SPAN implements Enumerator { ONE_HOUR("ONE_HOUR", "1小时"), TWO_HOUR("TWO_HOUR", "2小时"), SIX_HOUR("SIX_HOUR", "6小时"), @@ -1110,18 +942,20 @@ public class ApsEnumUtil { ONE_WEEK("ONE_WEEK", "1周"), ONE_MONTH("ONE_MONTH", "1月"); - private String value; - private String description; + private final String value; + private final String description; RESOURCE_LOAD_SPAN(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -1130,8 +964,7 @@ public class ApsEnumUtil { /** * 订单状态 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ORDER_STATUS { + public enum ORDER_STATUS implements Enumerator { NOPLAN("NOPLAN", "未计划"), PLANDONE("PLANDONE", "计划完毕"), INDICATIONDONE("INDICATIONDONE", "指示完毕"), @@ -1139,18 +972,20 @@ public class ApsEnumUtil { STARTPRODUCT("STARTPRODUCT", "开始生产"), FINISH("FINISH", "完成"); - private String value; - private String description; + private final String value; + private final String description; ORDER_STATUS(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -1159,24 +994,25 @@ public class ApsEnumUtil { /** * 销售订单状态 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SALES_ORDER_STATUS { + public enum SALES_ORDER_STATUS implements Enumerator { WAITING("WAITING", "待处理"), CHANGE("CHANGE", "改带"), COMMIT("COMMIT", "确认"); - private String value; - private String description; + private final String value; + private final String description; SALES_ORDER_STATUS(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -1185,24 +1021,25 @@ public class ApsEnumUtil { /** * 销售订单拆分下发 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SALES_ORDER_SPLIT_STATUS { + public enum SALES_ORDER_SPLIT_STATUS implements Enumerator { NONE("NONE", "不拆分下发"), SPLIT_MAIN("SPLIT_MAIN", "拆分下发（主）"), SPLIT_CHILD("SPLIT_CHILD", "拆分下发（子）"); - private String value; - private String description; + private final String value; + private final String description; SALES_ORDER_SPLIT_STATUS(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -1211,23 +1048,24 @@ public class ApsEnumUtil { /** * 库存订单状态 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SAFE_STOCK_ORDER_STATUS { + public enum SAFE_STOCK_ORDER_STATUS implements Enumerator { UNCOMMIT("UNCOMMIT", "待处理"), COMMIT("COMMIT", "确认"); - private String value; - private String description; + private final String value; + private final String description; SAFE_STOCK_ORDER_STATUS(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -1236,23 +1074,24 @@ public class ApsEnumUtil { /** * 插单状态 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum INSERTED_ORDER_STATUS { + public enum INSERTED_ORDER_STATUS implements Enumerator { UNCOMMIT("UNCOMMIT", "待处理"), COMMIT("COMMIT", "确认"); - private String value; - private String description; + private final String value; + private final String description; INSERTED_ORDER_STATUS(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -1261,23 +1100,24 @@ public class ApsEnumUtil { /** * 插单状态 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum FEED_BACK_STATUS { + public enum FEED_BACK_STATUS implements Enumerator { UNCOMMIT("UNCOMMIT", "未提交"), COMMIT("COMMIT", "提交"); - private String value; - private String description; + private final String value; + private final String description; FEED_BACK_STATUS(String value, String description) { this.value = value; this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -1286,18 +1126,18 @@ public class ApsEnumUtil { /** * 订单类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum APS_ORDER_TYPE { + public enum APS_ORDER_TYPE implements Enumerator { SALES_ORDER("SALES_ORDER", "S", "销售订单"), PRODUCT_ORDER("PRODUCT_ORDER", "M", "生产订单"), PURCHASE_ORDER("PURCHASE_ORDER", "P", "采购订单"), INVENTORY("INVENTORY", "W", "库存订单"), SAFE_STOCK_ORDER("SAFE_STOCK_ORDER", "Q", "安全库存订单"), - INSERTED_ORDER("INSERTED_ORDER", "I", "插单"); + INSERTED_ORDER("INSERTED_ORDER", "I", "插单"), + SUPPLY_ORDER("SUPPLY_ORDER", "Z", "补充订单"); - private String value; - private String prefix; - private String description; + private final String value; + private final String prefix; + private final String description; APS_ORDER_TYPE(String value, String prefix, String description) { this.value = value; @@ -1305,12 +1145,14 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } public String getPrefix() { return prefix; } + @Override public String getDescription() { return description; } @@ -1319,30 +1161,67 @@ public class ApsEnumUtil { /** * 工序类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SANLUX_OPERATION_TYPE { + public enum SANLUX_OPERATION_TYPE implements Enumerator { NORMAL("NORMAL", "正常工序"), FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"), - FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间牵纱"), + FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间自动牵纱"), FOUR_COATING("FOUR_COATING", "四车间覆胶"), FOUR_WRAPPING("FOUR_WRAPPING", "四车间包布"), TWO_SULFIDATION("TWO_SULFIDATION", "二车间硫化"), - TWO_TRAINBEARER("TWO_TRAINBEARER", "二车间牵纱"), + TWO_MOLDING("TWO_MOLDING", "二车间成型"), TWO_COATING("TWO_COATING", "二车间覆胶"), - TWO_WRAPPING("TWO_WRAPPING", "二车间包布"); + TWO_WRAPPING("TWO_WRAPPING", "二车间包布"), + TWO_TRAINBEARER("TWO_TRAINBEARER", "二车间牵纱"), + FOUR_MANUF_TRAINBEARER("FOUR_MANUF_TRAINBEARER", "四车间手动牵纱"), + THIRD_SULFIDATION("THIRD_SULFIDATION", "汽车带硫化"), + THIRD_MOLDING("THIRD_MOLDING", "汽车带成型"), + THIRD_CUTTING("THIRD_CUTTING", "汽车带切割"), + THIRD_SMALLGRIND("THIRD_SMALLGRIND", "汽车带小磨"), + THIRD_BIGGRIND("THIRD_BIGGRIND", "汽车带大磨"); - private String value; - private String description; + private final String value; + private final String description; SANLUX_OPERATION_TYPE(String value, String description) { this.value = value; this.description = description; } + @Override + public String getValue() { + return value; + } + + @Override + public String getDescription() { + return description; + } + } + + /** + * 产线类型 + */ + public enum SANLUX_PRODUCT_TYPE implements Enumerator { + ONE_LINE("ONE_LINE", "汽车带1号线"), + TWO_LINE("TWO_LINE", "汽车带2号线"), + THREE_LINE("THREE_LINE", "汽车带3号线"), + SEVEN_LINE("SEVEN_LINE", "汽车带7号线"), + EIGHT_LINE("EIGHT_LINE", "汽车带8号线"); + + private final String value; + private final String description; + + SANLUX_PRODUCT_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java index 2ba35cf..7c2a3fc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java @@ -22,13 +22,17 @@ public class BaseToken implements AuthenticationToken { this.languageCode = languageCode; } - public BaseToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) { + public BaseToken(String loginName, String loginPwd, String languageCode, Integer loginPlatform) { this.loginName = loginName; this.loginPwd = loginPwd; this.languageCode = languageCode; this.loginPlatform = loginPlatform; } + public BaseToken(String loginName) { + this.loginName = loginName; + } + //身份 @Override public Object getPrincipal() { diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java index 9d6cf59..4c1ee78 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java @@ -13,7 +13,11 @@ public class UserToken extends BaseToken { super(loginName, loginPwd, languageCode); } - public UserToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) { - super(loginName, loginPwd, languageCode,loginPlatform); + public UserToken(String loginName, String loginPwd, String languageCode, Integer loginPlatform) { + super(loginName, loginPwd, languageCode, loginPlatform); + } + + public UserToken(String loginName) { + super(loginName); } } diff --git a/modules/i3plus-pojo-bsp/pom.xml b/modules/i3plus-pojo-bsp/pom.xml index d86244b..95ce841 100644 --- a/modules/i3plus-pojo-bsp/pom.xml +++ b/modules/i3plus-pojo-bsp/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -70,4 +70,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37bf889..6a5ec3b 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -53,4 +53,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 048d5cd..fc117f8 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -52,4 +52,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index c338f71..47a62e1 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1ed6d53..38220d4 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -46,4 +46,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 93d4237..b415ee3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -52,4 +52,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d98b7d8..63c1e2f 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -19,4 +19,4 @@ - \ No newline at end of file + diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 0ee0761..4c20447 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -52,4 +52,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 4519749..e05843d 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -52,4 +52,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java index c3b4d99..d50846d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java @@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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.*; import java.io.Serializable; /** @@ -60,4 +56,8 @@ public class MesCustProdLine extends BaseBean implements Serializable { @Column(name = "DOCK_NO") @ApiParam("dock") private String dockNo; + + @Column(name = "ZONE_NO") + @ApiParam("区域代码") + private String zoneNo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java index 2cee1b9..42491af 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java @@ -4,16 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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; +import javax.persistence.*; import java.io.Serializable; /** @@ -38,6 +33,10 @@ public class MesJitIssueCfg extends BaseBean implements Serializable { @ApiParam("客户工厂代码") private String custPlantCode; + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + @Column(name = "QTY") @ApiParam("配置数量") private Integer qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 34e5995..0a7af47 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3348,6 +3348,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(queueJitPlan.getVinCode())) { DdlPreparedPack.getStringLikerPack(queueJitPlan.getVinCode(), "vinCode", packBean); } + if (!StringUtils.isEmpty(queueJitPlan.getProdCfgTypeCode())) { + DdlPreparedPack.getStringLikerPack(queueJitPlan.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } if (queueJitPlan.getStatus() != null) { DdlPreparedPack.getNumEqualPack(queueJitPlan.getStatus(), "status", packBean); } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 07a496b..b817206 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java index 8801a7a..483a6d9 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java @@ -131,7 +131,6 @@ public class WmsActionResponseBean implements Serializable { @ApiParam(value = "是否重置") private Integer isReset; - public WmsActionResponseBean(Boolean codeStatus, String message) { this.codeStatus = codeStatus; this.message = message; diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 657abba..0c26e7f 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -52,4 +52,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 504b0e7..34ba9a9 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -51,4 +51,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26e173f..e73c24b 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -52,4 +52,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml index 48930f8..d343a06 100644 --- a/modules/i3plus-pojo-screen/pom.xml +++ b/modules/i3plus-pojo-screen/pom.xml @@ -5,7 +5,8 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 + ../../pom.xml 4.0.0 @@ -54,4 +55,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 9e00793..18589a2 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -52,4 +52,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index f73c5b2..04d7e98 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -52,4 +52,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 1bf205d..9a7a5b6 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -70,4 +70,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index 26fabac..9e7c5d9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -204,6 +204,8 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", @Transient @ApiParam("库存地代码") private String areaNo; + @ApiParam("单号") + private String orderNo; public WmsTransQuan(){} diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index ca147a4..2b83fd0 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -46,4 +46,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 478033a..9d0cf82 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0.0.1 modules/i3plus-pojo-base @@ -271,4 +271,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file +