From 02cf004828cae038457e8a0b34252a78391fd9d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 18 Jun 2021 14:37:28 +0800 Subject: [PATCH 01/27] =?UTF-8?q?=E3=80=903566=2020063-=E9=89=B4=E5=AE=9A?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5-20210618=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 33 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/IfPackage.java | 4 +++ .../i3plus/pojo/mes/bean/IfPackageDetail.java | 4 +++ .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 20 +++++++++++++ .../i3plus/pojo/mes/bean/MesPackageDetail.java | 6 +++- 5 files changed, 66 insertions(+), 1 deletion(-) 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 b2a2d97..a92a66d 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 @@ -6724,4 +6724,37 @@ public class MesPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PENDING_REPORT_TYPE { + + IDENTIFICATION_TYPE(10, "鉴定类型"), + FAILURE_MODE(20, "失效模式"); + + private int value; + private String description; + + PENDING_REPORT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + 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; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java index 15c072a..ddec01b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java @@ -80,4 +80,8 @@ public class IfPackage extends BaseBean implements Serializable { @Column(name = "SYNC_STATUS") @ApiParam("同步状态") private Integer syncStatus; + + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; } \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index cc831dc..1b18a01 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -128,4 +128,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "SYNC_FLAG") @ApiParam("同步标识(同步工具使用)") private Integer syncFlag; + + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index d0ed327..12566dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -117,6 +117,22 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("入库时间") private String inLocationTime; + @Column(name = "PATTERN_CODE") + @ApiParam("模式代码") + private String patternCode; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式代码名称") + private String patternName; + + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; + + @Column(name = "IS_RETURN") + @ApiParam("是否回传") + private Integer isReturn; + @Transient @ApiParam("封箱状态") private String sealStatus; @@ -211,6 +227,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("产品条码") private String productSn; + @Transient + @ApiParam("临时条码集合") + private List mesTemporarySnRecordList = new ArrayList<>(); + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index a9c9324..2275812 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -69,11 +69,15 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("包装编码4") private String packageNo4; + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; + @Transient @ApiParam("批次") private String lotNo; - @Transient + @Column(name = "PRODUCT_SN") @ApiParam("产品条码") private String productSn; From d6b2bce9b017fc36328bc2eda1613c9fc314b359 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 21 Jun 2021 21:56:09 +0800 Subject: [PATCH 02/27] =?UTF-8?q?fix(screen):=206.21=20=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.21 枚举调整 增删改查测试 --- .../cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java | 6 +----- .../java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java | 6 +----- .../java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java | 9 ++------- .../cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java | 6 +----- .../java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java | 10 ++-------- .../main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java | 7 +------ .../main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java | 6 +----- .../java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java | 7 +------ .../cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java | 10 +++------- .../main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java | 10 ++-------- 11 files changed, 17 insertions(+), 62 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java index 3db1a34..6bde42d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java @@ -264,6 +264,8 @@ public class ScreenEnumUtil { } return tmp; } + + } public enum LAYOUT_TYPE { diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java index b62b2a4..676ea57 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -12,8 +11,6 @@ import lombok.NoArgsConstructor; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.persistence.Table; import java.io.Serializable; @@ -43,7 +40,6 @@ public class ScrAction extends BaseBean implements Serializable { @Column(name = "ACTION_TYPE") @ApiModelProperty("动作类型") - @Enumerated(EnumType.STRING) - private ScreenEnumUtil.ACTION_TYPE actionType; + private Integer actionType; } \ No newline at end of file diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java index 4576a2b..f02e9a9 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -12,8 +11,6 @@ import lombok.NoArgsConstructor; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.persistence.Table; import java.io.Serializable; @@ -63,8 +60,7 @@ public class ScrDataAuth extends BaseBean implements Serializable { @Column(name = "AUTH_TYPE") @ApiModelProperty("权限类型 （行，列）") - @Enumerated(EnumType.STRING) - private ScreenEnumUtil.AUTH_TYPE authType; + private Integer authType; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java index 3394de5..e07d8fb 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; @@ -14,8 +13,6 @@ import lombok.NoArgsConstructor; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.persistence.Table; import java.io.Serializable; @@ -50,8 +47,7 @@ public class ScrDataObject extends BaseBean implements Serializable { @Column(name = "DATA_TYPE") @ApiModelProperty(value = "数据类型") - @Enumerated(EnumType.STRING) - private ScreenEnumUtil.DATA_OBJECT_SOURCE dataType; + private Integer dataType; @Column(name = "FIELD_CODE") @ApiModelProperty(value = "字段代码") @@ -80,7 +76,6 @@ public class ScrDataObject extends BaseBean implements Serializable { @Column(name = "NULLABLE") @ApiModelProperty("是否能为空") - @Enumerated(EnumType.STRING) - private ScreenEnumUtil.NULLABLE nullable; + private Integer nullable; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java index 8eb61aa..9f49d5a 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -12,8 +11,6 @@ import lombok.NoArgsConstructor; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.persistence.Table; import java.io.Serializable; @@ -39,8 +36,7 @@ public class ScrDataObjectIndex extends BaseBean implements Serializable { @Column(name = "INDEX_TYPE") @ApiModelProperty("约束类型") - @Enumerated(EnumType.STRING) - private ScreenEnumUtil.INDEX_TYPE indexType; + private Integer indexType; @Column(name = "GROUP_NO") @ApiModelProperty("组号") diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java index 08078fa..6d28b02 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -13,8 +11,6 @@ import lombok.NoArgsConstructor; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.persistence.Table; import java.io.Serializable; @@ -45,13 +41,11 @@ public class ScrDatasource extends BaseBean implements Serializable { @Column(name = "SOURCE_CONNECTION_STATUS") @ApiModelProperty(value = "数据源状态", name = "状态：可用，不可用 看枚举当中是否存在") - @Enumerated(EnumType.STRING) - private ScreenEnumUtil.DATASOURCE_CONNECTION_STATUS sourceConnectionStatus; + private Integer sourceConnectionStatus; @Column(name = "SOURCE_TYPE") @ApiModelProperty(value = "数据源类型", name = "CommonEnumUtil.DATA_SOURCE_TYPE") - @Enumerated(EnumType.STRING) - private CommonEnumUtil.DATA_SOURCE_TYPE sourceType; + private Integer sourceType; @Column(name = "SOURCE_HOST") @ApiModelProperty(value = "数据源连接地址") diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java index 90f9535..6c1d0da 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -13,8 +11,6 @@ import lombok.NoArgsConstructor; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.persistence.Table; import java.io.Serializable; @@ -44,7 +40,6 @@ public class ScrLayout extends BaseBean implements Serializable { @Column(name = "LAYOUT_TYPE") @ApiModelProperty("布局类型") - @Enumerated(EnumType.STRING) - private ScreenEnumUtil.LAYOUT_TYPE layoutType; + private Integer layoutType; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java index ce0ffe0..08bb0d7 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -12,8 +11,6 @@ import lombok.NoArgsConstructor; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.persistence.Table; import java.io.Serializable; @@ -39,8 +36,7 @@ public class ScrModel extends BaseBean implements Serializable { @Column(name = "MODEL_TYPE") @ApiModelProperty("model的类型") - @Enumerated(EnumType.STRING) - private ScreenEnumUtil.MODEL_TYPE modelType; + private Integer modelType; @Column(name = "DATA_OBJECT_CODE") @ApiModelProperty("数据对象代码") diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java index f054066..1fdc02f 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -13,8 +11,6 @@ import lombok.NoArgsConstructor; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.persistence.Table; import javax.persistence.Transient; import java.io.Serializable; @@ -89,8 +85,7 @@ public class ScrModelField extends BaseBean implements Serializable { @Column(name = "MODEL_FIELD_DATASOURCE") @ApiModelProperty("字段数据来源") - @Enumerated(EnumType.STRING) - private ScreenEnumUtil.MODEL_FIELD_DATASOURCE modelFieldDatasource; + private Integer modelFieldDatasource; @Column(name = "MODEL_FIELD_DATASOURCE_PROPS") @ApiModelProperty("model字段来源属性") diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java index 3e4130e..645802f 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -40,8 +39,7 @@ public class ScrModelFieldIndex extends BaseBean implements Serializable { @Column(name = "INDEX_TYPE") @ApiModelProperty("约束类型") - @Enumerated(EnumType.STRING) - private ScreenEnumUtil.INDEX_TYPE indexType; + private Integer indexType; @Column(name = "GROUP_NO") @ApiModelProperty("组号") @@ -58,11 +56,9 @@ public class ScrModelFieldIndex extends BaseBean implements Serializable { @Column(name = "PRIMARY_KEY_SWITCH") @ApiModelProperty("model主键唯一检查开关") - @Enumerated(EnumType.STRING) - private CommonEnumUtil.TRUE_OR_FALSE primaryKeySwitch; + private Integer primaryKeySwitch; @Column(name = "UNIQUE_KEY_SWITCH") @ApiModelProperty("model唯一键唯一检查开关") - @Enumerated(EnumType.STRING) - private CommonEnumUtil.TRUE_OR_FALSE uniqueKeySwitch; + private Integer uniqueKeySwitch; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java index d6249a0..daa60a5 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.screen.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -13,8 +11,6 @@ import lombok.NoArgsConstructor; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.persistence.Table; import java.io.Serializable; @@ -52,12 +48,10 @@ public class ScrScreen extends BaseBean implements Serializable { @Column(name = "SCREEN_TYPE") @ApiModelProperty("页面类型") - @Enumerated(EnumType.STRING) - private ScreenEnumUtil.SCREEN_TYPE screenType; + private Integer screenType; @Column(name = "SCREEN_OWNING_SYSTEM") @ApiModelProperty("界面所属系统") - @Enumerated(EnumType.STRING) - private CommonEnumUtil.SOFT_TYPE screenOwningSystem; + private Integer screenOwningSystem; } From e3a558913b8b93eb260d03825f91512edf29581d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 23 Jun 2021 11:41:52 +0800 Subject: [PATCH 03/27] =?UTF-8?q?=E3=80=903566=2020063-=E9=89=B4=E5=AE=9A?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5-20210618=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesTemporarySnRecord.java | 72 ++++++++++++++++++++++ .../repository/MesTemporarySnRecordRepository.java | 14 +++++ 2 files changed, 86 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTemporarySnRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTemporarySnRecordRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTemporarySnRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTemporarySnRecord.java new file mode 100644 index 0000000..0272598 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTemporarySnRecord.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TEMPORARY_SN_RECORD") +@Api("MES_临时条码记录信息") +public class MesTemporarySnRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5274274774653791153L; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "IF_PACK") + @ApiParam("是否打包") + private Integer ifPack; + + @Column(name = "PATTERN_CODE") + @ApiParam("模式代码") + private String patternCode; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式名称") + private String patternName; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTemporarySnRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTemporarySnRecordRepository.java new file mode 100644 index 0000000..8e968f7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTemporarySnRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesTemporarySnRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:53 + * @Modify: + **/ +public interface MesTemporarySnRecordRepository extends BaseRepository { +} From 3c42131f2bd16711fd8160de4f1a0feba43d886e Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 24 Jun 2021 19:19:31 +0800 Subject: [PATCH 04/27] =?UTF-8?q?16436=2019081-PCN-=E8=BF=94=E5=B7=A5?= =?UTF-8?q?=E8=BF=94=E4=BF=AE-=E9=9A=94=E7=A6=BB-=E5=9F=BA=E4=BA=8E?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=9F=A5=E8=AF=A2=E9=9B=B6=E4=BB=B6=E6=97=B6?= =?UTF-8?q?-=E6=95=A3=E4=BB=B6=E6=B8=85=E5=8D=95=E5=92=8C=E7=89=A9?= =?UTF-8?q?=E6=96=99bom=EF=BC=8C=E5=92=8C=E5=A2=9E=E5=8A=A0=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index 6095463..dc0a116 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -108,6 +108,9 @@ public class MesBom extends BaseBean implements Serializable { @ApiParam("报废数") private Double wasteQty = 0d; + @Transient + @ApiParam("客户零件号") + private String custPartNo; public double getQtyVal() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java index 46a5850..bdf9ab3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java @@ -85,4 +85,8 @@ public class MesQuarantineRecord extends BaseBean { @Column(name = "REPAIR_NAME") @ApiParam("维修名称") private String repairName; + + @Column(name = "IS_CANCEL_REPAIR") + @ApiParam("取消报废") + private Integer isCancelScrap; } From ed7b2fdbfea9653e56044da8d3531c0bab7bd595 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 24 Jun 2021 22:02:05 +0800 Subject: [PATCH 05/27] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java index e750735..aff63c1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java @@ -4,14 +4,14 @@ 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.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; /** diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index ab02943..53ed57b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1379,6 +1379,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getLeftCode(), "leftCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getCtNo(), "ctNo", result); if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { DdlPreparedPack.getNumberBiggerPackContainsZero(0.0, "qty", result); } From 42fb211a262991c7d6ff23ad13fb5a05dc444588 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 25 Jun 2021 17:16:57 +0800 Subject: [PATCH 06/27] =?UTF-8?q?625=20=E6=95=B0=E6=8D=AE=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ScreenEnumUtil.java | 72 ++++++++++++++++++++ .../estsh/i3plus/pojo/screen/bean/ScrDataAuth.java | 34 +++++----- .../i3plus/pojo/screen/bean/ScrDataObject.java | 48 +++++--------- .../pojo/screen/bean/ScrDataObjectIndex.java | 12 ++++ .../pojo/screen/bean/ScrDataObjectProperty.java | 76 ++++++++++++++++++++++ .../i3plus/pojo/screen/bean/ScrEventAction.java | 6 +- .../cn/estsh/i3plus/pojo/screen/bean/ScrModel.java | 7 +- .../i3plus/pojo/screen/bean/ScrModelField.java | 3 +- .../pojo/screen/model/ScrDataObjectIndexModel.java | 5 +- .../ScrDataObjectPropertyRepository.java | 14 ++++ 10 files changed, 223 insertions(+), 54 deletions(-) create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java create mode 100644 modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectPropertyRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java index 6bde42d..8fb4674 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java @@ -788,8 +788,80 @@ public class ScreenEnumUtil { } return tmp; } + } + + public enum AUTH_ACCESS_TYPE { + NO_AUTH(10, "NO_AUTH", "无权限"), + READONLY(20, "READONLY", "只读"); + + private Integer value; + private String code; + private String description; + + AUTH_ACCESS_TYPE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + public enum AUTH_KIND_TYPE { + USER(10, "USER", "用户"), + ROLE(20, "ROLE", "角色"); + + private Integer value; + private String code; + private String description; + + AUTH_KIND_TYPE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } } } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java index f02e9a9..49f1dba 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java @@ -30,6 +30,10 @@ import java.io.Serializable; public class ScrDataAuth extends BaseBean implements Serializable { private static final long serialVersionUID = 8099384243374450186L; + @Column(name = "SCREEN_CODE") + @ApiModelProperty("页面代码") + private String screenCode; + @Column(name = "MODEL_CODE") @ApiModelProperty("model代码") private String modelCode; @@ -38,25 +42,25 @@ public class ScrDataAuth extends BaseBean implements Serializable { @ApiModelProperty("model字段代码") private String modelFieldCode; - @Column(name = "MODEL_FIELD_CONDITION") - @ApiModelProperty("model字段条件") - private String modelFieldCondition; - - @Column(name = "ACCESS_ROLES") + @Column(name = "ROLE") @ApiModelProperty("可以访问的角色") - private String accessRoles; + private String role; - @Column(name = "DENIED_ROLES") - @ApiModelProperty("拒绝访问的角色") - private String deniedRoles; + @Column(name = "ACCESS_TYPE") + @ApiModelProperty("访问类型") + private Integer accessType; - @Column(name = "ACCESS_USERS") - @ApiModelProperty("可以访问的用户") - private String accessUsers; + @Column(name = "AUTH_KIND_TYPE") + @ApiModelProperty("行权限类型") + private Integer authKindType; - @Column(name = "DENIED_USERS") - @ApiModelProperty("拒绝访问的用户") - private String deniedUsers; + @Column(name="AUTH_VALUE") + @ApiModelProperty("权限制") + private String authValue; + + @Column(name = "MODEL_FIELD_CONDITION") + @ApiModelProperty("model字段条件") + private String modelFieldCondition; @Column(name = "AUTH_TYPE") @ApiModelProperty("权限类型 （行，列）") diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java index e07d8fb..b542882 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java @@ -14,6 +14,7 @@ import lombok.NoArgsConstructor; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -32,50 +33,33 @@ import java.io.Serializable; public class ScrDataObject extends BaseBean implements Serializable { private static final long serialVersionUID = -270662014158685376L; - @Column(name = "DATA_SOURCE_ID") + @Column(name = "DATASOURCE_ID") @ApiModelProperty(value = "数据源ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) - private Long dataSourceId; + private Long datasourceId; @Column(name = "DATA_OBJECT_CODE") @ApiModelProperty(value = "数据对象代码") private String dataObjectCode; + @Column(name = "DATA_OBJECT_NAME") + @ApiModelProperty(value = "数据对象名称") + private String dataObjectName; + @Column(name = "TABLE_NAME") @ApiModelProperty(value = "表或视图名称") private String tableName; - @Column(name = "DATA_TYPE") - @ApiModelProperty(value = "数据类型") - private Integer dataType; - - @Column(name = "FIELD_CODE") - @ApiModelProperty(value = "字段代码") - private String fieldCode; - - @Column(name = "FIELD_NAME") - @ApiModelProperty(value = "字段名称") - private String fieldName; - - - @Column(name = "FIELD_TYPE") - @ApiModelProperty(value = "字段类型") - private String fieldType; - - @Column(name = "FIELD_SIZE") - @ApiModelProperty(value = "字段长度") - private Integer fieldSize; - - @Column(name = "DISPLAY_NAME") - @ApiModelProperty(value = "字段名称") - private String displayName; + @Column(name = "TABLE_TYPE") + @ApiModelProperty(value = "表还是视图") + private Integer tableType; - @Column(name = "DESCRIPTION") - @ApiModelProperty(value = "描述") - private String description; + @Transient + @ApiModelProperty(value = "数据源代码") + private String datasourceCode; - @Column(name = "NULLABLE") - @ApiModelProperty("是否能为空") - private Integer nullable; + @Transient + @ApiModelProperty(value="数据源名称") + private String datasourceName; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java index 9f49d5a..3062320 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java @@ -42,8 +42,20 @@ public class ScrDataObjectIndex extends BaseBean implements Serializable { @ApiModelProperty("组号") private Integer groupNo; + @Column(name = "SEQ_NO") + @ApiModelProperty("组号") + private Integer seqNo; + @Column(name = "FIELD_CODE") @ApiModelProperty("字段代码") private String fieldCode; + @Column(name = "INDEX_NAME") + @ApiModelProperty("索引名字") + private String indexName; + + @Column(name = "IS_UNIQUE") + @ApiModelProperty("是否唯一") + private Integer isUnique; + } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java new file mode 100644 index 0000000..03bc465 --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.screen.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.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/3/22 下午1:27 + * @desc 数据对象管理 + */ +@Entity +@Table(name = "SCR_DATA_OBJECT_PROPERTY") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("数据对象管理") +public class ScrDataObjectProperty extends BaseBean implements Serializable { + private static final long serialVersionUID = -2729101772049144018L; + + @Column(name = "DATA_OBJECT_CODE") + @ApiModelProperty(value = "数据对象代码") + private String dataObjectCode; + + @Column(name = "DISPLAY_NAME") + @ApiModelProperty(value = "字段名称") + private String displayName; + + @Column(name = "DATA_TYPE") + @ApiModelProperty(value = "数据类型") + private Integer dataType; + + @Column(name = "DATA_TYPE_NAME") + @ApiModelProperty(value = "数据类型名称") + private String dataTypeName; + + @Column(name = "FIELD_TYPE") + @ApiModelProperty(value = "java类型") + private String fieldType; + + @Column(name = "FIELD_CODE") + @ApiModelProperty(value = "字段代码") + private String fieldCode; + + @Column(name = "NULLABLE") + @ApiModelProperty("是否能为空") + private Integer nullable; + + @Column(name = "FIELD_NAME") + @ApiModelProperty(value = "字段名称") + private String fieldName; + + @Column(name = "FIELD_SIZE") + @ApiModelProperty(value = "字段长度") + private Integer fieldSize; + + @Column(name = "DESCRIPTION") + @ApiModelProperty(value = "描述") + private String description; + + +} diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java index 800abf4..469c22b 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java @@ -44,6 +44,10 @@ public class ScrEventAction extends BaseBean implements Serializable { private String executeActionCode; @Column(name = "POST_ACTION_CODE") - @ApiModelProperty("执行前动作代码") + @ApiModelProperty("执行后动作代码") private String postActionCode; + + @Column(name = "EXCEPTION_ACTION_CODE") + @ApiModelProperty("报错时动作代码") + private String exceptionActionCode; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java index 08bb0d7..bde977a 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java @@ -34,6 +34,10 @@ public class ScrModel extends BaseBean implements Serializable { @ApiModelProperty("model代码") private String modelCode; + @Column(name = "MODEL_NAME") + @ApiModelProperty("model名称") + private String modelName; + @Column(name = "MODEL_TYPE") @ApiModelProperty("model的类型") private Integer modelType; @@ -42,7 +46,4 @@ public class ScrModel extends BaseBean implements Serializable { @ApiModelProperty("数据对象代码") private String dataObjectCode; - @Column(name = "DATA_COlUMN_AUTH") - @ApiModelProperty("数据列权限") - private String dataColumnAuth; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java index 1fdc02f..954be8f 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java @@ -71,7 +71,7 @@ public class ScrModelField extends BaseBean implements Serializable { @ApiModelProperty("是否必填") private Boolean isRequired = false; - @Column(name = "SEQ") + @Column(name = "SEQ",columnDefinition = "int(11) default 0") @ApiModelProperty("表单顺序") private Integer seq; @@ -98,5 +98,4 @@ public class ScrModelField extends BaseBean implements Serializable { @Transient private Object fieldValue; - } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDataObjectIndexModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDataObjectIndexModel.java index 7b9f2b7..9208bc6 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDataObjectIndexModel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDataObjectIndexModel.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.screen.model; import cn.estsh.i3plus.pojo.screen.bean.ScrDataObject; import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectIndex; +import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectProperty; import cn.estsh.i3plus.pojo.screen.bean.ScrDatasource; import lombok.Builder; import lombok.Data; @@ -21,7 +22,9 @@ public class ScrDataObjectIndexModel implements Serializable { private ScrDatasource datasource; - private List dataObjects; + private ScrDataObject dataObject; private List dataObjectIndices; + + private List dataObjectProperties; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectPropertyRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectPropertyRepository.java new file mode 100644 index 0000000..d532b4c --- /dev/null +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectPropertyRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.screen.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectProperty; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface ScrDataObjectPropertyRepository extends BaseRepository { +} From d96f4b5d74ce7f1ac3c9aeef999525e5df3d3831 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 26 Jun 2021 17:01:59 +0800 Subject: [PATCH 07/27] =?UTF-8?q?16496=2019081-=E8=AE=BE=E5=A4=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E8=B0=83=E6=95=B4-?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 102 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java | 24 +++++ .../estsh/i3plus/pojo/mes/bean/MesEquipment.java | 4 + .../i3plus/pojo/mes/model/MesEquTaskModel.java | 29 +++++- .../i3plus/pojo/mes/model/MesEquipmentModel.java | 6 +- 5 files changed, 162 insertions(+), 3 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 ba8f21d..6de9de8 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 @@ -8503,4 +8503,106 @@ public class MesEnumUtil { return description; } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TASK_INTEGRAL_JUNCTION { + + TEMPORARY_RESOLVED(10, "临时解决"), + LONG_TERM_SOLUTION(20, "长期解决"), + UNRESOLVED(30, "未解决"); + + private int value; + private String description; + + TASK_INTEGRAL_JUNCTION(int value, String description) { + this.value = value; + this.description = description; + } + + 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; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MAINTENANCE_TYPE { + + PERIODIC_MAINTENANCE(10, "周期性维护"), + IMPROVING_MAINTENANCE(20, "改善性维护"), + EMERGENCY_MAINTENANCE(30, "紧急维护"); + + private int value; + private String description; + + MAINTENANCE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + 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; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRIORITY { + + HIGH(10, "高"), + CENTER(20, "中"), + LOW(30, "低"); + + private int value; + private String description; + + PRIORITY(int value, String description) { + this.value = value; + this.description = description; + } + + 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; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java index b08353f..4735aef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java @@ -73,6 +73,30 @@ public class MesEquTask extends BaseBean implements Serializable { @ApiParam("关联任务") private String relateTask; + @Column(name = "FAULT_LOCATION") + @ApiParam("故障位置") + private String faultLocation; + + @Column(name = "REPAIR_TYPE") + @ApiParam("维修类型") + private Integer repairType; + + @Column(name = "PRIORITY") + @ApiParam("优先级") + private Integer priority; + + @Column(name = "DESIGNATOR") + @ApiParam("指派人") + private String designator; + + @Transient + @ApiParam("维修类型") + private String repairTypeName; + + @Transient + @ApiParam("优先级") + private String priorityName; + @Transient @ApiParam(value = "设备代码") private String equipmentCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java index b055268..a752a50 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -92,6 +92,10 @@ public class MesEquipment extends BaseBean implements Serializable { @ApiParam("备注") private String memo; + @Column(name = "FIXED_ASSETS_NO") + @ApiParam("固定资产编号") + private String fixedAssetsNo; + @Transient @ApiParam(value = "名称") private String name; 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 ce42085..d8bb734 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 @@ -19,7 +19,7 @@ public class MesEquTaskModel implements Serializable { @ApiParam("作业状态") private Integer taskStatus; - @ApiParam(value="生产线") + @ApiParam(value = "生产线") private String workCenterCode; @ApiParam("计划日期") @@ -73,12 +73,33 @@ public class MesEquTaskModel implements Serializable { @ApiParam("mes设备作业任务页面按钮控制") private MesButtonFlagModel mesButtonFlagModel; + @ApiParam("故障位置") + private String faultLocation; + + @ApiParam("维修类型") + private Integer repairType; + + @ApiParam("优先级") + private Integer priority; + + @ApiParam("指派人") + private String designator; + + @ApiParam("维修类型") + private String repairTypeName; + + @ApiParam("优先级") + private String priorityName; + public MesEquTaskModel() { } - public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, + String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, + String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, + String modifyUser, String modifyDatetime, String faultLocation, Integer repairType, Integer priority, String designator) { this.id = id; this.taskNo = taskNo; this.taskType = taskType; @@ -96,5 +117,9 @@ public class MesEquTaskModel implements Serializable { this.createDatetime = createDatetime; this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; + this.faultLocation = faultLocation; + this.repairType = repairType; + this.priority = priority; + this.designator = designator; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index 5a21f16..db6a569 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -100,6 +100,9 @@ public class MesEquipmentModel implements Serializable { @ApiParam("作业校验模式") private Integer checkModel; + @ApiParam("固定资产编号") + private String fixedAssetsNo; + public MesEquipmentModel() { @@ -143,7 +146,7 @@ public class MesEquipmentModel implements Serializable { } //获取设备分页数据 queryMesEquipmentByPager - public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer checkModel) { + public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer checkModel, String fixedAssetsNo) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -168,6 +171,7 @@ public class MesEquipmentModel implements Serializable { this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; this.checkModel = checkModel; + this.fixedAssetsNo = fixedAssetsNo; } } From fd32eb6bf87130a71b9053e96da682afd36d9d2c Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 26 Jun 2021 21:42:56 +0800 Subject: [PATCH 08/27] =?UTF-8?q?=E5=B7=A5=E8=A3=85=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=AC=A1=E6=95=B0=E9=A2=84=E8=AD=A6job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java | 12 ++++++++++++ .../pojo/mes/repository/MesToolingDetailRepository.java | 13 +++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingDetailRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java index 22bbb6c..46249eb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java @@ -58,6 +58,18 @@ public class MesTooling extends BaseBean implements Serializable { @ApiParam("提醒次数") private Integer remindCount; + @Column(name = "WARNING_TIME") + @ApiParam("预警次数") + private Integer warningTime; + + @Column(name = "NOTIFY_USER_EMP_NO") + @ApiParam("通知员工号") + private String notifyUserEmpNo; + + @Column(name = "NOTIFY_USER_NAME") + @ApiParam("通知员工名称") + private String notifyUserName; + @Transient @ApiParam("使用次数") private Integer useCount; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingDetailRepository.java new file mode 100644 index 0000000..c372fba --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingDetailRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesToolingDetail; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/6/26 5:57 PM + * @Modify: + */ +public interface MesToolingDetailRepository extends BaseRepository { +} From 5755f86ca52eaa4a3d9375730a7fdd4f58bb1aa5 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Sun, 27 Jun 2021 11:04:13 +0800 Subject: [PATCH 09/27] =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/andon/bean/AndonTarget.java | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonTarget.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonTarget.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonTarget.java new file mode 100644 index 0000000..af33c13 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonTarget.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.andon.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @author Dominic + * @date 2021/6/27 10:46 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_TARGET") +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Api("安灯目标") +public class AndonTarget extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1472090790204808649L; + + @Column(name = "TARGET_TYPE") + @ApiParam("目标类型") + private String targetType; + + @Column(name = "TARGET") + @ApiParam("目标值") + private String target; + + @Column(name = "WEEK") + @ApiParam("星期") + private String week; +} From f2274243a6e4e410148f818cb2600d4304ee66d3 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Sun, 27 Jun 2021 11:06:30 +0800 Subject: [PATCH 10/27] =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonTarget.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonTarget.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonTarget.java index af33c13..5f4a98f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonTarget.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonTarget.java @@ -28,7 +28,7 @@ import java.io.Serializable; @Api("安灯目标") public class AndonTarget extends BaseBean implements Serializable { - private static final long serialVersionUID = -1472090790204808649L; + private static final long serialVersionUID = -8981868292756664265L; @Column(name = "TARGET_TYPE") @ApiParam("目标类型") From 52f4ea0331a0fc7a1f04469935201792bf915a1d Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sun, 27 Jun 2021 11:32:40 +0800 Subject: [PATCH 11/27] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index 69ee2b9..9b42b0d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -65,6 +65,10 @@ public class MesEquTaskDetail extends BaseBean implements Serializable { @ApiParam("维修标识") private Integer repairFlag; + @Column(name = "FILE_ID") + @ApiParam("文件id") + private Long fileId; + @Transient @ApiParam(value = "点检保养记录") private List equTaskStandardRecordList; From 21c9a4ae01547c406594ceaec8259e6a319d809b Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Sun, 27 Jun 2021 11:41:07 +0800 Subject: [PATCH 12/27] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=89=E7=81=AF?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/andon/repository/IAndonTargetRepository.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonTargetRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonTargetRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonTargetRepository.java new file mode 100644 index 0000000..ffb3bbd --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonTargetRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonTarget; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 安灯目标 + * @Reference : + * @Author : dominic + * @CreateDate : 2021/6/27 11:39 + * @Modify: + **/ +@Repository +public interface IAndonTargetRepository extends BaseRepository { +} From 9c94d857d7b829fe8de609f46a721355920a20e8 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Sun, 27 Jun 2021 12:08:34 +0800 Subject: [PATCH 13/27] =?UTF-8?q?=E6=B3=B0=E5=9B=BD=E7=94=B5=E6=A3=80?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesElectrotestingPrintData.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesElectrotestingPrintData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesElectrotestingPrintData.java index 5ecc961..67110f8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesElectrotestingPrintData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesElectrotestingPrintData.java @@ -45,6 +45,10 @@ public class MesElectrotestingPrintData extends BaseBean implements Serializable @ApiParam("佣金号") private String commissionNumber; + @Column(name = "SERIAL_NUMBER") + @ApiParam("流水号") + private String serialNumber; + @Column(name = "QAD_NO") @ApiParam("位置号") private String qadNo; From 7c67e954c7c62545af891afbacc854d01459b650 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sun, 27 Jun 2021 13:01:49 +0800 Subject: [PATCH 14/27] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index 9b42b0d..c966134 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -67,7 +67,7 @@ public class MesEquTaskDetail extends BaseBean implements Serializable { @Column(name = "FILE_ID") @ApiParam("文件id") - private Long fileId; + private String fileId; @Transient @ApiParam(value = "点检保养记录") From 37b352ce0b10f6e017d6a239667b1663c5a65c76 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Sun, 27 Jun 2021 13:49:22 +0800 Subject: [PATCH 15/27] =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=8F=AD=E4=BC=91=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/andon/bean/MesShiftRest.java | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShiftRest.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShiftRest.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShiftRest.java new file mode 100644 index 0000000..45ecce4 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShiftRest.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.andon.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description :mes系统业务动作 + * @Reference : + * @Author : yiming.gu + * @CreateDate : 2019-05-20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_SHIFT_REST") +@Api("班次休息信息") +public class MesShiftRest extends BaseBean implements Serializable { + private static final long serialVersionUID = 5486276486536860088L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name = "START_TIME") + @ApiParam("开始时间") + private String startTime; + + @Column(name = "REST_TIMES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("休息时长") + private Double restTimes; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "REST_DESC") + @ApiParam("班休描述") + private String restDesc; +} From cee28a81bca8f21a6ff258bd33aa9b9b8812e358 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Sun, 27 Jun 2021 14:12:39 +0800 Subject: [PATCH 16/27] =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=8F=AD=E4=BC=91=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/andon/repository/MesShiftRestRepository.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/MesShiftRestRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/MesShiftRestRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/MesShiftRestRepository.java new file mode 100644 index 0000000..03213f0 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/MesShiftRestRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.MesShiftRest; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-05-20 + * @Modify: + **/ +@Repository +public interface MesShiftRestRepository extends BaseRepository { +} From e415b4599d5df777f3cf82ead937e98053b789d0 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Sun, 27 Jun 2021 15:06:28 +0800 Subject: [PATCH 17/27] =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9F=BA=E7=A1=80=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/andon/model/AndonBoardModel.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index ff9e619..a3ab756 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.andon.model; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; import java.io.Serializable; /** @@ -34,10 +33,10 @@ public class AndonBoardModel implements Serializable { private String andonOrderNo; @ApiParam("安灯类型") - private String alarmCode; + private String alarmCode; @ApiParam("安灯类型名称") - private String alarmName; + private String alarmName; @ApiParam("故障时长 单位：分钟") private Long exceptionTimeCount = 0L; @@ -70,7 +69,7 @@ public class AndonBoardModel implements Serializable { private String acDesc; @ApiParam("工位运行状态") - private String cellStatus; + private String cellStatus; @ApiParam("图表类型颜色") private String color; @@ -90,6 +89,15 @@ public class AndonBoardModel implements Serializable { @ApiParam(value = "小时") public String hour; + @ApiParam(value = "运行时长(分钟)") + public String runMinute; + + @ApiParam(value = "平均故障时长(分钟)") + public String avgExceptionTime; + + @ApiParam(value = "MTBF(总运行时间/停线次数)") + public String mtbf; + public int getTotalTimeVal() { return totalTime == null ? 0 : totalTime; } From 7755034dc8c59f0830af5dba42187dbf95fc2603 Mon Sep 17 00:00:00 2001 From: nies Date: Sun, 27 Jun 2021 18:06:05 +0800 Subject: [PATCH 18/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9SyslogRoleChange=20curr?= =?UTF-8?q?entRoles=20=E5=AD=97=E6=AE=B5=E4=B8=BATEXT=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java index 9fd30fc..b601377 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java @@ -46,7 +46,7 @@ public class SysLogRoleChange extends BaseBean { @ApiModelProperty(value = "之前的角色", access = "之前的角色") private String previousRoles; - @Column(name = "CURRENT_ROLES") + @Column(name = "CURRENT_ROLES", columnDefinition = "TEXT") @ApiModelProperty(value = "当前的角色", access = "当前的角色") private String currentRoles; From e0277363645a08019518a8635fd9e748e4a50a78 Mon Sep 17 00:00:00 2001 From: gsz Date: Mon, 28 Jun 2021 09:31:06 +0800 Subject: [PATCH 19/27] =?UTF-8?q?16409=2020063-PDA=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E9=A2=86=E6=96=99=E4=BB=BB=E5=8A=A1-=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AD=90=E9=9B=B6=E4=BB=B6=E5=92=8C=E6=9B=BF?= =?UTF-8?q?=E4=BB=A3=E6=96=99=E7=BB=B4=E6=8A=A4=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 9f83850..59aa838 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -257,6 +257,15 @@ public class WmsMoveToERP extends BaseBean { @Transient private Double transQtySum; + @Transient + private Integer totalNum; + + @Transient + private Integer successNum; + + @Transient + private Integer falseNum; + public Double getTransQtySumVal() { return this.transQtySum == null ? 0 : this.transQtySum.doubleValue(); } From 6eff18d60b4bf284aa7f501e392c4b315e046eae Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Mon, 28 Jun 2021 09:55:31 +0800 Subject: [PATCH 20/27] =?UTF-8?q?=E6=9D=BE=E4=B8=8B=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9B=B4=E6=96=B0=E8=AE=B0=E5=BD=95=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6=E8=BF=87=E9=95=BF?= =?UTF-8?q?=E6=8A=A5=E9=94=99,=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java index 9fd30fc..bac76fd 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java @@ -42,11 +42,11 @@ public class SysLogRoleChange extends BaseBean { @ApiModelProperty(value = "用户名", access = "用户名") private String userName; - @Column(name = "PREVIOUS_ROLES") + @Column(name = "PREVIOUS_ROLES",columnDefinition = "TEXT") @ApiModelProperty(value = "之前的角色", access = "之前的角色") private String previousRoles; - @Column(name = "CURRENT_ROLES") + @Column(name = "CURRENT_ROLES",columnDefinition = "TEXT") @ApiModelProperty(value = "当前的角色", access = "当前的角色") private String currentRoles; From c8b994a596615bb415fe1b20f22f9e3c40222910 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 29 Jun 2021 13:17:00 +0800 Subject: [PATCH 21/27] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 d8bb734..bcbd776 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 @@ -91,6 +91,9 @@ public class MesEquTaskModel implements Serializable { @ApiParam("优先级") private String priorityName; + @ApiParam("设备代码") + private String equipmentCode; + public MesEquTaskModel() { @@ -99,7 +102,7 @@ public class MesEquTaskModel implements Serializable { public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, - String modifyUser, String modifyDatetime, String faultLocation, Integer repairType, Integer priority, String designator) { + String modifyUser, String modifyDatetime, String faultLocation, Integer repairType, Integer priority, String designator, String equipmentCode) { this.id = id; this.taskNo = taskNo; this.taskType = taskType; @@ -121,5 +124,6 @@ public class MesEquTaskModel implements Serializable { this.repairType = repairType; this.priority = priority; this.designator = designator; + this.equipmentCode = equipmentCode; } } From 72a2a24cf732019c3ea0e404d1cdd217f155ccc7 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 29 Jun 2021 14:25:05 +0800 Subject: [PATCH 22/27] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) 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 6de9de8..d513d0d 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 @@ -8605,4 +8605,38 @@ public class MesEnumUtil { return description; } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TOOLING_TYPE { + + WORK_CLOTHES(10, "工装"), + INSPECTION_TOOL(20, "检具"), + MOULD(30, "模具"); + + private int value; + private String description; + + TOOLING_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + 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; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } From cfcb4bda039caffe2ef5bb2d12834c6b83cf2434 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 30 Jun 2021 10:39:11 +0800 Subject: [PATCH 23/27] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E7=8E=B0=E8=B1=A1=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java index 12ba1c4..ae1c1a8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java @@ -44,4 +44,8 @@ public class MesEquFaultPhenomenon extends BaseBean implements Serializable { @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; + + @Column(name = "FILE_ID") + @ApiParam("文件id") + private String fileId; } From 4d8240c78cbf53f629fd7837718f2c4e6e3f7865 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 30 Jun 2021 13:26:10 +0800 Subject: [PATCH 24/27] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E5=94=AF=E4=B8=80=E7=BA=A6?= =?UTF-8?q?=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java index 8a577f0..30b7a84 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java @@ -25,8 +25,7 @@ import javax.persistence.*; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name="WMS_FILE", - uniqueConstraints = {@UniqueConstraint(columnNames = {"FILE_NAME", "REF_SRC", "REF_TYPE"})}) +@Table(name="WMS_FILE") @Api("附件信息") public class WmsFile extends BaseBean{ From 257bd43a8fe9ab4c1a4e3b9c7e11e3dccae8bdb7 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 30 Jun 2021 15:16:18 +0800 Subject: [PATCH 25/27] =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0plc=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/MesObjectCfg.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index 92cfc51..3581c46 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -69,6 +69,10 @@ public class MesObjectCfg extends BaseBean implements Serializable { @ApiParam("是否显示") private Integer isShow; + @Column(name = "PLC_CODE") + @ApiParam("PLC代码") + private String plcCode; + @Transient @ApiParam("是否存储名") private String isSaveName; From c557d715e42b58919b60dc97bb25b2a73dedaaa0 Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 30 Jun 2021 15:26:48 +0800 Subject: [PATCH 26/27] =?UTF-8?q?3578=2020063-=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=88=B0=E8=B4=A7=E7=AA=97=E5=8F=A3=E6=97=B6=E9=97=B4=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF-202106=2016556=2020063-=E6=8E=A5=E5=8F=A3=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=9B=91=E6=8E=A7=E6=8A=A5=E8=A1=A8-=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=95=B0=E6=8D=AE=E5=8F=AA=E6=9F=A5=E8=AF=A2=E6=9C=AA?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsVendorWindow.java | 11 ++++ .../i3plus/pojo/wms/dto/WmsVendorWindowDto.java | 66 ++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsVendorWindowDto.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java index 10e60d3..75e14fb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java @@ -51,4 +51,15 @@ public class WmsVendorWindow extends BaseBean { @Column(name = "WEEK_DAY") @ApiParam(value = "星期") private String weekDay; + + public WmsVendorWindow(WmsVendorWindow wmsVendorWindow) { + this.vendorNo = wmsVendorWindow.getVendorNo(); + this.vendorName = wmsVendorWindow.getVendorName(); + this.windowTime = wmsVendorWindow.getWindowTime(); + this.delayHour = wmsVendorWindow.getDelayHour(); + this.weekDay = wmsVendorWindow.getWeekDay(); + } + + public WmsVendorWindow() { + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsVendorWindowDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsVendorWindowDto.java new file mode 100644 index 0000000..8c2a287 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsVendorWindowDto.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Column; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * @Description : WmsVendorWindowDto + * @Author :gsz + * @Date 2021/6/29 16:32 + * @Modify + **/ +@Data +@Api("到货窗口输出类") +public class WmsVendorWindowDto { + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") + public Long id; + + + @ApiParam(value = "窗口时间") + private String vendorWindowTime; + + @ApiParam(value = "星期一供应商") + private String mondayVendor; + + @ApiParam(value = "星期二供应商") + private String tuesdayVendor; + + @ApiParam(value = "星期三供应商") + private String wednesdayVendor; + + @ApiParam(value = "星期四供应商") + private String thursdayVendor; + + @ApiParam(value = "星期五供应商") + private String fridayVendor; + + @ApiParam(value = "星期六供应商") + private String saturdayVendor; + + @ApiParam(value = "星期日供应商") + private String sundayVendor; + + public WmsVendorWindowDto() { + } + + public WmsVendorWindowDto(WmsVendorWindowDto wmsVendorWindowDto) { + this.vendorWindowTime = wmsVendorWindowDto.getVendorWindowTime(); + this.mondayVendor = wmsVendorWindowDto.getMondayVendor(); + this.tuesdayVendor = wmsVendorWindowDto.getTuesdayVendor(); + this.wednesdayVendor = wmsVendorWindowDto.getWednesdayVendor(); + this.thursdayVendor = wmsVendorWindowDto.getThursdayVendor(); + this.fridayVendor = wmsVendorWindowDto.getFridayVendor(); + this.saturdayVendor = wmsVendorWindowDto.getSaturdayVendor(); + this.sundayVendor = wmsVendorWindowDto.getSundayVendor(); + } +} From 9879d6a7b9b855567cddce244ffbb11e1daadab8 Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 30 Jun 2021 15:52:58 +0800 Subject: [PATCH 27/27] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/platform/AccountExportModel.java | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java new file mode 100644 index 0000000..740c511 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import java.io.Serializable; + +/** + * @author ns + * @create 2021/6/28 0028 下午 13:26 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel +public class AccountExportModel implements Serializable { + //用户名 登录名 部门 邮箱 手机 登录次数 最后登录时间 状态 + + + @ApiModelProperty(value ="姓名" , access ="名称") + private String infoName; + + + @ApiModelProperty(value ="登陆名称" , access ="登陆名称") + private String userLoginName; + + + @ApiModelProperty(value ="邮箱" , access ="邮箱") + private String userEmail; + + @ApiModelProperty(value ="手机号" , access ="手机号") + private String userPhone; + + @ApiModelProperty(value ="部门名称" , access ="部门名称") + private String departmentNameRdd; + + @ApiParam(value = "登录次数", example = "0") + private Integer userLoginNum; + + @ApiParam(value = "账号最后登录时间") + private String userLoginLastDateTime; + + @ApiParam(value = "账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)", example = "-1") + private Integer userStatus; +}