From 6c47817bfe713fde1e7af7695685e57d15151793 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 15 Jun 2020 15:09:16 +0800 Subject: [PATCH 01/11] mes enuk --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 0a82de8..885c8f0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -1903,7 +1903,8 @@ public class MesEnumUtil { MES_KPSN_RULE(410, "kpsnRuleExcelService", "关键件条码校验规则，支持编辑"), MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelService", "客户JIT生产队列"), MES_PART_BOM_IMPORT(430, "partBomExcelService", "散件BOM导入"), - MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑"); + MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑"), + MES_WORK_ORDER_PAINT(450, "workOrderPaintExcelService", "生产工单-涂装"); private int value; private String service; From 4de301bf79db302a342e2022b7e2698fc51334b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 15 Jun 2020 17:06:49 +0800 Subject: [PATCH 02/11] =?UTF-8?q?MDM=20=E7=B3=BB=E7=BB=9F=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E4=BC=98=E5=8C=96=20=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java | 4 ++++ .../cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java | 12 +++++++++--- .../i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java | 12 ++++++------ .../i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java | 10 +++++----- .../cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java | 12 ++++++++++++ .../i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java | 4 ++-- .../cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java | 13 ++++++++++++- .../i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java | 2 +- .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 1 + 10 files changed, 53 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java index e8c5618..84e7427 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java @@ -123,7 +123,7 @@ public class MdmEnumUtil { public enum MDM_SYNC_TYPE{ INSERT(1, "新增"), UPDATE(2, "修改"), - DELETE(2, "删除"); + DELETE(3, "删除"); private int value; private String description; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 29d0044..7417439 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -76,6 +76,10 @@ public class BfElement extends BaseBean { @ApiParam(value = "是否编辑") private Integer isObjectEdit; + @Column(name = "IS_READ_ONLY_SHOW") + @ApiParam(value = "是否只读显示") + private Integer isReadOnlyShow; + @Column(name = "IS_OBJECT_DEL") @ApiParam(value = "是否删除") private Integer isObjectDel; diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java index 859a6b3..3fef7c4 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java @@ -30,12 +30,13 @@ public abstract class BaseMdmBean extends BaseBean { @Transient @ApiModelProperty("是否主数据") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true) public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); @Column(name = "MDM_VERSION") @ApiModelProperty("mdm数据版本") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) private Long mdmVersion; public long getMdmVersionVal() { @@ -50,21 +51,26 @@ public abstract class BaseMdmBean extends BaseBean { @Column(name = "IS_MDM_PUBLISHED") @ApiModelProperty("是否发布") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true) private Integer isMdmPublished; @Column(name = "MDM_OPERATE_TYPE") @ApiModelProperty("操作类型") - @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class) + @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class,hidden = true) private Integer mdmOperateType; public Integer getMdmOperateTypeVal() { return mdmOperateType == null ? MdmEnumUtil.MDM_OPERATE_TYPE.INSERT.getValue() : mdmOperateType; } + public String getMdmOperateTypeTxt(){ + return MdmEnumUtil.MDM_OPERATE_TYPE.valueOfDescription(getMdmOperateTypeVal()); + } + @Column(name = "MDM_REF_ID") @ApiModelProperty("关联id") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) private Long mdmRefId; //排序方式 diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java index 96d8c16..ef84a68 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java @@ -28,22 +28,22 @@ public class BaseMdmBusiExtdBean extends BaseMdmBean { @Transient @ApiModelProperty("是否主数据") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true) public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); @Transient @ApiModelProperty("主数据Class") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) - public static Class mdmMasterClass = BaseMdmBean.class; + @AnnoOutputColumn(hidden = true) + protected static Class mdmMasterClass = BaseMdmBean.class; @Transient @ApiModelProperty("软件模块") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) - public static Integer mdmSoftType; + @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true) + protected static Integer mdmSoftType; @Column(name = "MDM_MASTER_ID") @ApiModelProperty("主数据id") @JsonSerialize(using = ToStringSerializer.class) - private Long mdmMasterId; + public Long mdmMasterId; } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java index 3aafc4b..1fe17c1 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java @@ -11,6 +11,11 @@ import io.swagger.annotations.ApiModelProperty; **/ public abstract class BaseMdmBusiModelBean { + public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) { + this.mdmMasterBean = mdmMasterBean; + this.mdmBusiBean = mdmBusiBean; + } + @ApiModelProperty("主数据") private M mdmMasterBean; @@ -20,11 +25,6 @@ public abstract class BaseMdmBusiModelBean Date: Mon, 15 Jun 2020 17:30:39 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java | 3 ++- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java | 3 ++- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java | 3 ++- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java | 4 ++-- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java index 7d49ff3..d53eb6b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -10,9 +10,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; -import javax.persistence.Entity; import javax.persistence.Table; /** @@ -23,7 +23,7 @@ import javax.persistence.Table; * @Modify: **/ @Data -@Entity +@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java index eed1578..90e1854 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java @@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.data.mongodb.core.index.Indexed; +import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,7 +24,7 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Entity +@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index ce575dc..f14accf 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.data.mongodb.core.index.Indexed; +import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; import javax.persistence.Entity; @@ -26,7 +27,7 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Entity +@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index 2c6c575..c45cd05 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.data.mongodb.core.index.Indexed; +import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; import javax.persistence.Entity; @@ -26,7 +27,7 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Entity +@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index 23f1a00..9d1de96 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -12,9 +12,9 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.data.mongodb.core.index.Indexed; +import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; -import javax.persistence.Entity; import javax.persistence.Table; /** @@ -25,7 +25,7 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Entity +@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) From b114daed3fee465c7eb3bf0aa2da03214c2ef578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 15 Jun 2020 17:45:32 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java index 83f9049..3c83ccd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -79,6 +80,7 @@ public class MesPcnTask extends BaseBean implements Serializable { @ApiParam("任务周期描述") private String taskCycleDescription; + @Lob @Column(name = "TASK_PARAM") @ApiParam("任务参数") private String taskParam; From ab8ee21c664ca7f2182d5ab01bb9ac8e8476866b Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 15 Jun 2020 20:12:14 +0800 Subject: [PATCH 05/11] Finish Task #2139 Cost:8h --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java | 12 ++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java index 7fbe7f7..76ee1d5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -56,4 +57,15 @@ public class MesPartCheck extends BaseBean implements Serializable { @ApiParam("校验表达式描述") private String recordNumDesc; + @Transient + @ApiParam("复核结果") + private Integer reviewResult = 1; + + @Transient + @ApiParam("对象名称") + private String objectCodeName; + + @Transient + @ApiParam("产线") + private String workCenterCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java index ab021fd..3d121d7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java @@ -25,16 +25,4 @@ public class DataReviewModel { @ApiParam("对象代码") private String objectCode; - @ApiParam("对象名称") - private String objectCodeName; - - @ApiParam("产线") - private String workCenterCode; - - @ApiParam("复核结果") - private Integer reviewResult; - - @ApiParam("补录操作") - private Integer supplementaryOperate; - } From 638c032d95c0d3525b51002d82e782433989613c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 16 Jun 2020 13:14:27 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E7=BB=84=E4=BB=B6=E8=B0=83=E7=94=A8=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 5 ++- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 51 +++++++++++++++++++++- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 885c8f0..7fc29e9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -70,8 +70,9 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_MODULE_TYPE { MONITOR_MODULE(10, "监听组件"), - REVEAL_MODULE(10, "展示组件"), - BUTTON_MODULE(30, "按钮组件"); + REVEAL_MODULE(20, "展示组件"), + BUTTON_MODULE(30, "按钮组件"), + TIMING_MODULE(40, "定时组件"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 6f4c656..c9c15e5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -18,8 +18,9 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_MODULE_TYPE { MONITOR_MODULE(10, "监听组件"), - REVEAL_MODULE(10, "展示组件"), - BUTTON_MODULE(30, "按钮组件"); + REVEAL_MODULE(20, "展示组件"), + BUTTON_MODULE(30, "按钮组件"), + TIMING_MODULE(40, "定时组件"); private int value; private String description; @@ -4073,6 +4074,52 @@ public class MesPcnEnumUtil { } /** + * 停机类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STOP_MACHINE_TYPE { + TIMER_TIME_OUT(10, "计时器超时停机"), + DELAY_HELP(20, "延时帮助停机"), + URGENT_STOP(30, "急停停机"); + + private int value; + private String description; + + STOP_MACHINE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * plc状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From 089f655cfebae5a49567d173f8b5fd86b46a24bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 16 Jun 2020 13:14:45 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E7=BB=84=E4=BB=B6=E8=B0=83=E7=94=A8=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index bb6d667..7952b14 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -138,6 +138,12 @@ public class StationRequestBean implements Serializable { @ApiParam("工步弹框状态") private Boolean stepDialogStatus = false; + @ApiParam("是否按时完成") + private Integer isOnTimeComplete; + + @ApiParam("工位剩余时间") + private Integer remainWorkTime; + @ApiParam("特殊展示数据") private Map specialDisplayMap = new HashMap<>(); From bdb5e6e27c2cfa533c0748db9556ab745760cee6 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 11 Jun 2020 17:47:52 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 43 ++++ .../estsh/i3plus/pojo/platform/bean/SysUser.java | 5 + .../i3plus/pojo/platform/bean/SysUserPassword.java | 47 ++++ .../repository/SysUserPasswordRepository.java | 14 ++ .../estsh/i3plus/pojo/report/bean/BrPojoAttr.java | 244 ++++++++++----------- .../report/repository/BrPojoAttrRepository.java | 30 +-- 6 files changed, 246 insertions(+), 137 deletions(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserPasswordRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 0574e44..64a9161 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1234,4 +1234,47 @@ public class ImppEnumUtil { return null; } } + + /** + * 密码策略 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CHECK_TEXT { + PASSWORD_VERIFY(1, "保存策略"), + PASSWORD_LOGIN(2, "登录策略"); + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private CHECK_TEXT(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static CHECK_TEXT valueOfEnum(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 9afa74c..02c2570 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -58,6 +58,11 @@ public class SysUser extends BaseBean { @ApiParam(value ="登陆密码") private String userLoginPassword; + @Column(name="USER_LOGIN_PASSWORD_ID") + @ApiParam(value ="密码ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userLoginPasswordId; + @Column(name="USER_TYPE") @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") private Integer userType; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java new file mode 100644 index 0000000..e2902ca --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-6-4 下午3:38 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_USER_PASSWORD") +@Api(value="账号密码") +public class SysUserPassword extends BaseBean { + private static final long serialVersionUID = 4536854582252378921L; + + @Column(name="USER_ID") + @ApiParam(value ="人员ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + @Column(name="USER_PASSWORD") + @ApiParam(value ="用户密码") + private String userPassword; + + @Column(name="USER_LOGIN_LAST_DATE_TIME") + @ApiParam(value ="账号最后登录时间") + private String userLoginLastDateTime; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserPasswordRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserPasswordRepository.java new file mode 100644 index 0000000..dda7e76 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserPasswordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysUserPassword; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-6-4 下午3:46 + * @Modify: + **/ +public interface SysUserPasswordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java index 5387dcd..6a9df34 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java @@ -1,122 +1,122 @@ -package cn.estsh.i3plus.pojo.report.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 11:32 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BR_POJO_ATTR") -@Api(value="对象属性",description = "对象属性") -public class BrPojoAttr extends BaseBean { - - private static final long serialVersionUID = -9025365832485707583L; - @Column(name="TEMPLATE_ID") - @ApiParam(value ="模板编号" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; - - @Column(name="SERVER_ID") - @ApiParam(value ="服务ID",example = "-1") - private Integer serverId; - - @Column(name="POJO_ID") - @ApiParam(value ="模板对象ID" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long pojoId; - - @Column(name="POJO_NAME") - @ApiParam(value ="对象名称") - private String pojoName; - - @Column(name="PACKAGE_NAME_RDD") - @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称") - private String packageNameRdd; - - @Column(name="POJO_TABLE_NAME_ALIAS") - @ApiParam(value ="对象别名") - private String pojoTableNameAlias; - - @Column(name="ATTR_COLUMN_NAME") - @ApiParam(value ="属性别名") - private String attrColumnName; - - @Column(name="ATTR_COLUMN_NAME_ALIAS") - @ApiParam(value ="属性别名") - private String attrColumnNameAlias; - - @Column(name="PARENT_ID") - @ApiParam(value ="上级ID",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; - - @Column(name="ATTR_TYPE") - @ApiParam(value ="属性类型",example = "-1") - private Integer attrType; - - @Column(name="ATTR_REF_TYPE") - @ApiParam(value ="关系类型",example = "-1") - private Integer attrRefType; - - @Column(name="DATA_TYPE") - @ApiParam(value ="数据类型",example = "-1") - private Integer dataType; - - @Column(name="CHART_ATTR_NAME") - @ApiParam(value ="图标属性名称") - private String chartAttrName; - - @Column(name="AGGREGATION_TYPE") - @ApiParam(value ="聚合类型",example = "-1") - private Integer aggregationType; - - @Column(name="AGGREGATION_ID") - @ApiParam(value ="聚合类型",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long aggregationId; - - @Column(name="ATTR_SORT") - @ApiParam(value ="字段排序") - private Integer attrSort; - - @Column(name="ATTR_DATA_SORT") - @ApiParam(value ="字段排序") - private Integer attrDataSort; - - @Column(name="ATTR_STYLE") - @ApiParam(value ="字段样式") - private Integer attrStyle; - - @Column(name="ATTR_STYLE_RDD") - @ApiParam(value ="字段样式") - private String attrStyleRdd; - - @Column(name="ATTR_DEFAULT_VALUE") - @ApiParam(value ="属性默认值") - private String attrDefaultValue; - - @Column(name="ATTR_SHOW") - @ApiParam(value ="属性是否显示",example = "-1") - private Integer attrShow; - -} +//package cn.estsh.i3plus.pojo.report.bean; +// +//import cn.estsh.i3plus.pojo.base.bean.BaseBean; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiParam; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import org.hibernate.annotations.DynamicInsert; +//import org.hibernate.annotations.DynamicUpdate; +// +//import javax.persistence.Column; +//import javax.persistence.Entity; +//import javax.persistence.Table; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 11:32 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name="BR_POJO_ATTR") +//@Api(value="对象属性",description = "对象属性") +//public class BrPojoAttr extends BaseBean { +// +// private static final long serialVersionUID = -9025365832485707583L; +// @Column(name="TEMPLATE_ID") +// @ApiParam(value ="模板编号" ,example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long templateId; +// +// @Column(name="SERVER_ID") +// @ApiParam(value ="服务ID",example = "-1") +// private Integer serverId; +// +// @Column(name="POJO_ID") +// @ApiParam(value ="模板对象ID" ,example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long pojoId; +// +// @Column(name="POJO_NAME") +// @ApiParam(value ="对象名称") +// private String pojoName; +// +// @Column(name="PACKAGE_NAME_RDD") +// @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称") +// private String packageNameRdd; +// +// @Column(name="POJO_TABLE_NAME_ALIAS") +// @ApiParam(value ="对象别名") +// private String pojoTableNameAlias; +// +// @Column(name="ATTR_COLUMN_NAME") +// @ApiParam(value ="属性别名") +// private String attrColumnName; +// +// @Column(name="ATTR_COLUMN_NAME_ALIAS") +// @ApiParam(value ="属性别名") +// private String attrColumnNameAlias; +// +// @Column(name="PARENT_ID") +// @ApiParam(value ="上级ID",example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long parentId; +// +// @Column(name="ATTR_TYPE") +// @ApiParam(value ="属性类型",example = "-1") +// private Integer attrType; +// +// @Column(name="ATTR_REF_TYPE") +// @ApiParam(value ="关系类型",example = "-1") +// private Integer attrRefType; +// +// @Column(name="DATA_TYPE") +// @ApiParam(value ="数据类型",example = "-1") +// private Integer dataType; +// +// @Column(name="CHART_ATTR_NAME") +// @ApiParam(value ="图标属性名称") +// private String chartAttrName; +// +// @Column(name="AGGREGATION_TYPE") +// @ApiParam(value ="聚合类型",example = "-1") +// private Integer aggregationType; +// +// @Column(name="AGGREGATION_ID") +// @ApiParam(value ="聚合类型",example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long aggregationId; +// +// @Column(name="ATTR_SORT") +// @ApiParam(value ="字段排序") +// private Integer attrSort; +// +// @Column(name="ATTR_DATA_SORT") +// @ApiParam(value ="字段排序") +// private Integer attrDataSort; +// +// @Column(name="ATTR_STYLE") +// @ApiParam(value ="字段样式") +// private Integer attrStyle; +// +// @Column(name="ATTR_STYLE_RDD") +// @ApiParam(value ="字段样式") +// private String attrStyleRdd; +// +// @Column(name="ATTR_DEFAULT_VALUE") +// @ApiParam(value ="属性默认值") +// private String attrDefaultValue; +// +// @Column(name="ATTR_SHOW") +// @ApiParam(value ="属性是否显示",example = "-1") +// private Integer attrShow; +// +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java index 386bfc5..b719014 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java @@ -1,15 +1,15 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrMenu; -import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 15:03 - * @Modify: - **/ -public interface BrPojoAttrRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrMenu; +//import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 15:03 +// * @Modify: +// **/ +//public interface BrPojoAttrRepository extends BaseRepository { +//} From 4208d39e3f0cb1f9de24428288a2b323f7a18b60 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 15 Jun 2020 18:46:20 +0800 Subject: [PATCH 09/11] =?UTF-8?q?feat(=E5=AF=86=E7=A0=81=E8=A7=84=E5=88=99?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=AE=8C=E6=88=90):=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=99=BB=E5=BD=95,=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 2 ++ .../java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 02c2570..643cb74 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -54,6 +54,7 @@ public class SysUser extends BaseBean { @ApiParam(value ="工号") private String userEmpNo; + @Deprecated // 废弃密码新 , 使用ID作为密码信息, 改密码作为数据传输使用 @Column(name="USER_LOGIN_PASSWORD") @ApiParam(value ="登陆密码") private String userLoginPassword; @@ -83,6 +84,7 @@ public class SysUser extends BaseBean { @ApiParam(value ="登录次数",example = "0") private Integer userLoginNum; + @Deprecated @Column(name="USER_LOGIN_LAST_DATE_TIME") @ApiParam(value ="账号最后登录时间") private String userLoginLastDateTime; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java index e2902ca..bd94c41 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java @@ -44,4 +44,11 @@ public class SysUserPassword extends BaseBean { @ApiParam(value ="账号最后登录时间") private String userLoginLastDateTime; + public SysUserPassword() { + } + + public SysUserPassword(Long userId, String userPassword) { + this.userId = userId; + this.userPassword = userPassword; + } } From 2546395b8d65efc87e1b717c853056a746262215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 16 Jun 2020 15:46:16 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6=E7=BB=84=E4=BB=B6=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=92=8C=E5=89=8D=E5=90=8E=E7=AB=AF=E8=B0=83=E7=94=A8=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 7952b14..7117863 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -142,7 +142,10 @@ public class StationRequestBean implements Serializable { private Integer isOnTimeComplete; @ApiParam("工位剩余时间") - private Integer remainWorkTime; + private Long remainWorkTime; + + @ApiParam("是否操作超时") + private Integer isTimeOut; @ApiParam("特殊展示数据") private Map specialDisplayMap = new HashMap<>(); From 0ea80a0f63ac17e05ceeb1badf93a1f1a09cf2c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 16 Jun 2020 17:43:04 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=20=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=BC=80=E5=85=B3=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/SysTaskTimeRecordingRepository.java | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java deleted file mode 100644 index 749dd25..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; - -/** - * @Description : 定时任务执行记录 - * @Reference : - * @Author : wei.peng - * @Date : 2018-10-22 12:03:01.409 - * @Modify : - **/ -public interface SysTaskTimeRecordingRepository extends BaseRepository { -}