From 2dc63a9a4e0b0e62d0ac9b643c47be2fb0d70ec5 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Oct 2019 11:15:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=AD=97=E6=AE=B5=E9=BB=98=E8=AE=A4=E5=9C=A8=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E4=B8=8D=E6=98=BE=E7=A4=BA=202=EF=BC=9A=E4=B8=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/annotation/FieldAnnotation.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 4 ++ .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 6 +++ .../cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java | 14 +++++ .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 63 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 2 + .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java | 3 ++ .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 4 +- .../pojo/aps/enums/RESOURCE_CHOISE_RULE.java | 4 ++ .../i3plus/pojo/aps/enums/WORK_SORT_RULE.java | 31 +++++++++++ .../i3plus/pojo/aps/holders/EResCalendar.java | 2 + .../cn/estsh/i3plus/pojo/aps/holders/EWork.java | 19 +++---- .../estsh/i3plus/pojo/aps/holders/EWorkPlan.java | 7 +++ .../pojo/aps/repository/IWorkPlanRepository.java | 9 ++++ .../src/main/resources/relations/ResCalendar.xml | 4 ++ .../src/main/resources/relations/WorkInput.xml | 12 ++--- .../src/main/resources/relations/WorkPlan.xml | 9 ++++ 18 files changed, 179 insertions(+), 17 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IWorkPlanRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index a8484af..6a0a0d2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -20,4 +20,5 @@ public @interface FieldAnnotation { boolean display() default true; // 是否需要在界面显示 int pric() default 2; // 对于浮点型，界面显示的精度 boolean mainkey() default false; // 是否为主键 + String defaultValue() default ""; // 字段的默认值 } 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 817df4a..be169d1 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 @@ -80,6 +80,10 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="数据库类型") private JDBCType jdbcType; + @Column(name="DEFAULT_VALUE") + @ApiParam(value ="字段默认值") + private String defaultValue; + @JsonIgnore private transient Class clazz; @JsonIgnore 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 4483e7e..46880ed 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,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; @@ -31,10 +32,12 @@ import java.util.List; public class Material extends BaseCode { @Column(name="TYPE") @ApiParam(value ="类型") + @FieldAnnotation(defaultValue = "PRODUCT") private MATERIAL_TYPE type; @Column(name="PREPARE_TYPE") @ApiParam(value ="备料类型") + @FieldAnnotation(defaultValue = "SELF_MAKE") private PREPARE_TYPE prepareType; @Column(name="REPL_TYPE") @@ -68,10 +71,12 @@ public class Material extends BaseCode { @Column(name="LEVEL") @ApiParam(value ="低阶码") @RippleAnnotation(dependence = {"OperOutputs.Operation.ProductRouting.Material"}, method = "calcLevel") + @FieldAnnotation(modify = false) private Integer level; @Column(name="IS_AUTO_FIX_PEGGING") @ApiParam(value ="自动补充标识") + @FieldAnnotation(defaultValue = "true") private Boolean autoFixPegging; @Column(name="MAX_PRODUCT_BATCH") @@ -80,6 +85,7 @@ public class Material extends BaseCode { @Column(name="MIN_PRODUCT_BATCH") @ApiParam(value ="最小制造批量") + @FieldAnnotation(defaultValue = "0.0") private Double minProductBatch; @Column(name="UNIT_PRODUCT_BATCH") 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 7edd19f..2ec0cbc 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 @@ -1,6 +1,9 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EResCalendar; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -8,6 +11,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :日历 @@ -40,4 +44,14 @@ public class ResCalendar extends BaseAPS { @Column(name="PRIORITY") @ApiParam(value ="优先级") private Integer priority; + + @JsonBackReference + public List getDayShifts() { + return BeanRelation.list(this, EResCalendar.DayShifts); + } + + @JsonBackReference + public List getResources() { + return BeanRelation.list(this, EResCalendar.Resources); + } } 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 a9992f3..896eb83 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 @@ -184,4 +184,6 @@ public class Work extends BaseCode { public List getPlanFeedbacks() { return BeanRelation.list(this, EWork.PlanFeedbacks); } + + public WorkPlan getWorkPlan() { return BeanRelation.get(this, EWork.WorkPlan); } } 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 new file mode 100644 index 0000000..546b590 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; +import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation; +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.Date; + +/** + * @Description :工作计划 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-10-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="APS_WORK_PLAN") +@Api("工作计划") +public class WorkPlan extends BaseAPS { + private Date prevSetStart; + private Date prevSetEnd; + private String prevSetTime; + private Date produceStart; + private Date produceEnd; + private String produceTime; + private Date postSetStart; + private Date postSetEnd; + private String postSetTime; + private Date lockStart; + private Date lockEnd; + private String lockTime; + + private Date edgeTime; + + private Long workId; + private Long resourceId; + + public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } + + public void setWork(Work work) { + this.workId = work != null ? work.getId() : 0l; + BeanRelation.set(this, EWorkPlan.Work, work); + } + + public Resource getResource() { return BeanRelation.get(this, EWorkPlan.Resource); } + + public void setResource(Resource resource) { + this.resourceId = resource != null ? resource.getId() : 0l; + BeanRelation.set(this, EWorkPlan.Resource, resource); + } +} 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 8b1c8f9..e61ce60 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.aps.common; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import javax.persistence.MappedSuperclass; @@ -18,6 +19,7 @@ import java.util.Map; @Data @MappedSuperclass public abstract class BaseAPS extends BaseBean { + @JsonIgnore private transient Map customFields = new HashMap<>(); public Object getCustomField(String code) { 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 de0cb5f..4c43a95 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 @@ -287,6 +287,9 @@ public class BeanInfo { case STRING: cls = String.class; break; + case DURATION: + cls = DateDuration.class; + break; default: break; } 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 1eaa05e..6c7e206 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 @@ -217,7 +217,7 @@ public class BeanRelation { * @param bean * @param holder */ - private static void remove(BaseBean bean, Enum holder) { + public static void remove(BaseBean bean, Enum holder) { if (bean == null || holder == null) { return; } @@ -241,7 +241,7 @@ public class BeanRelation { * @param holder * @param relaBean */ - private static void remove(BaseBean bean, Enum holder, BaseBean relaBean) { + public static void remove(BaseBean bean, Enum holder, BaseBean relaBean) { if (bean == null || holder == null) { return; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java new file mode 100644 index 0000000..864cf3e --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java @@ -0,0 +1,4 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum RESOURCE_CHOISE_RULE { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java new file mode 100644 index 0000000..4984c67 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +/** + * @Description :预置的工作排序规则 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +public enum WORK_SORT_RULE { + NONE, + ORDER_DELIVERY, // 订单交货期 + ORDER_PRIORITY, // 订单优先级 + ORDER_ESTSTART, // 订单最早开始时刻 + ORDER_COUNT, // 订单数量 + ORDER_RECEIVE_DATE,// 订单接单日期 + ORDER_LET_MINUS_EST,// 订单交货期与订单最早开始时刻之差 + ORDER_PRESSURE, // 订单紧迫程度 + ORDER_SURPLUS, // 订单余裕度 + REMAIN_OPERATION_COUNT,// 残留工序数 + REMAIN_PRODUCT, // 残留生产时间 + MINSTE_PREMAIN,// 最小工序宽裕时间 + WORK_LET, // 工作最晚结束时刻 + WORK_EST, // 工作最早开始时刻 + ORDER_STOCK_RELA, // 订单物品库存量相对值 + ORDER_FIRST_WORK_START,// 订单首工作上次开始时刻 + HAVE_HIGH_WORK, // 订单中含有高级别工作 + WORK_RESOURCE_COUNT, // 工作的可用资源数 + WORK_SCHED_APPROX,// 与已排工作近视度 + TOP_ORDER_DELIVERY;// 顶层订单的交货期 +} 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 86fd054..1717230 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,4 +1,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EResCalendar { + DayShifts, + Resources } 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 13dee44..47da0e1 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,13 +1,14 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EWork { - Order, - ParentWork, - WorkResources, - WorkInputs, - WorkOutputs, - PrevRelations, - PostRelations, - Operation, - PlanFeedbacks + Order, // 订单 + ParentWork, // 父工作 + WorkResources, // 工作资源 + WorkInputs, // 工作输入 + WorkOutputs, // 工作输出 + PrevRelations, // 前关联 + PostRelations, // 后关联 + Operation, // 工序 + PlanFeedbacks, // 工作计划反馈 + WorkPlan // 关联的为主资源的计划 } 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 new file mode 100644 index 0000000..f288a42 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EWorkPlan { + Work, + Resource, + AssPlans // 关联的为副资源的工作计划 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IWorkPlanRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IWorkPlanRepository.java new file mode 100644 index 0000000..a843876 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IWorkPlanRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.WorkPlan; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface IWorkPlanRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml index d35accc..d2d6643 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml @@ -1,3 +1,7 @@ + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml index c1f7586..369d560 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml @@ -1,9 +1,9 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml new file mode 100644 index 0000000..219bf07 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file From 1d3fc8b5c9a929de79152e7be88281aa9268ed6a Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 18 Oct 2019 17:17:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?mes=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java | 1 - .../{MesWorkOrderButtonModel.java => MesButtonFlagModel.java} | 7 +++++-- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java | 3 +++ 4 files changed, 10 insertions(+), 5 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{MesWorkOrderButtonModel.java => MesButtonFlagModel.java} (85%) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 8edb6bf..a5e62dc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel; +import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -201,7 +201,7 @@ public class MesWorkOrder extends BaseBean { @Transient @ApiParam("mes生产工单页面按钮控制") - private MesWorkOrderButtonModel workOrderButtonModel; + private MesButtonFlagModel workOrderButtonModel; @Transient @ApiParam(value = "下达按钮编号") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index df1dcb6..67a37dc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java similarity index 85% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java index 4a5af7e..1928952 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java @@ -17,8 +17,8 @@ import java.io.Serializable; @Data @NoArgsConstructor @AllArgsConstructor -@Api("mes生产工单页面按钮控制model") -public class MesWorkOrderButtonModel implements Serializable { +@Api("mes页面按钮控制model") +public class MesButtonFlagModel implements Serializable { @ApiParam("修改按钮") private boolean updateButton; @@ -47,5 +47,8 @@ public class MesWorkOrderButtonModel implements Serializable { @ApiParam("完成按钮") private boolean completeButton; + @ApiParam("关闭按钮-提醒") + private boolean closeButtonNoticeFlag; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java index 71f9cea..b1bb02b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java @@ -70,6 +70,9 @@ public class MesEquTaskModel implements Serializable { @ApiParam("通知标识") private String notifyFlagName; + @ApiParam("mes设备作业任务页面按钮控制") + private MesButtonFlagModel equTaskButtonFlagModel; + public MesEquTaskModel() { From 5a682467d1deefa3ecb6a3f830c2bf207d872eeb Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Oct 2019 17:37:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1=EF=BC=9A=E5=9C=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=A1=A8=E4=B8=AD=E6=96=B0=E5=A2=9E=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E9=A1=B9=E6=95=B0=E7=BB=84=EF=BC=8C=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E5=9C=A8=E9=80=89=E6=8B=A9=E6=9E=9A=E4=B8=BE=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E9=9C=80=E8=A6=81=E5=86=8D=E4=BB=8E=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E8=8E=B7=E5=8F=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 5 ++++- .../estsh/i3plus/pojo/aps/bean/OperResource.java | 4 ++++ .../estsh/i3plus/pojo/aps/bean/WorkResource.java | 4 ++++ .../pojo/aps/enums/RESOURCE_CHOISE_RULE.java | 18 +++++++++++++++++ .../i3plus/pojo/aps/enums/WORK_SORT_RULE.java | 23 +++++++++++----------- 5 files changed, 42 insertions(+), 12 deletions(-) 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 be169d1..f302131 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 @@ -41,7 +41,7 @@ public class FieldInfo extends BaseCode { private FIELD_TYPE type; @Column(name="TYPE_NAME") - @ApiParam(value ="类型全称") + @ApiParam(value ="类型名称") private String typeName; @Column(name="CUSTOMIZE") @@ -84,6 +84,9 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="字段默认值") private String defaultValue; + @ApiParam(value ="枚举项内容") + private transient Enum[] enumItems; + @JsonIgnore private transient Class clazz; @JsonIgnore 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 b56b850..4957a0e 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 @@ -59,6 +59,10 @@ public class OperResource extends BaseAPS { @ApiParam(value ="优先级") private Integer priority; + @Column(name="USER_MATCH_NUMBER") + @ApiParam(value ="资源使用配套号") + private String userMatchNumber; + @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(property = false) 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 2e9b10d..d500003 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 @@ -58,6 +58,10 @@ public class WorkResource extends BaseAPS { @ApiParam(value ="最大后设置中断时间") private String maxPostSdTime; + @Column(name="USER_MATCH_NUMBER") + @ApiParam(value ="资源使用配套号") + private String userMatchNumber; + @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java index 864cf3e..deb2079 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java @@ -1,4 +1,22 @@ package cn.estsh.i3plus.pojo.aps.enums; +/** + * @Description :预置的资源选择规则 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public enum RESOURCE_CHOISE_RULE { + PREV_SET_TIME, // 前设置时间 + PRODUCE_TIME, // 生产时间 + POST_SET_TIME, // 后设置时间 + WORK_WAIT_TIME, // 工作等待时间 + RES_BALANCE, // 资源均衡度 + SAME_MATERIAL, // 相同物料 + SAME_ORDER, // 相同订单 + NEARLY_WORK, // 前后工作 + POST_RESOURCE, // 后资源制约 + SAME_ASS_RESOURCE, // 相同副资源 + RESOURCE_PRIORITY; // 资源优先级 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java index 4984c67..99a6d77 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java @@ -9,23 +9,24 @@ package cn.estsh.i3plus.pojo.aps.enums; **/ public enum WORK_SORT_RULE { NONE, - ORDER_DELIVERY, // 订单交货期 + ORDER_LET, // 订单交货期 ORDER_PRIORITY, // 订单优先级 - ORDER_ESTSTART, // 订单最早开始时刻 + ORDER_EST, // 订单最早开始时刻 ORDER_COUNT, // 订单数量 ORDER_RECEIVE_DATE,// 订单接单日期 - ORDER_LET_MINUS_EST,// 订单交货期与订单最早开始时刻之差 + ORDER_LET_SUB_EST,// 订单交货期与订单最早开始时刻之差 ORDER_PRESSURE, // 订单紧迫程度 ORDER_SURPLUS, // 订单余裕度 - REMAIN_OPERATION_COUNT,// 残留工序数 - REMAIN_PRODUCT, // 残留生产时间 - MINSTE_PREMAIN,// 最小工序宽裕时间 + NOPLAN_OPERATION_SIZE,// 残留工序数 + REMAIN_PRODUCE_TIME, // 残留生产时间 + MIN_OPERATION_REMAIN_TIME,// 最小工序宽裕时间 WORK_LET, // 工作最晚结束时刻 WORK_EST, // 工作最早开始时刻 - ORDER_STOCK_RELA, // 订单物品库存量相对值 - ORDER_FIRST_WORK_START,// 订单首工作上次开始时刻 + INVENTORY_RELA, // 订单物品库存量相对值 + FIRST_WORK_BEGIN,// 订单首工作上次开始时刻 HAVE_HIGH_WORK, // 订单中含有高级别工作 - WORK_RESOURCE_COUNT, // 工作的可用资源数 - WORK_SCHED_APPROX,// 与已排工作近视度 - TOP_ORDER_DELIVERY;// 顶层订单的交货期 + WORK_RESOURCE_SIZE, // 工作的可用资源数 + TOP_ORDER_LET,// 顶层订单的交货期 + TOP_ORDER_CODE, // 顶层订单代码 + TOP_ORDER_PRIORITY; // 顶层订单优先级 } From f6be80db0173dbed668bc7a5e66185303b05d77a Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Sat, 19 Oct 2019 17:41:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0groupby=20=E6=9E=84?= =?UTF-8?q?=E9=80=A0=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 13 ++++++++++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 8 ++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 9722217..a1832ae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -149,12 +149,23 @@ public class WmsCSFactTrans extends BaseBean { this.srcZoneNo = srcZoneNo; this.srcWhNo = srcWhNo; } - + public WmsCSFactTrans(String partNo,String partNameRdd,String unit, String orderNo, String organizeCode,double qty) { + this.partNo=partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.orderNo = orderNo; + this.organizeCode = organizeCode; + this.qty=qty; + } public WmsCSFactTrans(Long countBoxQty,Double sumPartQty,String zoneNo, String partNo, String partNameRdd) { this.countBoxQty = countBoxQty; this.sumPartQty = sumPartQty; this.zoneNo = zoneNo; this.partNo = partNo; this.partNameRdd = partNameRdd; + } + + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 6461ae8..5addb05 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -178,4 +178,12 @@ public class WmsCSOrderDetails extends BaseBean { this.organizeCode = organizeCode; this.transStatus = transStatus; } + public WmsCSOrderDetails(String partNo,String partNameRdd,String unit, String orderNo, String organizeCode,double qty) { + this.partNo=partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.orderNo = orderNo; + this.organizeCode = organizeCode; + this.qty=qty; + } }